From c87f15e4f14259b75b9966bbe9d1d7f72ab13b10 Mon Sep 17 00:00:00 2001 From: TaeYai <82447519+TaeYai@users.noreply.github.com> Date: Wed, 28 Dec 2022 18:55:39 +0700 Subject: [PATCH] Pause Thing --- buildnumber.txt | 2 +- source/funkin/menus/FreeplayState.hx | 1 + source/funkin/menus/PauseSubState.hx | 10 +++++++++- source/funkin/menus/StoryMenuState.hx | 5 +++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index d32020aa..3a657e2f 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1848 \ No newline at end of file +1853 \ No newline at end of file diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index d254dee0..c35c32fa 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -66,6 +66,7 @@ class FreeplayState extends MusicBeatState // Updating Discord Rich Presence DiscordClient.changePresence("In the Menus", null); #end + StoryMenuState.playStoryMode = false; // LOAD CHARACTERS diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index d7ac5d32..0dc11d1f 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -18,6 +18,7 @@ import flixel.tweens.FlxTween; import flixel.util.FlxColor; import funkin.ui.Alphabet; import funkin.options.keybinds.KeybindsOptions; +import funkin.menus.StoryMenuState; class PauseSubState extends MusicBeatSubstate { @@ -147,7 +148,14 @@ class PauseSubState extends MusicBeatSubstate case "Options": FlxG.switchState(new OptionsMenu(true)); case "Exit to menu": - FlxG.switchState(new MainMenuState()); + if(StoryMenuState.playStoryMode){ + FlxG.switchState(new StoryMenuState()); + } + else{ + FlxG.switchState(new FreeplayState()); + } + FlxG.sound.playMusic(Paths.music('freakyMenu')); + } } override function destroy() diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 4cee34cd..7b708bf4 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -43,13 +43,14 @@ class StoryMenuState extends MusicBeatState { public var characterSprites:FlxTypedGroup; public var charFrames:Map = []; + public static var playStoryMode:Bool; public override function create() { super.create(); loadXMLs(); - + StoryMenuState.playStoryMode = true; persistentUpdate = persistentDraw = true; - + // WEEK INFO blackBar = new FlxSprite(0, 0).makeGraphic(1, 1, 0xFFFFFFFF); blackBar.color = 0xFF000000;