beta 47

Minemaker0430 · Nov 16, 2024 · 1eff196 · 1eff196
1 parent d816c84
commit 1eff196
Show file tree

Hide file tree

Showing 24 changed files with 1,126 additions and 479 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,6 +26,8 @@ add_library(${PROJECT_NAME} SHARED
     src/RecommendedUtils.cpp
     src/menus/DPSearchLayer.cpp
     src/popups/SearchPopup.cpp
+    src/RouletteUtils.cpp
+    src/popups/RoulettePopup.cpp
 )
 
 if (NOT DEFINED ENV{GEODE_SDK})

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+# v1.0.0-beta.47
+
+* Reorganized Settings
+* Updated for GD 2.207 & Geode 4.0
+* Added a new setting that moves skillset badges on the Level Info page
+* Added a new setting that lets you hide Bonus levels outside of GDDP Menus 
+
 # v1.0.0-beta.46
 
 * Optimized the Recommendations and XP System a bit

diff --git a/mod.json b/mod.json
@@ -1,10 +1,10 @@
 {
-		"geode": "3.9.0",
+		"geode": "4.0.0-beta.1",
 		"gd": {
-			"win": "2.206",
-			"android": "2.206"
+			"win": "2.2074",
+			"android": "2.2074"
 		},
-		"version": "v1.0.0-beta.46",
+		"version": "v1.0.0-beta.47",
 		"id": "minemaker0430.gddp_integration",
 		"name": "GDDP Integration",
 		"developer": "Minemaker0430",
@@ -49,7 +49,7 @@
 
 	"settings": {
 		"bypass-section": {
-			"name": "Bypass",
+			"name": "Progression Bypass",
 			"type": "title"
 		},
 		"unlock-all-tiers": {
@@ -64,19 +64,16 @@
 			"type": "bool",
 			"default": false
 		},
+		"utility-section": {
+			"name": "Utility",
+			"type": "title"
+		},
 		"enable-practice": {
 			"name": "Enable Practice Packs",
 			"description": "Adds Practice versions of the Main Packs to help you practice Main Tier levels.",
 			"type": "bool",
 			"default": true
 		},
-		"show-outside-menus": {
-			"name": "Show Faces Outside Menus",
-			"description": "Makes Custom Difficulty Faces no longer require GDDP Menus to activate.",
-			"type": "bool",
-			"default": false,
-			"enable-if": "custom-difficulty-faces"
-		},
 		"skillset-badges": {
 			"name": "Enable Skillset Badges",
 			"description": "Enables Skillset Badges next to the difficulty faces.",
@@ -89,56 +86,23 @@
 			"type": "bool",
 			"default": true
 		},
-		"show-support": {
-			"name": "Show Support Button",
-			"description": "Controls the support button in the GDDP Menu. No hard feelings if you disable this.",
-			"type": "bool",
-			"default": true
-		},
-		"menu-section": {
-			"name": "Menu",
-			"type": "title"
-		},
-		"alt-button-texture": {
-			"name": "Alternate Button Texture",
-			"description": "Changes the menu button to something less nightmarish.",
-			"type": "bool",
-			"default": false
-		},
-		"compact-button": {
-			"name": "Compact Menu Button",
-			"description": "Changes the menu button to a Circle Button rather than a typical Creator Menu Button.",
-			"type": "bool",
-			"default": false
-		},
-		"replace-map-packs": {
-			"name": "Replace Map Packs",
-			"description": "Replaces the Map Packs button with the Demon Progression button.",
-			"type": "bool",
-			"default": false
-		},
-		"show-database-version": {
-			"name": "Show Database Version",
-			"description": "Shows what version of the database you're currently on.",
-			"type": "bool",
-			"default": false
-		},
-		"cosmetic-section": {
-			"name": "Cosmetic",
+		"faces-section": {
+			"name": "Difficulty Faces",
 			"type": "title"
 		},
-		"restore-bg-color": {
-			"name": "Vanilla Background Color",
-			"description": "Changes the background color in the GDDP Menus to the Vanilla Color.",
-			"type": "bool",
-			"default": false
-		},
 		"custom-difficulty-faces": {
 			"name": "Custom Difficulty Faces",
 			"description": "Shows custom difficulty faces in the GDDP Menus.",
 			"type": "bool",
 			"default": true
 		},
+		"show-outside-menus": {
+			"name": "Show Faces Outside Menus",
+			"description": "Makes Custom Difficulty Faces no longer require GDDP Menus to activate.",
+			"type": "bool",
+			"default": false,
+			"enable-if": "custom-difficulty-faces"
+		},
 		"all-demons-rated": {
 			"name": "Rate All Demons [BROKEN]",
 			"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)",
@@ -180,12 +144,63 @@
 			"default": true,
 			"enable-if": "show-outside-menus"
 		},
+		"hide-bonus-outside": {
+			"name": "Hide Bonus Outside Menus",
+			"description": "Hides GDDP difficulty faces outside menus for levels only in a GDDP Bonus Pack.",
+			"type": "bool",
+			"default": false,
+			"enable-if": "show-outside-menus"
+		},
+		"menu-section": {
+			"name": "Menu Tweaks",
+			"type": "title"
+		},
+		"alt-button-texture": {
+			"name": "Alternate Button Texture",
+			"description": "Changes the menu button to something less nightmarish.",
+			"type": "bool",
+			"default": false
+		},
+		"compact-button": {
+			"name": "Compact Menu Button",
+			"description": "Changes the menu button to a Circle Button rather than a typical Creator Menu Button.",
+			"type": "bool",
+			"default": false
+		},
+		"replace-map-packs": {
+			"name": "Replace Map Packs",
+			"description": "Replaces the Map Packs button with the Demon Progression button.",
+			"type": "bool",
+			"default": false
+		},
+		"show-database-version": {
+			"name": "Show Database Version",
+			"description": "Shows what version of the database you're currently on.",
+			"type": "bool",
+			"default": false
+		},
+		"cosmetic-section": {
+			"name": "Cosmetic",
+			"type": "title"
+		},
+		"restore-bg-color": {
+			"name": "Vanilla Background Color",
+			"description": "Changes the background color in the GDDP Menus to the Vanilla Color.",
+			"type": "bool",
+			"default": false
+		},
 		"disable-year-color": {
 			"name": "Disable Year Colors",
 			"description": "Disables the subtle Background coloring on Monthly Packs.",
 			"type": "bool",
 			"default": false
 		},
+		"show-support": {
+			"name": "Show Support Button",
+			"description": "Controls the support button in the GDDP Menu. No hard feelings if you disable this.",
+			"type": "bool",
+			"default": true
+		},
 		"compatibility-section": {
 			"name": "Compatibility",
 			"type": "title"
@@ -216,6 +231,13 @@
 			"type": "bool",
 			"default": false,
 			"enable-if": "show-xp"
+		},
+		"move-skill-badges": {
+			"name": "Move Skillset Badges",
+			"description": "Moves the Skillset Badges on the Level Info page to the right.",
+			"type": "bool",
+			"default": false,
+			"enable-if": "skillset-badges"
 		}
 	}
 }
diff --git a/src/ListManager.cpp b/src/ListManager.cpp
@@ -17,9 +17,9 @@ std::vector<ListRating> ListManager::ratings;
 std::string getUserAgent() {
     return fmt::format("{}/{}; GeometryDash/{} (GeodeSDK/{}); {}",
         Mod::get()->getID(),
-        Mod::get()->getVersion().toString(true),
+        Mod::get()->getVersion().toVString(true),
         GEODE_STR(GEODE_GD_VERSION),
-        Loader::get()->getVersion().toString(true),
+        Loader::get()->getVersion().toVString(true),
         GEODE_PLATFORM_NAME
     );
 }
@@ -37,7 +37,7 @@ void ListManager::parseResponse(std::string val) {
     // MAKE SURE WE ARE NOT SPLITTING THE COMMAS IN THE QUOTATION MARKS
     auto lines = string::split(val, "\n");
     auto keys = string::split(lines[0].substr(1, lines[0].size() - 2), "\",\"");
-    static auto demons = matjson::Array();
+    //static auto demons = matjson::Array();
     for (size_t i = 1; i < lines.size(); i++) {
         auto values = string::split(lines[i].substr(1, lines[i].size() - 2), "\",\"");
         ListRating demon;
@@ -185,7 +185,7 @@ bool GDDLListener::init() {
         this->bind([this](web::WebTask::Event* e) {
             if (auto res = e->getValue()) {
                 if (res->ok() && res->string().isOk()) {
-                    auto response = res->string().value();
+                    auto response = res->string().unwrap();
 
                     log::info("Successfully obtained GDDL Data.");