Merge pull request #1834 from Akechi-kun/GNB

[GNB] fixes/adjustments
Nik-Potokar · Nov 17, 2024 · 2496eb7 · 2496eb7
2 parents c21aa44 + b2fa26f
commit 2496eb7
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/GNB.cs b/XIVSlothCombo/Combos/PvE/GNB.cs
@@ -242,6 +242,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             if (ActionReady(DangerZone) && !LevelChecked(SonicBreak) && HasEffect(Buffs.NoMercy) || nmCD < 30)  //subLv54
                                 return OriginalHook(DangerZone);
                         }
+
+                        //if all else fails
+                        if (ActionReady(DoubleDown))
+                            return DoubleDown;
                     }
 
                     //GnashingFang
@@ -257,6 +261,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             || (!LevelChecked(ReignOfBeasts) && !LevelChecked(DoubleDown) && !LevelChecked(Bloodfest) && JustUsed(NoMercy, 3f)) //<=Lv79 use
                             || (nmCD > GCD * 7 && nmCD < GCD * 14)) //30s use
                             return GnashingFang;
+
+                        //if all else fails
+                        if (HasEffect(Buffs.NoMercy) && ActionReady(GnashingFang))
+                            return GnashingFang;
                     }
 
                     //ReadyToReign combo
@@ -493,6 +501,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             if (IsEnabled(CustomComboPreset.GNB_ST_BlastingZone) && ActionReady(DangerZone) && !LevelChecked(SonicBreak) && HasEffect(Buffs.NoMercy) || nmCD < 30)  //subLv54
                                 return OriginalHook(DangerZone);
                         }
+
+                        //if all else fails
+                        if (ActionReady(DoubleDown))
+                            return DoubleDown;
                     }
 
                     //GnashingFang
@@ -508,6 +520,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             || (!LevelChecked(ReignOfBeasts) && !LevelChecked(DoubleDown) && !LevelChecked(Bloodfest) && JustUsed(NoMercy, 3f)) //<=Lv79 use
                             || (nmCD > GCD * 7 && nmCD < GCD * 14)) //30s use
                             return GnashingFang;
+
+                        //if all else fails
+                        if (HasEffect(Buffs.NoMercy) && ActionReady(GnashingFang))
+                            return GnashingFang;
                     }
 
                     //ReadyToReign combo
@@ -723,6 +739,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             if (IsEnabled(CustomComboPreset.GNB_GF_Zone) && ActionReady(DangerZone) && !LevelChecked(SonicBreak) && HasEffect(Buffs.NoMercy) || nmCD < 30)  //subLv54
                                 return OriginalHook(DangerZone);
                         }
+
+                        //if all else fails
+                        if (ActionReady(DoubleDown))
+                            return DoubleDown;
                     }
 
                     //Gnashing Fang
@@ -738,6 +758,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             || (!LevelChecked(ReignOfBeasts) && !LevelChecked(DoubleDown) && !LevelChecked(Bloodfest) && JustUsed(NoMercy, 3f)) //<=Lv79 use
                             || (nmCD > GCD * 7 && nmCD < GCD * 14)) //30s use
                             return GnashingFang;
+
+                        //if all else fails
+                        if (HasEffect(Buffs.NoMercy) && ActionReady(GnashingFang))
+                            return GnashingFang;
                     }
 
                     //Reign combo
@@ -841,8 +865,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         }
                         //FatedCircle - if not unlocked, use BurstStrike
                         if (Ammo > 0 && LevelChecked(FatedCircle) && 
-                            (HasEffect(Buffs.NoMercy) && !ActionReady(DoubleDown) && GunStep == 0) || //use when under NM after DD & ignores GF
-                            (bfCD < 6)) // Bloodfest prep
+                            ((HasEffect(Buffs.NoMercy) && !ActionReady(DoubleDown) && GunStep == 0) || //use when under NM after DD & ignores GF
+                            (bfCD <= (level >= 88 ? GCD * 3 : GCD * 2)))) // Bloodfest prep
                             return FatedCircle;
                         if (Ammo > 0 && !LevelChecked(FatedCircle) && LevelChecked(BurstStrike) &&
                             (HasEffect(Buffs.NoMercy) && !ActionReady(DoubleDown) && GunStep == 0)) //use when under NM after DD & ignores GF
@@ -941,11 +965,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         //FatedCircle - if not unlocked, use BurstStrike
                         if (Ammo > 0 && LevelChecked(FatedCircle) && 
                             ((IsEnabled(CustomComboPreset.GNB_AoE_FatedCircle) && HasEffect(Buffs.NoMercy) && !ActionReady(DoubleDown) && GunStep == 0) || //use when under NM after DD & ignores GF
-                            (IsEnabled(CustomComboPreset.GNB_AoE_Bloodfest) && bfCD < 6))) // Bloodfest prep
+                            (IsEnabled(CustomComboPreset.GNB_AoE_Bloodfest) && bfCD <= (level >= 88 ? GCD * 3 : GCD * 2)))) // Bloodfest prep
                             return FatedCircle;
                         if (IsEnabled(CustomComboPreset.GNB_AoE_noFatedCircle) && Ammo > 0 && !LevelChecked(FatedCircle) && LevelChecked(BurstStrike) &&
                             (HasEffect(Buffs.NoMercy) && GunStep == 0)) // Bloodfest prep
                             return BurstStrike;
+
                     }
 
                     //1-2