Merge pull request #471 from Propagandist1/master

PCT: Add Holy Hammer combo feature
MKhayle · Nov 27, 2024 · 5052015 · 5052015
2 parents 1c93b05 + 13d56df
commit 5052015
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/XIVComboExpanded/Combos/PCT.cs b/XIVComboExpanded/Combos/PCT.cs
@@ -286,6 +286,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                     return PCT.RainbowDrip;
                 }
 
+                if (IsEnabled(CustomComboPreset.PictomancerHolyHammerCombo) && HasEffect(PCT.Buffs.HammerReady))
+                {
+                    return PCT.HammerStamp;
+                }
+
                 if (HasEffect(PCT.Buffs.MonochromeTones))
                     return PCT.CometBlack;
             }

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -1536,7 +1536,7 @@ public enum CustomComboPreset
     [SectionCombo("Holy Comet")]
     [ExpandedCustomCombo]
     [ParentCombo(PictomancerHolyCometCombo)]
-    [CustomComboInfo("Rainbow Holy Combo", "Replace Holy in White with Rainbow Drip when under the effect of Rainbow Drip Ready (has priority over Comet in Black).", PCT.JobID)]
+    [CustomComboInfo("Rainbow Holy Combo", "Replace Holy in White with Rainbow Drip when under the effect of Rainbow Drip Ready (has priority over Comet in Black and Hammer Stamp, if applicable).", PCT.JobID)]
     PictomancerRainbowHolyCombo = 4215,
 
     [IconsCombo([PCT.FireRedST, PCT.BlizzardCyanST, UTL.ArrowLeft, PCT.HolyWhite, UTL.Blank, PCT.HolyWhite, UTL.Danger])]
@@ -1557,6 +1557,13 @@ public enum CustomComboPreset
     [CustomComboInfo("Rainbow Drip Starter", "Replace Fire in Red & Fire in Red II with Rainbow Drip when out of combat.", PCT.JobID)]
     PictomancerRainbowStarter = 4216,
 
+    [IconsCombo([PCT.HolyWhite, UTL.ArrowLeft, PCT.HammerStamp, PCT.HammerBrush, PCT.PolishingHammer, UTL.Blank, PCT.Buffs.HammerReady, UTL.Checkmark])]
+    [SectionCombo("Holy Hammer")]
+    [ExpandedCustomCombo]
+    [ParentCombo(PictomancerHolyCometCombo)]
+    [CustomComboInfo("Holy Hammer Combo", "Replace Holy in White with Hammer Brush and its combo chain when they are usable (has priority over Comet in Black).", PCT.JobID)]
+    PictomancerHolyHammerCombo = 4217,
+
     #endregion
     // ====================================================================================
     #region REAPER