death from cruelty squad

poec987 · Jun 26, 2024 · 5e792aa · 5e792aa
1 parent d35867d
commit 5e792aa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/assets/shared/music/gameOver.ogg b/assets/shared/music/gameOver.ogg
diff --git a/assets/shared/music/gameOverEnd.ogg b/assets/shared/music/gameOverEnd.ogg
diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
@@ -41,14 +41,18 @@ class GameOverSubstate extends MusicBeatSubstate
 		add(camFollow);
 
 		FlxG.sound.play(Paths.sound('fnf_loss_sfx' + stageSuffix));
-		Conductor.changeBPM(100);
+		Conductor.changeBPM(85);
 
 		// FlxG.camera.followLerp = 1;
 		// FlxG.camera.focusOn(FlxPoint.get(FlxG.width / 2, FlxG.height / 2));
 		FlxG.camera.scroll.set();
 		FlxG.camera.target = null;
 
 		bf.playAnim('firstDeath');
+
+		new FlxTimer().start(2, (tmr:FlxTimer) -> {
+			FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix));
+		});
 	}
 
 	override function update(elapsed:Float)
@@ -70,15 +74,15 @@ class GameOverSubstate extends MusicBeatSubstate
 				FlxG.switchState(new FreeplayState());
 		}
 
-		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.curFrame == 12)
-		{
-			FlxG.camera.follow(camFollow, LOCKON, 0.01);
-		}
+		// if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.curFrame == 12)
+		// {
+		// 	FlxG.camera.follow(camFollow, LOCKON, 0.01);
+		// }
 
-		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished)
-		{
-			FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix));
-		}
+		// if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished)
+		// {
+		// 	FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix));
+		// }
 
 		if (FlxG.sound.music.playing)
 		{