Merge pull request #441 from MillerTheBest/main

bypass ttk check
FFXIV-CombatReborn · Oct 31, 2024 · ce8b163 · ce8b163
2 parents 7e0ffab + 57df7db
commit ce8b163
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction.cs b/RotationSolver.Basic/Actions/BaseAction.cs
@@ -122,7 +122,7 @@ public BaseAction(ActionID actionID, bool isDutyAction = false)
 
     /// <inheritdoc/>
     public bool CanUse(out IAction act, bool isLastAbility = false, bool isFirstAbility = false, bool skipStatusProvideCheck = false, bool skipComboCheck = false, bool skipCastingCheck = false,
-    bool usedUp = false, bool skipAoeCheck = false, byte gcdCountForAbility = 0)
+    bool usedUp = false, bool skipAoeCheck = false, bool skipTTKCheck = false, byte gcdCountForAbility = 0)
     {
         act = this;
 
@@ -149,7 +149,10 @@ public bool CanUse(out IAction act, bool isLastAbility = false, bool isFirstAbil
 
         if (Setting.SpecialType == SpecialActionType.MeleeRange && IActionHelper.IsLastAction(IActionHelper.MovingActions)) return false; // No range actions after moving.
 
-        if (!IsTimeToKillValid()) return false;
+        if (!skipTTKCheck)
+        {
+            if (!IsTimeToKillValid()) return false;
+        }
 
         PreviewTarget = TargetInfo.FindTarget(skipAoeCheck, skipStatusProvideCheck);
         if (PreviewTarget == null) return false;

diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -62,8 +62,9 @@ public interface IBaseAction : IAction
     /// <param name="skipCastingCheck">Skip Casting and Moving Check</param>
     /// <param name="usedUp">Is it used up all stacks</param>
     /// <param name="skipAoeCheck">Skip aoe Check</param>
+    /// <param name="skipTTKCheck">skip IsTimeToKillValid check in BaseAction</param>
     /// <param name="gcdCountForAbility">the gcd count for the ability.</param>
     /// <returns>can I use it</returns>
     bool CanUse(out IAction act, bool isLastAbility = false, bool isFirstAbility = false, bool skipStatusProvideCheck = false, bool skipComboCheck = false, bool skipCastingCheck = false,
-        bool usedUp = false, bool skipAoeCheck = false, byte gcdCountForAbility = 0);
+        bool usedUp = false, bool skipAoeCheck = false, bool skipTTKCheck = false, byte gcdCountForAbility = 0);
 }