diff --git a/RotationSolver.Basic/Rotations/Basic/BardRotation.cs b/RotationSolver.Basic/Rotations/Basic/BardRotation.cs index 7a1857951..fb9fc5d9a 100644 --- 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 - - /// - [RotationDesc(ActionID.TheWardensPaeanPvE)] - protected override bool DispelGCD(out IAction? act) - { - if (TheWardensPaeanPvE.CanUse(out act)) return true; - return base.DispelGCD(out act); - } - - /// - [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); - } - - /// - [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 index b806f4d36..5d86e2f1e 100644 --- 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 - - - /// - /// - /// - /// - /// - /// - [RotationDesc(ActionID.EnAvantPvE)] - protected sealed override bool MoveForwardAbility(IAction nextGCD, out IAction act) - { - if (EnAvantPvE.CanUse(out act, usedUp: true)) return true; - return false; - } - - /// - /// - /// - /// - /// - /// - [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; - } - - /// - /// - /// - /// - /// - /// - [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 index 024e32b19..6cf392052 100644 --- 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; } - - /// - [RotationDesc(ActionID.FeintPvE)] - protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act) - { - if (FeintPvE.CanUse(out act)) return true; - return false; - } - - /// - [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 index c8067f6fc..49ca3d49a 100644 --- 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, }; } - - - /// - [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 index f7eff0e96..76dbd2558 100644 --- 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; } - - /// - [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); - } - - /// - [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); - } - - /// - [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); - } - - /// - [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 index 97f16de74..a6d454f90 100644 --- 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; } - /// - 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); - } - - /// - [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); - } - - /// - [RotationDesc(ActionID.ClemencyPvE)] - protected sealed override bool HealSingleGCD(out IAction? act) - { - if (ClemencyPvE.CanUse(out act)) return true; - return base.HealSingleGCD(out act); - } }