stuff, i don't know what the hell i made, please fix yourself

about.md

@@ -6,7 +6,6 @@ This mod allows you to change the menu song every time you open the game, pickin
 
 # Notes
 
-- The song changes every time you restart the game, so you will not get another song every time you go back to the menu.
 - In the future i'll add a setting to toggle between using NG songs or your own songs.
 
 # Thanks to!

changelog.md

@@ -1,7 +1,7 @@
 # v1.1.0
 
 - Updated Geode target version to `v3.1.1`
-- Fixed crash when installing the mod (missing textures crash)
+- Fixed crash when opening the game (missing textures crash)
 - Fixed random song picker being on a loop for every song downloaded.
 - Moved song class to its own file.
 - The mod should now check for the songs path when loaded, not when executed.

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "3.1.1",
+	"geode": "3.2.0",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206"
@@ -8,7 +8,7 @@
 	"id": "elnexreal.menuloop_randomizer",
 	"name": "Menu Loop Randomizer",
 	"developer": "elnexreal",
-	"description": "Randomize your menu loop when opening the game.",
+	"description": "Menu Loop randomizer for GD.",
 	"tags": [
 		"music",
 		"interface",
@@ -25,6 +25,12 @@
 			"default": true,
 			"description": "Shows a notification with the name of the currently playing song.",
 			"name": "Show notification"
+		},
+		"randomizeWhenExiting": {
+			"type": "bool",
+			"default": true,
+			"description": "Randomize the song when you exit a level (for example when exiting the editor)",
+			"name": "Randomize on level exit"
 		}
 	},
 	"resources": {

src/Utils.cpp

@@ -0,0 +1,12 @@
+#include "Utils.hpp"
+#include <random>
+
+int Utils::randomIndex(int size) {
+	// select a random item from the vector and return the path
+	std::random_device rd;
+	std::mt19937 gen(rd());
+	std::uniform_int_distribution<> dist(0, size - 1);
+	int randomIndex = dist(gen);
+
+	return randomIndex;
+}

src/Utils.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+class Utils {
+  public:
+	static int randomIndex(int size);
+};

src/main.cpp

@@ -1,16 +1,17 @@
 #include "PlayingCard.hpp"
 #include "Song.hpp"
+#include "Utils.hpp"
 #include <Geode/Geode.hpp>
 #include <Geode/modify/GameManager.hpp>
 #include <Geode/modify/MenuLayer.hpp>
-#include <random>
+#include <Geode/modify/PauseLayer.hpp>
 #include <vector>
 
 using namespace geode::prelude;
 
 // global variables
 std::vector<Song> songs;
-Song *selectedSong;
+Song selectedSong;
 
 $on_mod(Loaded) {
 	// get the path for the songs
@@ -29,17 +30,22 @@ Song *selectedSong;
 		}
 	}
 
-	// select a random item from the vector and return the path
-	std::random_device rd;
-	std::mt19937 gen(rd());
-	std::uniform_int_distribution<> dist(0, songs.size() - 1);
-	int randomIndex = dist(gen);
-	selectedSong = std::move(&songs[randomIndex]);
+	selectedSong = std::move(songs[Utils::randomIndex(songs.size())]);
 }
 
 struct GameManagerHook : Modify<GameManagerHook, GameManager> {
 	gd::string getMenuMusicFile() {
-		return selectedSong->path;
+		return selectedSong.path;
+	}
+};
+
+struct PauseLayerHook : Modify<PauseLayerHook, PauseLayer> {
+	void onQuit(CCObject *sender) {
+		if (Mod::get()->getSettingValue<bool>("randomizeWhenExiting")) {
+			selectedSong = std::move(songs[Utils::randomIndex(songs.size())]);
+		}
+
+		PauseLayer::onQuit(sender);
 	}
 };
 
@@ -54,13 +60,13 @@ struct MenuLayerHook : Modify<MenuLayerHook, MenuLayer> {
 		auto cardSettingValue = Mod::get()->getSettingValue<bool>("nowPlayingCard");
 
 		if (cardSettingValue) {
-			if (auto songObject = downloadManager->getSongInfoObject(stoi(selectedSong->id))) {
-				selectedSong->name = songObject->m_songName;
+			if (auto songObject = downloadManager->getSongInfoObject(stoi(selectedSong.id))) {
+				selectedSong.name = songObject->m_songName;
 			} else {
-				selectedSong->name = "Unknown";
+				selectedSong.name = "Unknown";
 			}
 
-			auto card = PlayingCard::create(selectedSong->name, selectedSong->id);
+			auto card = PlayingCard::create(selectedSong.name, selectedSong.id);
 			card->position.x = screenSize.width / 2.0f;
 			card->position.y = screenSize.height;
 
@@ -71,13 +77,13 @@ struct MenuLayerHook : Modify<MenuLayerHook, MenuLayer> {
 			card->setPosition(defaultPos);
 			this->addChild(card);
 
-			// auto sequence = CCSequence::create(
-			// 	CCEaseInOut::create(CCMoveTo::create(1.5f, {posx, posy - 25.0f}), 2.0f),
-			// 	CCDelayTime::create(0.5f),
-			// 	CCEaseInOut::create(CCMoveTo::create(1.5f, {posx, posy}), 2.0f),
-			// 	nullptr
-			// );
-			// card->runAction(sequence);
+			auto sequence = CCSequence::create(
+				CCEaseInOut::create(CCMoveTo::create(1.5f, {posx, posy - 25.0f}), 2.0f),
+				CCDelayTime::create(0.5f),
+				CCEaseInOut::create(CCMoveTo::create(1.5f, {posx, posy}), 2.0f),
+				nullptr
+			);
+			card->runAction(sequence);
 		}
 
 		return true;