mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-08-18 14:05:06 +00:00
Rework quickWatch
This commit is contained in:
parent
1ef17770e9
commit
cddc50bbe5
|
@ -66,9 +66,11 @@ class MusicBeatState extends FlxUIState
|
|||
if (FlxG.keys.justPressed.F5) debug_refreshModules();
|
||||
|
||||
// Display Conductor info in the watch window.
|
||||
FlxG.watch.addQuick("songPos", Conductor.songPosition);
|
||||
FlxG.watch.addQuick("currentStepTime", Conductor.currentStepTime);
|
||||
FlxG.watch.addQuick("songPosition", Conductor.songPosition);
|
||||
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));
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@ package funkin;
|
|||
|
||||
import flixel.FlxSubState;
|
||||
import flixel.util.FlxColor;
|
||||
import funkin.Conductor.BPMChangeEvent;
|
||||
import funkin.modding.events.ScriptEvent;
|
||||
import funkin.modding.module.ModuleHandler;
|
||||
import flixel.text.FlxText;
|
||||
|
|
|
@ -1201,13 +1201,10 @@ class PlayState extends MusicBeatState
|
|||
camHUD.zoom = FlxMath.lerp(defaultHUDCameraZoom, camHUD.zoom, 0.95);
|
||||
}
|
||||
|
||||
FlxG.watch.addQuick('beatShit', Conductor.currentBeat);
|
||||
FlxG.watch.addQuick('stepShit', Conductor.currentStep);
|
||||
if (currentStage != null)
|
||||
{
|
||||
FlxG.watch.addQuick('bfAnim', currentStage.getBoyfriend().getCurrentAnimation());
|
||||
}
|
||||
FlxG.watch.addQuick('songPos', Conductor.songPosition);
|
||||
|
||||
// Handle GF dance speed.
|
||||
// TODO: Add a song event for this.
|
||||
|
|
Loading…
Reference in a new issue