fix: ActionAhead can't be greater than 0.4s.

ArchiDog1998 · Apr 25, 2023 · e05b6d2 · e05b6d2
1 parent e859822
commit e05b6d2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/RotationSolver/UI/RotationConfigWindow_List.cs b/RotationSolver/UI/RotationConfigWindow_List.cs
@@ -106,10 +106,11 @@ private void DrawDangerousStatus()
             Service.Config.DangerousStatus.Add(0);
         }
 
-        for (int i = 0; i < Service.Config.DangerousStatus.Count; i++)
-        {
-            //ImGuiHelper.SearchCombo()
-        }
+        //for (int i = 0; i < Service.Config.DangerousStatus.Count; i++)
+        //{
+        //    ImGuiHelper.SearchCombo($"DangerousStatus{Service.Config.DangerousStatus[i]}",
+        //        )
+        //}
     }
 
     private void DrawInvinsibility()
@@ -119,6 +120,6 @@ private void DrawInvinsibility()
             Service.Config.InvincibleStatus.Add(0);
         }
 
-        TargetCondition.AllStatus;
+        //TargetCondition.AllStatus;
     }
 }
diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -28,7 +28,7 @@ private void DrawParamTab()
     private void DrawParamBasic()
     {
         DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_ActionAhead,
-            ref Service.Config.ActionAhead, Service.Default.ActionAhead, max: 0.5f);
+            ref Service.Config.ActionAhead, Service.Default.ActionAhead, max: 0.4f);
 
         DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_CountDownAhead,
             ref Service.Config.CountDownAhead, Service.Default.CountDownAhead, min: 0.5f, max: 0.7f);

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -175,8 +175,10 @@ internal unsafe static void DoAction()
                 && ActionManager.Instance()->QueuedActionId != NextAction.AdjustedID
             || Service.Player.CurrentHp == 0) return;
 
+        var ahead = Math.Max(0.4f, Service.Config.ActionAhead);
+
         //GCD
-        var canUseGCD = DataCenter.WeaponRemain <= Service.Config.ActionAhead;
+        var canUseGCD = DataCenter.WeaponRemain <= ahead;
         if (_GCDDelay.Delay(canUseGCD)) RSCommands.DoAnAction(true);
         if (canUseGCD) return;
 
@@ -195,10 +197,10 @@ internal unsafe static void DoAction()
         //The last one.
         if (timeToNext + nextAction.AnimationLockTime + DataCenter.Ping + DataCenter.MinAnimationLock > DataCenter.WeaponRemain)
         {
-            if (DataCenter.WeaponRemain > nextAction.AnimationLockTime + DataCenter.Ping + Service.Config.ActionAhead) return;
+            if (DataCenter.WeaponRemain > nextAction.AnimationLockTime + DataCenter.Ping + ahead) return;
             RSCommands.DoAnAction(false);
         }
-        else if (timeToNext < Service.Config.ActionAhead)
+        else if (timeToNext < ahead)
         {
             RSCommands.DoAnAction(false);
         }