v1.1.6

hiimjasmine00 · May 27, 2024 · 44faf28 · 44faf28
1 parent ef5524a
commit 44faf28
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 # Fake Rate Changelog
+## v1.1.6 (2024-05-27)
+- Fixed incompatibility with the mod "GDDP Integration" by Minemaker0430
+
 ## v1.1.5 (2024-05-25)
 - Fixed incompatibility with the mod "Demons In Between" by me
 

diff --git a/mod.json b/mod.json
@@ -1,11 +1,11 @@
 {
-    "geode": "2.0.0-beta.26",
+    "geode": "2.0.0-beta.27",
     "gd": {
         "android": "2.205",
         "win": "2.204",
         "mac": "2.200"
     },
-    "version": "v1.1.5",
+    "version": "v1.1.6",
     "id": "hiimjustin000.fake_rate",
     "name": "Fake Rate",
     "developer": "hiimjustin000",

diff --git a/src/FREditPopup.cpp b/src/FREditPopup.cpp
@@ -52,19 +52,25 @@ void FRLevelInfoLayer::checkFakeRate() {
 
 void FRLevelInfoLayer::updateFakeRate(int stars, int feature, int difficulty, bool update, bool coins) {
     m_fields->m_fakeRateData = { .id = m_level->m_levelID, .stars = stars, .feature = feature, .difficulty = difficulty };
-    if (Loader::get()->isModLoaded("hiimjustin000.demons_in_between")) {
-        if (auto betweenDifficultySprite = static_cast<CCSprite*>(getChildByID("hiimjustin000.demons_in_between/between-difficulty-sprite"))) {
-            betweenDifficultySprite->setVisible(false);
-            m_difficultySprite->setOpacity(255);
-        }
+    if (auto betweenDifficultySprite = static_cast<CCSprite*>(getChildByID("hiimjustin000.demons_in_between/between-difficulty-sprite"))) {
+        betweenDifficultySprite->setVisible(false);
+        m_difficultySprite->setOpacity(255);
+    }
+    auto gddpOverride = false;
+    if (auto gddpDifficultySprite = static_cast<CCSprite*>(getChildByID("gddp-difficulty"))) {
+        gddpOverride = true;
+        gddpDifficultySprite->setVisible(false);
+        m_difficultySprite->setOpacity(255);
     }
-    if (Loader::get()->isModLoaded("itzkiba.grandpa_demon")) {
+    if (Loader::get()->isModLoaded("itzkiba.grandpa_demon") && !gddpOverride) {
         removeChildByTag(69420);
         if (auto grdDifficulty = getChildByID("grd-difficulty")) grdDifficulty->setVisible(false);
-        if (auto grdInfinity = getChildByID("grd-infinity")) grdInfinity->setVisible(false);
+        for (auto child : CCArrayExt<CCNode*>(getChildren())) {
+            if (child->getID() == "grd-difficulty") child->setVisible(false);
+        }
         m_difficultySprite->setVisible(true);
         if (auto featureGlow = m_difficultySprite->getChildByTag(69420))
-            featureGlow->setPosition(m_difficultySprite->getContentWidth() * 0.5f, m_difficultySprite->getContentHeight() * 0.5f);
+            featureGlow->setPosition(m_difficultySprite->getContentSize() * 0.5f);
     }
     auto winSize = CCDirector::sharedDirector()->getWinSize();
     auto gsm = GameStatsManager::sharedState();
@@ -175,7 +181,7 @@ void FRLevelInfoLayer::fixMoreDifficultiesIncompatibility(CCNode* difficultySpri
         m_difficultySprite->getPositionX() + (legacy ? 0.0f : 0.25f),
         m_difficultySprite->getPositionY() - (legacy ? 0.0f : 0.1f)
     });
-    if (spriteName.compare("uproxide.more_difficulties/MD_DifficultyCP.png") == 0) {
+    if (spriteName == "uproxide.more_difficulties/MD_DifficultyCP.png") {
         moreDifficultiesSprite->setVisible(true);
         m_difficultySprite->setOpacity(0);
     }

diff --git a/src/main.cpp b/src/main.cpp
@@ -19,7 +19,13 @@ class $modify(FRLevelCell, LevelCell) {
                     betweenDifficultySprite->setVisible(false);
                     difficultySprite->setOpacity(255);
                 }
-                if (difficultyContainer->getID().compare("grd-demon-icon-layer") == 0) {
+                auto gddpOverride = false;
+                if (auto gddpDifficultySprite = static_cast<CCSprite*>(difficultyContainer->getChildByID("gddp-difficulty"))) {
+                    gddpOverride = true;
+                    gddpDifficultySprite->setVisible(false);
+                    difficultySprite->setOpacity(255);
+                }
+                if (difficultyContainer->getID() == "grd-demon-icon-layer" && !gddpOverride) {
                     difficultyContainer->removeChildByTag(69420);
                     difficultySprite->setVisible(true);
                     if (auto grdInfinity = static_cast<CCSprite*>(difficultyContainer->getChildByID("grd-infinity"))) {
@@ -28,7 +34,7 @@ class $modify(FRLevelCell, LevelCell) {
                     }
                     else static_cast<CCSprite*>(difficultyContainer->getChildren()->lastObject())->setVisible(false);
                     if (auto featureGlow = difficultySprite->getChildByTag(69420))
-                        featureGlow->setPosition(difficultySprite->getContentWidth() * 0.5f, difficultySprite->getContentHeight() * 0.5f);
+                        featureGlow->setPosition(difficultySprite->getContentSize() * 0.5f);
                 }
 
                 auto& fakeRateData = *it;
@@ -144,7 +150,7 @@ class $modify(FRLevelCell, LevelCell) {
 
         auto legacy = Loader::get()->getLoadedMod("uproxide.more_difficulties")->getSettingValue<bool>("legacy-difficulties");
         auto pos = CCPoint { difficultySprite->getPositionX() + (legacy ? 0.0f : 0.25f), difficultySprite->getPositionY() - (legacy ? 0.0f : 0.1f) };
-        if (spriteName.compare("uproxide.more_difficulties/MD_DifficultyCP.png") == 0) {
+        if (spriteName == "uproxide.more_difficulties/MD_DifficultyCP.png") {
             moreDifficultiesSprite->setVisible(true);
             difficultySprite->setOpacity(0);
         }