mythic stuff

hiimjasmine00 · Aug 27, 2024 · ffc8647 · ffc8647
1 parent 7c0eb45
commit ffc8647
Show file tree

Hide file tree

Showing 45 changed files with 39 additions and 5 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.2.2)
+project(DemonsInBetween VERSION 1.2.3)
 
 add_library(${PROJECT_NAME} SHARED
     src/DemonsInBetween.cpp

diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,9 @@
 # Demons In Between Changelog
+## v1.2.3 (2024-08-27)
+- Added mythic demon textures
+- Removed the GodlikeFaces requirement for the textures, replacing them with settings
+- Added a setting to enable or disable the additional demon difficulties
+
 ## v1.2.2 (2024-08-26)
 - Fixed legendary demons being offset by slight amounts
 

diff --git a/mod.json b/mod.json
@@ -5,7 +5,7 @@
         "win": "2.206",
         "mac": "2.206"
     },
-    "version": "v1.2.2",
+    "version": "v1.2.3",
     "id": "hiimjustin000.demons_in_between",
     "name": "Demons In Between",
     "developer": "hiimjustin000",
@@ -34,13 +34,37 @@
             ],
             "DIB_LegendaryShortSheet": [
                 "resources/LegendaryShortSheet/*.png"
+            ],
+            "DIB_MythicLongSheet": [
+                "resources/MythicLongSheet/*.png"
+            ],
+            "DIB_MythicShortSheet": [
+                "resources/MythicShortSheet/*.png"
             ]
         },
         "sprites": [
             "resources/*.png"
         ]
     },
     "settings": {
+        "enable-difficulties": {
+            "name": "Enable Demon Difficulties",
+            "description": "Whether or not to enable the additional demon difficulties.",
+            "type": "bool",
+            "default": true
+        },
+        "enable-legendary": {
+            "name": "Enable Legendary Textures",
+            "description": "Whether or not to enable the legendary difficulty textures.",
+            "type": "bool",
+            "default": true
+        },
+        "enable-mythic": {
+            "name": "Enable Mythic Textures",
+            "description": "Whether or not to enable the mythic difficulty textures.",
+            "type": "bool",
+            "default": true
+        },
         "gddp-integration-override": {
             "name": "GDDP Integration Override",
             "description": "Whether or not to override the GDDP Integration difficulties.",

diff --git a/resources/MythicLongSheet/DIB_01_5_btn2_001.png b/resources/MythicLongSheet/DIB_01_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_02_5_btn2_001.png b/resources/MythicLongSheet/DIB_02_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_03_5_btn2_001.png b/resources/MythicLongSheet/DIB_03_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_04_5_btn2_001.png b/resources/MythicLongSheet/DIB_04_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_05_5_btn2_001.png b/resources/MythicLongSheet/DIB_05_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_06_5_btn2_001.png b/resources/MythicLongSheet/DIB_06_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_07_5_btn2_001.png b/resources/MythicLongSheet/DIB_07_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_08_5_btn2_001.png b/resources/MythicLongSheet/DIB_08_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_09_5_btn2_001.png b/resources/MythicLongSheet/DIB_09_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_10_5_btn2_001.png b/resources/MythicLongSheet/DIB_10_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_11_5_btn2_001.png b/resources/MythicLongSheet/DIB_11_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_12_5_btn2_001.png b/resources/MythicLongSheet/DIB_12_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_13_5_btn2_001.png b/resources/MythicLongSheet/DIB_13_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_14_5_btn2_001.png b/resources/MythicLongSheet/DIB_14_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_15_5_btn2_001.png b/resources/MythicLongSheet/DIB_15_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_16_5_btn2_001.png b/resources/MythicLongSheet/DIB_16_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_17_5_btn2_001.png b/resources/MythicLongSheet/DIB_17_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_18_5_btn2_001.png b/resources/MythicLongSheet/DIB_18_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_19_5_btn2_001.png b/resources/MythicLongSheet/DIB_19_5_btn2_001.png
diff --git a/resources/MythicLongSheet/DIB_20_5_btn2_001.png b/resources/MythicLongSheet/DIB_20_5_btn2_001.png
diff --git a/resources/MythicShortSheet/DIB_01_5_btn_001.png b/resources/MythicShortSheet/DIB_01_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_02_5_btn_001.png b/resources/MythicShortSheet/DIB_02_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_03_5_btn_001.png b/resources/MythicShortSheet/DIB_03_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_04_5_btn_001.png b/resources/MythicShortSheet/DIB_04_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_05_5_btn_001.png b/resources/MythicShortSheet/DIB_05_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_06_5_btn_001.png b/resources/MythicShortSheet/DIB_06_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_07_5_btn_001.png b/resources/MythicShortSheet/DIB_07_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_08_5_btn_001.png b/resources/MythicShortSheet/DIB_08_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_09_5_btn_001.png b/resources/MythicShortSheet/DIB_09_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_10_5_btn_001.png b/resources/MythicShortSheet/DIB_10_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_11_5_btn_001.png b/resources/MythicShortSheet/DIB_11_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_12_5_btn_001.png b/resources/MythicShortSheet/DIB_12_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_13_5_btn_001.png b/resources/MythicShortSheet/DIB_13_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_14_5_btn_001.png b/resources/MythicShortSheet/DIB_14_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_15_5_btn_001.png b/resources/MythicShortSheet/DIB_15_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_16_5_btn_001.png b/resources/MythicShortSheet/DIB_16_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_17_5_btn_001.png b/resources/MythicShortSheet/DIB_17_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_18_5_btn_001.png b/resources/MythicShortSheet/DIB_18_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_19_5_btn_001.png b/resources/MythicShortSheet/DIB_19_5_btn_001.png
diff --git a/resources/MythicShortSheet/DIB_20_5_btn_001.png b/resources/MythicShortSheet/DIB_20_5_btn_001.png
diff --git a/src/DemonsInBetween.cpp b/src/DemonsInBetween.cpp
@@ -202,7 +202,7 @@ std::string DemonsInBetween::infoForLevel(GJGameLevel* level, LadderDemon const&
 }
 
 CCSprite* DemonsInBetween::spriteForDifficulty(GJDifficultySprite* difficultySprite, int difficulty, GJDifficultyName name, GJFeatureState state) {
-    auto glow = state == GJFeatureState::Legendary ? "_4" : "";
+    auto glow = state == GJFeatureState::Legendary ? "_4" : state == GJFeatureState::Mythic ? "_5" : "";
     auto sprite = CCSprite::createWithSpriteFrameName((name == GJDifficultyName::Long ?
         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 ?
@@ -212,7 +212,10 @@ CCSprite* DemonsInBetween::spriteForDifficulty(GJDifficultySprite* difficultySpr
 }
 
 GJFeatureState DemonsInBetween::stateForLevel(GJGameLevel* level) {
-    return Loader::get()->isModLoaded("adyagd.godlikefaces") ? level->m_featured ? (GJFeatureState)(level->m_isEpic + 1) : GJFeatureState::None : GJFeatureState::None;
+    auto state = level->m_featured ? (GJFeatureState)(level->m_isEpic + 1) : GJFeatureState::None;
+    if (state == GJFeatureState::Legendary && !Mod::get()->getSettingValue<bool>("enable-legendary")) state = GJFeatureState::None;
+    else if (state == GJFeatureState::Mythic && !Mod::get()->getSettingValue<bool>("enable-mythic")) state = GJFeatureState::None;
+    return state;
 }
 
 GJSearchObject* DemonsInBetween::searchObjectForPage(int page) {

diff --git a/src/main.cpp b/src/main.cpp
@@ -60,7 +60,7 @@ class $modify(DIBLevelInfoLayer, LevelInfoLayer) {
     bool init(GJGameLevel* level, bool challenge) {
         if (!LevelInfoLayer::init(level, challenge)) return false;
 
-        if (getChildByID("grd-difficulty")) m_fields->m_disabled = true;
+        if (!Mod::get()->getSettingValue<bool>("enable-difficulties") || getChildByID("grd-difficulty")) m_fields->m_disabled = true;
 
         auto gddpDifficulty = getChildByID("gddp-difficulty");
         if (gddpDifficulty && !Mod::get()->getSettingValue<bool>("gddp-integration-override")) m_fields->m_disabled = true;
@@ -104,6 +104,8 @@ class $modify(DIBLevelCell, LevelCell) {
     void loadFromLevel(GJGameLevel* level) {
         LevelCell::loadFromLevel(level);
 
+        if (!Mod::get()->getSettingValue<bool>("enable-difficulties")) return;
+
         auto demon = DemonsInBetween::demonForLevel(level);
         if (demon.id == 0 || demon.difficulty == 0) return;