Merge pull request #233 from diwo/pld-holy-circle-downlevel

Fix Paladin Prominence combo stuck on Holy Circle when downleveled
MKhayle · Sep 4, 2023 · e43f6ad · e43f6ad
2 parents 2de975c + f00472e
commit e43f6ad
Showing 1 changed file with 13 additions and 9 deletions.
diff --git 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;