Merge pull request #1852 from edewen/Bard

[BRD] Preventing Bloodletter/Rain of death from doubleweaving itself.
Nik-Potokar · Nov 17, 2024 · 4d5fb5b · 4d5fb5b
2 parents 9994784 + 04bbd03
commit 4d5fb5b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/BRD.cs b/XIVSlothCombo/Combos/PvE/BRD.cs
@@ -451,7 +451,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         }
 
 
-                        if (LevelChecked(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
+                        if (LevelChecked(RainOfDeath) && !WasLastAction(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
                         {
                             uint rainOfDeathCharges = LevelChecked(RainOfDeath) ? GetRemainingCharges(RainOfDeath) : 0;
 
@@ -755,7 +755,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         }
 
 
-                        if (ActionReady(Bloodletter) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
+                        if (ActionReady(Bloodletter) && !(WasLastAction(Bloodletter) || WasLastAction(HeartbreakShot)) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
                         {
                             uint bloodletterCharges = GetRemainingCharges(Bloodletter);
 
@@ -1076,7 +1076,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             else return Sidewinder;
                         }
 
-                        if (LevelChecked(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
+                        if (LevelChecked(RainOfDeath) && !WasLastAction(RainOfDeath) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
                         {
                             uint rainOfDeathCharges = LevelChecked(RainOfDeath) ? GetRemainingCharges(RainOfDeath) : 0;
 
@@ -1305,7 +1305,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         }
 
 
-                        if (ActionReady(Bloodletter) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
+                        if (ActionReady(Bloodletter) && !(WasLastAction(Bloodletter) || WasLastAction(HeartbreakShot)) && (empyrealCD > 1 || !LevelChecked(EmpyrealArrow)))
                         {
                             uint bloodletterCharges = GetRemainingCharges(Bloodletter);