v2.1.4

bugfix: spinner color be wrong after fast forward

Author: LozenChen

Source/Gameplay/AutoWatchEntity/CoreLogic.cs

@@ -114,6 +114,10 @@ private static void FakeGetInfo(Level level) {
 
     public static void OnConfigChange() {
         InfoWatchEntity.ForceUpdateInfo = Config.MainEnabled;
+        // when this gets removed, check that:
+        // 1) works when both disabled
+        // 2) if we can click the hidden triggers
+
         if (Engine.Scene is not Level level) {
             return;
         }

Source/Gameplay/Spinner/SpinnerCalculateHelper.cs

@@ -5,6 +5,7 @@
 using MonoMod.Cil;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using TAS;
 // VivHelper namespace has a VivHelper class.... so if we want to visit VivHelper.Entities, we should use VivEntities
 
 namespace Celeste.Mod.TASHelper.Gameplay.Spinner;
@@ -43,14 +44,21 @@ private static void PrepareTags() {
         if (ModUtils.GetType("FrostHelper", "FrostHelper.Entities.WallBouncePresentation.WallbouncePlayback") is { } wallbouncePlayBack && wallbouncePlayBack.GetFieldInfo("tag") is { } fieldInfo && wallbouncePlayBack.GetConstructorInfo(new Type[] { typeof(string), typeof(Vector2) }) is { } ctorInfo) {
             ctorInfo.HookAfter<object>(x => fieldInfo.SetValue(x, (int)fieldInfo.GetValue(x) & ~IsHazardTagValue));
         }
-    }
+    }
+
+    public static bool WillFastForward => FastForwarding && Manager.NextState == Manager.State.Running;
+
+    public static int GroupCounter = 0;
 
     // JIT optimization may cause PredictLoadTimeActive[2] != 524288f when TimeActive = 524288f
     [MethodImpl(MethodImplOptions.NoOptimization)]
     internal static void PreSpinnerCalculate(Scene self) {
-        if (!TasHelperSettings.Enabled || FastForwarding || self is not Level) {
+        if (!TasHelperSettings.Enabled || WillFastForward || self is not Level) {
             return;
-        }
+        }
+
+        // only sync this when we plan to render
+        GroupCounter = TAS.EverestInterop.Hitboxes.CycleHitboxColor.GroupCounter;
         float time = TimeActive = self.TimeActive;
         for (int i = 0; i <= 9; i++) {
             PredictLoadTimeActive[i] = PredictUnloadTimeActive[i] = time;
@@ -437,13 +445,13 @@ public static int PredictCountdown(float offset, bool isDust, bool isLoad) {
 
     public static int CalculateSpinnerGroup(float offset) {
         if (OnInterval(PredictLoadTimeActive[0], 0.05f, offset)) {
-            return TAS.EverestInterop.Hitboxes.CycleHitboxColor.GroupCounter;
+            return GroupCounter;
         }
         if (OnInterval(PredictLoadTimeActive[1], 0.05f, offset)) {
-            return (1 + TAS.EverestInterop.Hitboxes.CycleHitboxColor.GroupCounter) % 3;
+            return (1 + GroupCounter) % 3;
         }
         if (OnInterval(PredictLoadTimeActive[2], 0.05f, offset)) {
-            return (2 + TAS.EverestInterop.Hitboxes.CycleHitboxColor.GroupCounter) % 3;
+            return (2 + GroupCounter) % 3;
         }
         return 3;
     }

Source/Module/WhatsNew.cs

@@ -89,6 +89,7 @@ public static void CreateUpdateLog() {
         AddLog("2.1.1", "Bugfix: fix a bug caused by CelesteTAS refactor.");
         AddLog("2.1.2", "Bugfix: Predictor not working properly, caused by CelesteTAS refactor.");
         AddLog("2.1.3", "Bugfix: Incompatibility with MotionSmoothing in event ch09_goto_the_future. (thanks @cameryn)");
+        AddLog("2.1.4", "Bugfix: Fastforward makes spinner colors change. (thanks @trans_alexa)");
         UpdateLogs.Sort((x, y) => new Version(y.Item1).CompareTo(new Version(x.Item1)));
     }
 

Source/TinySRT/ExtraSlActions.cs

@@ -202,7 +202,8 @@ public static TH Create() {
             ExactSpinnerGroup.offsetGroup = TH_offsetGroup.TH_DeepCloneShared();
             MovementOvershootAssistant.MOA_Renderer.Instance = TH_MOA.TH_DeepCloneShared();
             Gameplay.AutoWatchEntity.CoreLogic.WhenWatchedRenderers = TH_WhenWatchedRenderers.TH_DeepCloneShared();
-            AutoWatchRenderer.EverythingOnClone();
+            AutoWatchRenderer.EverythingOnClone();
+            SpinnerCalculateHelper.GroupCounter = CycleHitboxColor.GroupCounter;
         };
         Action clear = () => {
             TH_CachedNodes = null;
@@ -249,6 +250,7 @@ public static SRT CreateSRT() {
             Gameplay.AutoWatchEntity.CoreLogic.WhenWatchedRenderers = SRT_WhenWatchedRenderers.DeepCloneShared();
 
             AutoWatchRenderer.EverythingOnClone();
+            SpinnerCalculateHelper.GroupCounter = CycleHitboxColor.GroupCounter;
 
             PredictorCore.delayedClearFutures = true;
             PredictorCore.HasCachedFutures = false;

Source/Utils/HookHelper.cs

@@ -105,8 +105,11 @@ internal static class _Scene {
         public static event UpdateHandler AfterUpdate;
 
         [EventOnHook]
-        private static void CreateOnHook() {
-            On.Monocle.Scene.BeforeUpdate += OnBeforeUpdate;
+        private static void CreateOnHook() {
+            // pre spinner calc needs this to be after tas
+            using (new DetourContext { After = new List<string> { "CelesteTAS-EverestInterop" }, ID = "TAS Helper Scene.BeforeUpdate" }) {
+                On.Monocle.Scene.BeforeUpdate += OnBeforeUpdate;
+            }
 
             using (new DetourContext { Before = new List<string> { "CelesteTAS-EverestInterop" }, ID = "TAS Helper Scene.AfterUpdate" }) {
                 On.Monocle.Scene.AfterUpdate += OnAfterUpdate;

everest.yaml

@@ -1,5 +1,5 @@
 - Name: TASHelper
-  Version: 2.1.3
+  Version: 2.1.4
   DLL: bin/Release/net7.0/TASHelper.dll
   Dependencies:
     - Name: EverestCore