From 20c79a8b8bdae2627579ce2adb6fe6a6c90aa96a Mon Sep 17 00:00:00 2001 From: Justin Pridgen Date: Mon, 24 Jun 2024 00:22:13 -0400 Subject: [PATCH] v1.2.2 --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 2 +- changelog.md | 3 +++ mod.json | 2 +- src/FREditPopup.cpp | 4 ++-- src/main.cpp | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5c4e01..9d0307f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,7 @@ jobs: with: name: Build Output path: build-output - + - name: Create Draft Release uses: softprops/action-gh-release@v2 env: diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a97979..a4055d2 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.1) +project(FakeRate VERSION 1.2.2) add_library(${PROJECT_NAME} SHARED src/FakeRate.cpp diff --git a/changelog.md b/changelog.md index 73ffa5b..c77cbe6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,7 @@ # Fake Rate Changelog +## v1.2.2 (2024-06-24) +- Fixed a bug where removing the fake rate would display the wrong difficulty face with More Difficulties enabled + ## v1.2.1 (2024-06-23) - Fixed gaps in the various fake rate popup elements diff --git a/mod.json b/mod.json index 9b29895..9c6d3ed 100644 --- a/mod.json +++ b/mod.json @@ -5,7 +5,7 @@ "win": "2.206", "mac": "2.206" }, - "version": "v1.2.1", + "version": "v1.2.2", "id": "hiimjustin000.fake_rate", "name": "Fake Rate", "developer": "hiimjustin000", diff --git a/src/FREditPopup.cpp b/src/FREditPopup.cpp index 5f37b2a..5ab9203 100644 --- a/src/FREditPopup.cpp +++ b/src/FREditPopup.cpp @@ -185,7 +185,7 @@ bool FRSetDifficultyPopup::setup(int difficulty, int moreDifficultiesOverride, b m_difficulty = difficulty; m_moreDifficultiesOverride = moreDifficultiesOverride; m_legacy = legacy; - + auto menuRow1 = CCMenu::create(); menuRow1->setLayout(RowLayout::create()->setAxisAlignment(AxisAlignment::Even)); menuRow1->setPosition(150.0f, 185.0f); @@ -283,7 +283,7 @@ bool FRSetFeaturePopup::setup(int feature, int difficulty, int moreDifficultiesO createFeatureToggle(menuRow, GJFeatureState::Legendary); createFeatureToggle(menuRow, GJFeatureState::Mythic); menuRow->updateLayout(); - + auto confirmButton = CCMenuItemExt::createSpriteExtra(ButtonSprite::create("Confirm", "goldFont.fnt", "GJ_button_01.png", 0.8f), [this, callback](auto) { callback(static_cast(m_feature)); onClose(nullptr); diff --git a/src/main.cpp b/src/main.cpp index 917062c..15757b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -195,7 +195,7 @@ class $modify(FRLevelInfoLayer, LevelInfoLayer) { else { auto moreDifficultiesOverride = mdo; auto starsRequested = m_level->m_starsRequested; - if (remove && (starsRequested == 4 || starsRequested == 7 || starsRequested == 9)) moreDifficultiesOverride = starsRequested; + if (remove && m_level->m_stars == 0 && (starsRequested == 4 || starsRequested == 7 || starsRequested == 9)) moreDifficultiesOverride = starsRequested; if (moreDifficultiesOverride == 0) return; switch (moreDifficultiesOverride) { case 4: frameName = legacy ? "uproxide.more_difficulties/MD_Difficulty04_Legacy.png" : "uproxide.more_difficulties/MD_Difficulty04.png"; break;