Cutscene System V3

poec987 · Sep 14, 2024 · 4a1c517 · 4a1c517
1 parent 5c504e3
commit 4a1c517
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 5 deletions.
diff --git a/assets/preload/videos/scopophobia-end.mp4 b/assets/preload/videos/scopophobia-end.mp4
diff --git a/assets/preload/videos/peak.mp4 → assets/preload/videos/scopophobia.mp4 b/assets/preload/videos/peak.mp4 → assets/preload/videos/scopophobia.mp4
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -186,7 +186,7 @@ class FreeplayState extends MusicBeatState
 
 		PlayState.lastFPpage = page;
 		PlayState.lastFPselect = curSelected;
-		LoadingState.loadAndSwitchState(new PlayState());
+		PlayState.checkForCutscene(song, new PlayState());
 	}
 
 	public function refreshSongList(skipDestroy:Bool=false) {
@@ -303,7 +303,7 @@ class FreeplayState extends MusicBeatState
 					PlayState.isStoryMode = false;
 
 					PlayState.storyWeek = PlayState.stageDictionary[PlayState.SONG.stage];
-					LoadingState.loadAndSwitchState(new PlayState());
+					PlayState.checkForCutscene(poop, new PlayState());
 				}
 				catch(e) {
 					trace(e);

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -2324,7 +2324,7 @@ class PlayState extends MusicBeatState
 					transIn = FlxTransitionableState.defaultTransIn;
 					transOut = FlxTransitionableState.defaultTransOut;
 
-					FlxG.switchState(new StoryMenuState());
+					checkForCutscene(PlayState.curSong.toLowerCase()+"-end", new StoryMenuState());
 
 					// if ()
 					StoryMenuState.weekUnlocked[Std.int(Math.min(storyWeek + 1, StoryMenuState.weekUnlocked.length - 1))] = true;
@@ -2352,7 +2352,7 @@ class PlayState extends MusicBeatState
 					PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase(), PlayState.storyPlaylist[0]);
 					FlxG.sound.music.stop();
 
-					LoadingState.loadAndSwitchState(new PlayState());
+					checkForCutscene(PlayState.storyPlaylist[0].toLowerCase(), new PlayState());
 				}
 			}
 			else
@@ -2361,11 +2361,23 @@ class PlayState extends MusicBeatState
 			}
 	}
 
+	public static function checkForCutscene(vidName:String, nextState:flixel.FlxState) {
+		var files:Array<String> = sys.FileSystem.readDirectory('assets/data/'+SONG.song.toLowerCase().trim());
+
+		if (FileSystem.exists(Paths.video(vidName))) {
+			VideoCutsceneState.videoFile = vidName.trim();
+			VideoCutsceneState.targetState = nextState;
+			LoadingState.loadAndSwitchState(new VideoCutsceneState());
+		} else {
+			LoadingState.loadAndSwitchState(nextState);
+		}
+	}
+
 	function returnToFreeplay() {
 		trace('WENT BACK TO FREEPLAY??');
 		FreeplayState.lastPage = lastFPpage;
 		FreeplayState.lastSelected = lastFPselect;
-		FlxG.switchState(new FreeplayState());
+		checkForCutscene(PlayState.curSong.toLowerCase()+"-end", new FreeplayState());
 	}
 
 	public function startVideo(name:String)

diff --git a/source/VideoCutsceneState.hx b/source/VideoCutsceneState.hx
@@ -0,0 +1,61 @@
+package;
+
+import flixel.FlxG;
+import flixel.FlxState;
+
+#if (hxCodec >= "3.0.0") import hxcodec.flixel.FlxVideo as VideoHandler;
+#elseif (hxCodec >= "2.6.1") import hxcodec.VideoHandler as VideoHandler;
+#elseif (hxCodec == "2.6.0") import VideoHandler;
+#else import vlc.MP4Handler as VideoHandler; #end
+
+#if desktop
+import sys.FileSystem;
+#end
+
+class VideoCutsceneState extends MusicBeatState {
+
+    public static var videoFile:String;
+    public static var targetState:flixel.FlxState;
+
+    public override function create() {
+        super.create();
+
+        FlxG.sound.music.stop();
+
+        startVideo(videoFile);
+    }
+
+    public function startVideo(name:String)
+	{
+		var filepath:String = Paths.video(name);
+		#if sys
+		if(!FileSystem.exists(filepath))
+		#else
+		if(!OpenFlAssets.exists(filepath))
+		#end
+		{
+			FlxG.log.warn('Couldnt find video file: ' + name);
+			return;
+		}
+
+		var video:VideoHandler = new VideoHandler();
+			#if (hxCodec >= "3.0.0")
+			// Recent versions
+			video.play(filepath);
+			video.onEndReached.add(function()
+			{
+				video.dispose();
+                FlxG.switchState(targetState);
+				return;
+			}, true);
+			#else
+			// Older versions
+			video.playVideo(filepath);
+			video.finishCallback = function()
+			{
+                FlxG.switchState(targetState);
+				return;
+			}
+			#end
+	}
+}