Merge pull request #301 from lhn1703/master

BLM: bugfix flare star ID and added child feature to despair
MKhayle · Jul 11, 2024 · daa1948 · daa1948
2 parents 1cbda1c + 9448c44
commit daa1948
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/XIVComboExpanded/Combos/BLM.cs b/XIVComboExpanded/Combos/BLM.cs
@@ -32,7 +32,7 @@ public const uint
         HighFire2 = 25794,
         HighBlizzard2 = 25795,
         Paradox = 25797,
-        FlareStar = 38072;
+        FlareStar = 36989;
 
     public static class Buffs
     {
@@ -119,6 +119,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 {
                     if (IsEnabled(CustomComboPreset.BlackEnochianDespairFeature))
                     {
+                        if (IsEnabled(CustomComboPreset.BlackEnochianDespairFlareStarFeature))
+                            if (level >= BLM.Levels.FlareStar && gauge.AstralSoulStacks >= 6 && LocalPlayer?.CurrentMp <= 0)
+                                return BLM.FlareStar;
                         if (level >= BLM.Levels.Despair && LocalPlayer?.CurrentMp < 2400)
                             return BLM.Despair;
                     }

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -161,6 +161,11 @@ public enum CustomComboPreset
     [CustomComboInfo("Enochian Despair Feature", "Replace Fire 4 and Blizzard 4 with Despair when in Astral Fire with less than 2400 mana.", BLM.JobID)]
     BlackEnochianDespairFeature = 2510,
 
+    [SecretCustomCombo]
+    [ParentCombo(BlackEnochianDespairFeature)]
+    [CustomComboInfo("Enochian Despair into Flare Star Feature", "Replace Fire 4 and Blizzard 4 with Flare Star when you have 6 astral soul and 0 mana.", BLM.JobID)]
+    BlackEnochianDespairFlareStarFeature = 2524,
+
     [ParentCombo(BlackEnochianFeature)]
     [CustomComboInfo("Enochian No Sync Feature", "Fire 4 and Blizzard 4 will not sync to Fire 1 and Blizzard 1.", BLM.JobID)]
     BlackEnochianNoSyncFeature = 2518,