WHM Update

MKhayle · Jul 3, 2024 · 56117c8 · 56117c8
1 parent e77c61b
commit 56117c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/XIVComboExpanded/Combos/WHM.cs b/XIVComboExpanded/Combos/WHM.cs
@@ -12,6 +12,7 @@ public const uint
         Cure = 120,
         Medica = 124,
         Raise = 125,
+        Medica2 = 133,
         Cure2 = 135,
         PresenceOfMind = 136,
         Holy = 139,
@@ -168,7 +169,11 @@ internal class WhiteMageMedica : CustomCombo
 
     protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
     {
-        if (actionID == WHM.Medica)
+        if (actionID == WHM.Medica &&
+        (IsEnabled(CustomComboPreset.WhiteMageAfflatusMedicaPlusFeature) &&
+            (actionID == WHM.Medica2 || actionID == WHM.Medica3)
+            )
+        )
         {
             var gauge = GetJobGauge<WHMGauge>();
 

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -1146,6 +1146,10 @@ public enum CustomComboPreset
     [CustomComboInfo("Afflatus Feature", "Replace Cure 2 with Afflatus Solace and Medica with Afflatus Rapture when a Lily is available.", WHM.JobID)]
     WhiteMageAfflatusFeature = 2404,
 
+    [ParentCombo(WhiteMageAfflatusFeature)]
+    [CustomComboInfo("Medicafflatus Feature", "Also replaces Medica 2 & Medica 3 with Afflatus Rapture when a Lily is available.", WHM.JobID)]
+    WhiteMageAfflatusMedicaPlusFeature = 2408,
+
     [CustomComboInfo("Glare4 Feature", "Replace Glare 3 with Glare 4 when a stack is available.", WHM.JobID)]
     WhiteMageGlare4Feature = 2407,