feat: Change how some stuff is managed

Author: SpaghettDev

.github/workflows/build.yml

@@ -26,9 +26,9 @@ jobs:
           os: ubuntu-latest
           target: Android64
 
-        - name: iOS
-          os: macos-latest
-          target: iOS
+        # - name: iOS
+        #   os: macos-latest
+        #   target: iOS
 
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
@@ -37,11 +37,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build the mod
-        uses: geode-catgirls/build-geode-mod@test
+        uses: geode-catgirls/build-geode-mod@main
         with:
           cli: 'nightly'
-          bindings: SpaghettDev/bindings
-          bindings-ref: sapphire-sdk
+          # bindings: SpaghettDev/bindings
+          # bindings-ref: sapphire-sdk
           gh-pat: ${{ secrets.GH_PAT }}
           combine: true
           target: ${{ matrix.config.target }}
@@ -53,7 +53,7 @@ jobs:
     needs: ['build']
 
     steps:
-      - uses: geode-catgirls/build-geode-mod/combine@test
+      - uses: geode-catgirls/build-geode-mod/combine@main
         id: build
 
       - uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.3] - 2025-04-01
+
+### Added
+
+- April fools!
+
+### Changed
+
+- How some internal stuff is managed
+
+### Fixed
+
+- :trolley:
+
 ## [4.0.2] - 2025-02-01
 
 ### Fixed

cmake/rtrp.cmake

@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     RTRP
     GIT_REPOSITORY https://github.com/SpaghettDev/RTRP.git
-    GIT_TAG        ef10e5fe9b6988cba2a68aae1a1c520ce205ac2c
+    GIT_TAG        065812c6e8e0cde4b714c3cafaf04b5adc34152e
     GIT_PROGRESS TRUE
 )
 message("Fetching RTRP")

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "4.3.0",
+	"geode": "4.3.1",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",

src/custom_layers/base/BaseCustomAlertLayer.cpp

@@ -33,7 +33,16 @@ bool BaseCustomAlertLayer::createBasics(const BaseCustomAlertData& alertData)
 	m_buttonMenu->setID("button-menu");
 	m_mainLayer->addChild(m_buttonMenu, 10);
 
-	closeBtn = createButton("GJ_closeBtn_001.png", { -((alertSize.x) / 2.f) + 9.5f, (alertSize.y / 2.f) - 10.f }, alertData.onClose, -1, alertData.closeBtnScale);
+	auto buttonSprite = CCSprite::createWithSpriteFrameName("GJ_closeBtn_001.png");
+	buttonSprite->setScale(alertData.closeBtnScale);
+	closeBtn = CCMenuItemSpriteExtra::create(
+		buttonSprite,
+		this,
+		alertData.onClose
+	);
+	closeBtn->setPosition({ -((alertSize.x) / 2.f) + 9.5f, (alertSize.y / 2.f) - 10.f });
+	closeBtn->setSizeMult(1.2f);
+	m_buttonMenu->addChild(closeBtn);
 
 	return true;
 }
@@ -52,24 +61,6 @@ void BaseCustomAlertLayer::createTitle(std::string text, float separatorScale, f
 	m_buttonMenu->addChild(separator);
 }
 
-CCMenuItemSpriteExtra* BaseCustomAlertLayer::createButton(const char* texture, CCPoint position, SEL_MenuHandler callback, int tag, float textureScale, float sizeMult)
-{
-	auto buttonSprite = CCSprite::createWithSpriteFrameName(texture);
-	buttonSprite->setScale(textureScale);
-	auto button = CCMenuItemSpriteExtra::create(
-		buttonSprite,
-		this,
-		callback
-	);
-	button->setPosition(position);
-	button->setSizeMult(sizeMult);
-	if (tag != -1)
-		button->setTag(tag);
-	m_buttonMenu->addChild(button);
-
-	return button;
-}
-
 // overriden because clicking space crashes the game
 void BaseCustomAlertLayer::keyDown(enumKeyCodes key)
 {
@@ -81,3 +72,8 @@ void BaseCustomAlertLayer::keyBackClicked()
 {
 	onClose(nullptr);
 }
+
+BaseCustomAlertLayer::~BaseCustomAlertLayer()
+{
+	CCDirector::sharedDirector()->getTouchDispatcher()->unregisterForcePrio(this);
+}

src/custom_layers/base/BaseCustomAlertLayer.hpp

@@ -24,11 +24,12 @@ class BaseCustomAlertLayer : public FLAlertLayer
 public:
 	bool createBasics(const BaseCustomAlertData&);
 	void createTitle(std::string, float = .75f, float = 1.f);
-	CCMenuItemSpriteExtra* createButton(const char*, cocos2d::CCPoint, cocos2d::SEL_MenuHandler, int = -1, float = 1.f, float = 1.2f);
 
 	virtual void onClose(cocos2d::CCObject*) = 0;
-	void keyDown(cocos2d::enumKeyCodes);
-	void keyBackClicked();
+	virtual void keyDown(cocos2d::enumKeyCodes) override;
+	virtual void keyBackClicked() override;
+
+	virtual ~BaseCustomAlertLayer() override;
 
 	cocos2d::CCPoint alertSize;
 	CCMenuItemSpriteExtra* closeBtn;

src/layers/PlayLayer.cpp

@@ -88,6 +88,9 @@ class $modify(RLPlayLayer, PlayLayer)
 			rlm.gameState.levelPercentageGoal = percentage + 1;
 			rlm.gameState.numLevels++;
 
+			if (rlm.gameState.levelPercentage == 100)
+				rlm.hasFinishedARound = true;
+
 			// if the player has already reached this percentage, showNewBest will get called
 			if (percentage <= this->m_level->m_normalPercent.value())
 				showReachedGoal(percentage, 0, 0, 0);