From d31454c7ddf4cbf6a681cc8b32cd3f9480f8eacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=8D=9A=7ENex?=
 <87421482+NexIsDumb@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:57:47 +0200
Subject: [PATCH] substate auto custom transitions!!

---
 source/funkin/backend/MusicBeatState.hx    | 30 ++++++++++++++++++++--
 source/funkin/backend/MusicBeatSubstate.hx | 15 +++++------
 source/funkin/game/cutscenes/Cutscene.hx   |  2 ++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/source/funkin/backend/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx
index 856c429a..801794ec 100644
--- a/source/funkin/backend/MusicBeatState.hx
+++ b/source/funkin/backend/MusicBeatState.hx
@@ -162,10 +162,36 @@ class MusicBeatState extends FlxState implements IBeatReceiver
 		persistentUpdate = true;
 		call("postCreate");
 		if (!skipTransIn)
-			openSubState(new MusicBeatTransition(null));
+			startTransition(null);
 		skipTransIn = false;
 		skipTransOut = false;
 	}
+
+	public function startTransition(?newState:FlxState, skipSubStates:Bool = false):Bool {
+		if (!skipSubStates) {
+			var curCheckingSub:FlxSubState = subState;
+			var found:FlxSubState = null;  // always gets the last one  - Nex
+
+			while (curCheckingSub != null) {
+				if (curCheckingSub is MusicBeatTransition) {
+					found = null;  // avoiding infinite loops  - Nex
+					break;
+				}
+
+				if (curCheckingSub is MusicBeatSubstate && cast(curCheckingSub, MusicBeatSubstate).canOpenCustomTransition) found = curCheckingSub;
+				curCheckingSub = curCheckingSub.subState;
+			}
+
+			if (found != null) {
+				found.openSubState(new MusicBeatTransition(newState));
+				return true;  // "Started from a substate?"
+			}
+		}
+
+		openSubState(new MusicBeatTransition(newState));
+		return false;
+	}
+
 	public function call(name:String, ?args:Array<Dynamic>, ?defaultVal:Dynamic):Dynamic {
 		// calls the function on the assigned script
 		if(stateScripts != null)
@@ -258,7 +284,7 @@ class MusicBeatState extends FlxState implements IBeatReceiver
 
 		if (skipTransOut || (subState is MusicBeatTransition && cast(subState, MusicBeatTransition).newState != null))
 			return true;
-		openSubState(new MusicBeatTransition(e.substate));
+		startTransition(e.substate);
 		persistentUpdate = false;
 		return false;
 	}
diff --git a/source/funkin/backend/MusicBeatSubstate.hx b/source/funkin/backend/MusicBeatSubstate.hx
index 07cfbcfd..d0d0f86f 100644
--- a/source/funkin/backend/MusicBeatSubstate.hx
+++ b/source/funkin/backend/MusicBeatSubstate.hx
@@ -16,6 +16,10 @@ class MusicBeatSubstate extends FlxSubState implements IBeatReceiver
 	private var lastBeat:Float = 0;
 	private var lastStep:Float = 0;
 
+	/**
+	 * Whether this specifc substate can open custom transitions
+	 */
+	public var canOpenCustomTransition:Bool = false;
 	/**
 	 * Current step
 	 */
@@ -250,19 +254,14 @@ class MusicBeatSubstate extends FlxSubState implements IBeatReceiver
 
 	public var parent:FlxState;
 
-	public function onSubstateOpen() {
-
-	}
+	public function onSubstateOpen() {}
 
 	public override function resetSubState() {
+		super.resetSubState();
 		if (subState != null && subState is MusicBeatSubstate) {
 			var subState:MusicBeatSubstate = cast subState;
 			subState.parent = this;
-			super.resetSubState();
-			if (subState != null)
-				cast(subState, MusicBeatSubstate).onSubstateOpen();
-			return;
+			subState.onSubstateOpen();
 		}
-		super.resetSubState();
 	}
 }
diff --git a/source/funkin/game/cutscenes/Cutscene.hx b/source/funkin/game/cutscenes/Cutscene.hx
index ed1f2c60..9556f69b 100644
--- a/source/funkin/game/cutscenes/Cutscene.hx
+++ b/source/funkin/game/cutscenes/Cutscene.hx
@@ -23,6 +23,8 @@ class Cutscene extends MusicBeatSubstate {
 
 	public function new(callback:Void->Void, allowPause:Bool = true, canSkip:Bool = true) {
 		super();
+		canOpenCustomTransition = true;
+
 		__callback = callback;
 		__pausable = allowPause;