From 73721ca7e4a64b9ab0c68119dc7b0a891daa52a4 Mon Sep 17 00:00:00 2001 From: Joalor64 Date: Sat, 23 Sep 2023 16:41:24 -0400 Subject: [PATCH] switch to BrewScript people on discord got mad at me :/ --- .github/workflows/debug.yml | 2 +- .github/workflows/main.yml | 6 ++--- .github/workflows/nightly.yml | 6 ++--- Project.xml | 2 +- README.md | 2 +- .../{FunkinSScript.hx => FunkinBrewScript.hx} | 6 ++--- source/meta/state/PlayState.hx | 22 +++++++++---------- 7 files changed, 23 insertions(+), 23 deletions(-) rename source/meta/data/scripts/{FunkinSScript.hx => FunkinBrewScript.hx} (92%) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 57d949a9..b517502d 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -42,7 +42,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b1b7dab0..01a14ae9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc @@ -87,7 +87,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc @@ -133,7 +133,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9b3c13d6..6da60bef 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -42,7 +42,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc @@ -87,7 +87,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc @@ -133,7 +133,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/TheZoroForce240/FNF-Modcharting-Tools haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit haxelib git hxvm-luajit https://github.com/nebulazorua/hxvm-luajit - haxelib git SScript-New https://github.com/Joalor64GH/SScript-New + haxelib git BrewScript https://github.com/tahirk786/BrewScript haxelib git hscript-yoshiengine https://github.com/YoshiCrafter29/hscript-improved haxelib git hscript-ex https://github.com/ianharrigan/hscript-ex haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc diff --git a/Project.xml b/Project.xml index 78c953cd..1ba74678 100644 --- a/Project.xml +++ b/Project.xml @@ -125,7 +125,7 @@ - + diff --git a/README.md b/README.md index da37043e..b574ae75 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ You can check planned/upcoming features [here](/TODO). ### Special Thanks * [People on the PE Discord Server](https://discord.gg/2ka77eMXDv) - They made the Scripts lol * [BeastlyGhost](https://github.com/BeastlyGhost) - Customizable Main Menu via JSON + Credits Sounds + Old Latin Support -* [TheWorldMachinima](https://github.com/TheWorldMachinima) - SScript and Funkin Cocoa Code + Softcoded Achievements +* [TheWorldMachinima](https://github.com/TheWorldMachinima) - BrewScript and Funkin Cocoa Code + Softcoded Achievements * [Magnumsrt](https://github.com/steve-studios) - In-Game Mod Downloader * [TheZoroForce240](https://github.com/TheZoroForce240) - Modcharting Tools Haxelib * [MAJigsaw77](https://github.com/MAJigsaw77) - ToastCore diff --git a/source/meta/data/scripts/FunkinSScript.hx b/source/meta/data/scripts/FunkinBrewScript.hx similarity index 92% rename from source/meta/data/scripts/FunkinSScript.hx rename to source/meta/data/scripts/FunkinBrewScript.hx index d6660e0f..ad0b1289 100644 --- a/source/meta/data/scripts/FunkinSScript.hx +++ b/source/meta/data/scripts/FunkinBrewScript.hx @@ -30,11 +30,11 @@ import meta.data.alphabet.*; import objects.userinterface.note.*; import objects.*; -final class FunkinSScript extends tea.SScript +final class FunkinBrewScript extends brew.BrewScript { - public function new(?scriptFile:String = "", ?preset:Bool = true) + public function new(?scriptFile:String = "", ?preset:Bool = true, ?startExecute:Bool = true) { - super(scriptFile, preset); + super(scriptFile, preset, false); traces = false; diff --git a/source/meta/state/PlayState.hx b/source/meta/state/PlayState.hx index 9d703f8f..ee227084 100644 --- a/source/meta/state/PlayState.hx +++ b/source/meta/state/PlayState.hx @@ -383,7 +383,7 @@ class PlayState extends MusicBeatState #end public var introSoundsSuffix:String = ''; - public var scriptArray:Array = []; + public var scriptArray:Array = []; // Debug buttons private var debugKeysChart:Array; @@ -1094,7 +1094,7 @@ class PlayState extends MusicBeatState addHscript(folder + file); #elseif SCRIPT_EXTENSION if(file.toLowerCase().endsWith('.hx')) - scriptArray.push(new FunkinSScript(folder + file)); + scriptArray.push(new FunkinBrewScript(folder + file)); #end } } @@ -1143,7 +1143,7 @@ class PlayState extends MusicBeatState } if(doPush) - scriptArray.push(new FunkinSScript(scriptFile)); + scriptArray.push(new FunkinBrewScript(scriptFile)); #end #end @@ -1515,21 +1515,21 @@ class PlayState extends MusicBeatState var hxToLoad:String = Paths.modFolders('notetypes/' + notetype + '.hx'); if(FileSystem.exists(hxToLoad)) { - scriptArray.push(new FunkinSScript(hxToLoad)); + scriptArray.push(new FunkinBrewScript(hxToLoad)); } else { hxToLoad = Paths.getPreloadPath('notetypes/' + notetype + '.hx'); if(FileSystem.exists(hxToLoad)) { - scriptArray.push(new FunkinSScript(hxToLoad)); + scriptArray.push(new FunkinBrewScript(hxToLoad)); } } #elseif sys var hxToLoad:String = Paths.getPreloadPath('notetypes/' + notetype + '.hx'); if(OpenFlAssets.exists(hxToLoad)) { - scriptArray.push(new FunkinSScript(hxToLoad)); + scriptArray.push(new FunkinBrewScript(hxToLoad)); } #end } @@ -1539,21 +1539,21 @@ class PlayState extends MusicBeatState var hxToLoad:String = Paths.modFolders('events/' + event + '.hx'); if(FileSystem.exists(hxToLoad)) { - scriptArray.push(new FunkinSScript(hxToLoad)); + scriptArray.push(new FunkinBrewScript(hxToLoad)); } else { hxToLoad = Paths.getPreloadPath('events/' + event + '.hx'); if(FileSystem.exists(hxToLoad)) { - scriptArray.push(new FunkinSScript(hxToLoad)); + scriptArray.push(new FunkinBrewScript(hxToLoad)); } } #elseif sys var hxToLoad:String = Paths.getPreloadPath('events/' + event + '.hx'); if(OpenFlAssets.exists(hxToLoad)) { - scriptArray.push(new FunkinSScript(hxToLoad)); + scriptArray.push(new FunkinBrewScript(hxToLoad)); } #end } @@ -1575,7 +1575,7 @@ class PlayState extends MusicBeatState addHscript(folder + file); #elseif SCRIPT_EXTENSION if(file.toLowerCase().endsWith('.hx')) - scriptArray.push(new FunkinSScript(folder + file)); + scriptArray.push(new FunkinBrewScript(folder + file)); #end } } @@ -2200,7 +2200,7 @@ class PlayState extends MusicBeatState { if(script.scriptFile == scriptFile) return; } - scriptArray.push(new FunkinSScript(scriptFile)); + scriptArray.push(new FunkinBrewScript(scriptFile)); } #end }