make categorys less jank

FunkinModdingPlus · Mar 8, 2021 · 3536527 · 3536527
1 parent 14dcef2
commit 3536527
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -183,8 +183,15 @@ class FreeplayState extends MusicBeatState
 			FlxG.autoPause = true;
 			if (soundTest)
 				FlxG.switchState(new SaveDataState());
-			else
-				FlxG.switchState(new MainMenuState());
+			else {
+				var epicCategoryJs:Array<Dynamic> = CoolUtil.parseJson(Assets.getText('assets/data/freeplaySongJson.jsonc'));
+				if (epicCategoryJs.length > 1)
+				{
+					FlxG.switchState(new CategoryState());
+				} else
+					FlxG.switchState(new MainMenuState());
+			}
+
 		}
 
 		if (accepted)

diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -195,9 +195,16 @@ class MainMenuState extends MusicBeatState
 										trace("Story Menu Selected");
 									case 'freeplay':
 										CategoryState.choosingFor = "freeplay";
-										FlxG.switchState(new CategoryState());
+										var epicCategoryJs:Array<Dynamic> = CoolUtil.parseJson(Assets.getText('assets/data/freeplaySongJson.jsonc'));
 										FreeplayState.soundTest = false;
-										trace("Freeplay Menu Selected");
+										if (epicCategoryJs.length > 1)
+										{
+											FlxG.switchState(new CategoryState());
+										}  else {
+											FreeplayState.currentSongList = epicCategoryJs[0].songs;
+											FlxG.switchState(new FreeplayState());
+										}
+
 
 									case 'options':
 										FlxG.switchState(new SaveDataState());

diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx
@@ -26,9 +26,6 @@ class PauseSubState extends MusicBeatSubstate
 		pauseMusic = new FlxSound().loadEmbedded('assets/music/breakfast' + TitleState.soundExt, true, true);
 		pauseMusic.volume = 0;
 		pauseMusic.play(false, FlxG.random.int(0, Std.int(pauseMusic.length / 2)));
-		if (PlayState.isStoryMode) {
-			menuItems = ['Resume', 'Restart Song', "Exit to menu"];
-		}
 		FlxG.sound.list.add(pauseMusic);
 
 		var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);