From 2ab747449f9a0426d473d1600ac9cf7b88a8eab9 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Sat, 6 Jul 2024 22:51:08 -0600 Subject: [PATCH 01/15] Re-Enable WHM --- XIVSlothCombo/XIVSlothCombo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/XIVSlothCombo/XIVSlothCombo.cs b/XIVSlothCombo/XIVSlothCombo.cs index 0771ca298..b47bdcfa1 100644 --- a/XIVSlothCombo/XIVSlothCombo.cs +++ b/XIVSlothCombo/XIVSlothCombo.cs @@ -66,7 +66,7 @@ public sealed partial class XIVSlothCombo : IDalamudPlugin //SMN.JobID, //VPR.JobID, WAR.JobID, - WHM.JobID + //WHM.JobID }; public static readonly List DisabledJobsPVP = new List() @@ -635,4 +635,4 @@ private void OnCommand(string command, string arguments) Service.Configuration.Save(); } } -} \ No newline at end of file +} From 98403e2b2592bd41e152e534100fb1fc2e0a16e0 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Sat, 6 Jul 2024 23:09:39 -0600 Subject: [PATCH 02/15] Add new Action IDs --- XIVSlothCombo/Combos/PvE/WHM.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 66a5e4ccc..8e446addb 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -29,12 +29,15 @@ public const uint AfflatusMisery = 16535, Medica1 = 124, Medica2 = 133, + Medica3 = 37010, Tetragrammaton = 3570, DivineBenison = 7432, Aquaveil = 25861, + DivineCaress = 37011, // DPS Glare1 = 16533, Glare3 = 25859, + Glare4 = 37009, Stone1 = 119, Stone2 = 127, Stone3 = 3568, From c3e63e38224868db158811c30b038e11398c747c Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:12:57 -0600 Subject: [PATCH 03/15] Add Sacred Sight buff --- XIVSlothCombo/Combos/PvE/WHM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 8e446addb..8a9ab0f22 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -66,7 +66,8 @@ public const ushort PresenceOfMind = 157, ThinAir = 1217, DivineBenison = 1218, - Aquaveil = 2708; + Aquaveil = 2708, + SacredSight = 3879; } public static class Debuffs From b99caa5ba5432409b1d6cd369be1ad98c90fde58 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:17:18 -0600 Subject: [PATCH 04/15] Make Lucid Dreaming check consistent with other combos --- XIVSlothCombo/Combos/PvE/WHM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 8a9ab0f22..597992b52 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -243,7 +243,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (CanSpellWeave(actionID)) { - bool lucidReady = IsOffCooldown(All.LucidDreaming) && LevelChecked(All.LucidDreaming) && LocalPlayer.CurrentMp <= Config.WHM_STDPS_Lucid; + bool lucidReady = ActionReady(All.LucidDreaming) && LevelChecked(All.LucidDreaming) && LocalPlayer.CurrentMp <= Config.WHM_STHeals_Lucid; bool pomReady = LevelChecked(PresenceOfMind) && IsOffCooldown(PresenceOfMind); bool assizeReady = LevelChecked(Assize) && IsOffCooldown(Assize); bool pomEnabled = IsEnabled(CustomComboPreset.WHM_ST_MainCombo_PresenceOfMind); From 6be1a8fdaa6fdfd4b1a189cbf0a634c7214f5a8f Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:18:32 -0600 Subject: [PATCH 05/15] Add logic to Single Target Combo for Glare IV --- XIVSlothCombo/Combos/PvE/WHM.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 597992b52..e73d6cfc0 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -286,6 +286,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim return OriginalHook(Aero); } + // Glare IV + if (HasEffect(Buffs.SacredSight) + && GetBuffStacks(Buffs.SacredSight) > 0) + return OriginalHook(PresenceOfMind); + if (IsEnabled(CustomComboPreset.WHM_ST_MainCombo_LilyOvercap) && LevelChecked(AfflatusRapture) && (liliesFull || liliesNearlyFull)) return AfflatusRapture; From f67cd6f35ce6692358e63b90d08634788f821371 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:25:29 -0600 Subject: [PATCH 06/15] Add logic to AoE Combo for Glare IV --- XIVSlothCombo/Combos/PvE/WHM.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index e73d6cfc0..b0cead52e 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -446,6 +446,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim return All.LucidDreaming; } + // Glare IV + if (HasEffect(Buffs.SacredSight) + && GetBuffStacks(Buffs.SacredSight) > 0) + return OriginalHook(PresenceOfMind); + if (IsEnabled(CustomComboPreset.WHM_AoE_DPS_LilyOvercap) && LevelChecked(AfflatusRapture) && (liliesFullNoBlood || liliesNearlyFull)) return AfflatusRapture; From a3f326bddb9d44ca750e067b334fa0df035fe2e5 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:28:47 -0600 Subject: [PATCH 07/15] Add options for Glare IV on combos --- XIVSlothCombo/Combos/CustomComboPreset.cs | 24 +++++++++++++++-------- XIVSlothCombo/Combos/PvE/WHM.cs | 6 ++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index d9d2e7a91..15057cac2 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -3802,19 +3802,23 @@ The three digets after RDM.JobID can be used to reorder items in the list WHM_ST_MainCombo_Assize = 19009, [ParentCombo(WHM_ST_MainCombo)] - [CustomComboInfo("Afflatus Misery Option", "Adds Afflatus Misery to the single target combo when it is ready to be used.", WHM.JobID, 14, "", "")] + [CustomComboInfo("Glare IV Option", "Adds Glare IV to the single target combo when under Sacred Sight", WHM.JobID, 14, "", "")] + WHM_ST_MainCombo_GlareIV = 19015, + + [ParentCombo(WHM_ST_MainCombo)] + [CustomComboInfo("Afflatus Misery Option", "Adds Afflatus Misery to the single target combo when it is ready to be used.", WHM.JobID, 15, "", "")] WHM_ST_MainCombo_Misery_oGCD = 19017, [ParentCombo(WHM_ST_MainCombo)] - [CustomComboInfo("Lily Overcap Protection Option", "Adds Afflatus Rapture to the single target combo when at three Lilies.", WHM.JobID, 15, "", "")] + [CustomComboInfo("Lily Overcap Protection Option", "Adds Afflatus Rapture to the single target combo when at three Lilies.", WHM.JobID, 16, "", "")] WHM_ST_MainCombo_LilyOvercap = 19016, [ParentCombo(WHM_ST_MainCombo)] - [CustomComboInfo("Presence of Mind Option", "Adds Presence of Mind to the single target combo.", WHM.JobID, 16, "", "")] + [CustomComboInfo("Presence of Mind Option", "Adds Presence of Mind to the single target combo.", WHM.JobID, 17, "", "")] WHM_ST_MainCombo_PresenceOfMind = 19008, [ParentCombo(WHM_ST_MainCombo)] - [CustomComboInfo("Lucid Dreaming Option", "Adds Lucid Dreaming to the single target combo when below set MP value.", WHM.JobID, 17, "", "")] + [CustomComboInfo("Lucid Dreaming Option", "Adds Lucid Dreaming to the single target combo when below set MP value.", WHM.JobID, 18, "", "")] WHM_ST_MainCombo_Lucid = 19006, #endregion @@ -3830,19 +3834,23 @@ The three digets after RDM.JobID can be used to reorder items in the list WHM_AoE_DPS_Assize = 19192, [ParentCombo(WHM_AoE_DPS)] - [CustomComboInfo("Afflatus Misery Option", "Adds Afflatus Misery to the AoE combo when it is ready to be used.", WHM.JobID, 22, "", "")] + [CustomComboInfo("Glare IV Option", "Adds Glare IV to the AoE combo when under Sacred Sight", WHM.JobID, 22, "", "")] + WHM_AoE_DPS_GlareIV = 19196, + + [ParentCombo(WHM_AoE_DPS)] + [CustomComboInfo("Afflatus Misery Option", "Adds Afflatus Misery to the AoE combo when it is ready to be used.", WHM.JobID, 23, "", "")] WHM_AoE_DPS_Misery = 19194, [ParentCombo(WHM_AoE_DPS)] - [CustomComboInfo("Lily Overcap Protection Option", "Adds Afflatus Rapture to the AoE combo when at three Lilies.", WHM.JobID, 23, "", "")] + [CustomComboInfo("Lily Overcap Protection Option", "Adds Afflatus Rapture to the AoE combo when at three Lilies.", WHM.JobID, 24, "", "")] WHM_AoE_DPS_LilyOvercap = 19193, [ParentCombo(WHM_AoE_DPS)] - [CustomComboInfo("Presence of Mind Option", "Adds Presence of Mind to the AoE combo if you are moving or it can be weaved without GCD delay.", WHM.JobID, 24, "", "")] + [CustomComboInfo("Presence of Mind Option", "Adds Presence of Mind to the AoE combo if you are moving or it can be weaved without GCD delay.", WHM.JobID, 25, "", "")] WHM_AoE_DPS_PresenceOfMind = 19195, [ParentCombo(WHM_AoE_DPS)] - [CustomComboInfo("Lucid Dreaming Option", "Adds Lucid Dreaming to the AoE combo when below the set MP value if you are moving or it can be weaved without GCD delay.", WHM.JobID, 25, "", "")] + [CustomComboInfo("Lucid Dreaming Option", "Adds Lucid Dreaming to the AoE combo when below the set MP value if you are moving or it can be weaved without GCD delay.", WHM.JobID, 26, "", "")] WHM_AoE_DPS_Lucid = 19191, #endregion diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index b0cead52e..4eaec1076 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -287,7 +287,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } // Glare IV - if (HasEffect(Buffs.SacredSight) + if (IsEnabled(CustomComboPreset.WHM_ST_MainCombo_GlareIV) + && HasEffect(Buffs.SacredSight) && GetBuffStacks(Buffs.SacredSight) > 0) return OriginalHook(PresenceOfMind); @@ -447,7 +448,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } // Glare IV - if (HasEffect(Buffs.SacredSight) + if (IsEnabled(CustomComboPreset.WHM_AoE_DPS_GlareIV) + && HasEffect(Buffs.SacredSight) && GetBuffStacks(Buffs.SacredSight) > 0) return OriginalHook(PresenceOfMind); From d8c7310b7c68e37ef1a6e2611aab64c6156ff9fe Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:37:50 -0600 Subject: [PATCH 08/15] Add Divine Grace Buff --- XIVSlothCombo/Combos/PvE/WHM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 4eaec1076..fbbcf52f6 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -67,7 +67,8 @@ public const ushort ThinAir = 1217, DivineBenison = 1218, Aquaveil = 2708, - SacredSight = 3879; + SacredSight = 3879, + DivineGrace = 3881; } public static class Debuffs From cd794972a9981bf6e5d9d868c8dfad847b55ed8d Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 05:46:12 -0600 Subject: [PATCH 09/15] Add Medica III buff --- XIVSlothCombo/Combos/PvE/WHM.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index fbbcf52f6..f6cd6d00b 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -63,6 +63,7 @@ public static class Buffs public const ushort Regen = 158, Medica2 = 150, + Medica3 = 3880, PresenceOfMind = 157, ThinAir = 1217, DivineBenison = 1218, From 930b27a41c0a44328149fb09561de0e3c0b2965a Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 06:02:08 -0600 Subject: [PATCH 10/15] Add Medica III upgrade option --- XIVSlothCombo/Combos/CustomComboPreset.cs | 4 ++++ XIVSlothCombo/Combos/PvE/WHM.cs | 19 +++++++++++++++---- XIVSlothCombo/Window/Functions/UserConfig.cs | 6 +++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index 15057cac2..93880bb31 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -3901,6 +3901,10 @@ The three digets after RDM.JobID can be used to reorder items in the list [CustomComboInfo("Medica II Option", "Uses Medica II when current target doesn't have Medica II buff.", WHM.JobID, 1)] WHM_AoEHeals_Medica2 = 19205, + [ParentCombo(WHM_AoEHeals_Medica2)] + [CustomComboInfo("Medica III Option", "Upgrades to Medica III when level allows.", WHM.JobID)] + WHM_AoEHeals_Medica3 = 19206, + #endregion #region Single Target Heals diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index f6cd6d00b..31bf1e26c 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -117,11 +117,11 @@ internal static UserBool WHM_STHeals_AquaveilWeave = new("WHM_STHeals_AquaveilWeave"), WHM_AoEHeals_PlenaryWeave = new("WHM_AoEHeals_PlenaryWeave"), WHM_AoEHeals_AssizeWeave = new("WHM_AoEHeals_AssizeWeave"), - WHM_AoEHeals_Medica2MO = new("WHM_AoEHeals_Medica2MO"); + WHM_AoEHeals_MedicaMO = new("WHM_AoEHeals_MedicaMO"); internal static UserFloat WHM_ST_MainCombo_DoT_Threshold = new("WHM_ST_MainCombo_DoT_Threshold"), WHM_STHeals_RegenTimer = new("WHM_STHeals_RegenTimer"), - WHM_AoEHeals_Medica2Time = new("WHM_AoEHeals_Medica2Time"); + WHM_AoEHeals_MedicaTime = new("WHM_AoEHeals_MedicaTime"); public static UserBoolArray WHM_ST_MainCombo_Adv_Actions = new("WHM_ST_MainCombo_Adv_Actions"); } @@ -323,7 +323,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim bool lucidReady = ActionReady(All.LucidDreaming) && LocalPlayer.CurrentMp <= Config.WHM_AoEHeals_Lucid; bool plenaryReady = ActionReady(PlenaryIndulgence) && (!Config.WHM_AoEHeals_PlenaryWeave || (Config.WHM_AoEHeals_PlenaryWeave && canWeave)); bool assizeReady = ActionReady(Assize) && (!Config.WHM_AoEHeals_AssizeWeave || (Config.WHM_AoEHeals_AssizeWeave && canWeave)); - var healTarget = GetHealTarget(Config.WHM_AoEHeals_Medica2MO); + var healTarget = GetHealTarget(Config.WHM_AoEHeals_MedicaMO); if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Assize) && assizeReady) return Assize; @@ -343,8 +343,19 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsEnabled(CustomComboPreset.WHM_AoEHeals_ThinAir) && thinAirReady) return ThinAir; - if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Medica2) && (FindEffectOnMember(Buffs.Medica2, healTarget) == null || FindEffectOnMember(Buffs.Medica2, healTarget).RemainingTime <= Config.WHM_AoEHeals_Medica2Time) && ActionReady(Medica2)) + if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Medica2) + && ((FindEffectOnMember(Buffs.Medica2, healTarget) == null && FindEffectOnMember(Buffs.Medica3, healTarget) == null) + || FindEffectOnMember(Buffs.Medica2, healTarget).RemainingTime <= Config.WHM_AoEHeals_MedicaTime + || FindEffectOnMember(Buffs.Medica3, healTarget).RemainingTime <= Config.WHM_AoEHeals_MedicaTime) + && (ActionReady(Medica2) || ActionReady(Medica3))) + { + // Medica 3 upgrade + if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Medica3) + && LevelChecked(Medica3)) + return Medica3; + return Medica2; + } if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Cure3) && ActionReady(Cure3) && (LocalPlayer.CurrentMp >= Config.WHM_AoEHeals_Cure3MP || HasEffect(Buffs.ThinAir))) return Cure3; diff --git a/XIVSlothCombo/Window/Functions/UserConfig.cs b/XIVSlothCombo/Window/Functions/UserConfig.cs index 0b5b4aa41..4f628ae0d 100644 --- a/XIVSlothCombo/Window/Functions/UserConfig.cs +++ b/XIVSlothCombo/Window/Functions/UserConfig.cs @@ -2577,8 +2577,8 @@ internal static void Draw(CustomComboPreset preset, bool enabled) if (preset == CustomComboPreset.WHM_AoEHeals_Medica2) { - UserConfig.DrawRoundedSliderFloat(0f, 6f, WHM.Config.WHM_AoEHeals_Medica2Time, "Time Remaining on Buff to Renew"); - UserConfig.DrawAdditionalBoolChoice(WHM.Config.WHM_AoEHeals_Medica2MO, "Party UI Mousover Checking", "Check your mouseover target for the Medica II buff.\nTo be used in conjunction with Redirect/Reaction/etc."); + UserConfig.DrawRoundedSliderFloat(0f, 6f, WHM.Config.WHM_AoEHeals_MedicaTime, "Time Remaining on Buff to Renew"); + UserConfig.DrawAdditionalBoolChoice(WHM.Config.WHM_AoEHeals_MedicaMO, "Party UI Mousover Checking", "Check your mouseover target for the Medica II/III buff.\nTo be used in conjunction with Redirect/Reaction/etc."); } #endregion @@ -2679,4 +2679,4 @@ public const uint Hundreds = 100, Thousands = 1000; } -} \ No newline at end of file +} From 6b9f99c9374ef267016240fef9d8da49cf3120c5 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 06:07:22 -0600 Subject: [PATCH 11/15] Remove duplicate action --- XIVSlothCombo/Combos/PvE/WHM.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 31bf1e26c..cc7f2f0b9 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -18,7 +18,6 @@ internal static class WHM public const uint // Heals Cure = 120, - Medica = 124, Cure2 = 135, Cure3 = 131, Regen = 137, @@ -88,8 +87,6 @@ internal static readonly Dictionary { Dia, Debuffs.Dia } }; - - public static class Config { internal static UserInt @@ -166,7 +163,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } } - internal class WHM_Raise : CustomCombo { protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.WHM_Raise; @@ -315,7 +311,7 @@ internal class WHM_AoEHeals : CustomCombo protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) { - if (actionID is Medica) + if (actionID is Medica1) { WHMGauge? gauge = GetJobGauge(); bool thinAirReady = LevelChecked(ThinAir) && !HasEffect(Buffs.ThinAir) && GetRemainingCharges(ThinAir) > Config.WHM_AoEHeals_ThinAir; From f79da56ca821ecb7a99aa325eea6dae52c6801e7 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 06:10:41 -0600 Subject: [PATCH 12/15] Remove duplicate Medica --- XIVSlothCombo/Combos/CustomComboPreset.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index 93880bb31..fe5ac60ae 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -3865,7 +3865,7 @@ The three digets after RDM.JobID can be used to reorder items in the list #region AoE Heals Feature - [ReplaceSkill(WHM.Medica)] + [ReplaceSkill(WHM.Medica1)] [CustomComboInfo("Simple Heals (AoE)", "Replaces Medica with a one button AoE healing setup.", WHM.JobID, 4, "", "")] WHM_AoEHeals = 19007, From 9b2ae10207d5464dccfbec35444b17b64961b6ad Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Mon, 8 Jul 2024 06:15:39 -0600 Subject: [PATCH 13/15] Add Option and Combo code for Divine Caress --- XIVSlothCombo/Combos/CustomComboPreset.cs | 6 +++++- XIVSlothCombo/Combos/PvE/WHM.cs | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index fe5ac60ae..cb2bf91b6 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -3894,7 +3894,7 @@ The three digets after RDM.JobID can be used to reorder items in the list WHM_AoEHeals_Plenary = 19203, [ParentCombo(WHM_AoEHeals)] - [CustomComboInfo("Lucid Dreaming Option", "Uses Lucid Dreaming when available.", WHM.JobID, 8)] + [CustomComboInfo("Lucid Dreaming Option", "Uses Lucid Dreaming when available.", WHM.JobID, 9)] WHM_AoEHeals_Lucid = 19204, [ParentCombo(WHM_AoEHeals)] @@ -3905,6 +3905,10 @@ The three digets after RDM.JobID can be used to reorder items in the list [CustomComboInfo("Medica III Option", "Upgrades to Medica III when level allows.", WHM.JobID)] WHM_AoEHeals_Medica3 = 19206, + [ParentCombo(WHM_AoEHeals)] + [CustomComboInfo("Divine Caress", "Uses Divine Caress when Divine Grace from Temperance is active.", WHM.JobID, 8)] + WHM_AoEHeals_DivineCaress = 19207, + #endregion #region Single Target Heals diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index cc7f2f0b9..13c35ef2b 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -318,6 +318,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim var canWeave = CanSpellWeave(actionID, 0.3); bool lucidReady = ActionReady(All.LucidDreaming) && LocalPlayer.CurrentMp <= Config.WHM_AoEHeals_Lucid; bool plenaryReady = ActionReady(PlenaryIndulgence) && (!Config.WHM_AoEHeals_PlenaryWeave || (Config.WHM_AoEHeals_PlenaryWeave && canWeave)); + bool divineCaressReady = ActionReady(DivineCaress) && HasEffect(Buffs.DivineGrace); bool assizeReady = ActionReady(Assize) && (!Config.WHM_AoEHeals_AssizeWeave || (Config.WHM_AoEHeals_AssizeWeave && canWeave)); var healTarget = GetHealTarget(Config.WHM_AoEHeals_MedicaMO); @@ -327,6 +328,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Plenary) && plenaryReady) return PlenaryIndulgence; + if (IsEnabled(CustomComboPreset.WHM_AoEHeals_DivineCaress) && divineCaressReady) + return DivineCaress; + if (IsEnabled(CustomComboPreset.WHM_AoEHeals_Lucid) && canWeave && lucidReady) return All.LucidDreaming; From 82375633f74d2e26835db6a635f7f5fbe5bd63d0 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Tue, 9 Jul 2024 04:39:57 -0600 Subject: [PATCH 14/15] Prevent attempting opener on different single targets (Won't execute opener if you precast Presence of Mind) --- XIVSlothCombo/Combos/PvE/WHM.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs index 13c35ef2b..0534aeaf1 100644 --- a/XIVSlothCombo/Combos/PvE/WHM.cs +++ b/XIVSlothCombo/Combos/PvE/WHM.cs @@ -205,7 +205,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (ActionFound) { WHMGauge? gauge = GetJobGauge(); - bool inOpener = IsEnabled(CustomComboPreset.WHM_ST_MainCombo_Opener) && Glare3Count < 4; + bool inOpener = IsEnabled(CustomComboPreset.WHM_ST_MainCombo_Opener) + && Glare3Count < 4 + && !HasEffect(Buffs.SacredSight); bool liliesFull = gauge.Lily == 3; bool liliesNearlyFull = gauge.Lily == 2 && gauge.LilyTimer >= 17000; @@ -223,7 +225,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim return OriginalHook(All.Swiftcast); if (ActionReady(PresenceOfMind)) - return PresenceOfMind; + return PresenceOfMind; } if (Glare3Count == 4) From af393901c16c0ba0217e393ae9ea997008d02a74 Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Wed, 10 Jul 2024 09:08:46 -0600 Subject: [PATCH 15/15] Correct Aquaveil typo --- XIVSlothCombo/Combos/CustomComboPreset.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index cb2bf91b6..33ab226bc 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -3942,7 +3942,7 @@ The three digets after RDM.JobID can be used to reorder items in the list WHM_STHeals_Benison = 19306, [ParentCombo(WHM_STHeals)] - [CustomComboInfo("Aqualveil Option", "Uses Aquaveil when available.", WHM.JobID)] + [CustomComboInfo("Aquaveil Option", "Uses Aquaveil when available.", WHM.JobID)] WHM_STHeals_Aquaveil = 19307, [ParentCombo(WHM_STHeals)]