attempted rampart fix on warrior and paladin

FFXIV-CombatReborn · Apr 8, 2024 · 69b5748 · 69b5748
1 parent 0231580
commit 69b5748
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/BasicRotations/Tank/PLD_Default.cs b/BasicRotations/Tank/PLD_Default.cs
@@ -96,15 +96,17 @@ protected override bool GeneralGCD(out IAction? act)
     [RotationDesc(ActionID.ReprisalPvE, ActionID.DivineVeilPvE)]
     protected override bool DefenseAreaAbility(out IAction? act)
     {
+
         if (ReprisalPvE.CanUse(out act, skipAoeCheck: true)) return true;
         if (DivineVeilPvE.CanUse(out act)) return true;
+        if (PassageOfArmsPvE.CanUse(out act)) return true;
         return base.DefenseAreaAbility(out act);
     }
 
     [RotationDesc(ActionID.PassageOfArmsPvE)]
     protected override bool HealAreaAbility(out IAction? act)
     {
-        if (PassageOfArmsPvE.CanUse(out act)) return true;
+        //if (PassageOfArmsPvE.CanUse(out act)) return true;
         return base.HealAreaAbility(out act);
     }
 
@@ -118,9 +120,7 @@ protected override bool DefenseSingleAbility(out IAction? act)
         if ((!RampartPvE.Cooldown.IsCoolingDown || RampartPvE.Cooldown.ElapsedAfter(60)) && SentinelPvE.CanUse(out act)) return true;
 
         //20
-        if (SentinelPvE.Cooldown.IsCoolingDown && SentinelPvE.Cooldown.ElapsedAfter(60) && RampartPvE.CanUse(out act)) return true;
-
-        if (ReprisalPvE.CanUse(out act)) return true;
+        if ((SentinelPvE.EnoughLevel && SentinelPvE.Cooldown.IsCoolingDown && SentinelPvE.Cooldown.ElapsedAfter(60) || !SentinelPvE.EnoughLevel) && RampartPvE.CanUse(out act)) return true;
 
         return base.DefenseSingleAbility(out act);
     }

diff --git a/BasicRotations/Tank/WAR_Default.cs b/BasicRotations/Tank/WAR_Default.cs
@@ -119,11 +119,11 @@ protected override bool DefenseSingleAbility(out IAction? act)
 
     private bool HighDefense(out IAction? act)
     {
-        //30
+        //Vengence use
         if ((!RampartPvE.Cooldown.IsCoolingDown || RampartPvE.Cooldown.ElapsedAfter(60)) && VengeancePvE.CanUse(out act)) return true;
 
-        //20
-        if (VengeancePvE.Cooldown.IsCoolingDown && VengeancePvE.Cooldown.ElapsedAfter(60) && RampartPvE.CanUse(out act)) return true;
+        //Rampart use
+        if ((VengeancePvE.EnoughLevel && VengeancePvE.Cooldown.IsCoolingDown && VengeancePvE.Cooldown.ElapsedAfter(60) || !VengeancePvE.EnoughLevel) && RampartPvE.CanUse(out act)) return true;
 
         act = null;
         return false;