From cddc50bbe5c877154fdcd1e4ab08fd68e87d9be3 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Sun, 2 Jul 2023 16:17:04 -0400
Subject: [PATCH] Rework quickWatch

---
 source/funkin/MusicBeatState.hx    | 6 ++++--
 source/funkin/MusicBeatSubState.hx | 1 -
 source/funkin/play/PlayState.hx    | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/source/funkin/MusicBeatState.hx b/source/funkin/MusicBeatState.hx
index 2b97951f9..ef01e4d12 100644
--- a/source/funkin/MusicBeatState.hx
+++ b/source/funkin/MusicBeatState.hx
@@ -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));
   }
diff --git a/source/funkin/MusicBeatSubState.hx b/source/funkin/MusicBeatSubState.hx
index 5c6635a02..b9a2d0b81 100644
--- a/source/funkin/MusicBeatSubState.hx
+++ b/source/funkin/MusicBeatSubState.hx
@@ -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;
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 24595e6d6..92356db09 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -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.