v1.1.1

Author: Minemaker0430

changelog.md

@@ -1,3 +1,7 @@
+# v1.1.1
+
+* (Hopefully) Finally fixed a bug where levels would be mistakenly marked as completed
+
 # v1.1.0
 
 Major Additions/Changes:

mod.json

@@ -6,7 +6,7 @@
 			"ios": "2.2081",
 			"mac": "2.2081"
 		},
-		"version": "v1.1.0",
+		"version": "v1.1.1",
 		"id": "minemaker0430.gddp_integration",
 		"name": "GDDP - Demon Progression",
 		"developer": "ItsMochaTheOtter",

src/DPAchievementManager.cpp

@@ -5,11 +5,11 @@
 #include "menus/DPLayer.hpp"
 #include "popups/StatsPopup.hpp"
 #include "DPUtils.hpp"
-#include "popups/dev/VerificationPopup.hpp"
 
 using namespace geode::prelude;
 
 $on_game(Loaded) {
+    DPUtils::verifyCompletedLevels();
     DPAchievementManager::get();
 }
 

src/DPUtils.cpp

@@ -67,4 +67,46 @@ bool DPUtils::containsString(std::vector<std::string> v, std::string t) {
 
 bool DPUtils::containsJson(std::vector<matjson::Value> v, matjson::Value t) {
 	return (std::find(v.begin(), v.end(), t) != v.end());
+};
+
+void DPUtils::verifyCompletedLevels() {
+	auto data = Mod::get()->getSavedValue<matjson::Value>("cached-data");
+	auto completedLvls = Mod::get()->getSavedValue<std::vector<int>>("completed-levels");
+
+	// check completed levels in player's save file
+	auto glm = GameLevelManager::sharedState();
+	auto glmCompletedLvls = glm->getCompletedLevels(false)->asExt();
+
+	// make sure any level that should be there is there
+	if (glmCompletedLvls.size() > 0) {
+		for (auto i : glmCompletedLvls) {
+			auto lvl = static_cast<GJGameLevel*>(i);
+			auto lvlID = lvl->m_levelID.value();
+
+			if (
+				data["level-data"].contains(std::to_string(lvlID)) && 
+				lvl->getNormalPercent() >= 100 && 
+				!DPUtils::containsInt(completedLvls, lvlID)
+			) {
+				completedLvls.push_back(lvlID);
+			}
+
+			if (
+				data["level-data"].contains(std::to_string(lvlID)) && 
+				lvl->getNormalPercent() < 100 && 
+				DPUtils::containsInt(completedLvls, lvlID)
+			) {
+				completedLvls.erase(DPUtils::findInt(completedLvls, lvlID));
+			}
+		}
+	}
+
+	// remove any levels that shouldn't be there
+	for (auto lvlID : completedLvls) {
+		if (!data["level-data"].contains(std::to_string(lvlID))) {
+			completedLvls.erase(DPUtils::findInt(completedLvls, lvlID));
+		}
+	}
+
+	Mod::get()->setSavedValue<std::vector<int>>("completed-levels", completedLvls);
 };

src/DPUtils.hpp

@@ -19,4 +19,6 @@ class DPUtils {
 	static bool containsInt(std::vector<int>, int);
 	static bool containsString(std::vector<std::string>, std::string);
 	static bool containsJson(std::vector<matjson::Value>, matjson::Value);
+
+	static void verifyCompletedLevels();
 };

src/RecommendedUtils.cpp

@@ -54,6 +54,8 @@ above for that skill. its very unlikely that anyone will encounter this scenario
 using namespace geode::prelude;
 
 void RecommendedUtils::validateLevels() {
+	DPUtils::verifyCompletedLevels();
+	
 	auto data = Mod::get()->getSavedValue<matjson::Value>("cached-data");
 	auto recommendations = Mod::get()->getSavedValue<matjson::Value>("recommended-levels");
 	auto completedLvls = Mod::get()->getSavedValue<std::vector<int>>("completed-levels");

src/RouletteUtils.cpp

@@ -68,6 +68,8 @@ std::vector<bool> RouletteUtils::fromFlags(std::string flags) {
 }
 
 std::vector<int> RouletteUtils::setupLevels(std::vector<matjson::Value> packs, std::string settings, int randomSeed) {
+
+    DPUtils::verifyCompletedLevels();
 
     auto settingsBools = fromFlags(settings);
     auto completedFlag = settingsBools[2];

src/XPUtils.cpp

@@ -61,48 +61,6 @@ const matjson::Value XPUtils::skills = matjson::makeObject({
 	})}
 });
 
-/*const std::vector<std::string> XPUtils::skillIDs = { "chokepoints", "duals", "fastPaced", "cps", "memory", "nerve", "ship", "swing", "timings", "wave" };
-
-const std::map<std::string, std::string> skillNames = {
-	{"chokepoints", "Chokepoints"},
-	{"duals", "Duals"},
-	{"fastPaced", "Fast Paced"},
-	{"cps", "High CPS"},
-	{"memory", "Memory/Learny"},
-	{"nerve", "Nerve Control"},
-	{"ship", "Ship"},
-	{"swing", "Swing"},
-	{"timings", "Timings"},
-	{"wave", "Wave"}
-};
-
-const std::map<std::string, CCPoint> skillPositions = {
-	{"chokepoints", {-105.f, 15.f}},
-	{"duals", {-105.f, -15.f}},
-	{"fastPaced", {-105.f, -45.f}},
-	{"cps", {-105.f, -75.f}},
-	{"memory", {-105.f, -105.f}},
-	{"nerve", {105.f, 15.f}},
-	{"ship", {105.f, -15.f}},
-	{"swing", {105.f, -45.f}},
-	{"timings", {105.f, -75.f}},
-	{"wave", {105.f, -105.f}}
-};
-
-const std::map<std::string, ccColor3B> skillColors = {
-	{"chokepoints", ccColor3B{255, 0, 0}}, 
-	{"duals", ccColor3B{255, 128, 0}}, 
-	{"fastPaced", ccColor3B{255, 255, 0}}, 
-	{"cps", ccColor3B{128, 255, 0}}, 
-	{"memory", ccColor3B{0, 255, 0}}, 
-	{"nerve", ccColor3B{0, 255, 128}}, 
-	{"ship", ccColor3B{0, 255, 255}}, 
-	{"swing", ccColor3B{0, 128, 255}}, 
-	{"timings", ccColor3B{0, 0, 255}},
-	{"wave", ccColor3B{128, 0, 255}}
-};*/
-
-//const std::vector<int> FIBONACCI = {1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181};
 const float scaling = (1.f / 500.f);
 
 void XPUtils::getMaxLevels() {

src/hooks/LevelCell.cpp

@@ -137,15 +137,6 @@ class $modify(DemonProgression, LevelCell) {
 			if (data["level-data"].contains(levelID)) {
 				gddpDiff = data["level-data"][levelID]["difficulty"].as<int>().unwrapOr(0);
 				skillsets = data["level-data"][levelID]["skillsets"].as<std::vector<std::string>>().unwrapOrDefault();
-
-				if (this->m_level->m_normalPercent.value() >= 100) {
-					auto completedLvls = Mod::get()->getSavedValue<std::vector<int>>("completed-levels");
-
-					if (!DPUtils::containsInt(completedLvls, this->m_level->m_levelID.value())) {
-						completedLvls.insert(completedLvls.begin(), this->m_level->m_levelID.value());
-						Mod::get()->setSavedValue<std::vector<int>>("completed-levels", completedLvls);
-					}
-				}
 			}
 
 			//skillset badges

src/hooks/LevelInfoLayer.cpp

@@ -172,15 +172,6 @@ class $modify(DemonProgression, LevelInfoLayer) {
 			if (data["level-data"].contains(levelID)) {
 				gddpDiff = data["level-data"][levelID]["difficulty"].as<int>().unwrapOr(0);
 				skillsets = data["level-data"][levelID]["skillsets"].as<std::vector<std::string>>().unwrapOrDefault();
-
-				if (this->m_level->m_normalPercent.value() == 100) {
-					auto completedLvls = Mod::get()->getSavedValue<std::vector<int>>("completed-levels");
-
-					if (!DPUtils::containsInt(completedLvls, this->m_level->m_levelID.value())) {
-						completedLvls.insert(completedLvls.begin(), this->m_level->m_levelID.value());
-						Mod::get()->setSavedValue<std::vector<int>>("completed-levels", completedLvls);
-					}
-				}
 			}
 
 			//skillset badges
@@ -387,7 +378,8 @@ class $modify(DemonProgression, LevelInfoLayer) {
 					}
 				}
 			}
-
+			
+			DPUtils::verifyCompletedLevels();
 		}
 
 		return true;
@@ -396,34 +388,7 @@ class $modify(DemonProgression, LevelInfoLayer) {
 	void onBack(CCObject* sender) {
 		LevelInfoLayer::onBack(sender);
 
-		auto data = Mod::get()->getSavedValue<matjson::Value>("cached-data");
-
-		//check for errors
-		auto jsonCheck = checkJson(data, "");
-
-		if (!jsonCheck.ok()) {
-			log::info("Something went wrong validating the GDDP list data.");
-
-			return;
-		}
-
-		bool inGDDP = Mod::get()->getSavedValue<bool>("in-gddp");
-
-		if (Mod::get()->getSettingValue<bool>("show-outside-menus")) inGDDP = true;
-
-		//if gauntlet level, return
-		if (this->m_level->m_gauntletLevel || this->m_level->m_gauntletLevel2) return;
-
-		if (inGDDP && data["level-data"].contains(std::to_string(this->m_level->m_levelID.value()))) {
-			if (this->m_level->m_normalPercent.value() == 100) {
-				auto completedLvls = Mod::get()->getSavedValue<std::vector<int>>("completed-levels");
-
-				if (!DPUtils::containsInt(completedLvls, this->m_level->m_levelID.value())) {
-					completedLvls.insert(completedLvls.begin(), this->m_level->m_levelID.value());
-					Mod::get()->setSavedValue<std::vector<int>>("completed-levels", completedLvls);
-				}
-			}
-		}
+		DPUtils::verifyCompletedLevels();
 
 		return;
 	}