fix: removed nextAbilityToNextGCD from ability method.

ArchiDog1998 · Apr 20, 2023 · 9fd333d · 9fd333d
1 parent 78d65d4
commit 9fd333d
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 91 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
@@ -190,7 +190,7 @@ protected sealed override bool DefenseSingleGCD(out IAction act)
     }
 
     [RotationDesc(ActionID.Addle)]
-    protected override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected override bool DefenseAreaAbility(out IAction act)
     {
         if (Addle.CanUse(out act)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs b/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs
@@ -114,25 +114,25 @@ protected static bool SongEndAfterGCD(uint gctCount = 0, int abilityCount = 0)
             StatusID.ShieldSamba),
     };
 
-    protected override bool EmergencyAbility(float nextAbilityToNextGCD, IAction nextGCD, out IAction act)
+    protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
         //Esuna
         if (DataCenter.SpecialType == SpecialCommandType.EsunaStanceNorth && DataCenter.WeakenPeople.Any() || DataCenter.DyingPeople.Any())
         {
             if (WardensPaean.CanUse(out act, CanUseOption.MustUse)) return true;
         }
-        return base.EmergencyAbility(nextAbilityToNextGCD, nextGCD, out act);
+        return base.EmergencyAbility(nextGCD, out act);
     }
 
     [RotationDesc(ActionID.Troubadour)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Troubadour.CanUse(out act)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.NaturesMinne)]
-    protected sealed override bool HealSingleAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool HealSingleAbility(out IAction act)
     {
         if (NaturesMinne.CanUse(out act)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs
@@ -201,22 +201,22 @@ protected static bool ExecuteStepGCD(out IAction act)
     }
 
     [RotationDesc(ActionID.EnAvant)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (EnAvant.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.CuringWaltz, ActionID.Improvisation)]
-    protected sealed override bool HealAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool HealAreaAbility(out IAction act)
     {
         if (CuringWaltz.CanUse(out act, CanUseOption.EmptyOrSkipCombo)) return true;
         if (Improvisation.CanUse(out act, CanUseOption.EmptyOrSkipCombo)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.ShieldSamba)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (ShieldSamba.CanUse(out act, CanUseOption.EmptyOrSkipCombo)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRG_Base.cs
@@ -114,7 +114,7 @@ public abstract class DRG_Base : CustomRotation
     public static IBaseAction BattleLitany { get; } = new BaseAction(ActionID.BattleLitany, ActionOption.Buff);
 
     [RotationDesc(ActionID.Feint)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Feint.CanUse(out act)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs
@@ -113,14 +113,14 @@ protected static bool DarkSideEndAfterGCD(uint gctCount = 0, int abilityCount =
         StatusNeed = new[] { StatusID.SaltedEarth },
     };
 
-    protected override bool EmergencyAbility(float nextAbilityToNextGCD, IAction nextGCD, out IAction act)
+    protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
         if (LivingDead.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0])) return true;
-        return base.EmergencyAbility(nextAbilityToNextGCD, nextGCD, out act);
+        return base.EmergencyAbility(nextGCD, out act);
     }
 
     [RotationDesc(ActionID.Plunge)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (Plunge.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
 

diff --git a/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs b/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs
@@ -136,14 +136,14 @@ public abstract class GNB_Base : CustomRotation
         == ActionID.Hypervelocity,
     };
 
-    protected override bool EmergencyAbility(float nextAbilityToNextGCD, IAction nextGCD, out IAction act)
+    protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
         if (SuperBolide.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0])) return true;
-        return base.EmergencyAbility(nextAbilityToNextGCD, nextGCD, out act);
+        return base.EmergencyAbility(nextGCD, out act);
     }
 
     [RotationDesc(ActionID.RoughDivide)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (RoughDivide.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs b/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs
@@ -96,7 +96,7 @@ protected static bool OverheatedEndAfterGCD(uint gctCount = 0, int abilityCount
     public static IBaseAction Dismantle { get; } = new BaseAction(ActionID.Dismantle, ActionOption.Defense);
 
     [RotationDesc(ActionID.Tactician, ActionID.Dismantle)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Tactician.CanUse(out act, CanUseOption.MustUse)) return true;
         if (Dismantle.CanUse(out act, CanUseOption.MustUse)) return true;

diff --git a/RotationSolver.Basic/Rotations/Basic/MNK_Base.cs b/RotationSolver.Basic/Rotations/Basic/MNK_Base.cs
@@ -94,28 +94,28 @@ public abstract class MNK_Base : CustomRotation
     public static IBaseAction RiddleOfWind { get; } = new BaseAction(ActionID.RiddleOfWind, ActionOption.Buff);
 
     [RotationDesc(ActionID.Thunderclap)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (Thunderclap.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.Feint)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Feint.CanUse(out act)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.Mantra)]
-    protected sealed override bool HealAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool HealAreaAbility(out IAction act)
     {
         if (Mantra.CanUse(out act)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.RiddleOfEarth)]
-    protected sealed override bool DefenseSingleAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseSingleAbility(out IAction act)
     {
         if (RiddleOfEarth.CanUse(out act, CanUseOption.EmptyOrSkipCombo)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs
@@ -168,22 +168,22 @@ internal NinAction(ActionID actionID, params IBaseAction[] ninjutsu)
     public static INinAction HyoshoRanryu { get; } = new NinAction(ActionID.HyoshoRanryu, Ten, Jin);
 
     [RotationDesc(ActionID.Shukuchi)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (Shukuchi.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
 
         return false;
     }
 
     [RotationDesc(ActionID.Feint)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Feint.CanUse(out act)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.ShadeShift)]
-    protected override bool DefenseSingleAbility(float nextAbilityToNextGCD, out IAction act)
+    protected override bool DefenseSingleAbility(out IAction act)
     {
         if (ShadeShift.CanUse(out act)) return true;
 

diff --git a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
@@ -101,14 +101,14 @@ public abstract class PLD_Base : CustomRotation
         ActionCheck = BaseAction.TankDefenseSelf,
     };
 
-    protected override bool EmergencyAbility(float nextAbilityToNextGCD, IAction nextGCD, out IAction act)
+    protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
         if (HallowedGround.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0])) return true;
-        return base.EmergencyAbility(nextAbilityToNextGCD, nextGCD, out act);
+        return base.EmergencyAbility(nextGCD, out act);
     }
 
     [RotationDesc(ActionID.Intervene)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (Intervene.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
@@ -132,14 +132,14 @@ protected sealed override bool HealSingleGCD(out IAction act)
     }
 
     [RotationDesc(ActionID.CorpsACorps)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (CorpsACorps.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.Addle, ActionID.MagickBarrier)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Addle.CanUse(out act)) return true;
         if (MagickBarrier.CanUse(out act, CanUseOption.MustUse)) return true;

diff --git a/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs b/RotationSolver.Basic/Rotations/Basic/RPR_Base.cs
@@ -205,14 +205,14 @@ public abstract class RPR_Base : CustomRotation
     #endregion
 
     [RotationDesc(ActionID.HellsIngress)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (HellsIngress.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.Feint)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (!SoulReaver && !Enshrouded)
         {
@@ -224,13 +224,13 @@ protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, ou
     }
 
     [RotationDesc(ActionID.ArcaneCrest)]
-    protected override bool DefenseSingleAbility(float nextAbilityToNextGCD, out IAction act)
+    protected override bool DefenseSingleAbility(out IAction act)
     {
         if (!SoulReaver && !Enshrouded)
         {
             if (ArcaneCrest.CanUse(out act)) return true;
         }
 
-        return base.DefenseSingleAbility(nextAbilityToNextGCD, out act);
+        return base.DefenseSingleAbility(out act);
     }
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs b/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
@@ -169,21 +169,21 @@ public abstract class SAM_Base : CustomRotation
     #endregion
 
     [RotationDesc(ActionID.HissatsuGyoten)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (HissatsuGyoten.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.Feint)]
-    protected sealed override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseAreaAbility(out IAction act)
     {
         if (Feint.CanUse(out act)) return true;
         return false;
     }
 
     [RotationDesc(ActionID.ThirdEye)]
-    protected override bool DefenseSingleAbility(float nextAbilityToNextGCD, out IAction act)
+    protected override bool DefenseSingleAbility(out IAction act)
     {
         if (ThirdEye.CanUse(out act)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs
@@ -147,7 +147,7 @@ protected static bool AddersgallEndAfterGCD(uint gctCount = 0, int abilityCount
     };
 
     [RotationDesc(ActionID.Icarus)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         //ÉñÒí
         if (Icarus.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;

diff --git a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
@@ -170,7 +170,7 @@ protected static bool SummonTimeEndAfter(float time)
     public static IBaseAction Physick { get; } = new BaseAction(ActionID.Physick, ActionOption.Heal);
 
     [RotationDesc(ActionID.RadiantAegis)]
-    protected sealed override bool DefenseSingleAbility(float nextAbilityToNextGCD, out IAction act)
+    protected sealed override bool DefenseSingleAbility(out IAction act)
     {
         if (RadiantAegis.CanUse(out act)) return true;
         return false;
@@ -184,7 +184,7 @@ protected override bool HealSingleGCD(out IAction act)
     }
 
     [RotationDesc(ActionID.Addle)]
-    protected override bool DefenseAreaAbility(float nextAbilityToNextGCD, out IAction act)
+    protected override bool DefenseAreaAbility(out IAction act)
     {
         if (Addle.CanUse(out act)) return true;
         return false;

diff --git a/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs b/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs
@@ -104,14 +104,14 @@ public abstract class WAR_Base : CustomRotation
         StatusNeed = new[] { StatusID.PrimalRendReady }
     };
 
-    protected override bool EmergencyAbility(float nextAbilityToNextGCD, IAction nextGCD, out IAction act)
+    protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
         if (Holmgang.CanUse(out act) && BaseAction.TankBreakOtherCheck(JobIDs[0])) return true;
-        return base.EmergencyAbility(nextAbilityToNextGCD, nextGCD, out act);
+        return base.EmergencyAbility(nextGCD, out act);
     }
 
     [RotationDesc(ActionID.Onslaught)]
-    protected sealed override bool MoveForwardAbility(float nextAbilityToNextGCD, out IAction act, CanUseOption option = CanUseOption.None)
+    protected sealed override bool MoveForwardAbility(out IAction act, CanUseOption option = CanUseOption.None)
     {
         if (Onslaught.CanUse(out act, CanUseOption.EmptyOrSkipCombo | option)) return true;
         return false;