v1.9.10

optimize reverse frame advance

Author: LozenChen

Dialog/Simplified Chinese.txt

@@ -145,7 +145,7 @@ TAS_HELPER_MAIN_SWITCH_THREE_STATES=                       关 - 默认 - 全部
 TAS_HELPER_MAIN_SWITCH_TWO_STATES=                         关 - 全部
 TAS_HELPER_MAIN_SWITCH_VISUALIZE=                          快捷键可视化
 TAS_HELPER_MAIN_SWITCH_PREVENT=                            通过快捷键启用本模组
-TAS_HELPER_CONFIGURE_AT_STATE_ALL=                         配置其他设置时请在 全部 状态下进行.
+TAS_HELPER_CONFIGURE_AT_STATE_ALL=                         配置其他设置时请在 [全部] 状态下进行.
 TAS_HELPER_PREDICT_ENABLE_HOTKEY=                          开关未来视
 TAS_HELPER_PREDICT_FUTURE_HOTKEY=                          预测一次
 TAS_HELPER_OOO_STEP_HOTKEY=                                亚帧步进

Source/Gameplay/FrameStepBack.cs

@@ -1,4 +1,5 @@
-using TAS;
+using Celeste.Mod.TASHelper.Module.Menu;
+using TAS;
 using TAS.EverestInterop;
 using TAS.Input;
 
@@ -31,13 +32,47 @@ public static void SetupNextFastForward(int relativeMove) {
                 Controller.RefreshInputs(true);
             }
             if (delayedClear) {
-                Savestates.Clear(); // clear it after RefreshInputs
+                Savestates.Clear(); // the savestate is after us, clear it after RefreshInputs, so we will not run to the savestate breakpoint instead
             }
 
             Controller.NextCommentFastForward = new FastForward(frame, "", 0);
             Manager.States &= ~StudioCommunication.States.FrameStep;
             Manager.NextStates &= ~StudioCommunication.States.FrameStep;
+            ForwardTarget = frame;
+        }
+    }
+
+    internal static int ForwardTarget = 0;
+
+    public static bool CheckOnHotkeyHold() {
+        return OnInterval((int)Math.Round(4 / TasSettings.SlowForwardSpeed)) && frameStepBackHoldTimer > 60;
+    }
+
+    private static int frameCounter = 0;
+
+    private static int frameStepBackHoldTimer = 0;
 
+    internal static void OnHotkeyUpdate(bool check) {
+        frameCounter++;
+        if (check) {
+            frameStepBackHoldTimer++;
         }
+        else {
+            frameStepBackHoldTimer = 0;
+            if (!Manager.UltraFastForwarding) {
+                ForwardTarget = 0;
+            }
+        }
+        if (!ForwardingIsDone()) {
+            TH_Hotkeys.FrameStepBack.Update(false, false);
+            TH_Hotkeys.FrameStepBack.Update(false, false);
+        }
+    }
+    private static bool ForwardingIsDone() {
+        return Controller.CurrentFrameInTas >= ForwardTarget;
+    }
+
+    private static bool OnInterval(int period) {
+        return frameCounter % period == 0u;
     }
 }

Source/Gameplay/SimplifiedTrigger.cs

@@ -197,6 +197,22 @@ private static void HandleBerryTrigger() {
         GetTypes("CollabUtils2", "Celeste.Mod.CollabUtils2.Triggers.SpeedBerryCollectTrigger", "Celeste.Mod.CollabUtils2.Triggers.SilverBerryCollectTrigger").ForEach(x => goldBerryTriggers.Add(x));
     }
 
+    internal static void OnHideBerryChange(bool enable) {
+        if (Engine.Scene is not Level level) {
+            return;
+        }
+        if (enable) {
+            foreach (Entity entity in level.Tracker.GetEntities<Trigger>()) {
+                if (goldBerryTriggers.Contains(entity.GetType())) {
+                    UnimportantTriggers.Add(entity);
+                }
+            }
+        }
+        else {
+            UnimportantTriggers.RemoveWhere(x => goldBerryTriggers.Contains(x.GetType()));
+        }
+    }
+
     private static readonly HashSet<Type> goldBerryTriggers = new() { typeof(GoldBerryCollectTrigger) };
 
     private static void HandleCameraTrigger() {
@@ -215,6 +231,22 @@ void AddTypes(string modName, params string[] typeNames) {
         }
     }
 
+    internal static void OnHideCameraChange(bool enable) {
+        if (Engine.Scene is not Level level) {
+            return;
+        }
+        if (enable) {
+            foreach (Entity entity in level.Tracker.GetEntities<Trigger>()) {
+                if (cameraTriggers.Contains(entity.GetType())) {
+                    UnimportantTriggers.Add(entity);
+                }
+            }
+        }
+        else {
+            UnimportantTriggers.RemoveWhere(x => cameraTriggers.Contains(x.GetType()));
+        }
+    }
+
     private static readonly HashSet<Type> cameraTriggers = new() { typeof(CameraOffsetTrigger), typeof(CameraTargetTrigger), typeof(CameraAdvanceTargetTrigger), typeof(SmoothCameraOffsetTrigger) };
 
     private static void HandleExtendedVariantTrigger() {

Source/Module/Menu/Hotkeys.cs

@@ -95,14 +95,10 @@ public static void Update(bool updateKey, bool updateButton) {
         foreach (Hotkey hotkey in Hotkeys) {
             hotkey.Update(updateKey, updateButton);
         }
-        frameCounter++;
+        Gameplay.FrameStepBack.OnHotkeyUpdate(FrameStepBack.Check);
     }
 
-    private static int frameCounter = 0;
 
-    public static bool OnInterval(int period) {
-        return frameCounter % period == 0u;
-    }
 
     internal static Hotkey BindingToHotkey(ButtonBinding binding, bool held = false) {
         return new(binding.Keys, binding.Buttons, true, held);

Source/Module/Menu/TASHelperMenu.cs

@@ -112,8 +112,8 @@ private static EaseInSubMenu CreateSimplifiedGraphicSubMenu(TextMenu menu) {
             subMenu.Add(new HLine(Color.Gray));
             TextMenu.Item simplifiedTrigger;
             subMenu.Add(simplifiedTrigger = new TextMenuExt.EnumerableSlider<SimplifiedGraphicsMode>("Simplified Triggers".ToDialogText(), CreateSimplifiedGraphicsModeOptions(), TasHelperSettings.EnableSimplifiedTriggersMode).Change(value => TasHelperSettings.EnableSimplifiedTriggersMode = value));
-            subMenu.Add(new TextMenu.OnOff("Hide Camera Trigger".ToDialogText(), TasHelperSettings.HideCameraTriggers).Change(value => TasHelperSettings.HideCameraTriggers = value));
-            subMenu.Add(new TextMenu.OnOff("Hide Gold Berry".ToDialogText(), TasHelperSettings.HideGoldBerryCollectTrigger).Change(value => TasHelperSettings.HideGoldBerryCollectTrigger = value));
+            subMenu.Add(new TextMenu.OnOff("Hide Camera Trigger".ToDialogText(), TasHelperSettings.HideCameraTriggers).Change(value => { TasHelperSettings.HideCameraTriggers = value; SimplifiedTrigger.OnHideCameraChange(value); }));
+            subMenu.Add(new TextMenu.OnOff("Hide Gold Berry".ToDialogText(), TasHelperSettings.HideGoldBerryCollectTrigger).Change(value => { TasHelperSettings.HideGoldBerryCollectTrigger = value; SimplifiedTrigger.OnHideBerryChange(value); }));
             subMenu.Add(new HLine(Color.Gray));
         });
     }

Source/Module/TASHelperSettings.cs

@@ -925,7 +925,7 @@ public bool SettingsHotkeysPressed() {
             Gameplay.ConsoleEnhancement.SetOpenConsole();
             // it's completely ok that this feature is not enabled and people press this key, so there's no warning
         }
-        else if (!OoO_Core.Applied && (TH_Hotkeys.FrameStepBack.Released || TH_Hotkeys.FrameStepBack.Check && TH_Hotkeys.OnInterval((int)Math.Round(4 / TasSettings.SlowForwardSpeed)))) { // we use release so there's no save/load issue
+        else if (!OoO_Core.Applied && (TH_Hotkeys.FrameStepBack.Released || TH_Hotkeys.FrameStepBack.Check && Gameplay.FrameStepBack.CheckOnHotkeyHold())) { // we use release so there's no save/load issue
             FrameStepBack.StepBackOneFrame();
         }
 

Source/Module/WhatsNew.cs

@@ -64,6 +64,7 @@ public static void CreateUpdateLog() {
         AddLog("1.9.7", "Some daily maintenance.");
         AddLog("1.9.8", "ModInterop: Export predictor's SL action.");
         AddLog("1.9.9", "New Hotkey: Reverse Frame Advance. This makes tas re-run but up to the previous frame. (Feature Request from Vamp)");
+        AddLog("1.9.10", "Optimize Reverse Frame Advance.");
         UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));
     }
 

everest.yaml

@@ -1,5 +1,5 @@
 - Name: TASHelper
-  Version: 1.9.9
+  Version: 1.9.10
   DLL: bin/Release/net4.5.2/TASHelper.dll
   Dependencies:
     - Name: Everest