1.6.0-beta.1, actual usable mod now lol

Author: SpaghettDev

CHANGELOG.md

@@ -5,6 +5,32 @@ 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/).
 
+## [1.6.0-beta.1] - 2024-02-04
+
+### Added
+
+- Android support (?)
+- Error text when ListFetcher fails to fetch a link
+- RouletteLayer pointer member to RouletteManager
+- Array verifier to assure selected difficulty/list is correct (cant select multiple at once, maybe for a future update?)
+- Choosing a list highlights a difficulty that matches said list
+
+### Changed
+
+- about.md
+- Logo
+- RouletteManager to be an inline global variable instead of that broken define system
+- Removed CustomDirector
+- Made selecting a list change the selected difficulty (only visual)
+- Renamed RouletteManagerStruct to RouletteManager
+- Renamed RouletteManager's variable name to g_rouletteManager
+- Cleaned up include directives
+
+### Fixed
+
+- Crash when clicking Reset after ListFetcher fails
+- Bugs
+
 ## [1.5.0-beta] - 2024-02-03
 
 ### Changed
@@ -75,7 +101,6 @@ Last update before 2.2. I might update this to 2.2 if I have enough free time.
 
 - Fixed JsonManager overriding saved values
 
-
 ## [1.2.0] - 2023-12-06
 
 ### Added
@@ -99,23 +124,3 @@ Last update before 2.2. I might update this to 2.2 if I have enough free time.
 
 - Added a DEV_CONSOLE macro enabled only when compiling RelWithDebInfo
 - Added a check for MegaHack v7 to change the roulette button's position
-
-<!-- maybe add the other versions here too -->
-<!-- 
-## [X.Y.Z] - YYYY-MM-DD
-
-### Added
-- ...
-- ...
-- ...
-
-### Changed
-- ...
-- ...
-- ...
-
-### Fixed
-- ...
-- ...
-- ...
--->

CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
-setup_geode_mod(${PROJECT_NAME})
+setup_geode_mod(${PROJECT_NAME} EXTERNALS geode.node-ids:1.1.4)
 
 # Warnings as errors
 set_property(TARGET ${PROJECT_NAME} PROPERTY COMPILE_WARNING_AS_ERROR ON)

about.md

@@ -1,3 +1,20 @@
 # GD-Roulette
 
-A Geometry Dash Roulette.
+A Geometry Dash Level Roulette.
+
+## Features
+
+- Normal List (regular levels ranging from Easy to Extreme Demon)
+- Demon List
+- Challenge List
+- Skip levels you can't beat
+
+## How To Play
+
+Simply choose the list you want to play levels from (the default is normal list), select a difficulty, and press Start!
+A random level of the chosen difficulty will be given to you and you will need to achieve a certain percentage in said level (starts from 1%, and increments by 1 after each level beaten).
+Normally, you're supposed to get to get the goal percentage, and not higher. Unfortunately, some levels don't have a way to die at said percentage, so the goal will automatically be your death percentage + 1.
+
+If a level is too hard, you can click on the Skip button, which will subtract 1 skip from your skips. You can set the number of skips you are allowed to use during a round of roulette in the roulette's settings (accessible from the info icon in the roulette while not playing it, or from the Geode mod settings).
+
+And that's pretty much it! Have fun rouletting!

logo.png

@@ -1,24 +1,31 @@
 {
-	"geode": "2.0.0-beta.12",
+	"geode": "2.0.0-beta.14",
 	"gd": {
 		"win": "2.204",
 		"android": "2.205"
 	},
-	"version": "v1.5.0-beta",
+	"version": "v1.6.0-beta.1",
 	"id": "spaghettdev.gd-roulette",
 	"name": "GD-Roulette",
 	"developer": "SpaghettDev",
 	"description": "An in-game level roulette.",
 	"repository": "https://github.com/SpaghettDev/GD-Roulette",
 	"issues": {
-		"info": "Report any bugs/suggestions.",
+		"info": "Report any bugs/suggestions here.",
 		"url": "https://github.com/SpaghettDev/GD-Roulette/issues"
 	},
 	"resources": {
 		"sprites": [
 			"resources/*.png"
 		]
 	},
+	"dependencies": [
+        {
+            "id": "geode.node-ids",
+            "version": "v1.1.4",
+            "importance": "required"
+        }
+    ],
 	"tags": [
 		"level", "roulette"
 	],

mod.json

@@ -1,5 +1,4 @@
 #include "BaseCustomLayer.hpp"
-#include "../CustomDirector.hpp"
 
 bool BaseCustomLayer::createBasics(CCPoint contentSize, SEL_MenuHandler onClose, float closeBtnScale, const ccColor4B& color)
 {
@@ -20,26 +19,26 @@ bool BaseCustomLayer::createBasics(CCPoint contentSize, SEL_MenuHandler onClose,
 	CCSize winSize = director->getWinSize();
 	extension::CCScale9Sprite* bg = extension::CCScale9Sprite::create("GJ_square01.png", { .0f, .0f, 80.f, 80.f });
 	bg->setContentSize(alertSize);
-	bg->setPosition({ winSize.width / 2, winSize.height / 2 });
+	bg->setPosition({ winSize.width / 2.f, winSize.height / 2.f });
 	m_mainLayer->addChild(bg, -1);
 
 	m_buttonMenu = CCMenu::create();
 	m_mainLayer->addChild(m_buttonMenu, 10);
 
-	closeBtn = createButton("GJ_closeBtn_001.png", { -((alertSize.x) / 2) + 9.5f, (alertSize.y / 2) - 10 }, onClose, -1, closeBtnScale);
+	closeBtn = createButton("GJ_closeBtn_001.png", { -((alertSize.x) / 2) + 9.5f, (alertSize.y / 2) - 10.f }, onClose, -1, closeBtnScale);
 
 	return true;
 }
 
 void BaseCustomLayer::createTitle(std::string text, float separatorScale, float usernameScale)
 {
 	auto userName = CCLabelBMFont::create(text.c_str(), "bigFont.fnt");
-	userName->setPosition({ 0, (alertSize.y / 2) - 22 });
+	userName->setPosition({ .0f, (alertSize.y / 2.f) - 22.f });
 	userName->setScale(usernameScale);
 	m_buttonMenu->addChild(userName);
 
 	auto separator = CCSprite::createWithSpriteFrameName("floorLine_001.png");
-	separator->setPosition({ 0, (alertSize.y / 2) - 46 });
+	separator->setPosition({ .0f, (alertSize.y / 2.f) - 46.f });
 	separator->setScaleX(separatorScale);
 	separator->setOpacity(100);
 	m_buttonMenu->addChild(separator);

src/custom_layers/CustomDirector.hpp

@@ -10,9 +10,9 @@ class BaseCustomLayer : public FLAlertLayer
 	CCPoint alertSize{};
 	CCMenuItemSpriteExtra* closeBtn{};
 
-	bool createBasics(CCPoint, SEL_MenuHandler, float = 1, const ccColor4B& = { 0x00, 0x00, 0x00, 0x4B });
-	void createTitle(std::string, float = .75f, float = 1);
-	CCMenuItemSpriteExtra* createButton(const char*, CCPoint, SEL_MenuHandler, int = -1, float = 1.0f, float = 1.2f);
+	bool createBasics(CCPoint, SEL_MenuHandler, float = 1.f, const ccColor4B& = { 0x00, 0x00, 0x00, 0x4B });
+	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;
 	static cocos2d::CCScene* scene();
 	void keyDown(enumKeyCodes);

src/custom_layers/base/BaseCustomLayer.cpp

@@ -1,4 +1,3 @@
-#define DECLAREROULETTEMANAGER
 #include "../roulette/manager/RouletteManager.hpp"
 #include "../roulette/layers/RouletteLayer.hpp"
 
@@ -11,7 +10,9 @@ class $modify(RouletteButton, CreatorLayer)
 {
 	void onRouletteButton(CCObject*)
 	{
-		RouletteLayer::create()->show();
+		g_rouletteManager.rouletteLayer = RouletteLayer::create();
+		if (g_rouletteManager.rouletteLayer)
+			g_rouletteManager.rouletteLayer->show();
 	}
 
 	bool init()

src/custom_layers/base/BaseCustomLayer.hpp

@@ -1,7 +1,5 @@
-#define DECLAREROULETTEMANAGER
 #include "../roulette/manager/RouletteManager.hpp"
 #include "../roulette/layers/RouletteLayer.hpp"
-#include "../custom_layers/CustomDirector.hpp"
 
 #include <Geode/Geode.hpp>
 #include <Geode/modify/LevelInfoLayer.hpp>
@@ -14,20 +12,23 @@ class $modify(LevelInfoLayer)
 	{
 		if (!LevelInfoLayer::init(level, p1)) return false;
 
-		if (RouletteManager.isPlayingRoulette)
+		if (g_rouletteManager.isPlayingRoulette)
 		{
 			CCLabelBMFont* normalPercentageLabel = static_cast<CCLabelBMFont*>(this->getChildByID("normal-mode-percentage"));
 			float goalOffset = .0f;
 
+			// wtf v2
 			if (this->m_level->m_normalPercent < 10)
 				goalOffset = 24.f;
-			else if (this->m_level->m_normalPercent <= 100)
+			else if (this->m_level->m_normalPercent < 100)
 				goalOffset = 31.f;
+			else
+				goalOffset = 39.f;
 
 			if (normalPercentageLabel == nullptr) return true;
 
 			auto goalPercentage = CCLabelBMFont::create(
-				fmt::format("({}%)", static_cast<int>(RouletteManager.levelPercentageGoal)).c_str(),
+				fmt::format("({}%)", static_cast<int>(g_rouletteManager.levelPercentageGoal)).c_str(),
 				"bigFont.fnt"
 			);
 			goalPercentage->setPosition({ normalPercentageLabel->getPositionX() + goalOffset, normalPercentageLabel->getPositionY() });
@@ -42,21 +43,11 @@ class $modify(LevelInfoLayer)
 
 	void onBack(CCObject* sender)
 	{
-		CustomDirector* director = static_cast<CustomDirector*>(CCDirector::sharedDirector());
-
-		if (RouletteManager.isPlayingRoulette && this->m_level->m_levelID == RouletteManager.lastLevelID)
+		if (g_rouletteManager.rouletteLayer)
 		{
-			if (
-				CCScene* prevScene = director->getPreviousScene();
-				prevScene->getChildrenCount() == 2
-				) {
-				if (auto rouletteLayer = typeinfo_cast<RouletteLayer*>(prevScene->getChildren()->objectAtIndex(1)))
-				{
-					static_cast<CCLabelBMFont*>(
-						rouletteLayer->m_pPlayingMenu->getChildByTag(20)
-					)->setString(fmt::format("{}%", RouletteManager.levelPercentageGoal).c_str());
-				}
-			}
+			static_cast<CCLabelBMFont*>(
+				g_rouletteManager.rouletteLayer->m_pPlayingMenu->getChildByTag(20)
+			)->setString(fmt::format("{}%", g_rouletteManager.levelPercentageGoal).c_str());
 		}
 
 		LevelInfoLayer::onBack(sender);