From fd970290fc1a75d0c17dc7ae3a00bba91457f026 Mon Sep 17 00:00:00 2001 From: edewen Date: Wed, 6 Nov 2024 09:47:38 -0500 Subject: [PATCH 1/2] Update BRD.cs --- XIVSlothCombo/Combos/PvE/BRD.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/BRD.cs b/XIVSlothCombo/Combos/PvE/BRD.cs index 90dc03f51..f9b8e4d57 100644 --- a/XIVSlothCombo/Combos/PvE/BRD.cs +++ b/XIVSlothCombo/Combos/PvE/BRD.cs @@ -452,7 +452,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } - if (LevelChecked(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (LevelChecked(RainOfDeath) && !JustUsed(RainOfDeath, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint rainOfDeathCharges = LevelChecked(RainOfDeath) ? GetRemainingCharges(RainOfDeath) : 0; @@ -756,7 +756,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } - if (ActionReady(Bloodletter) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (ActionReady(Bloodletter) && !JustUsed(Bloodletter, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint bloodletterCharges = GetRemainingCharges(Bloodletter); @@ -1077,7 +1077,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim else return Sidewinder; } - if (LevelChecked(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (LevelChecked(RainOfDeath) && !JustUsed(RainOfDeath, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint rainOfDeathCharges = LevelChecked(RainOfDeath) ? GetRemainingCharges(RainOfDeath) : 0; @@ -1306,7 +1306,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } - if (ActionReady(Bloodletter) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (ActionReady(Bloodletter) && !JustUsed(Bloodletter, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint bloodletterCharges = GetRemainingCharges(Bloodletter); From 04bbd03ba2ad25f5f4a65c3f014a8241cb270162 Mon Sep 17 00:00:00 2001 From: edewen Date: Thu, 7 Nov 2024 10:00:37 -0500 Subject: [PATCH 2/2] Update BRD.cs --- XIVSlothCombo/Combos/PvE/BRD.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/BRD.cs b/XIVSlothCombo/Combos/PvE/BRD.cs index f9b8e4d57..74b38e92c 100644 --- a/XIVSlothCombo/Combos/PvE/BRD.cs +++ b/XIVSlothCombo/Combos/PvE/BRD.cs @@ -452,7 +452,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } - if (LevelChecked(RainOfDeath) && !JustUsed(RainOfDeath, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (LevelChecked(RainOfDeath) && !WasLastAction(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint rainOfDeathCharges = LevelChecked(RainOfDeath) ? GetRemainingCharges(RainOfDeath) : 0; @@ -756,7 +756,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } - if (ActionReady(Bloodletter) && !JustUsed(Bloodletter, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (ActionReady(Bloodletter) && !(WasLastAction(Bloodletter) || WasLastAction(HeartbreakShot)) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint bloodletterCharges = GetRemainingCharges(Bloodletter); @@ -1077,7 +1077,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim else return Sidewinder; } - if (LevelChecked(RainOfDeath) && !JustUsed(RainOfDeath, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (LevelChecked(RainOfDeath) && !WasLastAction(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint rainOfDeathCharges = LevelChecked(RainOfDeath) ? GetRemainingCharges(RainOfDeath) : 0; @@ -1306,7 +1306,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } - if (ActionReady(Bloodletter) && !JustUsed(Bloodletter, 3F) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) + if (ActionReady(Bloodletter) && !(WasLastAction(Bloodletter) || WasLastAction(HeartbreakShot)) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow))) { uint bloodletterCharges = GetRemainingCharges(Bloodletter);