Merge pull request #263 from Four-amer/main

Fixed Bard Overcap Protection
FFXIV-CombatReborn · Sep 27, 2024 · e3efbbd · e3efbbd
2 parents a916230 + 7ec4ad7
commit e3efbbd
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs
@@ -148,22 +148,22 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         }
 
         // Bloodletter Overcap protection
-        if (RagingStrikesPvE.Cooldown.IsCoolingDown && BloodletterMax == BloodletterPvE.Cooldown.CurrentCharges)
+        if (BloodletterPvE.Cooldown.WillHaveXCharges(BloodletterMax, 3f))
         {
-            if (HeartbreakShotPvE.CanUse(out act)) return true;
+            if (RainOfDeathPvE.CanUse(out act, usedUp: true)) return true;
 
-            if (RainOfDeathPvE.CanUse(out act)) return true;
+            if (HeartbreakShotPvE.CanUse(out act, usedUp: true)) return true;
 
-            if (BloodletterPvE.CanUse(out act)) return true;
+            if (BloodletterPvE.CanUse(out act, usedUp: true)) return true;
         }
 
         // Prevents Bloodletter bumpcapping when MAGE is the song due to Repetoire procs
-        if ((BloodletterPvE.Cooldown.CurrentCharges > 1) && Song == Song.MAGE)
+        if (BloodletterPvE.Cooldown.WillHaveXCharges(BloodletterMax, 7.5f) && Song == Song.MAGE)
         {
-            if (HeartbreakShotPvE.CanUse(out act, usedUp: true)) return true;
-
             if (RainOfDeathPvE.CanUse(out act, usedUp: true)) return true;
 
+            if (HeartbreakShotPvE.CanUse(out act, usedUp: true)) return true;
+
             if (BloodletterPvE.CanUse(out act, usedUp: true)) return true;
         }