Skip to content

Commit

Permalink
switch to BrewScript
Browse files Browse the repository at this point in the history 
people on discord got mad at me :/
  • Loading branch information
@Joalor64GH
Joalor64GH authored Sep 23, 2023
1 parent ae3898f commit 73721ca
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/debug.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<haxelib name="fnf-modcharting-tools" />
<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
<haxelib name="hxvm-luajit" if="LUA_ALLOWED"/>
<haxelib name="SScript-New" if="SCRIPT_EXTENSION"/>
<haxelib name="BrewScript" if="SCRIPT_EXTENSION"/>

<!-- Videos -->
<haxelib name="actuate"/> <!-- Used for extension-webm -->
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions source/meta/data/scripts/FunkinSScript.hx → source/meta/data/scripts/FunkinBrewScript.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
22 changes: 11 additions & 11 deletions source/meta/state/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class PlayState extends MusicBeatState
#end
public var introSoundsSuffix:String = '';

public var scriptArray:Array<FunkinSScript> = [];
public var scriptArray:Array<FunkinBrewScript> = [];

// Debug buttons
private var debugKeysChart:Array<FlxKey>;
Expand Down Expand Up @@ -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
}
}
Expand Down Expand Up @@ -1143,7 +1143,7 @@ class PlayState extends MusicBeatState
}

if(doPush)
scriptArray.push(new FunkinSScript(scriptFile));
scriptArray.push(new FunkinBrewScript(scriptFile));
#end
#end

Expand Down Expand Up @@ -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
}
Expand All @@ -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
}
Expand All @@ -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
}
}
Expand Down Expand Up @@ -2200,7 +2200,7 @@ class PlayState extends MusicBeatState
{
if(script.scriptFile == scriptFile) return;
}
scriptArray.push(new FunkinSScript(scriptFile));
scriptArray.push(new FunkinBrewScript(scriptFile));
}
#end
}
Expand Down

2 comments on commit 73721ca

@Stefan2008Git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are mad at your on Discord?

@Joalor64GH
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because i archived sscript even though the creator did NOT want it to be public anymore

Please sign in to comment.