From 82b0fb20fe0553f7d4556f4d4c308ea6c108a6cd Mon Sep 17 00:00:00 2001
From: Justin Pridgen <justincpridgen672@gmail.com>
Date: Fri, 28 Jun 2024 02:05:12 -0400
Subject: [PATCH] v1.2.5

---
 CMakeLists.txt     |  2 +-
 CMakeSettings.json | 28 ----------------------------
 changelog.md       |  3 +++
 mod.json           |  2 +-
 src/main.cpp       | 16 +++++++++-------
 5 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100644 CMakeSettings.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 058bd03..06284fe 100644
--- 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(FakeRate VERSION 1.2.4)
+project(FakeRate VERSION 1.2.5)
 
 add_library(${PROJECT_NAME} SHARED
     src/FakeRate.cpp
diff --git a/CMakeSettings.json b/CMakeSettings.json
deleted file mode 100644
index 0b6f7ad..0000000
--- a/CMakeSettings.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Release",
-            "generator": "Ninja",
-            "configurationType": "Release",
-            "buildRoot": "${projectDir}\\out\\build\\${name}",
-            "installRoot": "${projectDir}\\out\\install\\${name}",
-            "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
-            "ctestCommandArgs": "",
-            "inheritEnvironments": [ "msvc_x64" ],
-            "variables": []
-        },
-        {
-            "name": "RelWithDebInfo",
-            "generator": "Ninja",
-            "configurationType": "RelWithDebInfo",
-            "buildRoot": "${projectDir}\\out\\build\\${name}",
-            "installRoot": "${projectDir}\\out\\install\\${name}",
-            "cmakeCommandArgs": "",
-            "buildCommandArgs": "",
-            "ctestCommandArgs": "",
-            "inheritEnvironments": [ "msvc_x64" ],
-            "variables": []
-        }
-    ]
-}
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index bb0da9c..43a1ba3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,7 @@
 # Fake Rate Changelog
+## v1.2.5 (2024-06-28)
+- Fixed a bug that caused the More Difficulties difficulty face to be offset in the level cell
+
 ## v1.2.4 (2024-06-27)
 - Fixed a bug that caused orbs not to display correctly in map packs
 
diff --git a/mod.json b/mod.json
index 5d0be84..434a327 100644
--- a/mod.json
+++ b/mod.json
@@ -5,7 +5,7 @@
         "win": "2.206",
         "mac": "2.206"
     },
-    "version": "v1.2.4",
+    "version": "v1.2.5",
     "id": "hiimjustin000.fake_rate",
     "name": "Fake Rate",
     "developer": "hiimjustin000",
diff --git a/src/main.cpp b/src/main.cpp
index 261abef..b950d40 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,10 +182,6 @@ class $modify(FRLevelInfoLayer, LevelInfoLayer) {
         m_difficultySprite->setOpacity(255);
 
         auto legacy = Loader::get()->getLoadedMod("uproxide.more_difficulties")->getSettingValue<bool>("legacy-difficulties");
-        auto pos = difficultySpriteParent->convertToWorldSpace({
-            m_difficultySprite->getPositionX() + (legacy ? 0.0f : 0.25f),
-            m_difficultySprite->getPositionY() - (legacy ? 0.0f : 0.1f)
-        });
         auto frameName = "";
         auto stars = m_fields->m_fakeRateData.stars;
         if (spriteName == "uproxide.more_difficulties/MD_DifficultyCP.png") {
@@ -204,6 +200,10 @@ class $modify(FRLevelInfoLayer, LevelInfoLayer) {
             }
             if (!moreDifficultiesSprite) {
                 moreDifficultiesSprite = CCSprite::createWithSpriteFrameName(frameName);
+                moreDifficultiesSprite->setPosition(difficultySpriteParent->convertToWorldSpace({
+                    m_difficultySprite->getPositionX() + (legacy ? 0.0f : 0.25f),
+                    m_difficultySprite->getPositionY() - (legacy ? 0.0f : 0.1f)
+                }));
                 moreDifficultiesSprite->setID("uproxide.more_difficulties/more-difficulties-spr");
                 addChild(moreDifficultiesSprite, 3);
             }
@@ -211,7 +211,6 @@ class $modify(FRLevelInfoLayer, LevelInfoLayer) {
                 moreDifficultiesSprite->initWithSpriteFrameName(frameName);
                 moreDifficultiesSprite->setVisible(true);
             }
-            moreDifficultiesSprite->setPosition(pos);
             m_difficultySprite->setOpacity(0);
         }
     }
@@ -381,14 +380,17 @@ class $modify(FRLevelCell, LevelCell) {
             }
             if (!moreDifficultiesSprite) {
                 moreDifficultiesSprite = CCSprite::createWithSpriteFrameName(frameName);
+                moreDifficultiesSprite->setPosition({
+                    difficultySprite->getPositionX() + (legacy ? 0.0f : 0.25f),
+                    difficultySprite->getPositionY() - (legacy ? 0.0f : 0.1f)
+                });
                 moreDifficultiesSprite->setID("uproxide.more_difficulties/more-difficulties-spr");
-                addChild(moreDifficultiesSprite, 3);
+                difficultyContainer->addChild(moreDifficultiesSprite, 3);
             }
             else {
                 moreDifficultiesSprite->initWithSpriteFrameName(frameName);
                 moreDifficultiesSprite->setVisible(true);
             }
-            moreDifficultiesSprite->setPosition(pos);
             difficultySprite->setOpacity(0);
         }
     }