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

Commit

Permalink
Merge pull request #1420 from Taurenkey/SMN
Browse files Browse the repository at this point in the history
Smn
  • Loading branch information
Taurenkey authored Jul 6, 2024
2 parents b789b80 + 85f857c commit 2f01488
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 51 deletions.
18 changes: 13 additions & 5 deletions XIVSlothCombo/Combos/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3345,7 +3345,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 @@ -3382,11 +3382,15 @@ New features should be added to the appropriate sections.

[ParentCombo(SMN_Advanced_Combo)]
[CustomComboInfo("Searing Light Combo Option", "Adds Searing Light to the single target and AoE combos.\nWill be used on cooldown.", SMN.JobID, 9, "", "")]
SMN_SearingLight = 17018,
SMN_SearingLight = 17017,

[ParentCombo(SMN_SearingLight)]
[CustomComboInfo("Searing Light Burst Option", "Casts Searing Light only during Demi phases.\nReflects Demi choice selected under 'Pooled oGCDs Option'.\nNot recommended for SpS Builds.", SMN.JobID, 0, "")]
SMN_SearingLight_Burst = 170181, // Genesis, why must you be like this -K
SMN_SearingLight_Burst = 17018,

[ParentCombo(SMN_SearingLight)]
[CustomComboInfo("Searing Flash Combo Option", "Adds Searing Flash to the single target and AoE combos.", SMN.JobID, 1, "", "")]
SMN_SearingFlash = 17019,

[ParentCombo(SMN_Advanced_Combo)]
[CustomComboInfo("Demi Summons Combo Option", "Adds Demi summons to the single target and AoE combos.", SMN.JobID, 10, "", "")]
Expand All @@ -3400,17 +3404,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
Loading

0 comments on commit 2f01488

Please sign in to comment.