fix: add ignoreClipping check for actions.

ArchiDog1998 · Apr 21, 2023 · 4ec1a3a · 4ec1a3a
1 parent eb794a4
commit 4ec1a3a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,9 @@
 
 Download it at this url:
 
-`https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/pluginmaster.json`
+```
+https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/pluginmaster.json
+```
 
 ## Brief
 

diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -88,7 +88,7 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO
             {
                 if (DataCenter.NextAbilityToNextGCD > AnimationLockTime + DataCenter.Ping + DataCenter.MinPing) return false;
             }
-            else
+            else if (!option.HasFlag(CanUseOption.IgnoreClippingCheck))
             {
                 if (DataCenter.NextAbilityToNextGCD < AnimationLockTime) return false;
             }

diff --git a/RotationSolver.Basic/Data/CanUseOption.cs b/RotationSolver.Basic/Data/CanUseOption.cs
@@ -45,4 +45,9 @@ public enum CanUseOption : byte
     /// On the last ability in one GCD.
     /// </summary>
     OnLastAbility = 1 << 5,
+
+    /// <summary>
+    /// Ignore clipping check for 0GCDs.
+    /// </summary>
+    IgnoreClippingCheck = 1 << 6,
 }
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -43,7 +43,7 @@ private bool Ability(IAction nextGCD, out IAction act, bool helpDefenseAOE, bool
 
         //Run!
         if (!InCombat && IsMoving && role == JobRole.RangedPhysical
-            && Peloton.CanUse(out act, CanUseOption.MustUse)) return true;
+            && Peloton.CanUse(out act, CanUseOption.MustUse | CanUseOption.IgnoreClippingCheck)) return true;
 
         return false;
     }
@@ -90,7 +90,7 @@ private bool ShirkOrShield(JobRole role, SpecialCommandType specialType, out IAc
 
         if (DataCenter.SetAutoStatus(AutoStatus.TankStance, Service.Config.GetValue(SettingsCommand.AutoTankStance)
             && !DataCenter.AllianceTanks.Any(t => t.CurrentHp != 0 && t.HasStatus(false, StatusHelper.TankStanceStatus))
-            && !HasTankStance && TankStance.CanUse(out act)))
+            && !HasTankStance && TankStance.CanUse(out act, CanUseOption.IgnoreClippingCheck)))
         {
             return true;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     if (DataCenter.NextAbilityToNextGCD > AnimationLockTime + DataCenter.Ping + DataCenter.MinPing) return false;
                 }
-                else
+                else if (!option.HasFlag(CanUseOption.IgnoreClippingCheck))
                 {
                     if (DataCenter.NextAbilityToNextGCD < AnimationLockTime) return false;
                 }
@@ Expand Down @@