beta 43

changelog.md

@@ -1,3 +1,11 @@
+# v1.0.0-beta.43
+
+* Fixed Recommendations not recognizing Swing XP
+* Ported settings to the new system
+* Fixed a crash
+* Recommendations now start generating upon beating a level in the GDDP
+* Fixed a visual bug involving Stats
+
 # v1.0.0-beta.42
 
 * Added Swing as a new Skill XP

mod.json

@@ -1,10 +1,10 @@
 {
-		"geode": "3.5.0",
+		"geode": "3.7.1",
 		"gd": {
 			"win": "2.206",
 			"android": "2.206"
 		},
-		"version": "v1.0.0-beta.42",
+		"version": "v1.0.0-beta.43",
 		"id": "minemaker0430.gddp_integration",
 		"name": "GDDP Integration",
 		"developer": "Minemaker0430",
@@ -43,15 +43,15 @@
 		"dependencies": [
 			{
 				"id": "geode.node-ids",
-				"version": ">=1.13.1",
+				"version": ">=1.14.0",
 				"importance": "required"
 			}
 		],
 
 	"settings": {
 		"bypass-section": {
 			"name": "Bypass",
-			"type": "custom"
+			"type": "title"
 		},
 		"unlock-all-tiers": {
 			"name": "Unlock All Tiers",
@@ -75,7 +75,8 @@
 			"name": "Show Faces Outside Menus",
 			"description": "Makes Custom Difficulty Faces no longer require GDDP Menus to activate.",
 			"type": "bool",
-			"default": false
+			"default": false,
+			"enable-if": "custom-difficulty-faces"
 		},
 		"skillset-badges": {
 			"name": "Enable Skillset Badges",
@@ -97,7 +98,7 @@
 		},
 		"menu-section": {
 			"name": "Menu",
-			"type": "custom"
+			"type": "title"
 		},
 		"alt-button-texture": {
 			"name": "Alternate Button Texture",
@@ -125,7 +126,7 @@
 		},
 		"cosmetic-section": {
 			"name": "Cosmetic",
-			"type": "custom"
+			"type": "title"
 		},
 		"restore-bg-color": {
 			"name": "Vanilla Background Color",
@@ -141,9 +142,10 @@
 		},
 		"all-demons-rated": {
 			"name": "Rate All Demons",
-			"description": "Shows custom difficulty faces on all rated demons. Please note that demons without GDDL Ratings will not be given ratings. <cr>Requires \"Show Faces Outside Menus\".</c> \n\n(Option created by wint0r)",
+			"description": "Shows custom difficulty faces on all rated demons. Please note that demons without GDDL Ratings will not be given ratings.\n\n(Option created by wint0r)",
 			"type": "bool",
-			"default": false
+			"default": false,
+			"enable-if": "custom-difficulty-faces && show-outside-menus"
 		},
 		"replace-epic": {
 			"name": "Replace Epic Fire",
@@ -171,7 +173,7 @@
 		},
 		"compatibility-section": {
 			"name": "Compatibility",
-			"type": "custom"
+			"type": "title"
 		},
 		"override-grandpa-demon": {
 			"name": "Override Grandpa Demon",

src/RecommendedUtils.cpp

@@ -69,7 +69,7 @@ void RecommendedUtils::validateLevels() {
 	//check if data exists
 	if (!data["main"].is_array() && !data["legacy"].is_array()) { return; }
 
-	if (levels.empty()) {
+	if (levels.empty() && completedLvls.size() > 0) {
 		generateRecommendations();
 	}
 	else {
@@ -148,10 +148,10 @@ void RecommendedUtils::generateRecommendations() {
 	log::info("highest partial rank: {}", highestPartial);
 
 	//Sort Skills
-	std::vector<int> skills = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; //Highest -> Lowest
+	std::vector<int> skills = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; //Highest -> Lowest
 	for (int i = 0; i < skills.size(); i++) {
 
-		auto xp = Mod::get()->getSavedValue<matjson::Array>("xp", { 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+		auto xp = Mod::get()->getSavedValue<matjson::Array>("xp", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
 
 		for (int j = 0; j < skillIDs.size(); j++) {
 			if (i == 0 && xp[j].as_double() > xp[skills[i]].as_double()) {

src/main.cpp

@@ -5,21 +5,11 @@
 #include <Geode/utils/web.hpp>
 #include <Geode/loader/Event.hpp>
 
-#include "Settings.hpp"
 #include "ListManager.hpp"
 
 //geode namespace
 using namespace geode::prelude;
 
-SettingNode* SectionSettingValue::createNode(float width) {
-	return SectionSettingNode::create(this, width);
-}
-
 $on_mod(Loaded) {
-	Mod::get()->addCustomSetting<SectionSettingValue>("bypass-section", "");
-	Mod::get()->addCustomSetting<SectionSettingValue>("menu-section", "");
-	Mod::get()->addCustomSetting<SectionSettingValue>("cosmetic-section", "");
-	Mod::get()->addCustomSetting<SectionSettingValue>("compatibility-section", "");
-
 	ListManager::init();
 }

src/menus/RecommendedLayer.cpp

@@ -241,6 +241,13 @@ void RecommendedLayer::loadLevelsFailed(const char*) {
 
 	m_loadCircle->fadeAndRemove();
 
+	if (m_IDs.size() > 0) {
+		m_errorText->setCString("Something went wrong...");
+	}
+	else {
+		m_errorText->setCString("Beat a level to generate Recommendations!");
+	}
+
 	/*auto alert = FLAlertLayer::create("ERROR", "Failed to load levels. Please try again later.", "OK");
 	alert->setParent(this);
 	alert->show();*/

src/popups/StatsPopup.cpp

@@ -257,7 +257,6 @@ void StatsPopup::loadTab(int id) {
 			else {
 				if (i == 0) {
 					highestRankSprite->setColor({ 0, 0, 0 });
-					break;
 				}
 			}
 		}
@@ -294,7 +293,6 @@ void StatsPopup::loadTab(int id) {
 			else {
 				if (i == 0) {
 					highestPlusSprite->setColor({ 0, 0, 0 });
-					break;
 				}
 			}
 		}