From 78ee0a9db48bfa751107562bb84e556b300aee0f Mon Sep 17 00:00:00 2001 From: Genesis <12591123+Genesis-Nova@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:54:23 -0500 Subject: [PATCH] Added demi attacks requirement for "emergency" usage of demi attacks during burst phase, not sure why this wasn't here before. Lux Solaris is not dependent on demi being active, it is a skill used by consuming a buff so I removed it from the above mentioned section.. --- XIVSlothCombo/Combos/PvE/SMN.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/XIVSlothCombo/Combos/PvE/SMN.cs b/XIVSlothCombo/Combos/PvE/SMN.cs index 6668ffc70..a85dc0990 100644 --- a/XIVSlothCombo/Combos/PvE/SMN.cs +++ b/XIVSlothCombo/Combos/PvE/SMN.cs @@ -453,7 +453,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } // Emergency priority Demi Nuke to prevent waste if you can't get demi attacks out to satisfy the slider check. - if (OriginalHook(Ruin) is AstralImpulse or UmbralImpulse or FountainOfFire && GetCooldown(OriginalHook(Aethercharge)).CooldownElapsed >= 12.5) + if (OriginalHook(Ruin) is AstralImpulse or UmbralImpulse or FountainOfFire && + IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Attacks) && GetCooldown(OriginalHook(Aethercharge)).CooldownElapsed >= 12.5) { if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Attacks)) { @@ -475,10 +476,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsOffCooldown(Sunflare) && LevelChecked(Sunflare) && OriginalHook(Ruin) is UmbralImpulse) return OriginalHook(AstralFlow); - - if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_LuxSolaris)) - if (IsOffCooldown(LuxSolaris) && HasEffect(Buffs.RefulgentLux)) - return OriginalHook(LuxSolaris); } }