diff --git a/buildnumber.txt b/buildnumber.txt index b532769d..3b2a35fa 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1291 \ No newline at end of file +1293 \ No newline at end of file diff --git a/source/funkin/cutscenes/ScriptedCutscene.hx b/source/funkin/cutscenes/ScriptedCutscene.hx index c448f603..1f49c456 100644 --- a/source/funkin/cutscenes/ScriptedCutscene.hx +++ b/source/funkin/cutscenes/ScriptedCutscene.hx @@ -30,7 +30,7 @@ class ScriptedCutscene extends Cutscene { public override function update(elapsed:Float) { script.call("update", [elapsed]); super.update(elapsed); - script.call("updatePost", [elapsed]); + script.call("postUpdate", [elapsed]); } public override function beatHit(curBeat:Int) { diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index 6b61c50c..1000627d 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -293,7 +293,7 @@ class Character extends FlxSprite implements IBeatReceiver implements IOffsetCom if (isPlayer) flipX = !flipX; __baseFlipped = flipX; dance(); - script.call("createPost"); + script.call("postCreate"); } var __baseFlipped:Bool = false; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index cd3d3f23..6b47bb7a 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -386,7 +386,7 @@ class PlayState extends MusicBeatState public override function createPost() { startCutscene(); super.createPost(); - scripts.call("createPost"); + scripts.call("postCreate"); } public function startCutscene() { @@ -1095,7 +1095,7 @@ class PlayState extends MusicBeatState for(e in (daNote.mustPress ? playerStrums : cpuStrums).members) { if (e.ID == daNote.noteData % 4) { strum = e; - break; + break; //ing bad } } diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 01734ad6..d2b5966c 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -40,6 +40,8 @@ class MainMenuState extends MusicBeatState override function create() { + super.create(); + #if desktop // Updating Discord Rich Presence DiscordClient.changePresence("In the Menus", null); @@ -103,8 +105,6 @@ class MainMenuState extends MusicBeatState // NG.core.calls.event.logEvent('swag').send(); changeItem(); - - super.create(); } var selectedSomethin:Bool = false; diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index 68193070..e7822fe6 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -97,7 +97,7 @@ class PauseSubState extends MusicBeatSubstate cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]]; - pauseScript.call("createPost"); + pauseScript.call("postCreate"); } override function update(elapsed:Float) diff --git a/source/funkin/scripting/GlobalScript.hx b/source/funkin/scripting/GlobalScript.hx index 3cc7ebcc..d27f2c84 100644 --- a/source/funkin/scripting/GlobalScript.hx +++ b/source/funkin/scripting/GlobalScript.hx @@ -42,7 +42,6 @@ class GlobalScript { }); FlxG.signals.postUpdate.add(function() { call("postUpdate", [FlxG.elapsed]); - call("updatePost", [FlxG.elapsed]); if (FlxG.keys.justPressed.F5) { if (script != null && !(script is DummyScript)) { Logs.trace('Reloading global script...', WARNING, YELLOW); diff --git a/source/funkin/system/MusicBeatState.hx b/source/funkin/system/MusicBeatState.hx index bc4da2f2..154bef71 100644 --- a/source/funkin/system/MusicBeatState.hx +++ b/source/funkin/system/MusicBeatState.hx @@ -119,7 +119,7 @@ class MusicBeatState extends FlxUIState implements IBeatReceiver public override function createPost() { super.createPost(); - call("createPost"); + call("postCreate"); } public function call(name:String, ?args:Array, ?defaultVal:Dynamic):Dynamic { // calls the function on the assigned script diff --git a/source/scripting/CharacterScript.hx b/source/scripting/CharacterScript.hx index 8db41d32..418d986d 100644 --- a/source/scripting/CharacterScript.hx +++ b/source/scripting/CharacterScript.hx @@ -16,7 +16,7 @@ interface CharacterScript { /** * Triggered after the character has been entirely loaded. */ - public function createPost():Void; + public function postCreate():Void; /** * Triggered every frame. diff --git a/source/scripting/GlobalScript.hx b/source/scripting/GlobalScript.hx index b2b04c5c..3ccca9e0 100644 --- a/source/scripting/GlobalScript.hx +++ b/source/scripting/GlobalScript.hx @@ -51,7 +51,7 @@ interface GlobalScript { * * @param elapsed Time elapsed since last frame */ - public function updatePost(elapsed:Float):Void; + public function postUpdate(elapsed:Float):Void; /** * Called before the game draws on screen. diff --git a/source/scripting/PlayStateScript.hx b/source/scripting/PlayStateScript.hx index b459274e..9e7fbeb9 100644 --- a/source/scripting/PlayStateScript.hx +++ b/source/scripting/PlayStateScript.hx @@ -20,7 +20,7 @@ interface PlayStateScript { /** * Triggered at the very end of PlayState's creation */ - public function createPost():Void; + public function postCreate():Void; /** * Triggered every frame. @@ -32,7 +32,7 @@ interface PlayStateScript { * Triggered at the end of every frame. * @param elapsed Time elapsed since last frame. */ - public function updatePost(elapsed:Float):Void; + public function postUpdate(elapsed:Float):Void; /** * Triggered every step @@ -80,7 +80,7 @@ interface PlayStateScript { * Triggered after the input system updates. * @param note Event object with the pressed, justPressed and justReleased notes. */ - public function inputUpdatePost(event:InputSystemEvent):Void; + public function inputPostUpdate(event:InputSystemEvent):Void; /** * Triggered on each note creation