Merge pull request #464 from lhn1703/black_magic

BLM, 7.1 insta-despair go brrr
MKhayle · Nov 18, 2024 · 2e4650c · 2e4650c
2 parents 1497f4b + 20bd39e
commit 2e4650c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/XIVComboExpanded/Combos/BLM.cs b/XIVComboExpanded/Combos/BLM.cs
@@ -126,15 +126,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             if (((HasEffect(BLM.Buffs.Swiftcast) || HasEffect(BLM.Buffs.Triplecast))
                             && gauge.ElementTimeRemaining / 1000.0 < fire4.BaseCooldown * 1.10) || gauge.ElementTimeRemaining / 1000.0 < fire4.CastTime * 1.10)
                             {
-                                if (level >= BLM.Levels.Despair &&
-                                    LocalPlayer?.CurrentMp >= 800 && LocalPlayer?.CurrentMp < 2400 &&
-                                    (HasEffect(BLM.Buffs.Swiftcast) || HasEffect(BLM.Buffs.Triplecast)))
+                                if (level >= BLM.Levels.Despair && LocalPlayer?.CurrentMp >= 800 && LocalPlayer?.CurrentMp < 2400) // optimal despair usage
                                     return BLM.Despair;
-                                if (HasEffect(BLM.Buffs.Firestarter))
+                                if (HasEffect(BLM.Buffs.Firestarter)) // rare case usually caused by rotation error or clipping
                                     return BLM.Fire3;
-                                if (level > BLM.Levels.Paradox && gauge.IsParadoxActive)
+                                if (level > BLM.Levels.Paradox && gauge.IsParadoxActive) // typical use case
                                     return BLM.Paradox;
-                                if (level >= BLM.Levels.Blizzard3)
+                                if (level >= BLM.Levels.Despair && LocalPlayer?.CurrentMp >= 800) // suboptimal despair usage, but still better than Blizzard3
+                                    return BLM.Despair;
+                                if (level >= BLM.Levels.Blizzard3) // ultra-rare corner case when user royally screws up
                                     return BLM.Blizzard3;
                             }
                         }

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -242,11 +242,11 @@ public enum CustomComboPreset
     [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, or when optimal.\n\nSince Despair refreshes Astral Fire, casting Flare Star afterwards is safer instead of cramming it with Fire 4s. Exceptions are during the Dawntrail opener, or manafont is used before casting Flare Star from the previous fire phase.", BLM.JobID)]
     BlackEnochianDespairFlareStarFeature = 2524,
 
-    [IconsCombo([BLM.Fire4, BLM.Blizzard4, UTL.ArrowLeft, ADV.Swiftcast, BLM.Triplecast, BLM.Despair, UTL.Blank, BLM.Buffs.Firestarter, BLM.Fire3, UTL.Blank, BLM.Paradox, UTL.Blank, UTL.Clock])]
+    [IconsCombo([BLM.Fire4, BLM.Blizzard4, UTL.ArrowLeft, BLM.Despair, UTL.Blank, BLM.Buffs.Firestarter, BLM.Fire3, UTL.Blank, BLM.Paradox, UTL.Blank, UTL.Clock])]
     [SectionCombo("Single Target")]
     [ParentCombo(BlackEnochianFeature)]
     [AccessibilityCustomCombo]
-    [CustomComboInfo("Enochian Timer Feature", "Replace Fire 4 and Blizzard 4 with Instant-Despair, Fire 3 Proc, Paradox, or Blizzard 3 when Enochian is about to run out.", BLM.JobID)]
+    [CustomComboInfo("Enochian Timer Feature", "Replace Fire 4 and Blizzard 4 with Despair, Fire 3 Proc, Paradox, or Blizzard 3 when Enochian is about to run out.", BLM.JobID)]
     BlackEnochianTimerFeature = 2525,
 
     [IconsCombo([BLM.Fire4, BLM.Blizzard4, UTL.Cross, UTL.ArrowLeft, BLM.Fire, BLM.Blizzard])]