v1.1.4

hiimjasmine00 · Jul 12, 2024 · 1ff4398 · 1ff4398
1 parent 799de70
commit 1ff4398
Show file tree

Hide file tree

Showing 46 changed files with 25 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(DemonsInBetween VERSION 1.1.3)
+project(DemonsInBetween VERSION 1.1.4)
 
 add_library(${PROJECT_NAME} SHARED
     src/DemonsInBetween.cpp

diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 # Demons In Between Changelog
+## v1.1.4 (2024-07-11)
+- Added some compatibility with the mod "GodlikeFaces" by adyagmd
+
 ## v1.1.3 (2024-07-01)
 - The last update actually didn't fix the main menu crash lmfaooooo
 - Updated to use the GDDL spreadsheet, so that the mod doesn't crash the API like it did before

diff --git a/mod.json b/mod.json
@@ -1,11 +1,11 @@
 {
-    "geode": "3.1.1",
+    "geode": "3.2.0",
     "gd": {
         "android": "2.206",
         "win": "2.206",
         "mac": "2.206"
     },
-    "version": "v1.1.3",
+    "version": "v1.1.4",
     "id": "hiimjustin000.demons_in_between",
     "name": "Demons In Between",
     "developer": "hiimjustin000",
@@ -25,6 +25,12 @@
             ],
             "DIB_ShortSheet": [
                 "resources/ShortSheet/*.png"
+            ],
+            "DIB_LegendaryLongSheet": [
+                "resources/LegendaryLongSheet/*.png"
+            ],
+            "DIB_LegendaryShortSheet": [
+                "resources/LegendaryShortSheet/*.png"
             ]
         },
         "sprites": [

diff --git a/resources/LegendaryLongSheet/DIB_01_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_01_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_02_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_02_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_03_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_03_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_04_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_04_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_05_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_05_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_06_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_06_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_07_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_07_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_08_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_08_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_09_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_09_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_10_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_10_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_11_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_11_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_12_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_12_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_13_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_13_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_14_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_14_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_15_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_15_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_16_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_16_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_17_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_17_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_18_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_18_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_19_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_19_4_btn2_001.png
diff --git a/resources/LegendaryLongSheet/DIB_20_4_btn2_001.png b/resources/LegendaryLongSheet/DIB_20_4_btn2_001.png
diff --git a/resources/LegendaryShortSheet/DIB_01_4_btn_001.png b/resources/LegendaryShortSheet/DIB_01_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_02_4_btn_001.png b/resources/LegendaryShortSheet/DIB_02_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_03_4_btn_001.png b/resources/LegendaryShortSheet/DIB_03_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_04_4_btn_001.png b/resources/LegendaryShortSheet/DIB_04_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_05_4_btn_001.png b/resources/LegendaryShortSheet/DIB_05_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_06_4_btn_001.png b/resources/LegendaryShortSheet/DIB_06_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_07_4_btn_001.png b/resources/LegendaryShortSheet/DIB_07_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_08_4_btn_001.png b/resources/LegendaryShortSheet/DIB_08_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_09_4_btn_001.png b/resources/LegendaryShortSheet/DIB_09_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_10_4_btn_001.png b/resources/LegendaryShortSheet/DIB_10_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_11_4_btn_001.png b/resources/LegendaryShortSheet/DIB_11_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_12_4_btn_001.png b/resources/LegendaryShortSheet/DIB_12_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_13_4_btn_001.png b/resources/LegendaryShortSheet/DIB_13_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_14_4_btn_001.png b/resources/LegendaryShortSheet/DIB_14_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_15_4_btn_001.png b/resources/LegendaryShortSheet/DIB_15_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_16_4_btn_001.png b/resources/LegendaryShortSheet/DIB_16_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_17_4_btn_001.png b/resources/LegendaryShortSheet/DIB_17_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_18_4_btn_001.png b/resources/LegendaryShortSheet/DIB_18_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_19_4_btn_001.png b/resources/LegendaryShortSheet/DIB_19_4_btn_001.png
diff --git a/resources/LegendaryShortSheet/DIB_20_4_btn_001.png b/resources/LegendaryShortSheet/DIB_20_4_btn_001.png
diff --git a/src/DemonsInBetween.cpp b/src/DemonsInBetween.cpp
@@ -105,15 +105,20 @@ LadderDemon const& DemonsInBetween::demonForLevel(GJGameLevel* level) {
     return demon == GDDL.end() ? defaultDemon : *demon;
 }
 
-CCSprite* DemonsInBetween::spriteForDifficulty(GJDifficultySprite* difficultySprite, int difficulty, GJDifficultyName name) {
+CCSprite* DemonsInBetween::spriteForDifficulty(GJDifficultySprite* difficultySprite, int difficulty, GJDifficultyName name, GJFeatureState state) {
+    auto glow = state == GJFeatureState::Legendary ? "_4" : "";
     auto sprite = CCSprite::createWithSpriteFrameName((name == GJDifficultyName::Long ?
-        fmt::format("DIB_{:02d}_btn2_001.png"_spr, difficulty) : fmt::format("DIB_{:02d}_btn_001.png"_spr, difficulty)).c_str());
+        fmt::format("DIB_{:02d}{}_btn2_001.png"_spr, difficulty, glow) : fmt::format("DIB_{:02d}{}_btn_001.png"_spr, difficulty, glow)).c_str());
     sprite->setPosition(difficultySprite->getPosition() + (name == GJDifficultyName::Long ?
         LONG_OFFSETS[(size_t)difficulty - 1] : SHORT_OFFSETS[(size_t)difficulty - 1]));
     sprite->setID("between-difficulty-sprite"_spr);
     return sprite;
 }
 
+GJFeatureState DemonsInBetween::stateForLevel(GJGameLevel* level) {
+    return Loader::get()->isModLoaded("adyagd.godlikefaces") ? level->m_featured ? (GJFeatureState)(level->m_isEpic + 1) : GJFeatureState::None : GJFeatureState::None;
+}
+
 GJSearchObject* DemonsInBetween::searchObjectForPage(int page) {
     SEARCH_RESULTS.clear();
 

diff --git a/src/DemonsInBetween.hpp b/src/DemonsInBetween.hpp
@@ -40,6 +40,7 @@ class DemonsInBetween {
     static void initGDDL(matjson::Array const&, bool saveCache = false);
     static matjson::Array const& parseGDDL(std::string const&);
     static LadderDemon const& demonForLevel(GJGameLevel*);
-    static CCSprite* spriteForDifficulty(GJDifficultySprite*, int, GJDifficultyName);
+    static CCSprite* spriteForDifficulty(GJDifficultySprite*, int, GJDifficultyName, GJFeatureState);
+    static GJFeatureState stateForLevel(GJGameLevel*);
     static GJSearchObject* searchObjectForPage(int);
 };
diff --git a/src/main.cpp b/src/main.cpp
@@ -56,7 +56,8 @@ class $modify(DIBLevelInfoLayer, LevelInfoLayer) {
         auto& demon = DemonsInBetween::demonForLevel(level);
         if (demon.id == 0) return true;
 
-        addChild(DemonsInBetween::spriteForDifficulty(m_difficultySprite, demon.difficulty, GJDifficultyName::Long), 3);
+        addChild(DemonsInBetween::spriteForDifficulty(m_difficultySprite, demon.difficulty,
+            GJDifficultyName::Long, DemonsInBetween::stateForLevel(level)), 3);
         m_difficultySprite->setOpacity(0);
 
         return true;
@@ -75,7 +76,8 @@ class $modify(DIBLevelCell, LevelCell) {
             if (difficultyContainer->getChildByID("grd-difficulty") || difficultyContainer->getChildByID("gddp-difficulty")) return;
 
             auto difficultySprite = static_cast<GJDifficultySprite*>(difficultyContainer->getChildByID("difficulty-sprite"));
-            difficultyContainer->addChild(DemonsInBetween::spriteForDifficulty(difficultySprite, demon.difficulty, GJDifficultyName::Short), 3);
+            difficultyContainer->addChild(DemonsInBetween::spriteForDifficulty(difficultySprite,
+                demon.difficulty, GJDifficultyName::Short, DemonsInBetween::stateForLevel(level)), 3);
             difficultySprite->setOpacity(0);
         }
     }