Bump rtrp version. Bug fixed & colors ig

Author: SpaghettDev

CHANGELOG.md

@@ -39,6 +39,8 @@ Notable changes:
 - `rl::constants` namespace
 - `rl::utils::createLevelFromResponse()`, `rl::utils::getCreatorFromLevelResponse()`, `rl::utils::getDifficultyFromResponse()`
 - Geode 2.0.0-beta.21 support
+- Some missing node IDs to `RLRouletteLayer`
+- Some colors to some layers
 
 ### Changed
 
@@ -61,6 +63,8 @@ Notable changes:
 - `RLRouletteLayer::getRandomListLevel` is passed a GJDifficulty instead of an int
 - How coins are positioned in `RLRouletteLayer` (they're now based on the difficulty node's position)
 - Some info about the info icons in ABOUT.md
+- How touch priority is handled in BaseCustomAlertLayer
+- No longer use `geode::cocos::handleTouchPriority`
 
 ### Fixed
 
@@ -75,6 +79,7 @@ Notable changes:
 - Clicking the level's name/creator/id not copying it to the clipboard
 - Potential crash if `RLRouletteLayer::m_level` is empty (highly situational)
 - Geode invalid tags
+- Touch Prio on android :heart:
 
 ## [1.6.2] - 2024-02-09
 

cmake/rtrp.cmake

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

src/custom_layers/RLIntegerInputLayer.cpp

@@ -18,7 +18,6 @@ RLIntegerInputLayer* RLIntegerInputLayer::create(const IntegerInputInfo& iili)
 bool RLIntegerInputLayer::init(const IntegerInputInfo& iili)
 {
 	m_iili = iili;
-	handleTouchPriority(this);
 	if (!this->createBasics({ 175.f, 135.f }, menu_selector(RLIntegerInputLayer::onClose))) return false;
 	this->closeBtn->setVisible(false);
 

src/custom_layers/base/BaseCustomAlertLayer.cpp

@@ -1,20 +1,26 @@
+#include <limits>
 #include "BaseCustomAlertLayer.hpp"
 
-bool BaseCustomAlertLayer::createBasics(CCPoint contentSize, SEL_MenuHandler onClose, float closeBtnScale, const ccColor4B& color)
+bool BaseCustomAlertLayer::createBasics(CCPoint contentSize, SEL_MenuHandler onClose, float closeBtnScale, const ccColor4B& color, int prio)
 {
 	if (!CCLayerColor::initWithColor(color)) return false;
 
 	alertSize = contentSize;
 
 	CCDirector* director = CCDirector::sharedDirector();
 
-	setTouchEnabled(true);
-	setKeypadEnabled(true);
+	this->setTouchEnabled(true);
+	this->setKeypadEnabled(true);
 
 	m_mainLayer = CCLayer::create();
 	this->addChild(m_mainLayer);
 
-	m_mainLayer->setTouchPriority(director->getTouchDispatcher()->getTargetPrio());
+	if (prio == std::numeric_limits<int>::max())
+		m_mainLayer->setTouchPriority(director->getTouchDispatcher()->getTargetPrio());
+	else
+		m_mainLayer->setTouchPriority(prio);
+	// this is what FLAlertLayer::incrementForcePrio does
+	director->getTouchDispatcher()->registerForcePrio(this, 2);
 
 	CCSize winSize = director->getWinSize();
 	extension::CCScale9Sprite* bg = extension::CCScale9Sprite::create("GJ_square01.png", { .0f, .0f, 80.f, 80.f });

src/custom_layers/base/BaseCustomAlertLayer.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <limits>
 
 #include <Geode/Bindings.hpp>
 
@@ -10,7 +11,7 @@ class BaseCustomAlertLayer : public FLAlertLayer
 	CCPoint alertSize{};
 	CCMenuItemSpriteExtra* closeBtn{};
 
-	bool createBasics(CCPoint, SEL_MenuHandler, float = 1.f, const ccColor4B& = { 0x00, 0x00, 0x00, 0x4B });
+	bool createBasics(CCPoint, SEL_MenuHandler, float = 1.f, const ccColor4B& = { 0x00, 0x00, 0x00, 0x4B }, int = std::numeric_limits<int>::max());
 	void createTitle(std::string, float = .75f, float = 1.f);
 	CCMenuItemSpriteExtra* createButton(const char*, CCPoint, SEL_MenuHandler, int = -1, float = 1.f, float = 1.2f);
 	virtual void onClose(CCObject*) = 0;

src/custom_nodes/RLDifficultyNode.cpp

@@ -29,6 +29,11 @@ bool RLDifficultyNode::init(GJDifficulty difficulty, bool featured, bool epic)
 	m_difficulty_sprite->setID("difficulty-sprite");
 	this->addChild(m_difficulty_sprite);
 
+	// TODO: fix this setting the position relative to the bottom left when not in a CCMenuItemSpriteExtra
+	const CCPoint& targetContentSize = m_difficulty_sprite->getContentSize();
+	this->setContentSize(targetContentSize);
+	m_difficulty_sprite->setPosition(targetContentSize / 2);
+
 	if (featured)
 	{
 		m_featured_sprite = CCSprite::createWithSpriteFrameName("GJ_featuredCoin_001.png");
@@ -45,9 +50,6 @@ bool RLDifficultyNode::init(GJDifficulty difficulty, bool featured, bool epic)
 		this->addChild(m_epic_sprite, -1);
 	}
 
-	this->setContentSize(m_difficulty_sprite->getContentSize());
-	m_difficulty_sprite->setPosition(this->getContentSize() / 2);
-
 	return true;
 }
 
@@ -62,6 +64,7 @@ void RLDifficultyNode::setColor(const ccColor3B& color)
 	m_color = color;
 }
 
+// basically RLDifficultyNode::init but without the call to CCNode::init and some extra checks
 void RLDifficultyNode::setDifficulty(GJDifficulty difficulty, bool featured, bool epic)
 {
 	if (m_difficulty_info == DifficultyInfo{ difficulty, featured, epic }) return;
@@ -76,6 +79,11 @@ void RLDifficultyNode::setDifficulty(GJDifficulty difficulty, bool featured, boo
 	m_difficulty_sprite->setID("difficulty-sprite");
 	this->addChild(m_difficulty_sprite);
 
+	// man this codebase is getting worse by the minute
+	// TODO: find a better way :despair:
+	if (this->getParent() && typeinfo_cast<CCMenuItemSpriteExtra*>(this->getParent()))
+		m_difficulty_sprite->setPosition(this->getContentSize() / 2);
+
 	if (featured)
 	{
 		m_featured_sprite = CCSprite::createWithSpriteFrameName("GJ_featuredCoin_001.png");
@@ -94,10 +102,5 @@ void RLDifficultyNode::setDifficulty(GJDifficulty difficulty, bool featured, boo
 		this->addChild(m_epic_sprite, -1);
 	}
 
-	// man this codebase is getting worse by the minute
-	// TODO: is there a better way :despair:
-	if (this->getParent() && typeinfo_cast<CCMenuItemSpriteExtra*>(this->getParent()))
-		m_difficulty_sprite->setPosition(this->getContentSize() / 2);
-
 	m_difficulty_info = { difficulty, featured, epic };
 }

src/roulette/layers/RLRouletteInfoLayer.cpp

@@ -197,7 +197,7 @@ void RLRouletteInfoLayer::onInfoIcon(CCObject* sender)
 		FLAlertLayer::create(
 			nullptr,
 			"Normal List",
-			"Levels ranging from the Easy difficulty to the Extreme Demon difficulty.\nOnly rated levels appear in this list.",
+			"Levels ranging from the <cl>Easy</c> difficulty to the <cr>Extreme Demon</c> difficulty.\nOnly rated levels appear in this list.",
 			"OK",
 			nullptr
 		)->show();
@@ -207,7 +207,7 @@ void RLRouletteInfoLayer::onInfoIcon(CCObject* sender)
 		FLAlertLayer::create(
 			nullptr,
 			"Demon List",
-			"The Pointercrate demon list.\nOnly includes levels from the regular demon list, and not the extended list.\nSource: https://pointercrate.com/demonlist",
+			"The Pointercrate demon list.\n<cy>Only</c> includes levels from the regular demon list, <cr>and not</c> the extended list.\nSource: https://pointercrate.com/demonlist",
 			"OK",
 			nullptr
 		)->show();
@@ -217,7 +217,7 @@ void RLRouletteInfoLayer::onInfoIcon(CCObject* sender)
 		FLAlertLayer::create(
 			nullptr,
 			"Challenge List",
-			"The Challenge list.\nSame as the demon list, as in the levels from the extended list don't appear in the roulette.\nSource: https://challengelist.gd/challenges",
+			"The Challenge list.\nSame as the demon list, as in the levels from the extended list <cr>don't appear</c> in the roulette.\nSource: https://challengelist.gd/challenges",
 			"OK",
 			nullptr
 		)->show();
@@ -227,7 +227,7 @@ void RLRouletteInfoLayer::onInfoIcon(CCObject* sender)
 		FLAlertLayer::create(
 			nullptr,
 			"GD List",
-			"A GD List.\nPretty self-explanatory.\nPlatformer levels appear in this list. No, i will not fix :D",
+			"A GD List.\nPretty self-explanatory.\n<cr>Platformer levels appear in this list!</c> <cy>No</c>, i will not fix :D",
 			"OK",
 			nullptr
 		)->show();

src/roulette/layers/RLRouletteLayer.cpp

@@ -214,6 +214,7 @@ bool RLRouletteLayer::init()
 		levelCoinSprite->setPosition({ -120.f + 10.f * (i - 6), 13.f });
 		levelCoinSprite->setScale(1.5f);
 		levelCoinSprite->setVisible(false);
+		levelCoinSprite->setID(fmt::format("coin-{}", i - 5));
 		levelCoinSprite->setTag(i);
 		if (i == 6)
 			levelCoinSprite->setZOrder(-1);
@@ -253,7 +254,7 @@ bool RLRouletteLayer::init()
 		menu_selector(RLRouletteLayer::onNextButton)
 	);
 	nextButton->setPosition({ 50.f, -70.f });
-	nextButton->setTag(25);
+	nextButton->setID("next-button");
 	playing_menu->addChild(nextButton);
 
 	auto resetButton = CCMenuItemSpriteExtra::create(
@@ -316,14 +317,14 @@ bool RLRouletteLayer::init()
 	errorResetButton->setID("reset-button");
 	error_menu->addChild(errorResetButton);
 
+
 	if (g_rouletteManager.isPaused)
 	{
 		g_rouletteManager.isPlaying = true;
 		g_rouletteManager.isPaused = false;
 		finishLevelRoulette();
 	}
 
-
 	return true;
 }
 
@@ -343,7 +344,7 @@ void RLRouletteLayer::onClose(CCObject*)
 	{
 		m_confirmation_layer = RLConfirmationAlertLayer::create({
 			"Woah there!",
-			"Would you like to quit or pause the roulette?",
+			"Would you like to <cr>quit</c> or <co>pause</c> the roulette?",
 			[&](auto cl) {
 				this->setKeypadEnabled(false);
 				this->removeFromParentAndCleanup(true);
@@ -456,15 +457,10 @@ void RLRouletteLayer::onLevelInfo(CCObject* sender)
 
 	switch (textButton->getTag())
 	{
-	case 1:
-		text = m_level.first.name;
-		break;
-	case 2:
-		text = m_level.second.name;
-		break;
-	case 3:
-		text = m_level.first.levelID;
-		break;
+	case 1: text = m_level.first.name; break;
+	case 2: text = m_level.second.name; break;
+	case 3: text = std::to_string(m_level.first.levelID); break;
+	default: text = "[invalid]"; break;
 	}
 
 	clipboard::write(text);
@@ -651,9 +647,8 @@ void RLRouletteLayer::finishLevelRoulette()
 
 			if (x_pos != .0f)
 				playing_menu->getChildByTag(i)->setPositionX(x_pos);
-			playing_menu->getChildByTag(i)->setVisible(x_pos != .0f);
-			// playing_menu->getChildByTag(i)->setPositionY(difficulty >= GJDifficulty::Demon ? -1.f : 10.f);
 			playing_menu->getChildByTag(i)->setPositionY(difficultyNodeYPos - coinsYOffset);
+			playing_menu->getChildByTag(i)->setVisible(x_pos != .0f);
 		}
 	}
 	else