From 6d8479839711953488b6e0365b804cd937d3f129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=8D=9A=7ENex?=
 <87421482+NexIsDumb@users.noreply.github.com>
Date: Thu, 19 Sep 2024 22:16:30 +0200
Subject: [PATCH] my fucking grammar ass + some new stage stuff

---
 source/funkin/game/PlayState.hx | 10 +++++++++-
 source/funkin/game/Stage.hx     | 15 +++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index b36628b7..4e125724 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -243,7 +243,7 @@ class PlayState extends MusicBeatState
 	/**
 	 * Current stage name
 	 */
-	public var curStage:String = "";
+	public var curStage(get, set):String;
 
 	/**
 	 * Interval at which Girlfriend dances.
@@ -526,6 +526,14 @@ class PlayState extends MusicBeatState
 		return this.maxHealth = v;
 	}
 
+	private inline function get_curStage()
+		return stage == null ? "" : stage.stageName;
+
+	private inline function set_curStage(name:String) {
+		if (stage != null) stage.stageName = name;
+		return name;
+	}
+
 	@:dox(hide) override public function create()
 	{
 		Note.__customNoteTypeExists = [];
diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx
index f0fd76f0..f9a2fb49 100644
--- a/source/funkin/game/Stage.hx
+++ b/source/funkin/game/Stage.hx
@@ -13,6 +13,7 @@ import haxe.io.Path;
 using StringTools;
 
 class Stage extends FlxBasic implements IBeatReceiver {
+	public var stageName:String = "";
 	public var stageXML:Access;
 	public var stagePath:String;
 	public var stageSprites:Map<String, FlxSprite> = [];
@@ -37,11 +38,8 @@ class Stage extends FlxBasic implements IBeatReceiver {
 		this.state = state;
 
 		stagePath = Paths.xml('stages/$stage');
-		try {
-			if (Assets.exists(stagePath)) stageXML = new Access(Xml.parse(Assets.getText(stagePath)).firstElement());
-		} catch(e) {
-			Logs.trace('Couldn\'t load stage "$stage": ${e.message}', ERROR);
-		}
+		try if (Assets.exists(stagePath)) stageXML = new Access(Xml.parse(Assets.getText(stagePath)).firstElement())
+		catch(e) Logs.trace('Couldn\'t load stage "$stage": ${e.message}', ERROR);
 
 		if (PlayState.instance != null) {
 			stageScript = Script.create(Paths.script('data/stages/$stage'));
@@ -51,12 +49,13 @@ class Stage extends FlxBasic implements IBeatReceiver {
 
 		var event = null;
 		if (stageXML != null) {
+			stageName = stageXML.getAtt("name").getDefault(stage);
+
 			if (PlayState.instance != null) {
 				var parsed:Null<Float>;
 				if(stageXML.has.startCamPosX && (parsed = Std.parseFloat(stageXML.att.startCamPosX)) != null) PlayState.instance.camFollow.x = parsed;
 				if(stageXML.has.startCamPosY && (parsed = Std.parseFloat(stageXML.att.startCamPosY)) != null) PlayState.instance.camFollow.y = parsed;
 				if(stageXML.has.zoom && (parsed = Std.parseFloat(stageXML.att.zoom)) != null) PlayState.instance.defaultCamZoom = parsed;
-				PlayState.instance.curStage = stageXML.has.name ? stageXML.att.name : stage;
 			}
 			if (stageXML.has.folder) {
 				spritesParentFolder = stageXML.att.folder;
@@ -140,7 +139,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
 						PlayState.instance.add(PlayState.instance.comboGroup);
 						PlayState.instance.comboGroup;
 					case "use-extension" | "extension" | "ext":
-						if (XMLImportedScriptInfo.prepeareInfos(node, this) == null) continue;
+						if (XMLImportedScriptInfo.prepareInfos(node, this) == null) continue;
 						null;
 					default: null;
 				}
@@ -325,7 +324,7 @@ class XMLImportedScriptInfo {
 	public function getScript():Script
 		return PlayState.instance == null ? null : PlayState.instance.scripts.getByPath(path);
 
-	public static function prepeareInfos(node:Access, ?stage:Stage):XMLImportedScriptInfo {
+	public static function prepareInfos(node:Access, ?stage:Stage):XMLImportedScriptInfo {
 		if (!node.has.script || PlayState.instance == null) return null;
 
 		var folder = node.getAtt("folder").getDefault("data/scripts/");