v1.1 beta 1

Author: Minemaker0430

CMakeLists.txt

@@ -10,36 +10,9 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 project(GDDPIntegration VERSION 1.0.0)
 
-# Set up the mod binary
-add_library(${PROJECT_NAME} SHARED
-    #src/main.cpp
-    # Add your cpp files here
-    src/hooks/CreatorLayer.cpp
-    src/hooks/LevelInfoLayer.cpp
-    src/hooks/LevelCell.cpp
-    src/hooks/PlayLayer.cpp
-    src/popups/StatsPopup.cpp
-    src/DPUtils.cpp
-    src/menus/DPListLayer.cpp
-    src/menus/DPLayer.cpp
-    src/menus/DPPackCell.cpp
-    src/menus/RecommendedLayer.cpp
-    src/popups/SupportPopup.cpp
-    src/XPUtils.cpp
-    src/popups/XPPopup.cpp
-    src/RecommendedUtils.cpp
-    src/menus/DPSearchLayer.cpp
-    src/popups/SearchPopup.cpp
-    src/RouletteUtils.cpp
-    src/popups/RoulettePopup.cpp
-    src/menus/RouletteSafeLayer.cpp
-    src/popups/dev/VerificationPopup.cpp
-    src/popups/dev/SaveContentsPopup.cpp
-    src/base64.cpp
-    src/CustomText.cpp
-    src/RefreshStats.cpp
-    src/popups/OpenStartposPopup.cpp
-)
+file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
+
+add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
 if (NOT DEFINED ENV{GEODE_SDK})
     message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")

README.md

@@ -14,11 +14,6 @@ An official mod for the **G**eometry **D**ash **D**emon **P**rogression list tha
 
 [Learn more about the GDDP on the website!](https://gddp.pro/)
 
-# Update Roadmap
-
-* Pack Banners
-* Achievement Popups
-
 # Credits
 
 * **ItsMochaTheOtter** - Made the mod
@@ -34,5 +29,4 @@ An official mod for the **G**eometry **D**ash **D**emon **P**rogression list tha
 
 * Colon - For helping me with Server Response stuff for lists
 * oatmealine - API Framework for "Rate All Demons"
-
 * wint0r - Created the "Rate All Demons" Option & its Sprite Framework

changelog.md

@@ -1,3 +1,30 @@
+# v1.1.0
+
+* Cleaned up codebase by A LOT
+* Reworked Recommendations system to match the website
+* Added a Button next to Recommended Levels to tell you what Skill they were Recommended for (Can be disabled)
+* Check/Uncheck All no longer scrolls the menu back to the top
+* Merged Skillsets and most hardcoded data to the Main List
+* XP now shows your progress to the Max Level for a Skill
+* XP now displays the Correct Progress to your Next Level
+* You can now view your projected XP Value on an uncompleted level
+* Added a Random Level Selector in Packs
+	* Completed & Uncompleted Filters
+	* Customizable Weight & Offset for more fine-tuned results
+* Progress Bars on Packs and Recommendations now Automatically Update
+* Added Achievement Popups for Packs and Medals (Can be Disabled/Customized)
+* Improved Stats Menu UI and made it update Dynamically
+* Highest/Next Highest now show the actual Highest/Next Highest you have or don't have/skipped in Stats
+* Fixed Roulette Name Entry being cleared on Check All/Uncheck All
+* Added Fancy Medals (And an Option to Toggle Them)
+* Removed "Reduce Demon Label Effects" as it didn't do much to help anyway
+	* Alternative option is to disable "Fancy Demon Labels"
+* Patched up some crashes thanks to Jasmine
+
+# v1.0.16
+
+* Fixed Roulette not working
+
 # v1.0.15
 
 * Fixed monthly timer desync

mod.json

@@ -1,12 +1,12 @@
 {
-		"geode": "5.0.0-beta.2",
+		"geode": "5.4.1",
 		"gd": {
 			"win": "2.2081",
 			"android": "2.2081",
 			"ios": "2.2081",
 			"mac": "2.2081"
 		},
-		"version": "v1.0.15",
+		"version": "v1.1.0-beta.1",
 		"id": "minemaker0430.gddp_integration",
 		"name": "GDDP - Demon Progression",
 		"developer": "ItsMochaTheOtter",
@@ -93,6 +93,13 @@
 			"default": true,
 			"enable-if": "skillset-badges"
 		},
+		"show-recommended-in-list": {
+			"name": "Show Recommendations Button in List",
+			"description": "If disabled, the star button on recommendations will only be shown on the Level Page.",
+			"type": "bool",
+			"default": true,
+			"enable-if": "skillset-badges"
+		},
 		"enable-search": {
 			"name": "Enable Search Menu",
 			"description": "Enables the Advanced GDDP Search Menu.",
@@ -111,6 +118,18 @@
 			"type": "bool",
 			"default": true
 		},
+		"enable-recommended-btn": {
+			"name": "Enable Recommendation Button",
+			"description": "Enables the Star button next to recommended levels.",
+			"type": "bool",
+			"default": true
+		},
+		"enable-random-level-picker": {
+			"name": "Enable Random Level Picker",
+			"description": "Enables the Button on GDDP Pages that pick a Random Level.",
+			"type": "bool",
+			"default": true
+		},
 		"show-xp": {
 			"name": "Enable XP",
 			"description": "Enables all XP-Related Buttons.",
@@ -123,6 +142,12 @@
 			"type": "bool",
 			"default": true
 		},
+		"replace-main-levels": {
+			"name": "Replace Main Level Copies",
+			"description": "Overrides the GDDP's Main Level Copies by sending you to the actual Main Levels.",
+			"type": "bool",
+			"default": true
+		},
 		"faces-section": {
 			"name": "Difficulty Faces",
 			"description": "Options relating to the GDDP Difficulties. Purely cosmetic.",
@@ -210,6 +235,30 @@
 			"description": "Options that relate to cosmetics in menus.",
 			"type": "title"
 		},
+		"achievement-popups": {
+			"name": "Achievement Popups",
+			"description": "Toggles the Achievement Popups that happen whenever you get a Rank, Plus Rank, Pack Completion, Monthly Completion, or Medal.",
+			"type": "bool",
+			"default": true
+		},
+		"disable-pack-achievements": {
+			"name": "Disable Pack Achievements",
+			"description": "Disables the Achievement Popups that happen whenever you complete a Legacy or Bonus Pack.",
+			"type": "bool",
+			"default": false
+		},
+		"disable-monthly-achievements": {
+			"name": "Disable Monthly Achievements",
+			"description": "Disables the Achievement Popups that happen whenever you complete the Monthly.",
+			"type": "bool",
+			"default": false
+		},
+		"disable-medal-achievements": {
+			"name": "Disable Medal Achievements",
+			"description": "Disables the Achievement Popups that happen whenever you get a Medal or Plus Medal.",
+			"type": "bool",
+			"default": false
+		},
 		"custom-pack-text": {
 			"name": "Fancy Pack Text",
 			"description": "Adds fancy text to pack names.",
@@ -222,18 +271,18 @@
 			"type": "bool",
 			"default": true
 		},
-		"reduce-demon-label-effects": {
-			"name": "Reduce Demon Label Effects",
-			"description": "Disables most Demon Label Effects to prevent eyestrain from pixelation on lower resolutions.",
-			"type": "bool",
-			"default": false
-		},
 		"custom-level-name": {
 			"name": "Fancy Level Name",
 			"description": "Adds fancy text to level names.",
 			"type": "bool",
 			"default": true
 		},
+		"fancy-medals": {
+			"name": "Fancy Medals",
+			"description": "Adds fancy text to Medals & Plus Medals.",
+			"type": "bool",
+			"default": true
+		},
 		"override-gold-text": {
 			"name": "Override Completed Text",
 			"description": "Fancy text overrides gold text on completed packs.",
@@ -270,17 +319,11 @@
 			"type": "bool",
 			"default": false
 		},
-		"custom-banners": {
-			"name": "Enable Banners [NYI]",
-			"description": "Adds a custom banner for each tier.",
+		"disable-fancy-monthly-text": {
+			"name": "Disable Fancy Monthly Pack Text",
+			"description": "Disables the text effects on monthly packs.",
 			"type": "bool",
-			"default": true
-		},
-		"custom-backgrounds": {
-			"name": "Enable Tier Backgrounds [NYI]",
-			"description": "Adds a custom background for each tier.",
-			"type": "bool",
-			"default": true
+			"default": false
 		},
 		"restore-bg-color": {
 			"name": "Vanilla Background Color",

src/CustomText.cpp

@@ -74,7 +74,7 @@ std::string CustomText::getText() {
 }
 
 void CustomText::addBevel() {
-    if (Mod::get()->getSettingValue<bool>("disable-bevel")) { return; }
+    if (Mod::get()->getSettingValue<bool>("disable-bevel")) return;
 
     auto bevel = CCLabelBMFont::create(m_label->getString(), "bevelFont.fnt"_spr);
     bevel->setOpacity(125);
@@ -88,7 +88,7 @@ void CustomText::addBevel() {
 }
 
 void CustomText::addGradient(ccColor3B color, float opacity, bool rotated) {
-    if (Mod::get()->getSettingValue<bool>("disable-text-gradient")) { return; }
+    if (Mod::get()->getSettingValue<bool>("disable-text-gradient")) return;
 
     auto gradient = CCSprite::createWithSpriteFrameName("DP_Gradient.png"_spr);
     gradient->setColor(color);
@@ -116,7 +116,7 @@ void CustomText::addGradient(ccColor3B color, float opacity, bool rotated) {
 }
 
 void CustomText::addRadialGradient(ccColor3B color, float opacity) {
-    if (Mod::get()->getSettingValue<bool>("disable-text-gradient")) { return; }
+    if (Mod::get()->getSettingValue<bool>("disable-text-gradient")) return;
 
     auto gradient = CCSprite::createWithSpriteFrameName("DP_RadialGradient.png"_spr);
     gradient->setColor(color);
@@ -132,7 +132,7 @@ void CustomText::addRadialGradient(ccColor3B color, float opacity) {
 }
 
 void CustomText::addStars(ccColor3B color, float opacity) {
-    if (Mod::get()->getSettingValue<bool>("disable-stars")) { return; }
+    if (Mod::get()->getSettingValue<bool>("disable-stars")) return;
 
     auto frontStars = CCSprite::createWithSpriteFrameName("DP_Stars.png"_spr);
     auto backStars = CCSprite::createWithSpriteFrameName("DP_Stars.png"_spr);
@@ -157,7 +157,7 @@ void CustomText::addStars(ccColor3B color, float opacity) {
 }
 
 void CustomText::addCrystals(ccColor3B color, float opacity) {
-    if (Mod::get()->getSettingValue<bool>("disable-crystals")) { return; }
+    if (Mod::get()->getSettingValue<bool>("disable-crystals")) return;
 
     auto crystalParent = CCNode::create();
 
@@ -339,16 +339,8 @@ void CustomText::scaleToContentSize(CCNode* node, CCSize size) {
 }
 
 void CustomText::addEffectsFromProperties(matjson::Value properties) {
-    bool reducedEffects = (Mod::get()->getSettingValue<bool>("reduce-demon-label-effects") && this->getScale() <= 0.35f);
-    
     m_label->setColor(properties["textColor"].as<ccColor3B>().unwrapOr(ccColor3B{255, 255, 255}));
-    if (reducedEffects) { 
-        m_outline->setColor(ccColor3B{ 135, 135, 135 });
-    }
-    else {
-        m_outline->setColor(properties["outlineColor"].as<ccColor3B>().unwrapOr(ccColor3B{0, 0, 0}));
-    }
-
+    m_outline->setColor(properties["outlineColor"].as<ccColor3B>().unwrapOr(ccColor3B{0, 0, 0}));
     m_dropshadow->setColor(properties["shadowColor"].as<ccColor3B>().unwrapOr(ccColor3B{0, 0, 0}));
 
     bool gradient = properties["gradient"].as<bool>().unwrapOr(false);
@@ -381,21 +373,21 @@ void CustomText::addEffectsFromProperties(matjson::Value properties) {
         }
     }
 
-    if (crystal && !reducedEffects) {
+    if (crystal) {
         addCrystals(
             properties["crystalColor"].as<ccColor3B>().unwrapOr(ccColor3B{255, 255, 255}),
             properties["crystalOpacity"].as<float>().unwrapOr(1.0f)
         );
     }
 
-    if (stars && !reducedEffects) {
+    if (stars) {
         addStars(
             properties["starsColor"].as<ccColor3B>().unwrapOr(ccColor3B{255, 255, 255}),
             properties["starsOpacity"].as<float>().unwrapOr(1.0f)
         );
     }
 
-    if (bevel && !reducedEffects) {
+    if (bevel) {
         addBevel();
     }
 
@@ -406,6 +398,10 @@ void CustomText::addEffectsFromProperties(matjson::Value properties) {
     return;
 }
 
+void CustomText::clearEffects() {
+    m_effects->removeAllChildrenWithCleanup(true);
+}
+
 CustomText* CustomText::create(std::string text) {
 	auto pRet = new CustomText();
 	if (pRet && pRet->init(text)) {

src/CustomText.hpp

@@ -69,7 +69,7 @@ special (String) - custom effects
 */
 
 // Yes, all of these are hardcoded, they pretty much have to be to avoid any issues.
-const matjson::Value DPTextEffects = matjson::parse(R"(
+/*const matjson::Value DPTextEffects = matjson::parse(R"(
     {
         "beginner": {
             "textColor": [0, 134, 168],
@@ -454,4 +454,4 @@ const matjson::Value DPTextEffects = matjson::parse(R"(
             "crystal": true
         }
     }
-)").unwrapOrDefault();
+)").unwrapOrDefault();*/