From 806efe6a17d8fe44bf34730af76252e73730378e Mon Sep 17 00:00:00 2001
From: MtH <mth@mth.moe>
Date: Thu, 15 Apr 2021 03:56:42 +0200
Subject: [PATCH] week6 cam center and move senpaiEvil

---
 source/PlayState.hx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index 01f8e0d0a..8403128a3 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -989,7 +989,6 @@ class PlayState extends MusicBeatState
 					cameraMovement();
 
 					startCountdown();
-					camHUD.visible = true;
 				});
 			});
 		});
@@ -1039,8 +1038,6 @@ class PlayState extends MusicBeatState
 				dad.visible = true;
 				gfCutsceneLayer.remove(tankCutscene);
 			});
-
-			camHUD.visible = true;
 		});
 	}
 
@@ -1333,10 +1330,13 @@ class PlayState extends MusicBeatState
 		var senpaiEvil:FlxSprite = new FlxSprite();
 		senpaiEvil.frames = Paths.getSparrowAtlas('weeb/senpaiCrazy');
 		senpaiEvil.animation.addByPrefix('idle', 'Senpai Pre Explosion', 24, false);
-		senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * 6));
+		senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * daPixelZoom));
 		senpaiEvil.scrollFactor.set();
 		senpaiEvil.updateHitbox();
 		senpaiEvil.screenCenter();
+		senpaiEvil.x += senpaiEvil.width / 5;
+
+		camFollow.setPosition(camPos.x, camPos.y);
 
 		if (SONG.song.toLowerCase() == 'roses' || SONG.song.toLowerCase() == 'thorns')
 		{
@@ -1345,6 +1345,7 @@ class PlayState extends MusicBeatState
 			if (SONG.song.toLowerCase() == 'thorns')
 			{
 				add(red);
+				camHUD.visible = false;
 			}
 		}
 
@@ -1383,6 +1384,7 @@ class PlayState extends MusicBeatState
 									FlxG.camera.fade(FlxColor.WHITE, 0.01, true, function()
 									{
 										add(dialogueBox);
+										camHUD.visible = true;
 									}, true);
 								});
 								new FlxTimer().start(3.2, function(deadTime:FlxTimer)
@@ -1411,6 +1413,7 @@ class PlayState extends MusicBeatState
 	function startCountdown():Void
 	{
 		inCutscene = false;
+		camHUD.visible = true;
 
 		generateStaticArrows(0);
 		generateStaticArrows(1);
@@ -2516,10 +2519,7 @@ class PlayState extends MusicBeatState
 			{
 				case 'mom':
 					camFollow.y = dad.getMidpoint().y;
-				case 'senpai':
-					camFollow.y = dad.getMidpoint().y - 430;
-					camFollow.x = dad.getMidpoint().x - 100;
-				case 'senpai-angry':
+				case 'senpai' | 'senpai-angry':
 					camFollow.y = dad.getMidpoint().y - 430;
 					camFollow.x = dad.getMidpoint().x - 100;
 			}