From 3b366d399757f6b03306dc0f182dd726ebddbbfe Mon Sep 17 00:00:00 2001 From: Four-amer Date: Fri, 27 Sep 2024 11:14:12 +0200 Subject: [PATCH 1/3] Fixed Bard Overcap Protection --- BasicRotations/Ranged/BRD_Default.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs index 5c55e4e..b0720ff 100644 --- a/BasicRotations/Ranged/BRD_Default.cs +++ b/BasicRotations/Ranged/BRD_Default.cs @@ -148,17 +148,17 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) } // Bloodletter Overcap protection - if (RagingStrikesPvE.Cooldown.IsCoolingDown && BloodletterMax == BloodletterPvE.Cooldown.CurrentCharges) + if (RainOfDeathPvE.Cooldown.WillHaveXCharges(BloodletterMax, 3f)) { - if (HeartbreakShotPvE.CanUse(out act)) return true; + if (BloodletterPvE.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 (RainOfDeathPvE.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; From 613a73a365f0b0e8e714818f43fed2e22b402d28 Mon Sep 17 00:00:00 2001 From: Four-amer Date: Fri, 27 Sep 2024 11:32:21 +0200 Subject: [PATCH 2/3] Typo but not really --- BasicRotations/Ranged/BRD_Default.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs index b0720ff..6765afe 100644 --- a/BasicRotations/Ranged/BRD_Default.cs +++ b/BasicRotations/Ranged/BRD_Default.cs @@ -148,7 +148,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) } // Bloodletter Overcap protection - if (RainOfDeathPvE.Cooldown.WillHaveXCharges(BloodletterMax, 3f)) + if (BloodletterPvE.Cooldown.WillHaveXCharges(BloodletterMax, 3f)) { if (BloodletterPvE.CanUse(out act, usedUp: true)) return true; From 7ec4ad7f8a221361fd7c88401c68e696c0ba1470 Mon Sep 17 00:00:00 2001 From: Four-amer Date: Fri, 27 Sep 2024 12:51:56 +0200 Subject: [PATCH 3/3] Adjusted oGCD priority --- BasicRotations/Ranged/BRD_Default.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs index 6765afe..a6f9c3b 100644 --- a/BasicRotations/Ranged/BRD_Default.cs +++ b/BasicRotations/Ranged/BRD_Default.cs @@ -150,20 +150,20 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) // Bloodletter Overcap protection if (BloodletterPvE.Cooldown.WillHaveXCharges(BloodletterMax, 3f)) { - if (BloodletterPvE.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 (RainOfDeathPvE.CanUse(out act, usedUp: true)) 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.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; }