This commit is contained in:
Yoshman29
2022-12-28 17:32:57 +01:00
parent cf1ad42cc7
commit 27f1a22cdd
4 changed files with 14 additions and 4 deletions
+1 -1
View File
@@ -1 +1 @@
1848
1853
+1
View File
@@ -66,6 +66,7 @@ class FreeplayState extends MusicBeatState
// Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null);
#end
StoryMenuState.playStoryMode = false;
// LOAD CHARACTERS
+9 -1
View File
@@ -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()
+3 -2
View File
@@ -43,13 +43,14 @@ class StoryMenuState extends MusicBeatState {
public var characterSprites:FlxTypedGroup<MenuCharacterSprite>;
public var charFrames:Map<String, FlxFramesCollection> = [];
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;