diff --git a/Project.xml b/Project.xml index bbe04c7c..8dbe8ae5 100644 --- a/Project.xml +++ b/Project.xml @@ -70,7 +70,7 @@ THEN UHHH I USED THE NAME OF THE FONT WITH SETFORMAT() ON THE TEXT!!! NOT USING A DIRECT THING TO THE ASSET!!! --> - + diff --git a/buildnumber.txt b/buildnumber.txt index 6f5d72ea..6794342e 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1391 \ No newline at end of file +1393 \ No newline at end of file diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx index 01641dce..5b525f34 100644 --- a/source/funkin/game/GameOverSubstate.hx +++ b/source/funkin/game/GameOverSubstate.hx @@ -77,14 +77,15 @@ class GameOverSubstate extends MusicBeatSubstate FlxG.switchState(new FreeplayState()); } - if (!isEnding && ((!lossSFX.playing) || (character.animation.curAnim != null && character.animation.curAnim.name == "firstDeath" && character.animation.curAnim.finished)) && (FlxG.sound.music == null || !FlxG.sound.music.playing)) + if (!isEnding && ((!lossSFX.playing) || (character.animation.curAnim != null && character.animation.curAnim.name == "firstDeath" && character.animation.curAnim.finished)) && (FlxG.sound.music == null || !FlxG.sound.music.playing)) { CoolUtil.playMusic(Paths.music(gameOverSong), 100); + } } override function beatHit(curBeat:Int) { super.beatHit(curBeat); - if (!lossSFX.playing) + if (FlxG.sound.music != null && FlxG.sound.music.playing) character.playAnim("deathLoop", true, DANCE); } diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 69f44ce6..ac539ec3 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1005,10 +1005,7 @@ class PlayState extends MusicBeatState // RESET = Quick Game Over Screen if (controls.RESET) - { health = 0; - trace("RESET = True"); - } // CHEAT = brandon's a pussy if (controls.CHEAT)