Merge pull request #74 from hagazzi/PLD80-89fix

PLD80-89 fix
FFXIV-CombatReborn · Jul 13, 2024 · a17e8ce · a17e8ce
2 parents de8ecbe + 56f1477
commit a17e8ce
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/BasicRotations/Tank/PLD_Default.cs b/BasicRotations/Tank/PLD_Default.cs
@@ -122,10 +122,17 @@ protected override bool GeneralGCD(out IAction? act)
 
         if (Player.HasStatus(true, StatusID.Requiescat))
         {
-            if (BladeOfFaithPvE.EnoughLevel && BladeOfValorPvE.CanUse(out act, skipAoeCheck: true)) return true;
-            if (BladeOfFaithPvE.EnoughLevel && BladeOfTruthPvE.CanUse(out act, skipAoeCheck: true)) return true;
-            if (BladeOfFaithPvE.EnoughLevel && BladeOfFaithPvE.CanUse(out act, skipAoeCheck: true)) return true;
-            if (ConfiPvE.CanUse(out act, skipAoeCheck: true)) return true;
+            if ((Player.Level >= 90) && (Player.StatusStack(true, StatusID.Requiescat) < 4))
+            {
+                //if (BladeOfValorPvE.CanUse(out act, skipAoeCheck: true)) return true;
+                //if (BladeOfTruthPvE.CanUse(out act, skipAoeCheck: true)) return true;
+                //if (BladeOfFaithPvE.CanUse(out act, skipAoeCheck: true)) return true;
+                if (ConfiPvE.CanUse(out act, skipAoeCheck: true)) return true;
+            }
+            if ((Player.Level >= 80) && (Player.StatusStack(true, StatusID.Requiescat) > 3))
+            {
+                if (ConfiPvE.CanUse(out act, skipAoeCheck: true)) return true;
+            }
             if (HolyCirclePvE.CanUse(out act)) return true;
             if (HolySpiritPvE.CanUse(out act)) return true;
         }