Cleanup to release on index!

SpaghettDev · SpaghettDev · commit b176882a4222 · 2024-02-04T12:35:28.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@ 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.2] - 2024-02-04
+
+### Changed
+
+- assets/GD-Roulette.png
+- Removed 1 unnecessary objectAtIndex
+
+### Fixed
+
+- Crash when on a fresh install of GD-Roulette
+
 ## [1.6.0-beta.1] - 2024-02-04
 
 ### Added
diff --git a/README.md b/README.md
@@ -1,44 +1,47 @@
 # GD-Roulette
-A Geometry Dash Roulette.
 
-<details>
+A Geometry Dash Level Roulette.
+
+<details open>
 <summary>Image of the roulette</summary>
 <br>
 <img src="./assets/GD-Roulette.png" width="720"/>
 </details>
 
-## How to install
-1. Download the latest release from the the [Releases tab](https://github.com/SpaghettDev/GD-Roulette/releases)
-1. Copy the contents of the resources.zip from the downloaded release into the "Resources" folder of your Geometry Dash installation.
-2. Then grab GD-Roulette.dll from the downloaded release and use you preferred injector to inject it into GeometryDash.exe
+## How to install (from Geode)
 
-## Errors
-<details open>
-<summary>Error Image</summary>
-<br>
-<img src="./assets/Resources-Error.png" width="480"/>
-</details>
+1. Get [Geode](https://geode-sdk.org)
+2. Click the Geode button
+3. Click the download tab, find GD-Roulette, and click Install!
+
+You'll now find the roulette button after clicking the Create button on the main menu.
 
-If you're getting the error above then you haven't installed the roulette correctly...
-<br/>
-Please follow the instructions in the [How to install](#how-to-install) part.
+## How to install (from Releases)
+
+1. Download the latest release's GD-Roulette.geode file
+2. Copy it to `Geometry Dash/geode/mods`
 
 ## How to build
+
 Run the following commands in your preferred terminal:
+
 ```sh
 git clone https://github.com/SpaghettDev/GD-Roulette
 cd GD-Roulette
 mkdir build
 cd build
 cmake ..
 ```
+
 Then open the generated solution in Visual Studio.
 
 **Make sure to compile in Release Mode! Otherwise the solution will not compile.**
 
 ## Credits
+
 - SpaghettDev ([@SpaghettDev](https://github.com/SpaghettDev)): Creator & maintainer.
-- Skyue1 ([@Skyue1](https://github.com/Skyue1)): Added the featured/epic glow, and other stuff.
+- qwix ([@qwix456](https://github.com/qwix456)): Added the featured/epic glow, and other stuff.
 - iAndyHD3 ([@iAndyHD3](https://github.com/iAndyHD3)): Helped with issues.
-- Cvolton ([@Cvolton](https://github.com/Cvolton)): Helped with issues. And the buttons (RL_blankBtn_001).
+- Cvolton ([@Cvolton](https://github.com/Cvolton)): Helped with issues.
 - Alphalaneous ([@Alphatism](https://github.com/Alphatism)): Helped with issues.
+- mat ([@matcool](https://github.com/matcool)): Helped with Geode issues.
diff --git a/assets/GD-Roulette.png b/assets/GD-Roulette.png
diff --git a/assets/Resources-Error.png b/assets/Resources-Error.png
diff --git a/assets/resources.zip b/assets/resources.zip
diff --git a/mod.json b/mod.json
@@ -4,7 +4,7 @@
 		"win": "2.204",
 		"android": "2.205"
 	},
-	"version": "v1.6.0-beta.1",
+	"version": "v1.6.0-beta.2",
 	"id": "spaghettdev.gd-roulette",
 	"name": "GD-Roulette",
 	"developer": "SpaghettDev",
diff --git a/src/layers/CreatorLayer.cpp b/src/layers/CreatorLayer.cpp
@@ -19,25 +19,24 @@ class $modify(RouletteButton, CreatorLayer)
 	{
 		if (!CreatorLayer::init()) return false;
 
-		auto layer = static_cast<CCMenu*>(this->getChildren()->objectAtIndex(1));
 		auto menu = CCMenu::create();
 		menu->setID("creator-layer-menu"_spr);
 		menu->setPosition({ .0f, .0f });
 		this->addChild(menu);
 
 		// Loader::get()->isModLoaded("absolllute.megahack")
 
+		// this is, well uhhh, very awful
 		auto rouletteButton = CCMenuItemSpriteExtra::create(
 			CCSprite::create("RL_blankBtn_001.png"_spr),
-			layer,
+			this,
 			menu_selector(RouletteButton::onRouletteButton)
 		);
 		auto rouletteSprite = CCSprite::create("RL_btn_001.png"_spr);
 		rouletteSprite->setScale(.725f);
 		rouletteSprite->setPosition({ 22.25f, 23.75f });
 		rouletteButton->addChild(rouletteSprite);
 		rouletteButton->setPosition({ 25.f, 160.f });
-		rouletteButton->setScale(.9f);
 
 		menu->addChild(rouletteButton);
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,3 +1,4 @@
+#include "roulette/manager/RouletteManager.hpp"
 #include <Geode/Geode.hpp>
 
 using namespace geode::prelude;
diff --git a/src/roulette/layers/RouletteInfoLayer.cpp b/src/roulette/layers/RouletteInfoLayer.cpp
@@ -108,10 +108,10 @@ void RouletteInfoLayer::onToggleButton(CCObject* sender)
 
 	auto button = static_cast<CCMenuItemToggler*>(sender);
 	auto parent = static_cast<CCMenu*>(button->getParent());
-	auto ind = roulette::utils::getIndexOf(g_rouletteManager.selectedListArr->as_array(), true);
+	auto ind = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("selected-list-array").as_array(), true);
 
-	g_rouletteManager.selectedListArr->as_array().at(ind) = false;
-	g_rouletteManager.selectedListArr->as_array().at(button->getTag()) = true;
+	g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(ind) = false;
+	g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(button->getTag()) = true;
 
 	// purely visual, "toggles" the difficulty face based on the selected list (demon for demon list, insane for challenge list, and previous difficulty for normal list)
 	switch (button->getTag())
@@ -191,7 +191,7 @@ CCMenuItemToggler* RouletteInfoLayer::createToggler(int tag, const char* labelTe
 	// button->setSizeMult(1.2f);
 	button->setTag(tag);
 	button->setVisible(visible);
-	button->toggle(g_rouletteManager.selectedListArr->as_array().at(tag).as<bool>());
+	button->toggle(g_rouletteManager.getFromSaveContainer("selected-list-array").as_array().at(tag).as<bool>());
 	m_buttonMenu->addChild(button);
 
 	auto label = roulette::utils::createTextLabel(labelText, { point.x + 20, point.y }, .5f, m_buttonMenu);
diff --git a/src/roulette/layers/RouletteLayer.cpp b/src/roulette/layers/RouletteLayer.cpp
@@ -131,7 +131,7 @@ bool RouletteLayer::init()
 	plusButton->setPosition({ 135.f, -20.f });
 	plusButton->setSizeMult(1.2f);
 	plusButton->setTag(11);
-	plusButton->setVisible(g_rouletteManager.getArrayState(g_rouletteManager.difficultyArr, 5));
+	plusButton->setVisible(g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("difficulty-array"), 5));
 	m_pMainMenu->addChild(plusButton);
 
 	auto startButtonText = CCLabelBMFont::create("Start", "bigFont.fnt");
@@ -347,7 +347,7 @@ bool RouletteLayer::init()
 	m_pErrorMenu->addChild(errorResetButton);
 
 
-	if (g_rouletteManager.getArrayState(g_rouletteManager.difficultyArr, 5))
+	if (g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("difficulty-array"), 5))
 	{
 		if (RouletteLayer::m_plus_button_state)
 		{
@@ -356,7 +356,7 @@ bool RouletteLayer::init()
 		}
 
 		for (int i = 6; i < 11; i++)
-			if (g_rouletteManager.getArrayState(g_rouletteManager.demonDifficultyArr, i - 6))
+			if (g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("demon-difficulty-array"), i - 6))
 				static_cast<CCMenuItemSpriteExtra*>(
 					m_pMainMenu->getChildByTag(i)
 				)->setColor({ 255, 255, 255 });
@@ -423,7 +423,7 @@ void RouletteLayer::onInfoButton(CCObject*)
 void RouletteLayer::onDifficultyChosen(CCObject* sender)
 {
 	if (
-		auto ind = roulette::utils::getIndexOf(g_rouletteManager.selectedListArr->as_array(), true);
+		auto ind = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("selected-list-array").as_array(), true);
 		ind != 0
 		)
 		return;
@@ -434,41 +434,41 @@ void RouletteLayer::onDifficultyChosen(CCObject* sender)
 	// check if difficultyButton is one of the demon types and not a regular difficulty
 	if (tag > 5 && (tag < 10 || tag > 5))
 	{
-		int ind = roulette::utils::getIndexOf(g_rouletteManager.demonDifficultyArr->as_array(), true);
+		int ind = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array(), true);
 		static_cast<CCMenuItemSpriteExtra*>(
 			m_pMainMenu->getChildByTag(ind + 6)
 		)->setColor({ 125, 125, 125 });
 
-		g_rouletteManager.demonDifficultyArr->as_array().at(ind) = false;
-		g_rouletteManager.demonDifficultyArr->as_array().at(tag - 6) = true;
+		g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array().at(ind) = false;
+		g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array().at(tag - 6) = true;
 	}
 	else
 	{
 		if (m_plus_button_state && tag != 5)
 			onPlusButton(nullptr);
 
-		int ind = roulette::utils::getIndexOf(g_rouletteManager.difficultyArr->as_array(), true);
+		int ind = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("difficulty-array").as_array(), true);
 		static_cast<CCMenuItemSpriteExtra*>(
 			m_pMainMenu->getChildByTag(ind)
 		)->setColor({ 125, 125, 125 });
 
-		g_rouletteManager.difficultyArr->as_array().at(ind) = false;
-		g_rouletteManager.difficultyArr->as_array().at(tag) = true;
+		g_rouletteManager.getFromSaveContainer("difficulty-array").as_array().at(ind) = false;
+		g_rouletteManager.getFromSaveContainer("difficulty-array").as_array().at(tag) = true;
 		g_rouletteManager.previousDifficulty = tag;
 	}
 
 	difficultyButton->setColor({ 255, 255, 255 });
 
 	// demon
-	m_pMainMenu->getChildByTag(11)->setVisible(g_rouletteManager.getArrayState(g_rouletteManager.difficultyArr, 5));
+	m_pMainMenu->getChildByTag(11)->setVisible(g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("difficulty-array"), 5));
 }
 
 void RouletteLayer::onStartButton(CCObject*)
 {
 	m_pMainMenu->setVisible(false);
 
-	int diffInd = roulette::utils::getIndexOf(g_rouletteManager.difficultyArr->as_array(), true);
-	int demonInd = roulette::utils::getIndexOf(g_rouletteManager.demonDifficultyArr->as_array(), true);
+	int diffInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("difficulty-array").as_array(), true);
+	int demonInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array(), true);
 	int difficulty = diffInd == 5 ? (demonInd + 6) : (diffInd + 1);
 
 	getRandomListLevel(difficulty, m_level, m_list_fetcher_error);
@@ -586,8 +586,8 @@ void RouletteLayer::onNextButton(CCObject*)
 			m_pPlayingMenu->getChildByTag(20)
 		)->setString(fmt::format("{}%", g_rouletteManager.levelPercentageGoal).c_str());
 
-		int diffInd = roulette::utils::getIndexOf(g_rouletteManager.difficultyArr->as_array(), true);
-		int demonInd = roulette::utils::getIndexOf(g_rouletteManager.demonDifficultyArr->as_array(), true);
+		int diffInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("difficulty-array").as_array(), true);
+		int demonInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array(), true);
 		int difficulty = diffInd == 5 ? (demonInd + 6) : (diffInd + 1);
 
 		getRandomListLevel(difficulty, m_level, m_list_fetcher_error);
@@ -637,7 +637,7 @@ void RouletteLayer::onResetButton(CCObject*)
 	m_pMainMenu->getChildByTag(12)->setVisible(true);
 	m_pMainMenu->getChildByTag(12)->setPositionY(-85.f);
 
-	if (g_rouletteManager.getArrayState(g_rouletteManager.difficultyArr, 5))
+	if (g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("difficulty-array"), 5))
 	{
 		m_plus_button_state = true;
 		onPlusButton(nullptr);
@@ -664,8 +664,8 @@ void RouletteLayer::onSkipButton(CCObject*)
 
 		onNextLevel(false, true, -125.f);
 
-		int diffInd = roulette::utils::getIndexOf(g_rouletteManager.difficultyArr->as_array(), true);
-		int demonInd = roulette::utils::getIndexOf(g_rouletteManager.demonDifficultyArr->as_array(), true);
+		int diffInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("difficulty-array").as_array(), true);
+		int demonInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array(), true);
 		int difficulty = diffInd == 5 ? (demonInd + 6) : (diffInd + 1);
 
 		getRandomListLevel(difficulty, m_level, m_list_fetcher_error);
@@ -719,8 +719,8 @@ void RouletteLayer::finishLevelRoulette()
 		m_pPlayingMenu->getChildByTag(3)->getChildren()->objectAtIndex(0)
 	)->setString(("ID: " + m_level.get<std::string>("id")).c_str());
 
-	auto diffInd = roulette::utils::getIndexOf(g_rouletteManager.difficultyArr->as_array(), true);
-	auto demonInd = roulette::utils::getIndexOf(g_rouletteManager.demonDifficultyArr->as_array(), true);
+	auto diffInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("difficulty-array").as_array(), true);
+	auto demonInd = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("demon-difficulty-array").as_array(), true);
 	int difficultyTag = m_difficulty_to_tag.at(m_level.get<std::string>("difficulty"));
 
 	if (int coins = m_level.get<int>("coins"); coins > 0)
@@ -810,7 +810,7 @@ void RouletteLayer::onNextLevel(bool levelTextVisible, bool enableLoadingCircle,
 
 void RouletteLayer::getRandomListLevel(int difficulty, matjson::Value& list, std::string& error)
 {
-	int listType = roulette::utils::getIndexOf(g_rouletteManager.selectedListArr->as_array(), true);
+	int listType = roulette::utils::getIndexOf(g_rouletteManager.getFromSaveContainer("selected-list-array").as_array(), true);
 	std::thread getListThread;
 
 	switch (listType)
@@ -853,12 +853,12 @@ CCMenuItemSpriteExtra* RouletteLayer::createDifficultyButton(int tag, CCNode* sp
 	button->setTag(tag);
 	if (isDemon)
 	{
-		if (!g_rouletteManager.getArrayState(g_rouletteManager.difficultyArr, tag - 6))
+		if (!g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("difficulty-array"), tag - 6))
 			button->setColor({ 125, 125, 125 });
 	}
 	else
 	{
-		if (!g_rouletteManager.getArrayState(g_rouletteManager.difficultyArr, tag))
+		if (!g_rouletteManager.getArrayState(g_rouletteManager.getFromSaveContainer("difficulty-array"), tag))
 			button->setColor({ 125, 125, 125 });
 	}
 	button->setVisible(visible);
diff --git a/src/roulette/manager/RouletteManager.hpp b/src/roulette/manager/RouletteManager.hpp
@@ -31,9 +31,9 @@ struct RouletteManager
 	inline static std::atomic_bool isPlayingRoulette = false;
 	inline static bool hasFinishedPreviousLevel = false;
 
-	inline static matjson::Value* difficultyArr; // 6
-	inline static matjson::Value* demonDifficultyArr; // 5
-	inline static matjson::Value* selectedListArr; // 3
+	// inline static matjson::Value* difficultyArr; // 6
+	// inline static matjson::Value* demonDifficultyArr; // 5
+	// inline static matjson::Value* selectedListArr; // 3
 
 	inline static int lastLevelID = 0;
 	inline static int lastLevelPercentage = 0;
@@ -54,29 +54,40 @@ struct RouletteManager
 			auto& saveContainer = Mod::get()->getSaveContainer().as_object();
 
 			if (!Mod::get()->hasSavedValue("difficulty-array"))
+			{
 				Mod::get()->setSavedValue<std::vector<bool>>("difficulty-array", { true, false, false, false, false, false });
-			difficultyArr = &(saveContainer["difficulty-array"]);
-			verifyArray(difficultyArr->as_array());
+				previousDifficulty = 0;
+			}
+			else
+			{
+				auto& arr = getFromSaveContainer("difficulty-array").as_array();
+
+				previousDifficulty = roulette::utils::getIndexOf(arr, true);
+				verifyArray(arr);
+			}
 
 			if (!Mod::get()->hasSavedValue("demon-difficulty-array"))
 				Mod::get()->setSavedValue<std::vector<bool>>("demon-difficulty-array", { true, false, false, false, false });
-			demonDifficultyArr = &(saveContainer["demon-difficulty-array"]);
-			verifyArray(demonDifficultyArr->as_array());
+			else
+				verifyArray(saveContainer["demon-difficulty-array"].as_array());
 
 			if (!Mod::get()->hasSavedValue("selected-list-array"))
 				Mod::get()->setSavedValue<std::vector<bool>>("selected-list-array", { true, false, false });
-			selectedListArr = &(saveContainer["selected-list-array"]);
-			verifyArray(selectedListArr->as_array());
-
-			previousDifficulty = roulette::utils::getIndexOf(difficultyArr->as_array(), true);
+			else
+				verifyArray(saveContainer["selected-list-array"].as_array());
 
 			hasInitManager = true;
 		}
 	}
 
-	bool getArrayState(matjson::Value* arr, std::size_t idx)
+	matjson::Value& getFromSaveContainer(std::string_view const key)
+	{
+		return Mod::get()->getSaveContainer().as_object()[key];
+	}
+
+	bool getArrayState(matjson::Value& arr, std::size_t idx)
 	{
-		return arr->as_array().at(idx).as<bool>();
+		return arr.as_array().at(idx).as<bool>();
 	}
 
 	void reset()

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include "roulette/manager/RouletteManager.hpp"`
`1`	`2`	`#include <Geode/Geode.hpp>`
`2`	`3`
`3`	`4`	`using namespace geode::prelude;`