fix: fix for casting & moving bug for Tingle.

ArchiDog1998 · Jan 28, 2023 · 1326219 · 1326219
1 parent 89d313b
commit 1326219
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/RotationSolver/Actions/BaseAction/BaseAction_ActionInfo.cs b/RotationSolver/Actions/BaseAction/BaseAction_ActionInfo.cs
@@ -79,22 +79,25 @@ public unsafe virtual bool CanUse(out IAction act, bool mustUse = false, bool em
 
         if (!WillCooldown) return false;
 
-        if (IsGeneralGCD)
+        if (!emptyOrSkipCombo)
         {
-            if (!emptyOrSkipCombo && !CheckForCombo()) return false;
-
-            if (CastTime > 0 && MovingUpdater.IsMoving)
+            if (IsGeneralGCD)
             {
-                if (!player.HasStatus(true, CustomRotation.Swiftcast.StatusProvide))
-                {
+                if (!CheckForCombo()) return false;
+            }
+            else
+            {
+                if (RecastTimeRemain > ActionUpdater.WeaponRemain + ActionUpdater.WeaponTotal)
                     return false;
-                }
             }
         }
-        else
+
+        if (CastTime > 0 && MovingUpdater.IsMoving)
         {
-            if (!emptyOrSkipCombo && RecastTimeRemain > ActionUpdater.WeaponRemain + ActionUpdater.WeaponTotal)
+            if (!player.HasStatus(true, CustomRotation.Swiftcast.StatusProvide))
+            {
                 return false;
+            }
         }
 
         if (!FindTarget(mustUse, out var target)) return false;