From 11245e40d5c6f1a55a6f1a42c0f669c0ca2a01bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Furball=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Mon, 9 Dec 2024 19:36:09 -0500 Subject: [PATCH 01/20] the start --- setup/Main.hx | 4 ++-- setup/libs.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/Main.hx b/setup/Main.hx index 8833d1bb..6811214d 100644 --- a/setup/Main.hx +++ b/setup/Main.hx @@ -36,9 +36,9 @@ class Main { Sys.println('The libraries json doesn\'t exist!\nPlease make one in the setup folder.\nHere\'s an example of one.\n${Json.stringify([ { global: false, - name: 'hscript-improved', + name: 'rulescript', version: 'git', - url: 'https://github.com/FNF-CNE-Devs/hscript-improved', + url: 'https://github.com/Kriptel/RuleScript', branch: 'custom-classes', optional: true, description: 'include haxe scripting support' diff --git a/setup/libs.json b/setup/libs.json index 9ef52b7e..8d13cb77 100644 --- a/setup/libs.json +++ b/setup/libs.json @@ -24,7 +24,7 @@ }, { - "name": "hscript-improved", "version": "git", "url": "https://github.com/FNF-CNE-Devs/hscript-improved", + "name": "rulescript", "version": "git", "url": "https://github.com/Kriptel/RuleScript", "branch": "custom-classes", "optional": true, "description": "include haxe scripting support" }, { From 1ddc7780070be0f03f8a977b2e0183b60e28bfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=9C=20Rodney=2C=20An=20Imaginative=20Furball=20?= =?UTF-8?q?=F0=9F=92=99?= Date: Tue, 10 Dec 2024 13:43:06 -0500 Subject: [PATCH 02/20] progress --- Project.hxp | 2 +- engine/source/backend/scripting/Script.hx | 3 +- .../backend/scripting/types/HaxeScript.hx | 118 +++++------------- 3 files changed, 33 insertions(+), 90 deletions(-) diff --git a/Project.hxp b/Project.hxp index b1ba5bac..edbeb675 100644 --- a/Project.hxp +++ b/Project.hxp @@ -257,7 +257,7 @@ class EngineAsset { // chart converter addHaxelib('moonchart', 'git'); - if ( canHaxeScript.exists()) addHaxelib('hscript-improved', 'git'); + if ( canHaxeScript.exists()) addHaxelib('rulescript', 'git'); if ( canLuaScript .exists()) addHaxelib('linc_luajit', 'git'); if ( discordRPC .exists()) addHaxelib('hxdiscord_rpc'); if (allowVideos .exists()) addHaxelib('hxvlc', 'git'); diff --git a/engine/source/backend/scripting/Script.hx b/engine/source/backend/scripting/Script.hx index 6ac1acbb..9b53f5fc 100644 --- a/engine/source/backend/scripting/Script.hx +++ b/engine/source/backend/scripting/Script.hx @@ -51,7 +51,6 @@ class Script extends FlxBasic implements IScript { * Every script instance created. */ public static var scripts:Array