From f00472eb4145778bac36ad73d3b4d5c328d5d3ec Mon Sep 17 00:00:00 2001 From: diwo Date: Wed, 30 Aug 2023 19:05:25 -0700 Subject: [PATCH] Fix Paladin Prominence combo stuck on Holy Circle when downleveled --- XIVComboExpanded/Combos/PLD.cs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/XIVComboExpanded/Combos/PLD.cs b/XIVComboExpanded/Combos/PLD.cs index ceb920b95..651dd766a 100644 --- a/XIVComboExpanded/Combos/PLD.cs +++ b/XIVComboExpanded/Combos/PLD.cs @@ -111,8 +111,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim // During FoF, prioritize the higher-potency Divine Might cast over Atonement and the normal combo chain if (IsEnabled(CustomComboPreset.PaladinRoyalAuthorityFightOrFlightFeature)) { - if (HasEffect(PLD.Buffs.FightOrFlight) && HasEffect(PLD.Buffs.DivineMight) && HasMp(PLD.HolySpirit)) - return PLD.HolySpirit; + if (HasEffect(PLD.Buffs.FightOrFlight) && HasEffect(PLD.Buffs.DivineMight)) + if (level >= PLD.Levels.HolySpirit && HasMp(PLD.HolySpirit)) + return PLD.HolySpirit; } if (IsEnabled(CustomComboPreset.PaladinRoyalAuthorityAtonementFeature)) @@ -129,8 +130,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim { if (IsEnabled(CustomComboPreset.PaladinRoyalAuthorityDivineMightFeature)) { - if (level >= PLD.Levels.HolySpirit && HasEffect(PLD.Buffs.DivineMight) && HasMp(PLD.HolySpirit)) - return PLD.HolySpirit; + if (HasEffect(PLD.Buffs.DivineMight)) + if (level >= PLD.Levels.HolySpirit && HasMp(PLD.HolySpirit)) + return PLD.HolySpirit; } // Royal Authority @@ -157,11 +159,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim { if (actionID == PLD.Prominence) { - // During FoF, prioritize the higher-potency Divine Might cast over Atonement and the normal combo chain + // During FoF, prioritize the higher-potency Divine Might cast over the normal combo chain if (IsEnabled(CustomComboPreset.PaladinProminenceDivineMightFeature)) { - if (HasEffect(PLD.Buffs.FightOrFlight) && HasEffect(PLD.Buffs.DivineMight) && HasMp(PLD.HolyCircle)) - return PLD.HolyCircle; + if (HasEffect(PLD.Buffs.FightOrFlight) && HasEffect(PLD.Buffs.DivineMight)) + if (level >= PLD.Levels.HolyCircle && HasMp(PLD.HolyCircle)) + return PLD.HolyCircle; } if (comboTime > 0) @@ -170,8 +173,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim { if (IsEnabled(CustomComboPreset.PaladinProminenceDivineMightFeature)) { - if (level >= PLD.Levels.HolyCircle && HasEffect(PLD.Buffs.DivineMight) && HasMp(PLD.HolyCircle)) - return PLD.HolyCircle; + if (HasEffect(PLD.Buffs.DivineMight)) + if (level >= PLD.Levels.HolyCircle && HasMp(PLD.HolyCircle)) + return PLD.HolyCircle; } return PLD.Prominence;