Merge remote-tracking branch 'upstream/main'

source/funkin/backend/assets/Paths.hx

@@ -114,17 +114,28 @@ class Paths
 		return scriptPath;
 	}
 
-	static public function chart(song:String, ?difficulty:String = "normal"):String {
+	static public function chart(song:String, ?difficulty:String = "normal"):String
+	{
 		difficulty = difficulty.toLowerCase();
 		song = song.toLowerCase();
 
 		return getPath('songs/$song/charts/$difficulty.json', null);
 	}
 
-	static public function character(character:String):String {
+	inline static public function character(character:String):String
+	{
 		return getPath('data/characters/$character.xml', null);
 	}
 
+	/**
+	 * Gets the name of a registered font.
+	 * @param font The font's path (if it's already passed as a font name, the same name will be returned)
+	 */
+	inline static public function getFontName(font:String)
+	{
+		return OpenFlAssets.exists(font, FONT) ? OpenFlAssets.getFont(font).fontName : font;
+	}
+
 	inline static public function font(key:String)
 	{
 		return getPath('fonts/$key');

source/funkin/backend/scripting/events/CharacterNodeEvent.hx

@@ -0,0 +1,21 @@
+package funkin.backend.scripting.events;
+
+import funkin.game.Character;
+import haxe.xml.Access;
+
+final class CharacterNodeEvent extends CancellableEvent {
+	/**
+	 * The character instance
+	 */
+	public var character:Character;
+
+	/**
+	 * The node which is currently being parsed
+	 */
+	public var node:Access;
+
+	/**
+	 * The name of the node, quicker access than e.node.name
+	 */
+	public var name:String;
+}

source/funkin/backend/scripting/events/CharacterXMLEvent.hx

@@ -0,0 +1,16 @@
+package funkin.backend.scripting.events;
+
+import funkin.game.Character;
+import haxe.xml.Access;
+
+final class CharacterXMLEvent extends CancellableEvent {
+	/**
+	 * The character instance
+	 */
+	 public var character:Character;
+
+	/**
+	 * The xml
+	 */
+	public var xml:Access;
+}

source/funkin/backend/system/modules/AudioSwitchFix.hx

@@ -62,6 +62,7 @@ class AudioSwitchFix {
 	}
 }
 
+@:dox(hide)
 typedef PlayingSound = {
 	var sound:FlxSound;
 	var time:Float;

source/funkin/backend/utils/CoolUtil.hx

@@ -596,7 +596,7 @@ class CoolUtil
 			var fmt = new FlxTextFormat();
 
 			fmt.format.color = Reflect.hasField(fmtt, "color") ? FlxColor.fromString(fmtt.color) : text.color;
-			fmt.format.font = Reflect.hasField(fmtt, "font") ? Paths.font(fmtt.font) : text.font;
+			fmt.format.font = Reflect.hasField(fmtt, "font") ? Paths.getFontName(Paths.font(fmtt.font)) : text.font;
 			fmt.format.size = Reflect.hasField(fmtt, "size") ? Std.parseInt(fmtt.size) : text.size;
 			fmt.format.italic = Reflect.hasField(fmtt, "italic") ? fmtt.italic == "true" : text.italic;
 			fmt.format.bold = Reflect.hasField(fmtt, "bold") ? fmtt.bold == "true" : text.bold;

source/funkin/backend/utils/XMLUtil.hx

@@ -6,6 +6,13 @@ import funkin.backend.FunkinSprite.XMLAnimType;
 import funkin.backend.FunkinSprite;
 import funkin.game.Character;
 import funkin.backend.system.ErrorCode;
+import funkin.backend.FunkinSprite.XMLAnimType;
+import flixel.util.FlxColor;
+import haxe.xml.Access;
+import funkin.backend.scripting.Script;
+import funkin.backend.scripting.DummyScript;
+import funkin.backend.scripting.ScriptPack;
+import flixel.util.typeLimit.OneOfTwo;
 import funkin.backend.system.interfaces.IOffsetCompatible;
 import haxe.xml.Access;
 
@@ -328,6 +335,51 @@ class XMLUtil {
 	}
 }
 
+class XMLImportedScriptInfo {
+	public var path:String;
+	public var shortLived:Bool = false;
+	public var loadBefore:Bool = true;
+	public var importStageSprites:Bool = false;  // maybe will change later??  - Nex
+	public var parentScriptPack:ScriptPack = null;
+
+	public function new(path:String, parentScriptPack:ScriptPack) {
+		this.parentScriptPack = parentScriptPack;
+		this.path = path;
+	}
+
+	public function getScript():Script
+		return parentScriptPack == null ? null : parentScriptPack.getByPath(path);
+
+	public static function prepareInfos(node:Access, parentScriptPack:ScriptPack, ?onScriptPreLoad:XMLImportedScriptInfo->Void):XMLImportedScriptInfo {
+		if (!node.has.script || parentScriptPack == null) return null;
+
+		var folder = node.getAtt("folder").getDefault("data/scripts/");
+		if (!folder.endsWith("/")) folder += "/";
+
+		var path = Paths.script(folder + node.getAtt("script"));
+		var daScript = Script.create(path);
+		if (daScript is DummyScript) {
+			Logs.trace('Script Extension at ${path} does not exist.', ERROR);
+			return null;
+		}
+
+		var infos = new XMLImportedScriptInfo(daScript.path, parentScriptPack);
+		infos.shortLived = node.getAtt("isShortLived") == "true" || node.getAtt("shortLived") == "true";
+		infos.importStageSprites = node.getAtt("importStageSprites") == "true";
+		@:privateAccess infos.loadBefore = shouldLoadBefore(node);
+
+		if (onScriptPreLoad != null) onScriptPreLoad(infos);
+		parentScriptPack.add(daScript);
+		daScript.set("scriptInfo", infos);
+		daScript.load();
+
+		return infos;
+	}
+
+	@:dox(hide) public static inline function shouldLoadBefore(node:Access):Bool
+		return node.getAtt("loadBefore") != "false";
+}
+
 typedef AnimData = {
 	var name:String;
 	var anim:String;