AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'KadeDev:master' into master

Browse Source
This commit is contained in:
ArfieCat
2021-08-13 17:51:18 -07:00
committed by GitHub
parent 5f4dc939b9 7d59048332
commit 87b8afa888
9 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/PlayState.hx
View File

@ -2439,6 +2439,7 @@ class PlayState extends MusicBeatState
{
trace('GITAROO MAN EASTER EGG');
FlxG.switchState(new GitarooPause());
clean();
}
else
openSubState(new PauseSubState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
@ -2460,7 +2461,9 @@ class PlayState extends MusicBeatState
#if windows
DiscordClient.changePresence("Chart Editor", null, null, true);
#end
FlxG.switchState(new ChartingState());
clean();
FlxG.stage.removeEventListener(KeyboardEvent.KEY_DOWN, handleInput);
FlxG.stage.removeEventListener(KeyboardEvent.KEY_UP, releaseInput);
#if windows
@ -2514,6 +2517,7 @@ class PlayState extends MusicBeatState
}
FlxG.switchState(new AnimationDebug(SONG.player2));
clean();
FlxG.stage.removeEventListener(KeyboardEvent.KEY_DOWN, handleInput);
FlxG.stage.removeEventListener(KeyboardEvent.KEY_UP, releaseInput);
#if windows
@ -2528,6 +2532,7 @@ class PlayState extends MusicBeatState
if (FlxG.keys.justPressed.ZERO)
{
FlxG.switchState(new AnimationDebug(SONG.player1));
clean();
FlxG.stage.removeEventListener(KeyboardEvent.KEY_DOWN, handleInput);
FlxG.stage.removeEventListener(KeyboardEvent.KEY_UP, releaseInput);
#if windows
@ -3388,6 +3393,7 @@ class PlayState extends MusicBeatState
FlxG.sound.playMusic(Paths.music('freakyMenu'));
offsetTesting = false;
LoadingState.loadAndSwitchState(new OptionsMenu());
clean();
FlxG.save.data.offset = offsetTest;
}
else
@ -3425,6 +3431,7 @@ class PlayState extends MusicBeatState
FlxG.sound.playMusic(Paths.music('freakyMenu'));
Conductor.changeBPM(102);
FlxG.switchState(new StoryMenuState());
clean();
}
#if windows
@ -3479,6 +3486,7 @@ class PlayState extends MusicBeatState
FlxG.sound.music.stop();
LoadingState.loadAndSwitchState(new PlayState());
clean();
}
}
else
@ -3499,7 +3507,10 @@ class PlayState extends MusicBeatState
});
}
else
{
FlxG.switchState(new FreeplayState());
clean();
}
}
}
}