feat: Re-add right thumb-stick speed control

EverestAPI · Jan 1, 2025 · 4c0b118 · 4c0b118
1 parent 5a502be
commit 4c0b118
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/CelesteTAS-EverestInterop/Source/EverestInterop/Hotkeys.cs b/CelesteTAS-EverestInterop/Source/EverestInterop/Hotkeys.cs
@@ -134,7 +134,7 @@ private static GamePadState GetGamePadState() {
         for (int i = 0; i < 4; i++) {
             var state = GamePad.GetState((PlayerIndex) i);
             if (state.IsConnected) {
-                break;
+                return state;
             }
         }
 

diff --git a/CelesteTAS-EverestInterop/Source/TAS/Manager.cs b/CelesteTAS-EverestInterop/Source/TAS/Manager.cs
@@ -201,9 +201,15 @@ public static void UpdateMeta() {
                 break;
         }
 
+        // Allow altering the playback speed with the right thumb-stick
+        float normalSpeed = Hotkeys.RightThumbSticksX switch {
+            >=  0.001f => Hotkeys.RightThumbSticksX * TasSettings.FastForwardSpeed,
+            <= -0.001f => (1 + Hotkeys.RightThumbSticksX) * TasSettings.SlowForwardSpeed,
+            _          => 1.0f,
+        };
+
         // Apply fast / slow forwarding
-        switch (NextState)
-        {
+        switch (NextState) {
             case State.Running when Hotkeys.FastForward.Check:
                 PlaybackSpeed = TasSettings.FastForwardSpeed;
                 break;
@@ -216,15 +222,16 @@ public static void UpdateMeta() {
                 NextState = State.SlowForward;
                 break;
             case State.Paused or State.SlowForward:
-                PlaybackSpeed = 1.0f;
+                PlaybackSpeed = normalSpeed;
                 NextState = State.Paused;
                 break;
 
             case State.FrameAdvance:
+                PlaybackSpeed = normalSpeed;
                 break;
 
             default:
-                PlaybackSpeed = Controller.HasFastForward ? Controller.CurrentFastForward!.Speed : 1.0f;
+                PlaybackSpeed = Controller.HasFastForward ? Controller.CurrentFastForward!.Speed : normalSpeed;
                 break;
         }
     }