Merge pull request #428 from aldros-ffxi/feature/gnb-reign-bloodfest

Add the rest of the Reign combo on EmptyBloodfestFeature
MKhayle · Sep 11, 2024 · 6a365cc · 6a365cc
2 parents b0a5dd0 + 6352ea2
commit 6a365cc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/XIVComboExpanded/Combos/GNB.cs b/XIVComboExpanded/Combos/GNB.cs
@@ -100,18 +100,18 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         var gauge = GetJobGauge<GNBGauge>();
                         var maxAmmo = level >= GNB.Levels.CartridgeCharge2 ? 3 : 2;
 
-                        if (IsEnabled(CustomComboPreset.GunbreakerDoubleDownFeatureST))
-                        {
-                            if (level >= GNB.Levels.DoubleDown && gauge.Ammo == maxAmmo && IsCooldownUsable(GNB.DoubleDown))
-                                return GNB.DoubleDown;
-                        }
-
                         if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeCont))
                         {
                             if (level >= GNB.Levels.EnhancedContinuation && HasEffect(GNB.Buffs.ReadyToBlast))
                                 return GNB.Hypervelocity;
                         }
 
+                        if (IsEnabled(CustomComboPreset.GunbreakerDoubleDownFeatureST))
+                        {
+                            if (level >= GNB.Levels.DoubleDown && gauge.Ammo == maxAmmo && IsCooldownUsable(GNB.DoubleDown))
+                                return GNB.DoubleDown;
+                        }
+
                         if (level >= GNB.Levels.BurstStrike && gauge.Ammo == maxAmmo)
                             return GNB.BurstStrike;
                     }
@@ -166,17 +166,22 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
     {
         if (actionID == GNB.BurstStrike)
         {
+            if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeCont))
+            {
+                if (level >= GNB.Levels.EnhancedContinuation && HasEffect(GNB.Buffs.ReadyToBlast))
+                    return GNB.Hypervelocity;
+            }
+
             if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeDangerZone))
             {
                 if (level >= GNB.Levels.DangerZone && IsCooldownUsable(GNB.DangerZone))
                     return OriginalHook(GNB.DangerZone);
             }
 
-            if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeCont))
-            {
-                if (level >= GNB.Levels.EnhancedContinuation && HasEffect(GNB.Buffs.ReadyToBlast))
-                    return GNB.Hypervelocity;
-            }
+            if (IsEnabled(CustomComboPreset.GunbreakerBloodReignFeature) &&
+                (HasEffect(GNB.Buffs.ReadyToReign) ||
+                 !IsOriginal(GNB.Bloodfest)))
+                return OriginalHook(GNB.Bloodfest);
 
             if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeGnashingFang))
             {
@@ -190,7 +195,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return OriginalHook(GNB.Continuation);
                     if ((IsCooldownUsable(GNB.GnashingFang) && gauge.Ammo > 0) || !IsOriginal(GNB.GnashingFang))
                         return OriginalHook(GNB.GnashingFang);
-
                 }
             }
         }
@@ -202,6 +206,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 if (level >= GNB.Levels.EnhancedContinuation && HasEffect(GNB.Buffs.ReadyToFated))
                     return GNB.FatedBrand;
             }
+
+            if (IsEnabled(CustomComboPreset.GunbreakerBloodReignFeature) &&
+                (HasEffect(GNB.Buffs.ReadyToReign) ||
+                 !IsOriginal(GNB.Bloodfest)))
+                return OriginalHook(GNB.Bloodfest);
         }
 
         if (actionID == GNB.BurstStrike || actionID == GNB.FatedCircle)

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -894,6 +894,13 @@ public enum CustomComboPreset
     [CustomComboInfo("Empty Bloodfest Feature", "Replace Burst Strike and Fated Circle with Bloodfest if the powder gauge is empty.", GNB.JobID)]
     GunbreakerEmptyBloodfestFeature = 3707,
 
+    [SectionCombo("Buffs")]
+    [IconsCombo([GNB.Bloodfest, UTL.ArrowLeft, GNB.ReignOfBeasts, GNB.NobleBlood, GNB.LionHeart])]
+    [AccessibilityCustomCombo]
+    [ParentCombo(GunbreakerEmptyBloodfestFeature)]
+    [CustomComboInfo("Empty Blood Reign Feature", "Additionally, use the rest of the Reign combo on Bloodfest.", GNB.JobID)]
+    GunbreakerBloodReignFeature = 3726,
+
     [SectionCombo("Buffs")]
     [IconsCombo([GNB.BowShock, UTL.Cycle, GNB.SonicBreak])]
     [AccessibilityCustomCombo]