MOVING ANIMATIONS LOL

source/GameOverSubstate.hx

@@ -105,10 +105,13 @@ class GameOverSubstate extends MusicBeatSubstate
 				if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished && !playingDeathSound)
 				{
 					playingDeathSound = true;
+
+					bf.startedDeath = true;
+					coolStartDeath(0.2);
+
 					FlxG.sound.play(Paths.sound('jeffGameover/jeffGameover-' + randomGameover), 1, false, null, true, function()
 					{
-						bf.startedDeath = true;
-						coolStartDeath();
+						FlxG.sound.music.fadeIn(4, 0.2, 1);
 					});
 				}
 			default:
@@ -125,9 +128,9 @@ class GameOverSubstate extends MusicBeatSubstate
 		}
 	}
 
-	private function coolStartDeath():Void
+	private function coolStartDeath(?vol:Float = 1):Void
 	{
-		FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix));
+		FlxG.sound.playMusic(Paths.music('gameOver' + stageSuffix), vol);
 	}
 
 	override function beatHit()

source/PlayState.hx

@@ -563,6 +563,7 @@ class PlayState extends MusicBeatState
 
 				tankGround = new BGSprite('tankRolling', 300, 300, 0.5, 0.5, ['BG tank w lighting'], true);
 				add(tankGround);
+				tankGround.active = false;
 
 				tankmanRun = new FlxTypedGroup<TankmenBG>();
 				add(tankmanRun);
@@ -579,7 +580,7 @@ class PlayState extends MusicBeatState
 				var fgTank0:BGSprite = new BGSprite('tank0', -500, 650, 1.7, 1.5, ['fg']);
 				foregroundSprites.add(fgTank0);
 
-				var fgTank1:BGSprite = new BGSprite('tank1', -300, 700, 2, 0.2, ['fg']);
+				var fgTank1:BGSprite = new BGSprite('tank1', -300, 750, 2, 0.2, ['fg']);
 				foregroundSprites.add(fgTank1);
 
 				// just called 'foreground' just cuz small inconsistency no bbiggei
@@ -592,7 +593,7 @@ class PlayState extends MusicBeatState
 				var fgTank5:BGSprite = new BGSprite('tank5', 1800, 900, 1.5, 1.5, ['fg']);
 				foregroundSprites.add(fgTank5);
 
-				var fgTank3:BGSprite = new BGSprite('tank3', 1300, 1430, 3.5, 2.5, ['fg']);
+				var fgTank3:BGSprite = new BGSprite('tank3', 1300, 1400, 3.5, 2.5, ['fg']);
 				foregroundSprites.add(fgTank3);
 
 			default:
@@ -1098,13 +1099,24 @@ class PlayState extends MusicBeatState
 	{
 		inCutscene = true;
 
+		var vid:FlxVideo = new FlxVideo('music/stressCutscene.mp4');
+		vid.finishCallback = function()
+		{
+			FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
+			startCountdown();
+			cameraMovement();
+		};
+
+		/* 
+			camHUD.visible = false;
+
 			// for story mode shit
 			camFollow.setPosition(camPos.x, camPos.y);
 
 			var dummyLoaderShit:FlxGroup = new FlxGroup();
 
 			add(dummyLoaderShit);
-		/* 
+
 			for (i in 0...7)
 			{
 				var dummyLoader:FlxSprite = new FlxSprite();
@@ -1115,8 +1127,6 @@ class PlayState extends MusicBeatState
 				// dummyLoader.drawFrame(true);
 			}
 
-		 */
-
 			dad.visible = false;
 
 			// gf.y += 300;
@@ -1331,7 +1341,7 @@ class PlayState extends MusicBeatState
 
 					gfCutsceneLayer.remove(cutsceneShit);
 				});
-		});
+		});*/
 	}
 
 	function initDiscord():Void
@@ -1450,6 +1460,7 @@ class PlayState extends MusicBeatState
 	function startCountdown():Void
 	{
 		inCutscene = false;
+		camHUD.visible = true;
 
 		generateStaticArrows(0);
 		generateStaticArrows(1);
@@ -2847,6 +2858,8 @@ class PlayState extends MusicBeatState
 	}
 
 	function moveTank():Void
+	{
+		if (!inCutscene)
 		{
 			var daAngleOffset:Float = 1;
 			tankAngle += FlxG.elapsed * tankSpeed;
@@ -2855,6 +2868,7 @@ class PlayState extends MusicBeatState
 			tankGround.x = tankX + Math.cos(FlxAngle.asRadians((tankAngle * daAngleOffset) + 180)) * 1500;
 			tankGround.y = 1300 + Math.sin(FlxAngle.asRadians((tankAngle * daAngleOffset) + 180)) * 1100;
 		}
+	}
 
 	var tankResetShit:Bool = false;
 	var tankMoving:Bool = false;

source/ui/OptionsState.hx

@@ -31,7 +31,7 @@ class OptionsState extends MusicBeatState
 		var options = addPage(Options, new OptionsMenu(false));
 		var preferences = addPage(Preferences, new PreferencesMenu());
 		var controls = addPage(Controls, new ControlsMenu());
-		var colors = addPage(Colors, new ColorsMenu());
+		// var colors = addPage(Colors, new ColorsMenu());
 
 		#if cpp
 		var mods = addPage(Mods, new ModMenu());
@@ -41,7 +41,7 @@ class OptionsState extends MusicBeatState
 		{
 			options.onExit.add(exitToMainMenu);
 			controls.onExit.add(switchPage.bind(Options));
-			colors.onExit.add(switchPage.bind(Options));
+			// colors.onExit.add(switchPage.bind(Options));
 			preferences.onExit.add(switchPage.bind(Options));
 
 			#if cpp
@@ -176,7 +176,7 @@ class OptionsMenu extends Page
 		add(items = new TextMenuList());
 		createItem('preferences', function() switchPage(Preferences));
 		createItem("controls", function() switchPage(Controls));
-		createItem('colors', function() switchPage(Colors));
+		// createItem('colors', function() switchPage(Colors));
 		#if cpp
 		createItem('mods', function() switchPage(Mods));
 		#end

source/ui/PreferencesMenu.hx

@@ -30,7 +30,7 @@ class PreferencesMenu extends ui.OptionsState.Page
 
 		add(items = new TextMenuList());
 
-		createPrefItem('naughtyness', 'censor-naughty', false);
+		createPrefItem('naughtyness', 'censor-naughty', true);
 		createPrefItem('downscroll', 'downscroll', false);
 		createPrefItem('flashing menu', 'flashing-menu', true);
 		createPrefItem('Camera Zooming on Beat', 'camera-zoom', true);
@@ -65,7 +65,7 @@ class PreferencesMenu extends ui.OptionsState.Page
 
 	public static function initPrefs():Void
 	{
-		preferenceCheck('censor-naughty', false);
+		preferenceCheck('censor-naughty', true);
 		preferenceCheck('downscroll', false);
 		preferenceCheck('flashing-menu', true);
 		preferenceCheck('camera-zoom', true);