Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Added Refulgent Lux combo option.
Browse files Browse the repository at this point in the history 
Adjusted logic on some things during demi burst phase, used wrong combo preset on Phoenix demi burst.
Adjusted Combo Preset and tooptip text to account for Lv100 Demi rotation.
  • Loading branch information
@Genesis-Nova
Genesis-Nova committed Jul 2, 2024
1 parent d08ab34 commit 43fe999
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 15 deletions.
10 changes: 7 additions & 3 deletions XIVSlothCombo/Combos/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3319,7 +3319,7 @@ New features should be added to the appropriate sections.
SMN_Advanced_Combo = 17000,

[ParentCombo(SMN_Advanced_Combo)]
[CustomComboInfo("Demi Attacks Combo Option", "Adds Deathflare, Ahk Morn and Revelation to the single target and AoE combos.", SMN.JobID, 11, "", "")]
[CustomComboInfo("Demi Attacks Combo Option", "Adds Demi Summon oGCDs to the single target and AoE combos.", SMN.JobID, 11, "", "")]
SMN_Advanced_Combo_DemiSummons_Attacks = 17002,

[ParentCombo(SMN_Advanced_Combo)]
Expand Down Expand Up @@ -3378,17 +3378,21 @@ New features should be added to the appropriate sections.
SMN_DemiAbilities = 17024,

[ParentCombo(SMN_Advanced_Combo_EDFester)]
[CustomComboInfo("Pooled oGCDs Option", "Pools damage oGCDs for use inside the selected Demi phase while under the Searing Light buff.", SMN.JobID, 1, "", "")]
[CustomComboInfo("Pooled oGCDs Option", "Pools damage oGCDs for use inside the selected Demi phase while under the Searing Light buff.\nBahamut Burst becomes Solar Bahamut Burst at Lv100.", SMN.JobID, 1, "", "")]
SMN_DemiEgiMenu_oGCDPooling = 17025,

[ConflictingCombos(ALL_Caster_Raise)]
[CustomComboInfo("Alternative Raise Feature", "Changes Swiftcast to Raise when on cooldown.", SMN.JobID, 8, "", "")]
SMN_Raise = 17027,

[ParentCombo(SMN_Advanced_Combo)]
[ParentCombo(SMN_Advanced_Combo_DemiSummons_Attacks)]
[CustomComboInfo("Rekindle Combo Option", "Adds Rekindle to the single target and AoE combos.", SMN.JobID, 13, "", "")]
SMN_Advanced_Combo_DemiSummons_Rekindle = 17028,

[ParentCombo(SMN_Advanced_Combo_DemiSummons_Attacks)]
[CustomComboInfo("Lux Solaris Combo Option", "Adds Lux Solaris to the single target and AoE combos.", SMN.JobID, 14, "", "")]
SMN_Advanced_Combo_DemiSummons_LuxSolaris = 17029,

[ReplaceSkill(SMN.Ruin4)]
[CustomComboInfo("Ruin III Mobility Feature", "Puts Ruin III on Ruin IV when you don't have Further Ruin.", SMN.JobID, 9, "", "")]
SMN_RuinMobility = 17030,
Expand Down
30 changes: 20 additions & 10 deletions XIVSlothCombo/Combos/PvE/SMN.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,25 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (IsOffCooldown(OriginalHook(EnkindleBahamut)) && LevelChecked(SummonBahamut))
return OriginalHook(EnkindleBahamut);

if (IsOffCooldown(Deathflare) && LevelChecked(Deathflare) && OriginalHook(Ruin) is AstralImpulse or UmbralImpulse)
if (IsOffCooldown(Deathflare) && LevelChecked(Deathflare) && OriginalHook(Ruin) is AstralImpulse)
return OriginalHook(AstralFlow);
}

// Demi Nuke 2: Electric Boogaloo
if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Rekindle))
{
if (IsOffCooldown(Rekindle) && OriginalHook(Ruin) is FountainOfFire)
if (IsOffCooldown(OriginalHook(EnkindlePhoenix)) && LevelChecked(SummonPhoenix))
return OriginalHook(EnkindlePhoenix);

if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Rekindle))
if (IsOffCooldown(Rekindle) && OriginalHook(Ruin) is FountainOfFire)
return OriginalHook(AstralFlow);

if (IsOffCooldown(OriginalHook(EnkindleSolarBahamut)) && LevelChecked(SummonSolarBahamut))
return OriginalHook(EnkindleSolarBahamut);

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);
}
}

Expand Down Expand Up @@ -516,12 +526,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}

// Demi Nuke 2: Electric Boogaloo
if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Rekindle) && IsPhoenixReady)
if (IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Attacks) && IsPhoenixReady)
{
if (IsOffCooldown(OriginalHook(EnkindlePhoenix)) && LevelChecked(SummonPhoenix))
if (IsOffCooldown(OriginalHook(EnkindlePhoenix)) && LevelChecked(SummonPhoenix) && OriginalHook(Ruin) is FountainOfFire)
return OriginalHook(EnkindlePhoenix);

if (IsOffCooldown(Rekindle) && OriginalHook(Ruin) is FountainOfFire)
if (IsOffCooldown(Rekindle) && IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_Rekindle) && OriginalHook(Ruin) is FountainOfFire)
return OriginalHook(AstralFlow);
}

Expand All @@ -534,7 +544,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (IsOffCooldown(Sunflare) && LevelChecked(Sunflare) && OriginalHook(Ruin) is UmbralImpulse)
return OriginalHook(AstralFlow);

if (IsOffCooldown(LuxSolaris) && HasEffect(Buffs.RefulgentLux))
if (IsOffCooldown(LuxSolaris) && IsEnabled(CustomComboPreset.SMN_Advanced_Combo_DemiSummons_LuxSolaris) && HasEffect(Buffs.RefulgentLux))
return OriginalHook(LuxSolaris);
}
}
Expand Down
4 changes: 2 additions & 2 deletions XIVSlothCombo/Window/Functions/UserConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2343,9 +2343,9 @@ internal static void Draw(CustomComboPreset preset, bool enabled)

if (preset == CustomComboPreset.SMN_DemiEgiMenu_oGCDPooling)
{
UserConfig.DrawHorizontalRadioButton(SMN.Config.SMN_BurstPhase, "Bahamut", "Bursts during Bahamut phase.", 1);
UserConfig.DrawHorizontalRadioButton(SMN.Config.SMN_BurstPhase, "Solar Bahamut/Bahamut", "Bursts during Bahamut phase.\nBahamut burst phase becomes Solar Bahamut at Lv100.", 1);
UserConfig.DrawHorizontalRadioButton(SMN.Config.SMN_BurstPhase, "Phoenix", "Bursts during Phoenix phase.", 2);
UserConfig.DrawHorizontalRadioButton(SMN.Config.SMN_BurstPhase, "Bahamut or Phoenix", "Bursts during Bahamut or Phoenix phase (whichever comes first).", 3);
UserConfig.DrawHorizontalRadioButton(SMN.Config.SMN_BurstPhase, "Any Demi Phase", "Bursts during any Demi Summon phase.", 3);
UserConfig.DrawHorizontalRadioButton(SMN.Config.SMN_BurstPhase, "Flexible (SpS) Option", "Bursts when Searing Light is ready, regardless of phase.", 4);
}

Expand Down

0 comments on commit 43fe999

Please sign in to comment.