script thingies 1

Author: CharGoldenYT

Project.xml

@@ -163,6 +163,7 @@
 
 	<!-- _________________________ Polymod Configuration ________________________ -->
 
+	<haxedef name="POLYMOD_SCRIPT_EXT" value=".hscript" />
     <haxedef name="POLYMOD_ROOT_PATH" value="game/"/> <!-- This is used to tell polymod where scripts are-->
     <haxedef name="POLYMOD_MOD_METADATA_FILE" value="meta.json" />
     <haxedef name="POLYMOD_MOD_ICON_FILE" value="icon.png" />

source/MusicBeatState.hx

@@ -1,5 +1,6 @@
 package;
 
+import modding.backend.RedirectHandler;
 import modding.PolymodHandler;
 import modding.LoadState;
 import Conductor.BPMChangeEvent;
@@ -24,6 +25,8 @@ import sys.io.File;
 
 using StringTools;
 
+class ScriptHandler {} // stub
+
 class MusicBeatState extends modchart.modcharting.ModchartMusicBeatState
 {
 	private var curSection:Int = 0;
@@ -41,12 +44,8 @@ class MusicBeatState extends modchart.modcharting.ModchartMusicBeatState
 	inline function get_controls():Controls
 		return PlayerSettings.player1.controls;
 
-	public var scriptsAllowed:Bool = true;
-
-	public static var lastScriptName:String = null;
-	public static var lastStateName:String = null;
-
-	public var scriptName:String = null;
+	public static var redirects:Array<RedirectHandler> = [];
+	public var loadedScripts:ScriptHandler;
 
 	function loadScript() // Stubbed untill later, this will be re-used for loading polymod scripts.
 	{

source/modding/ModFolder.hx

@@ -8,17 +8,12 @@ import polymod.Polymod.PolymodError;
 import polymod.util.DefineUtil.getDefineString;
 import polymod.util.DefineUtil.getDefineBool;
 
-import modding.ModFolder;
-import modding.ScriptContext;
-import modding.ScriptContext.ModScriptContexts;
-
 import sys.FileSystem as Fs;
 import sys.io.File;
 
 class PolymodHandler {
     static var modRoot:String = #if TEST_BUILD "../../../new_example_mods" #else "mods" #end;
     static var apiVersion:String = "1.0.0"; // This should match the current engine version.
-    static var scriptContexts:Array<ModScriptContexts> = [];
 
     static var modsList:Array<ModMetadata> = [];
     static var customAssetLibrary:Map<String, String> = [
@@ -40,7 +35,6 @@ class PolymodHandler {
     public static function initModList()
     {
         modsList = [];
-        scriptContexts = [];
 
         trace("Searching for mods!");
 

source/modding/PolymodHandler.hx

@@ -0,0 +1,6 @@
+package modding;
+
+import polymod.hscript.HScriptedClass;
+
+@:hscriptClass
+class ScriptedBeatState extends MusicBeatState implements HScriptedClass {}

source/modding/ScriptContext.hx

@@ -0,0 +1,6 @@
+package modding;
+
+import polymod.hscript.HScriptedClass;
+
+@:hscriptClass
+class ScriptedBeatSubstate extends MusicBeatSubstate implements HScriptedClass {}

source/modding/ScriptedBeatState.hx

@@ -0,0 +1,64 @@
+package modding.backend;
+
+import polymod.hscript.HScriptedClass;
+
+/*
+* This is the global script
+*/
+class GlobalScript
+{
+    public var curBeat(get, null):Int;
+    public var curStep(get, null):Int;
+    public var curSection(get, null):Int;
+    public var game(default, set):Dynamic;
+    public var onPlayState:Bool = false;
+
+    public function new()
+    {
+        if (game == null) game = FlxG.state;
+    }
+
+    // Basic script functions
+    public function onCreate() {}
+    public function onCreatePost() {}
+    public function onUpdate(elapsed:Float) {}
+    public function onUpdatePost(elapsed:Float) {}
+    public function onStateSwitch(nextState:FlxState) {}
+    public function postStateSwitch(nextState:FlxState) {}
+
+    // PlayState specific functions
+    public function onBeatHit() {}
+    public function onSectionHit() {}
+    public function onStepHit() {}
+
+    // Other loader specific things
+    public function addRedirect(b:Class<FlxState>, r:Class<FlxState>)
+    {
+        MusicBeatState.redirects.push(new RedirectHandler(b, r));
+    }
+
+    // Variable getters
+    function get_curBeat():Int
+    {
+        return MusicBeatState.curBeat;
+    }
+    function get_curStep():Int
+    {
+        return MusicBeatState.curStep;
+    }
+    function get_curSection():Int
+    {
+        return MusicBeatState.curSection;
+    }
+
+    // Variable Setters
+    function set_game(v:Dynamic):Dynamic
+    {
+        onPlayState = Std.isOfType(v, PlayState);
+        game = v;
+        return v;
+    }
+}
+
+@:hscriptClass
+class GScript extends GlobalScript implements HScriptedClass {}

source/modding/ScriptedBeatSubstate.hx

@@ -0,0 +1,13 @@
+package modding.backend;
+
+class RedirectHandler
+{
+    public var baseState:Class<FlxState>;
+    public var redirect:Class<FlxState>;
+    
+    public function new(b:Class<FlxState>, r:Class<FlxState>)
+    {
+        baseState = b;
+        redirect = r;
+    }
+}