Merge pull request #419 from FFXIV-CombatReborn/MCH-defense

Moved all ability call logic out of base to be put in rotation
FFXIV-CombatReborn · Sep 28, 2024 · e0be09a · e0be09a
2 parents 4aac445 + 46b9ea6
commit e0be09a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 146 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/BardRotation.cs b/RotationSolver.Basic/Rotations/Basic/BardRotation.cs
@@ -383,28 +383,4 @@ static partial void ModifyTheWardensPaeanPvP(ref ActionSetting setting)
     }
 
     #endregion
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.TheWardensPaeanPvE)]
-    protected override bool DispelGCD(out IAction? act)
-    {
-        if (TheWardensPaeanPvE.CanUse(out act)) return true;
-        return base.DispelGCD(out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.NaturesMinnePvE)]
-    protected sealed override bool HealSingleAbility(IAction nextGCD, out IAction? act)
-    {
-        if (NaturesMinnePvE.CanUse(out act)) return true;
-        return base.HealSingleAbility(nextGCD, out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.TroubadourPvE)]
-    protected override bool DefenseAreaAbility(IAction nextGCD, out IAction act)
-    {
-        if (TroubadourPvE.CanUse(out act)) return true;
-        return false;
-    }
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/DancerRotation.cs b/RotationSolver.Basic/Rotations/Basic/DancerRotation.cs
@@ -373,45 +373,4 @@ protected bool ExecuteStepGCD(out IAction? act)
         return false;
     }
     #endregion
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="act"></param>
-    /// <param name="nextGCD"></param>
-    /// <returns></returns>
-    [RotationDesc(ActionID.EnAvantPvE)]
-    protected sealed override bool MoveForwardAbility(IAction nextGCD, out IAction act)
-    {
-        if (EnAvantPvE.CanUse(out act, usedUp: true)) return true;
-        return false;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="act"></param>
-    /// <param name="nextGCD"></param>
-    /// <returns></returns>
-    [RotationDesc(ActionID.CuringWaltzPvE, ActionID.ImprovisationPvE)]
-    protected sealed override bool HealAreaAbility(IAction nextGCD, out IAction act)
-    {
-        if (CuringWaltzPvE.CanUse(out act, usedUp: true)) return true;
-        if (ImprovisationPvE.CanUse(out act, usedUp: true)) return true;
-        return false;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="act"></param>
-    /// <param name="nextGCD"></param>
-    /// <returns></returns>
-    [RotationDesc(ActionID.ShieldSambaPvE)]
-    protected override bool DefenseAreaAbility(IAction nextGCD, out IAction act)
-    {
-        if (ShieldSambaPvE.CanUse(out act, usedUp: true)) return true;
-        return false;
-    }
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/DragoonRotation.cs b/RotationSolver.Basic/Rotations/Basic/DragoonRotation.cs
@@ -318,20 +318,4 @@ static partial void ModifyHighJumpPvP(ref ActionSetting setting)
     {
         setting.SpecialType = SpecialActionType.MovingForward;
     }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.FeintPvE)]
-    protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
-    {
-        if (FeintPvE.CanUse(out act)) return true;
-        return false;
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.ElusiveJumpPvE)]
-    protected override bool MoveBackAbility(IAction nextGCD, out IAction? act)
-    {
-        if (ElusiveJumpPvE.CanUse(out act)) return true;
-        return base.MoveBackAbility(nextGCD, out act);
-    }
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs b/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs
@@ -371,14 +371,4 @@ static partial void ModifyFullMetalFieldPvE(ref ActionSetting setting)
             AoeCount = 1,
         };
     }
-
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.TacticianPvE, ActionID.DismantlePvE)]
-    protected override bool DefenseAreaAbility(IAction nextGCD, out IAction act)
-    {
-        if (TacticianPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        if (DismantlePvE.CanUse(out act, skipAoeCheck: true)) return true;
-        return false;
-    }
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs b/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
@@ -374,36 +374,4 @@ static partial void ModifyThunderclapPvP(ref ActionSetting setting)
     {
         setting.SpecialType = SpecialActionType.MovingForward;
     }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.ThunderclapPvE)]
-    protected sealed override bool MoveForwardAbility(IAction nextGCD, out IAction? act)
-    {
-        if (ThunderclapPvE.CanUse(out act)) return true;
-        return base.MoveForwardAbility(nextGCD, out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.FeintPvE)]
-    protected sealed override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
-    {
-        if (FeintPvE.CanUse(out act)) return true;
-        return base.DefenseAreaAbility(nextGCD, out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.MantraPvE)]
-    protected sealed override bool HealAreaAbility(IAction nextGCD, out IAction? act)
-    {
-        if (MantraPvE.CanUse(out act)) return true;
-        return base.HealAreaAbility(nextGCD, out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.RiddleOfEarthPvE)]
-    protected sealed override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
-    {
-        if (RiddleOfEarthPvE.CanUse(out act, usedUp: true)) return true;
-        return base.DefenseSingleAbility(nextGCD, out act);
-    }
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/PaladinRotation.cs b/RotationSolver.Basic/Rotations/Basic/PaladinRotation.cs
@@ -332,27 +332,4 @@ static partial void ModifyIntervenePvP(ref ActionSetting setting)
     {
         setting.SpecialType = SpecialActionType.MovingForward;
     }
-    /// <inheritdoc/>
-    protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
-    {
-        if (HallowedGroundPvE.CanUse(out act)
-            && Player.GetHealthRatio() <= Service.Config.HealthForDyingTanks) return true;
-        return base.EmergencyAbility(nextGCD, out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.IntervenePvE)]
-    protected sealed override bool MoveForwardAbility(IAction nextGCD, out IAction? act)
-    {
-        if (IntervenePvE.CanUse(out act)) return true;
-        return base.MoveForwardAbility(nextGCD, out act);
-    }
-
-    /// <inheritdoc/>
-    [RotationDesc(ActionID.ClemencyPvE)]
-    protected sealed override bool HealSingleGCD(out IAction? act)
-    {
-        if (ClemencyPvE.CanUse(out act)) return true;
-        return base.HealSingleGCD(out act);
-    }
 }