From 08971e185d90e6164ee3b0b315035d0b54573967 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sun, 18 Apr 2021 06:53:23 -0400
Subject: [PATCH] wtf cutscene shit

---
 Project.xml         |  2 +-
 source/PlayState.hx | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Project.xml b/Project.xml
index 3b66a7189..24396968b 100644
--- a/Project.xml
+++ b/Project.xml
@@ -40,7 +40,7 @@
 
 	<classpath name="source" />
 
-	<assets path='assets/preload/music' include="*mp4" embed='false' />
+	<!-- <assets path='assets/preload/music' include="*mp4" embed='false' /> -->
 
 	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
 	<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web"/>
diff --git a/source/PlayState.hx b/source/PlayState.hx
index ad9f8416f..05ec046ac 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -934,8 +934,8 @@ class PlayState extends MusicBeatState
 			switch (curSong.toLowerCase())
 			{
 				// REMOVE THIS LATER
-				// case 'stress':
-				// stressIntro();
+				case 'stress':
+					stressIntro();
 
 				default:
 					startCountdown();
@@ -949,9 +949,14 @@ class PlayState extends MusicBeatState
 	{
 		inCutscene = true;
 
+		var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
+		blackShit.scrollFactor.set();
+		add(blackShit);
+
 		var vid:FlxVideo = new FlxVideo('music/ughCutscene.mp4');
 		vid.finishCallback = function()
 		{
+			remove(blackShit);
 			FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
 			startCountdown();
 			cameraMovement();
@@ -1030,9 +1035,15 @@ class PlayState extends MusicBeatState
 	{
 		inCutscene = true;
 
+		var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
+		blackShit.scrollFactor.set();
+		add(blackShit);
+
 		var vid:FlxVideo = new FlxVideo('music/gunsCutscene.mp4');
 		vid.finishCallback = function()
 		{
+			remove(blackShit);
+
 			FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
 			startCountdown();
 			cameraMovement();
@@ -1099,9 +1110,15 @@ class PlayState extends MusicBeatState
 	{
 		inCutscene = true;
 
+		var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
+		blackShit.scrollFactor.set();
+		add(blackShit);
+
 		var vid:FlxVideo = new FlxVideo('music/stressCutscene.mp4');
 		vid.finishCallback = function()
 		{
+			remove(blackShit);
+
 			FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
 			startCountdown();
 			cameraMovement();