cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-11 20:57:20 +00:00
Code Issues Releases Wiki Activity

Rework quickWatch

Browse source
This commit is contained in:
EliteMasterEric 2023-07-02 16:17:04 -04:00
parent 1ef17770e9
commit cddc50bbe5
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/funkin/MusicBeatState.hx
View file

@ -66,9 +66,11 @@ class MusicBeatState extends FlxUIState
if (FlxG.keys.justPressed.F5) debug_refreshModules(); if (FlxG.keys.justPressed.F5) debug_refreshModules();
// Display Conductor info in the watch window. // Display Conductor info in the watch window.
FlxG.watch.addQuick("songPos", Conductor.songPosition); FlxG.watch.addQuick("songPosition", Conductor.songPosition);
FlxG.watch.addQuick("currentStepTime", Conductor.currentStepTime);
FlxG.watch.addQuick("bpm", Conductor.bpm); FlxG.watch.addQuick("bpm", Conductor.bpm);
FlxG.watch.addQuick("currentMeasureTime", Conductor.currentBeatTime);
FlxG.watch.addQuick("currentBeatTime", Conductor.currentBeatTime);
FlxG.watch.addQuick("currentStepTime", Conductor.currentStepTime);
dispatchEvent(new UpdateScriptEvent(elapsed)); dispatchEvent(new UpdateScriptEvent(elapsed));
} }

1
source/funkin/MusicBeatSubState.hx
View file

@ -2,7 +2,6 @@ package funkin;
import flixel.FlxSubState; import flixel.FlxSubState;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import funkin.Conductor.BPMChangeEvent;
import funkin.modding.events.ScriptEvent; import funkin.modding.events.ScriptEvent;
import funkin.modding.module.ModuleHandler; import funkin.modding.module.ModuleHandler;
import flixel.text.FlxText; import flixel.text.FlxText;

3
source/funkin/play/PlayState.hx
View file

@ -1201,13 +1201,10 @@ class PlayState extends MusicBeatState
camHUD.zoom = FlxMath.lerp(defaultHUDCameraZoom, camHUD.zoom, 0.95); camHUD.zoom = FlxMath.lerp(defaultHUDCameraZoom, camHUD.zoom, 0.95);
} }
FlxG.watch.addQuick('beatShit', Conductor.currentBeat);
FlxG.watch.addQuick('stepShit', Conductor.currentStep);
if (currentStage != null) if (currentStage != null)
{ {
FlxG.watch.addQuick('bfAnim', currentStage.getBoyfriend().getCurrentAnimation()); FlxG.watch.addQuick('bfAnim', currentStage.getBoyfriend().getCurrentAnimation());
} }
FlxG.watch.addQuick('songPos', Conductor.songPosition);
// Handle GF dance speed. // Handle GF dance speed.
// TODO: Add a song event for this. // TODO: Add a song event for this.