Merge pull request #281 from bfabe8/patch-1

Support Wide Volley and Barrage replacement for Quick Nock/Ladonsbite
MKhayle · Jul 8, 2024 · 0a6dd84 · 0a6dd84
2 parents bd8c4f4 + 8c463e8
commit 0a6dd84
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/XIVComboExpanded/Combos/BRD.cs b/XIVComboExpanded/Combos/BRD.cs
@@ -64,6 +64,7 @@ public const byte
             RagingStrikes = 4,
             VenomousBite = 6,
             Bloodletter = 12,
+            WideVolley = 25,
             MagesBallad = 30,
             Windbite = 30,
             Barrage = 38,
@@ -202,15 +203,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.BardShadowbiteFeature))
             {
-                if (level >= BRD.Levels.Shadowbite && HasEffect(BRD.Buffs.HawksEye))
+                if (level >= BRD.Levels.WideVolley && (HasEffect(BRD.Buffs.HawksEye) || HasEffect(BRD.Buffs.Barrage))
                 {
                     if (IsEnabled(CustomComboPreset.BardShadowbiteBarrageFeature))
                     {
                         if (level >= BRD.Levels.Barrage && IsOffCooldown(BRD.Barrage))
                             return BRD.Barrage;
                     }
 
-                    return BRD.Shadowbite;
+                    return OriginalHook(BRD.Shadowbite);
                 }
             }
         }
@@ -472,4 +473,4 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
         return actionID;
     }
-}
+}