[PUSH] 2.0.0.9 SGE & GNB adjustments, NIN addition

Part 1/3 of #415
MKhayle · Aug 11, 2024 · 2cf4602 · 2cf4602
1 parent 56cd0af
commit 2cf4602
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/XIVComboExpanded/Combos/NIN.cs b/XIVComboExpanded/Combos/NIN.cs
@@ -102,7 +102,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             {
                 if (comboTime > 0)
                 {
-                    if (IsEnabled(CustomComboPreset.NinjaKazematoiFeature) && lastComboMove == NIN.GustSlash && level >= NIN.Levels.ArmorCrush && gauge.Kazematoi == 0)
+                    if (
+                        ((IsEnabled(CustomComboPreset.NinjaKazematoiFeature) && !IsEnabled(CustomComboPreset.NinjaOvercapKazematoiFeature) && gauge.Kazematoi == 0)
+                        || (IsEnabled(CustomComboPreset.NinjaOvercapKazematoiFeature) && gauge.Kazematoi + 2 <= 5))
+                        && lastComboMove == NIN.GustSlash
+                        && level >= NIN.Levels.ArmorCrush)
                         return NIN.ArmorCrush;
 
                     if (lastComboMove == NIN.GustSlash && level >= NIN.Levels.AeolianEdge)

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -1163,6 +1163,13 @@ public enum CustomComboPreset
     [CustomComboInfo("Auto-Refill Kazematoi / Huton Feature", "Replace Aeolian Edge with Armor Crush when you don't have any Kazematoi left or with its combo chain else.", NIN.JobID)]
     NinjaKazematoiFeature = 3019,
 
+    [IconsCombo([NIN.ArmorCrush, UTL.Cycle, NIN.AeolianEdge, UTL.ArrowLeft, NIN.GustSlash, UTL.ArrowLeft, NIN.SpinningEdge])]
+    [SectionCombo("Single Target")]
+    [SecretCustomCombo]
+    [ParentCombo(NinjaKazematoiFeature)]
+    [CustomComboInfo("Kazematoi Overcap Feature", "Instead only replace Armor Crush with Aeolian Edge when you are about to overcap Kazematoi stacks or with its combo chain else.", NIN.JobID)]
+    NinjaOvercapKazematoiFeature = 3021,
+
     [IconsCombo([NIN.AeolianEdge, UTL.ArrowLeft, NIN.Ninjutsu, UTL.Blank, NIN.Ninjutsu, UTL.Checkmark])]
     [SectionCombo("Single Target")]
     [ExpandedCustomCombo]

diff --git a/XIVComboExpanded/Interface/Changelog.cs b/XIVComboExpanded/Interface/Changelog.cs
@@ -18,6 +18,7 @@ public static Dictionary<string, string[]> GetChangelog()
                             "Fixed SGE's Dosis Psyche Feature being a child combo of the Auto Eukrasian Dosis feature.",
                             "Fixed SGE's Toxikon into Psyche being a child combo of the Toxikon into Phlegma.",
                             "Split GNB's Double Down Feature into Double Down Burst Feature & Double Down Fated Feature.",
+                            "Added NIN's Kazematoi Overcap Feature.",
                         ]
                     },
                     {