Merge pull request #8 from OmgRod/copilot/fix-6

Fix islands progression issue - levels now unlock immediately after completion

Author: OmgRod

changelog.md

@@ -1,3 +1,4 @@
-# 1.0.0-prerelease.1
-
-- Initial Release
+# 1.0.0-prerelease.1
+
+- Initial Release
+- Fixed islands progression issue where players had to leave and return to layer to progress to next level

include/Surge/layers/GDSIslandSelectLayer.h

@@ -139,4 +139,5 @@ class GDSIslandSelectLayer : public CCLayer, public BoomScrollLayerDelegate, pub
 	void updatePageWithObject(CCObject* page, CCObject* object) override;
 	void onEnterTransitionDidFinish() override;
 	void updatePageButtons();
+	void updateProgressionStatus();
 };

src/layers/GDSIslandSelectLayer.cpp

@@ -1515,7 +1515,8 @@ void GDSIslandSelectLayer::onEnterTransitionDidFinish() {
         m_scaleWithBounce2 = CCEaseBounceOut::create(CCScaleTo::create(0.5,1));
     }
 
-    // gonna look into it later
+    // Update progression status when layer becomes active again
+    updateProgressionStatus();
 }
 
 void GDSIslandSelectLayer::updatePageButtons() {
@@ -1534,4 +1535,61 @@ void GDSIslandSelectLayer::updatePageButtons() {
             m_prevPageBtn->setVisible(true);
         }
     }
+}
+
+void GDSIslandSelectLayer::updateProgressionStatus() {
+    auto GLM = GameLevelManager::sharedState();
+    
+    // Reload level data to ensure we have the latest completion percentages
+    m_iLevels.iLevel1 = GLM->getMainLevel(2001, false);
+    m_iLevels.iLevel2 = GLM->getMainLevel(2002, false);
+    m_iLevels.iLevel3 = GLM->getMainLevel(2003, false);
+    m_iLevels.iLevel4 = GLM->getMainLevel(2004, false);
+    m_iLevels.iLevel5 = GLM->getMainLevel(2005, false);
+    m_iLevels.iLevel6 = GLM->getMainLevel(2006, false);
+    m_iLevels.iLevel7 = GLM->getMainLevel(2007, false);
+    m_iLevels.iLevel8 = GLM->getMainLevel(2008, false);
+    m_iLevels.iLevel9 = GLM->getMainLevel(2009, false);
+    m_iLevels.iLevel10 = GLM->getMainLevel(2010, false);
+
+    // Reload completion status from saved values
+    m_iLevels.level1complete = Mod::get()->getSavedValue<int>("islandlevel1complete");
+    m_iLevels.level2complete = Mod::get()->getSavedValue<int>("islandlevel2complete");
+    m_iLevels.level3complete = Mod::get()->getSavedValue<int>("islandlevel3complete");
+    m_iLevels.level4complete = Mod::get()->getSavedValue<int>("islandlevel4complete");
+    m_iLevels.level5complete = Mod::get()->getSavedValue<int>("islandlevel5complete");
+    m_iLevels.level6complete = Mod::get()->getSavedValue<int>("islandlevel6complete");
+    m_iLevels.level7complete = Mod::get()->getSavedValue<int>("islandlevel7complete");
+    m_iLevels.level8complete = Mod::get()->getSavedValue<int>("islandlevel8complete");
+    m_iLevels.level9complete = Mod::get()->getSavedValue<int>("islandlevel9complete");
+    m_iLevels.level10complete = Mod::get()->getSavedValue<int>("islandlevel10complete");
+
+    // Simple progression check - make levels visible if they should be unlocked
+    if (m_iLevels.iLevel1->m_normalPercent == 100) {
+        m_iLevels.level2Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel2->m_normalPercent == 100) {
+        m_iLevels.level3Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel3->m_normalPercent == 100) {
+        m_iLevels.level4Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel4->m_normalPercent == 100) {
+        m_iLevels.level5Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel5->m_normalPercent == 100) {
+        m_iLevels.level6Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel6->m_normalPercent == 100) {
+        m_iLevels.level7Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel7->m_normalPercent == 100) {
+        m_iLevels.level8Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel8->m_normalPercent == 100) {
+        m_iLevels.level9Btn->setVisible(true);
+    }
+    if (m_iLevels.iLevel9->m_normalPercent == 100) {
+        m_iLevels.level10Btn->setVisible(true);
+    }
 }