Merge pull request #33 from hagazzi/FoFRequiescat

FoF Requiescat change keeping the old one commented
FFXIV-CombatReborn · Jul 4, 2024 · 5e21d79 · 5e21d79
2 parents 2f02fbc + e21bae6
commit 5e21d79
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/BasicRotations/Tank/PLD_Default.cs b/BasicRotations/Tank/PLD_Default.cs
@@ -67,8 +67,9 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         if (CircleOfScornPvE.CanUse(out act, skipAoeCheck: true)) return true;
         if (SpiritsWithinPvE.CanUse(out act, skipAoeCheck: true)) return true;
 
-        if (Player.WillStatusEndGCD(6, 0, true, StatusID.FightOrFlight)
-            && RequiescatPvE.CanUse(out act, skipAoeCheck: true)) return true;
+        //if (Player.WillStatusEndGCD(6, 0, true, StatusID.FightOrFlight)
+        //    && RequiescatPvE.CanUse(out act, skipAoeCheck: true)) return true;
+        if (Player.HasStatus(true, StatusID.FightOrFlight) && RequiescatPvE.CanUse(out act, skipAoeCheck: true)) return true;
 
         if (!IsMoving && IntervenePvE.CanUse(out act, skipAoeCheck: true, usedUp: HasFightOrFlight)) return true;