Merge pull request #421 from aldros-ffxi/feature/gnb-extras

Add a few extras to single target for GNB
MKhayle · Aug 12, 2024 · 6577f2d · 6577f2d
2 parents 2cf4602 + d77256a
commit 6577f2d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/XIVComboExpanded/Combos/GNB.cs b/XIVComboExpanded/Combos/GNB.cs
@@ -1,3 +1,4 @@
+using System.Data.Common;
 using Dalamud.Game.ClientState.JobGauge.Types;
 using System;
 
@@ -165,11 +166,33 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
     {
         if (actionID == GNB.BurstStrike)
         {
+            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.GunbreakerBurstStrikeGnashingFang))
+            {
+                if (level >= GNB.Levels.GnashingFang)
+                {
+                    var gauge = GetJobGauge<GNBGauge>();
+                    if (IsEnabled(CustomComboPreset.GunbreakerGnashingFangCont) &&
+                        (HasEffect(GNB.Buffs.ReadyToRip) ||
+                         HasEffect(GNB.Buffs.ReadyToTear) ||
+                         HasEffect(GNB.Buffs.ReadyToGouge)))
+                        return OriginalHook(GNB.Continuation);
+                    if ((IsCooldownUsable(GNB.GnashingFang) && gauge.Ammo > 0) || !IsOriginal(GNB.GnashingFang))
+                        return OriginalHook(GNB.GnashingFang);
+
+                }
+            }
         }
 
         if (actionID == GNB.FatedCircle)
@@ -252,7 +275,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return GNB.FatedBrand;
                     }
 
-
                     if (level >= GNB.Levels.FatedCircle && gauge.Ammo == maxAmmo)
                         return GNB.FatedCircle;
                 }

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -833,6 +833,18 @@ public enum CustomComboPreset
     [CustomComboInfo("Gnashing Fang Continuation", "Replace Gnashing Fang with Continuation moves when appropriate.", GNB.JobID)]
     GunbreakerGnashingFangCont = 3702,
 
+    [SectionCombo("Single Target")]
+    [IconsCombo([GNB.BurstStrike, UTL.ArrowLeft, GNB.GnashingFang])]
+    [AccessibilityCustomCombo]
+    [CustomComboInfo("Burst Strike into Gnashing Fang", "Replace Burst Strike with Gnashing Fang if available.", GNB.JobID)]
+    GunbreakerBurstStrikeGnashingFang = 3724,
+
+    [SectionCombo("Single Target")]
+    [IconsCombo([GNB.BurstStrike, UTL.ArrowLeft, GNB.DangerZone])]
+    [AccessibilityCustomCombo]
+    [CustomComboInfo("Burst Strike into Danger Zone", "Replace Burst Strike with Danger Zone if available.", GNB.JobID)]
+    GunbreakerBurstStrikeDangerZone = 3725,
+
     [SectionCombo("Area of Effect")]
     [IconsCombo([GNB.DemonSlaughter, UTL.ArrowLeft, GNB.DemonSlice])]
     [CustomComboInfo("Demon Slaughter Combo", "Replace Demon Slaughter with its combo chain.", GNB.JobID)]