Merge branch 'main' of https://github.com/JoaTH-Team/Cruese-Engine

JoaTH-Team · Jan 9, 2025 · 1dae360 · 1dae360
2 parents 55aa8c9 + 3c5170e
commit 1dae360
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/docs/Coding-Game.md b/docs/Coding-Game.md
@@ -44,11 +44,11 @@ function onCreate()
 
 ### Making a Group
 ```haxe
-var group:FlxTypedGroup<FlxSprite> = [];
+var group:Dynamic;
 
 function onCreate()
 {
-    group = createTypedGroup();
+    group = createTypedGroup(group);
     add(group);
 
     for (i in 0...5)

diff --git a/source/ScriptedClass.hx b/source/ScriptedClass.hx
@@ -10,19 +10,22 @@ using StringTools;
 class ScriptedClass extends FlxUIState
 {
 	public var script:HScript = null;
+	public var path:String = "";
 
 	public static var instance:ScriptedClass = null;
 	public static var trackerFolder:Int = 0;
-	var path:String = "";
 
 	public function new(fileName:String, ?args:Array<Dynamic>)
 	{
-		super();
+		if (fileName != null)
+			path = fileName;
+
 		instance = this;
+
 		trackerFolder = PlayState.trackerFolder;
 		try
 		{
-			var filePath = "mods/" + PolyHandler.trackedMods[trackerFolder].id + "/data/classes/" + fileName + ".hxs";
+			var filePath = "mods/" + PolyHandler.trackedMods[trackerFolder].id + "/data/classes/" + path + ".hxs";
 
 			if (FileSystem.exists(filePath))
 				path = filePath;
@@ -37,6 +40,10 @@ class ScriptedClass extends FlxUIState
 			script = null;
 			trace('Error getting script from $fileName!\n$e');
 		}
+
+		scriptExecute("new", args);
+
+		super();
 	}
 
 	override function create()

diff --git a/source/ScriptedSubClass.hx b/source/ScriptedSubClass.hx
@@ -9,19 +9,21 @@ using StringTools;
 class ScriptedSubClass extends FlxUISubState
 {
 	public var script:HScript = null;
+	public var path:String = "";
 
 	public static var instance:ScriptedSubClass = null;
 	public static var trackerFolder:Int = 0;
-	var path:String = "";
 
 	public function new(fileName:String, ?args:Array<Dynamic>)
 	{
-		super();
+		if (fileName != null)
+			path = fileName;
+
 		instance = this;
 		trackerFolder = PlayState.trackerFolder;
 		try
 		{
-			var filePath = "mods/" + PolyHandler.trackedMods[trackerFolder].id + "/data/classes/" + fileName + ".hxs";
+			var filePath = "mods/" + PolyHandler.trackedMods[trackerFolder].id + "/data/classes/" + path + ".hxs";
 
 			if (FileSystem.exists(filePath))
 				path = filePath;
@@ -36,6 +38,10 @@ class ScriptedSubClass extends FlxUISubState
 			script = null;
 			trace('Error getting script from $fileName!\n$e');
 		}
+
+		scriptExecute("new", args);
+
+		super();
 	}
 
 	override function create()