incorporating the new "Stage" class into PlayState

StageEditor still uses the vanilla Stage

Author: Jamextreme140

source/funkin/game/PlayState.hx

@@ -16,6 +16,7 @@ import funkin.backend.FunkinText;
 import funkin.backend.chart.Chart;
 import funkin.backend.chart.ChartData;
 import funkin.backend.chart.EventsData;
+import funkin.backend.utils.XMLUtil.XMLImportedScriptInfo;
 import funkin.backend.scripting.DummyScript;
 import funkin.backend.scripting.Script;
 import funkin.backend.scripting.ScriptPack;
@@ -31,6 +32,7 @@ import funkin.game.SplashHandler;
 import funkin.game.cutscenes.*;
 import funkin.game.scoring.*;
 import funkin.game.scoring.RatingManager.Rating;
+import funkin.game.stage.Stage;
 import funkin.menus.*;
 import funkin.backend.week.WeekData;
 import funkin.savedata.FunkinSave;
@@ -42,7 +44,7 @@ using StringTools;
 @:access(funkin.game.StrumLine)
 class PlayState extends MusicBeatState
 {
-	public static final __instanceFields = Type.getInstanceFields(PlayState);
+	public static final __instanceFields:Map<String, Bool> = [for(f in Type.getInstanceFields(PlayState)) f => true];
 	/**
 	 * Current PlayState instance.
 	 */
@@ -744,7 +746,7 @@ class PlayState extends MusicBeatState
 		cameraFocusOffset = FlxPoint.get();
 
 		if (SONG.stage == null || SONG.stage.trim() == "") SONG.stage = Flags.DEFAULT_STAGE;
-		add(stage = new Stage(SONG.stage));
+		add(stage = new Stage(SONG.stage, setupStage));
 
 		if (!chartingMode || Options.charterEnablePlaytestScripts) {
 			switch(SONG.meta.name) {
@@ -2309,6 +2311,33 @@ class PlayState extends MusicBeatState
 		return campaignAccuracyCount == 0 ? 0 : campaignAccuracyTotal / campaignAccuracyCount;
 	#end
 
+	//region INITIAL SETUP
+	private function setupStage(stage:Stage):Bool {
+		stage.prepareInfos = (node) -> {
+			return XMLImportedScriptInfo.prepareInfos(node, scripts, (infos) -> stage.xmlImportedScripts.push(infos));
+		};
+		stage.onStageScriptLoad = (stageScript) -> scripts.add(stageScript);
+		stage.onStartCamSet = (startCam, defaultZoom) -> {
+			camFollow.x = startCam.x; camFollow.y = startCam.y;
+			defaultCamZoom = defaultZoom;
+		};
+		stage.onXMLLoaded = (event) -> return gameAndCharsEvent("onStageXMLParsed", event).value3; // temporary
+		stage.onRatingSet = (x, y) -> {
+			comboGroup.setPosition(x, y);
+			add(comboGroup); // unnecessary since it's getting added later
+			return comboGroup;
+		};
+		stage.onNodeLoaded = (node, sprite) -> {
+			return gameAndCharsEvent("onStageNodeParsed", EventManager.get(DynamicEvent).recycle(stage, node, sprite, node.name)).value3; // temporary
+		};
+		stage.onPostStageCreation = (event) -> gameAndCharsEvent("onPostStageCreation", event);
+		stage.removeInfo = (scriptInfo) -> scripts.remove(scriptInfo);
+		stage.onStageDestroy = (_) -> gameAndCharsCall("onStageDestroy", [_]);
+		stage.onSilentDestroy = (stageScript) -> scripts.remove(stageScript);
+		return true;
+	}
+	//endregion
+
 	/**
 	 * Load a week into PlayState.
 	 * @param weekData Week Data

source/funkin/game/stage/Layer.hx

@@ -17,7 +17,7 @@ import hscript.IHScriptCustomBehaviour;
  * @author Jamextreme140 & ItsLJcool
  */
 class Layer extends FlxTypedSpriteGroup<FlxSprite> implements IBeatReceiver implements IHScriptCustomBehaviour {
-	private static final __instanceFields:Array<String> = Type.getInstanceFields(Layer);
+	private static final __instanceFields:Map<String, Bool> = [for(f in Type.getInstanceFields(Layer)) f => true];
 
 	/**
 	 * The Layer Name
@@ -160,15 +160,15 @@ class Layer extends FlxTypedSpriteGroup<FlxSprite> implements IBeatReceiver impl
 
 	//region IHScriptCustomBehaviour implementation
 	public function hget(name:String):Dynamic {
-		if (__instanceFields.contains(name) || __instanceFields.contains('get_$name'))
+		if (__instanceFields.exists(name) || __instanceFields.exists('get_$name'))
 			return Reflect.getProperty(this, name);
 		if (stageSprites.exists(name)) return stageSprites[name];
 		if (stageLayers.exists(name)) return stageLayers[name];
 		return null;
 	}
 
 	public function hset(name:String, val:Dynamic):Dynamic {
-		if (__instanceFields.contains(name) || __instanceFields.contains('set_$name')) {
+		if (__instanceFields.exists(name) || __instanceFields.exists('set_$name')) {
 			Reflect.setProperty(this, name, val);
 			return val;
 		}

source/funkin/game/stage/Stage.hx

@@ -58,7 +58,7 @@ using funkin.backend.utils.XMLUtil.XMLImportedScriptInfo;
  * @author Jamextreme140 & ItsLJcool
 **/
 class Stage extends Layer {
-	private static final __instanceFields = Type.getInstanceFields(Stage);
+	private static final __instanceFields:Map<String, Bool> = [for(f in Type.getInstanceFields(Stage)) f => true];
 
 	private static final DEFAULT_ATTRIBUTES:Array<String> = ["name", "startCamPosX", "startCamPosY", "zoom", "folder"];
 
@@ -503,29 +503,29 @@ class Stage extends Layer {
 	//region IHScriptCustomBehaviour implementation
 	override function hget(name:String):Dynamic {
 		// TODO: optimize this since "Type.getInstanceFields(Stage)" also gets the inherited fields from "Layer"
-		if (__instanceFields.contains(name) || __instanceFields.contains('get_$name'))
+		if (__instanceFields.exists(name) || __instanceFields.exists('get_$name'))
 			return Reflect.getProperty(this, name);
 
 		// We should check PlayState last, and check sub-layers before.
 		var og_val:Dynamic = super.hget(name);
 		if (og_val != null) return og_val;
 
-		if (PlayState.instance != null && (PlayState.__instanceFields.contains(name) || PlayState.__instanceFields.contains('get_$name')))
+		if (PlayState.instance != null && (PlayState.__instanceFields.exists(name) || PlayState.__instanceFields.exists('get_$name')))
 			return Reflect.getProperty(PlayState.instance, name);
 
 		return null;
 	}
 
 	override function hset(name:String, val:Dynamic):Dynamic {
-		if (__instanceFields.contains(name) || __instanceFields.contains('set_$name')) {
+		if (__instanceFields.exists(name) || __instanceFields.exists('set_$name')) {
 			Reflect.setProperty(this, name, val);
 			return val;
 		}
 
 		var og_val:Dynamic = super.hget(name);
 		if (og_val != null) return og_val;
 
-		if (PlayState.instance != null && (PlayState.__instanceFields.contains(name) || PlayState.__instanceFields.contains('set_$name'))) {
+		if (PlayState.instance != null && (PlayState.__instanceFields.exists(name) || PlayState.__instanceFields.exists('set_$name'))) {
 			Reflect.setProperty(PlayState.instance, name, val);
 			return val;
 		}
@@ -546,6 +546,6 @@ class Stage extends Layer {
 	function get_stageName():String { return this.name; }
 	function set_stageName(name:String):String { return this.name = name; }
 	function get_characterPoses():Map<String, StageCharPos> { return this.characterPosLookup; }
-	inline function applyCharStuff(char:Character, posName:String, id:Float = 0) { applyCharPos(char, posName, id); }
+	public inline function applyCharStuff(char:Character, posName:String, id:Float = 0) { applyCharPos(char, posName, id); }
 	//endregion
 }