From 0be4f848c579376fc00ee3b89f48cc9d882ee304 Mon Sep 17 00:00:00 2001 From: diwo Date: Sun, 2 Jul 2023 17:16:11 -0700 Subject: [PATCH] PLD: Split RoyalAuthority combo FoF behavior to a separate option --- XIVComboExpanded/Combos/PLD.cs | 2 +- XIVComboExpanded/CustomComboPreset.cs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/XIVComboExpanded/Combos/PLD.cs b/XIVComboExpanded/Combos/PLD.cs index 7c009e879..2749d4119 100644 --- a/XIVComboExpanded/Combos/PLD.cs +++ b/XIVComboExpanded/Combos/PLD.cs @@ -77,7 +77,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (actionID == PLD.RageOfHalone || actionID == PLD.RoyalAuthority) { // During FoF, prioritize the higher-potency Divine Might cast over Atonement and the normal combo chain - if (IsEnabled(CustomComboPreset.PaladinRoyalAuthorityDivineMightFeature)) + if (IsEnabled(CustomComboPreset.PaladinRoyalAuthorityFightOrFlightFeature)) { if (HasEffect(PLD.Buffs.FightOrFlight) && HasEffect(PLD.Buffs.DivineMight)) return PLD.HolySpirit; diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs index 78f93bcbe..aac55c50d 100644 --- a/XIVComboExpanded/CustomComboPreset.cs +++ b/XIVComboExpanded/CustomComboPreset.cs @@ -611,9 +611,15 @@ public enum CustomComboPreset [CustomComboInfo("Royal Authority Combo", "Replace Royal Authority with its combo chain.", PLD.JobID)] PaladinRoyalAuthorityCombo = 1902, - [CustomComboInfo("Royal Authority Divine Might Feature", "Replace Royal Authority with Holy Spirit when Divine Might is active.", PLD.JobID)] + [ParentCombo(PaladinRoyalAuthorityCombo)] + [CustomComboInfo("Royal Authority Divine Might Feature", "Replace Royal Authority with Holy Spirit when Divine Might would overcap.", PLD.JobID)] PaladinRoyalAuthorityDivineMightFeature = 1912, + [ParentCombo(PaladinRoyalAuthorityCombo)] + [CustomComboInfo("Royal Authority Fight or Flight Feature", "Replace Royal Authority with Holy Spirit during Fight or Flight when Divine Might is active.", PLD.JobID)] + PaladinRoyalAuthorityFightOrFlightFeature = 1915, + + [ParentCombo(PaladinRoyalAuthorityCombo)] [CustomComboInfo("Royal Authority Atonement Feature", "Replace Royal Authority with Atonement when under the effect of Sword Oath.", PLD.JobID)] PaladinRoyalAuthorityAtonementFeature = 1903,