fix: add an OtherOption for control actions as whole.

ArchiDog1998 · Apr 22, 2023 · a24d670 · a24d670
1 parent d0439eb
commit a24d670
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -42,6 +42,8 @@ private bool WillCooldown
 
     public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseOption.None, byte gcdCountForAbility = 0)
     {
+        option |= OtherOption;
+
         act = this;
         var mustUse = option.HasFlag(CanUseOption.MustUse);
 

diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -5,6 +5,8 @@ namespace RotationSolver.Basic.Actions;
 
 public partial class BaseAction : IBaseAction
 {
+    internal static CanUseOption OtherOption { get; set; } = CanUseOption.None;
+
     Action _action;
     ActionOption _option;
 

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs b/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs
@@ -119,7 +119,10 @@ private IAction Invoke(out IAction gcdAction)
         }
         else if (gcdAction == null)
         {
+            BaseAction.OtherOption = CanUseOption.IgnoreClippingCheck;
             if (Ability(Addle, out IAction ability, helpDefenseAOE, helpDefenseSingle)) return ability;
+            BaseAction.OtherOption = CanUseOption.None;
+
             return null;
         }
         return gcdAction;