diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index 8eda6ba53..cd6027a6f 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -2561,7 +2561,7 @@ public enum CustomComboPreset PCT_AoE_AdvancedMode = 20040, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Prepull Motifs Feature", "Adds missing Motifs to the combo while out of combat.", PCT.JobID)] + [CustomComboInfo("Prepull Motifs Feature", "Adds missing Motifs to the combo while out of combat.", PCT.JobID, 1)] PCT_AoE_AdvancedMode_PrePullMotifs = 20041, [ParentCombo(PCT_AoE_AdvancedMode_PrePullMotifs)] @@ -2569,7 +2569,7 @@ public enum CustomComboPreset PCT_AoE_AdvancedMode_NoTargetMotifs = 20042, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Starry Muse Burst Feature", $"Adds selected spells below to the burst phase.", PCT.JobID)] + [CustomComboInfo("Starry Muse Burst Feature", $"Adds selected spells below to the burst phase.", PCT.JobID, 2)] PCT_AoE_AdvancedMode_Burst_Phase = 20043, [ParentCombo(PCT_AoE_AdvancedMode_Burst_Phase)] @@ -2593,7 +2593,7 @@ public enum CustomComboPreset PCT_AoE_AdvancedMode_Burst_BlizzardInCyan = 20048, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Motif Selection Feature", $"Add Selected Motifs to the combo.", PCT.JobID)] + [CustomComboInfo("Motif Selection Feature", $"Add Selected Motifs to the combo.", PCT.JobID, 3)] PCT_AoE_AdvancedMode_MotifFeature = 20049, [ParentCombo(PCT_AoE_AdvancedMode_MotifFeature)] @@ -2609,7 +2609,7 @@ public enum CustomComboPreset PCT_AoE_AdvancedMode_WeaponMotif = 20052, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Muse Selection Feature", $"Adds Selected Muses to the combo.", PCT.JobID)] + [CustomComboInfo("Muse Selection Feature", $"Adds Selected Muses to the combo.", PCT.JobID, 4)] PCT_AoE_AdvancedMode_MuseFeature = 20053, [ParentCombo(PCT_AoE_AdvancedMode_MuseFeature)] @@ -2625,23 +2625,27 @@ public enum CustomComboPreset PCT_AoE_AdvancedMode_SteelMuse = 20056, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Mog/Madeen Feature", $"Adds Mog/Madeen to the combo.", PCT.JobID)] + [CustomComboInfo("Mog/Madeen Feature", $"Adds Mog/Madeen to the combo.", PCT.JobID, 5)] PCT_AoE_AdvancedMode_MogOfTheAges = 20057, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Subtractive Palette Feature", $"Adds Subtractive Palette to the combo.", PCT.JobID)] + [CustomComboInfo("Subtractive Palette Feature", $"Adds Subtractive Palette to the combo.", PCT.JobID, 6)] PCT_AoE_AdvancedMode_SubtractivePalette = 20058, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Comet in Black Option", $"Adds Comet in Black to the combo.", PCT.JobID)] + [CustomComboInfo("Comet in Black Option", $"Adds Comet in Black to the combo.", PCT.JobID, 7)] PCT_AoE_AdvancedMode_CometinBlack = 20059, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Hammer Stamp Combo Option", $"Adds Hammer Stamp combo.", PCT.JobID)] + [CustomComboInfo("Hammer Stamp Combo Option", $"Adds Hammer Stamp combo.", PCT.JobID, 8)] PCT_AoE_AdvancedMode_HammerStampCombo = 20060, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Movement Features", $"Adds selected features to the combo while moving.", PCT.JobID)] + [CustomComboInfo("Holy in White Option", $"Adds Holy in White to the combo.", PCT.JobID, 9)] + PCT_AoE_AdvancedMode_HolyinWhite = 20068, + + [ParentCombo(PCT_AoE_AdvancedMode)] + [CustomComboInfo("Movement Features", $"Adds selected features to the combo while moving.", PCT.JobID, 10)] PCT_AoE_AdvancedMode_MovementFeature = 20061, [ParentCombo(PCT_AoE_AdvancedMode_MovementFeature)] @@ -2661,11 +2665,11 @@ public enum CustomComboPreset PCT_AoE_AdvancedMode_SwitfcastOption = 20065, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Blizzard in Cyan Option", $"Adds Blizzard in Cyan to the combo.", PCT.JobID)] + [CustomComboInfo("Blizzard in Cyan Option", $"Adds Blizzard in Cyan to the combo.", PCT.JobID, 11)] PCT_AoE_AdvancedMode_BlizzardInCyan = 20066, [ParentCombo(PCT_AoE_AdvancedMode)] - [CustomComboInfo("Lucid Dreaming Option", $"Adds Lucid Dreaming to the combo.", PCT.JobID)] + [CustomComboInfo("Lucid Dreaming Option", $"Adds Lucid Dreaming to the combo.", PCT.JobID, 12)] PCT_AoE_AdvancedMode_LucidDreaming = 20067, [ReplaceSkill(PCT.FireInRed, PCT.FireIIinRed)] @@ -2681,7 +2685,6 @@ public enum CustomComboPreset [CustomComboInfo("One Button Paint", "Consolidates paint-consuming actions into one button.", PCT.JobID)] CombinedPaint = 20004, - // Last value for AoE = 20067 #endregion #region Variant diff --git a/XIVSlothCombo/Combos/PvE/PCT.cs b/XIVSlothCombo/Combos/PvE/PCT.cs index d16ae7a84..af9d707cd 100644 --- a/XIVSlothCombo/Combos/PvE/PCT.cs +++ b/XIVSlothCombo/Combos/PvE/PCT.cs @@ -25,6 +25,7 @@ public const uint AeroInGreen = 34651, WaterInBlue = 34652, FireIIinRed = 34656, + AeroIIinGreen = 34657, HammerMotif = 34668, WingedMuse = 34671, StrikingMuse = 34674, @@ -47,6 +48,7 @@ public const uint StarPrism = 34681, SteelMuse = 35348, SubtractivePalette = 34683, + StoneIIinYellow = 34660, ThunderIIinMagenta = 34661, ThunderinMagenta = 34655, WaterinBlue = 34652, @@ -77,6 +79,7 @@ public static class Config public static UserInt CombinedAetherhueChoices = new("CombinedAetherhueChoices"), PCT_ST_AdvancedMode_LucidOption = new("PCT_ST_AdvancedMode_LucidOption", 6500), + PCT_AoE_AdvancedMode_HolyinWhiteOption = new("PCT_AoE_AdvancedMode_HolyinWhiteOption", 0), PCT_AoE_AdvancedMode_LucidOption = new("PCT_AoE_AdvancedMode_LucidOption", 6500), PCT_VariantCure = new("PCT_VariantCure"); PCT_ST_CreatureStop = new("PCT_ST_CreatureStop"), @@ -1037,6 +1040,13 @@ protected override uint Invoke(uint actionID, uint lastComboActionID, float comb } } + if (IsEnabled(CustomComboPreset.PCT_AoE_AdvancedMode_HolyinWhite) && !HasEffect(Buffs.StarryMuse) && !HasEffect(Buffs.MonochromeTones)) + { + if (gauge.Paint > Config.PCT_AoE_AdvancedMode_HolyinWhiteOption || + (Config.PCT_AoE_AdvancedMode_HolyinWhiteOption == 5 && gauge.Paint == 5 && !HasEffect(Buffs.HammerTime) && + (HasEffect(Buffs.RainbowBright) || WasLastSpell(AeroIIinGreen) || WasLastSpell(StoneIIinYellow)))) + return OriginalHook(HolyInWhite); + } if (HasEffect(Buffs.RainbowBright) && !HasEffect(Buffs.StarryMuse)) return RainbowDrip; diff --git a/XIVSlothCombo/Window/Functions/UserConfig.cs b/XIVSlothCombo/Window/Functions/UserConfig.cs index 6bdef073e..1d25524fc 100644 --- a/XIVSlothCombo/Window/Functions/UserConfig.cs +++ b/XIVSlothCombo/Window/Functions/UserConfig.cs @@ -1702,6 +1702,12 @@ internal static void Draw(CustomComboPreset preset, bool enabled) { UserConfig.DrawSliderInt(0, 10000, PCT.Config.PCT_ST_AdvancedMode_LucidOption, "Add Lucid Dreaming when below this MP", sliderIncrement: SliderIncrements.Hundreds); } + + if (preset == CustomComboPreset.PCT_AoE_AdvancedMode_HolyinWhite) + { + UserConfig.DrawSliderInt(0, 5, PCT.Config.PCT_AoE_AdvancedMode_HolyinWhiteOption, "How many charges to keep ready? (0 = Use all)"); + } + if(preset == CustomComboPreset.PCT_AoE_AdvancedMode_LucidDreaming) { UserConfig.DrawSliderInt(0, 10000, PCT.Config.PCT_AoE_AdvancedMode_LucidOption, "Add Lucid Dreaming when below this MP", sliderIncrement: SliderIncrements.Hundreds);