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

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@Taurenkey
Taurenkey committed Nov 17, 2024
2 parents b553ef7 + 1c60b2b commit 459cb90
Show file tree
Hide file tree
Showing 5 changed files with 1,116 additions and 742 deletions.
2 changes: 1 addition & 1 deletion ECommons
Submodule ECommons updated 146 files
143 changes: 131 additions & 12 deletions XIVSlothCombo/Combos/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,128 @@ public enum CustomComboPreset
#endregion

#region BLACK MAGE

[ReplaceSkill(BLM.Fire)]
[CustomComboInfo("Simple Mode - Single Target", "Replaces Fire with a full one-button single target rotation.\nThis is the ideal option for newcomers to the job.", BLM.JobID, -10, "", "")]
BLM_ST_SimpleMode = 2012,
[ConflictingCombos(BLM_ST_AdvancedMode)]
[CustomComboInfo("Simple Mode - Single Target", "Replaces Fire with a full one-button single target rotation.\nThis is the ideal option for newcomers to the job.", BLM.JobID)]
BLM_ST_SimpleMode = 2001,


[ReplaceSkill(BLM.Blizzard2, BLM.HighBlizzard2)]
[CustomComboInfo("Simple Mode - AoE", "Replaces Blizzard II with a full one-button AoE rotation.\nThis is the ideal option for newcomers to the job.", BLM.JobID, -8, "", "")]
BLM_AoE_SimpleMode = 2008,
[ConflictingCombos(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Simple Mode - AoE", "Replaces Blizzard II with a full one-button AoE rotation.\nThis is the ideal option for newcomers to the job.", BLM.JobID)]
BLM_AoE_SimpleMode = 2002,

#region Single Target - Advanced

[ReplaceSkill(BLM.Fire)]
[ConflictingCombos(BLM_ST_SimpleMode)]
[CustomComboInfo("Advanced Mode - Single Target", "Replaces Fire with a full one-button single target rotation.\nThese features are ideal if you want to customize the rotation.", BLM.JobID)]
BLM_ST_AdvancedMode = 2100,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Level 100 Opener", "Adds the Balance opener to the rotation.", BLM.JobID)]
BLM_ST_Opener = 2101,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Amplifier", "Add Amplifier to the rotation.", BLM.JobID)]
BLM_ST_Amplifier = 2102,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Leylines", "Add Leylines to the rotation.", BLM.JobID)]
BLM_ST_LeyLines = 2103,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Foul / Xenoglossy", "Add Foul / Xenoglossy to the rotation.", BLM.JobID)]
BLM_ST_UsePolyglot = 2104,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Foul / Xenoglossy for movement", "Add Foul / Xenoglossy to the rotation as movement option.", BLM.JobID)]
BLM_ST_UsePolyglotMoving = 2105,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Swiftcast", "Add Swiftcast to the rotation.", BLM.JobID)]
BLM_ST_Swiftcast = 2106,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Triplecast", "Add Triplecast to the rotation.", BLM.JobID)]
BLM_ST_Triplecast = 2107,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Manafont", "Add Manafont to the rotation.", BLM.JobID)]
BLM_ST_Manafont = 2108,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Transpose", "Add Transpose to the rotation.", BLM.JobID)]
BLM_ST_Transpose = 2109,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Thunder", "Add Thunder to the rotation.", BLM.JobID)]
BLM_ST_Thunder = 2110,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Despair", "Add Despair to the rotation.", BLM.JobID)]
BLM_ST_Despair = 2111,

[ParentCombo(BLM_ST_AdvancedMode)]
[CustomComboInfo("Use Flarestar", "Add Flarestar to the rotation.", BLM.JobID)]
BLM_ST_Flarestar = 2112,

#endregion

#region AoE - Advanced

[ReplaceSkill(BLM.Fire)]
[ConflictingCombos(BLM_AoE_SimpleMode)]
[CustomComboInfo("Advanced Mode - AoE", "Replaces Blizzard II with a full one-button AoE rotation.\nThese features are ideal if you want to customize the rotation.", BLM.JobID)]
BLM_AoE_AdvancedMode = 2200,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Amplifier", "Add Amplifier to the rotation.", BLM.JobID)]
BLM_AoE_Amplifier = 2201,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Leylines", "Add Leylines to the rotation.", BLM.JobID)]
BLM_AoE_LeyLines = 2202,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Foul", "Add Foul to the rotation.", BLM.JobID)]
BLM_AoE_UsePolyglot = 2203,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Foul for movement", "Add Foul to the rotation as movement option.", BLM.JobID)]
BLM_AoE_UsePolyglotMoving = 2204,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Swiftcast", "Add Swiftcast to the rotation.", BLM.JobID)]
BLM_AoE_Swiftcast = 2205,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Triplecast", "Add Triplecast to the rotation.", BLM.JobID)]
BLM_AoE_Triplecast = 2206,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Manafont", "Add Manafont to the rotation.", BLM.JobID)]
BLM_AoE_Manafont = 2207,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Transpose", "Add Transpose to the rotation.", BLM.JobID)]
BLM_AoE_Transpose = 2208,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Thunder", "Add Thunder to the rotation.", BLM.JobID)]
BLM_AoE_Thunder = 2209,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Flare", "Add Flare to the rotation.", BLM.JobID)]
BLM_AoE_Flare = 2210,

[ParentCombo(BLM_AoE_AdvancedMode)]
[CustomComboInfo("Use Flarestar", "Add Flarestar to the rotation.", BLM.JobID)]
BLM_AoE_Flarestar = 2211,

#endregion

#region Variant

[Variant]
Expand All @@ -393,31 +506,37 @@ public enum CustomComboPreset
#region Miscellaneous
[ReplaceSkill(BLM.Transpose)]
[CustomComboInfo("Umbral Soul/Transpose Feature", "Replaces Transpose with Umbral Soul when Umbral Soul is available.", BLM.JobID)]
BLM_UmbralSoul = 2001,
BLM_UmbralSoul = 2050,

[ReplaceSkill(BLM.LeyLines)]
[CustomComboInfo("Between the Ley Lines Feature", "Replaces Ley Lines with Between the Lines when Ley Lines is active.", BLM.JobID)]
BLM_Between_The_LeyLines = 2002,
BLM_Between_The_LeyLines = 2051,

[ReplaceSkill(BLM.Blizzard, BLM.Freeze)]
[CustomComboInfo("Blizzard I/III Feature", "Replaces Blizzard I with Blizzard III when out of Umbral Ice." +
"\nReplaces Freeze with Blizzard II when synced below Lv.40.", BLM.JobID)]
BLM_Blizzard_1to3 = 2003,
BLM_Blizzard_1to3 = 2052,

[ReplaceSkill(BLM.Scathe)]
[CustomComboInfo("Xenoglossy Feature", "Replaces Scathe with Xenoglossy when available.", BLM.JobID)]
BLM_Scathe_Xeno = 2004,
BLM_Scathe_Xeno = 2053,

[ReplaceSkill(BLM.Fire)]
[CustomComboInfo("Fire I/III Feature", "Replaces Fire I with Fire III outside of Astral Fire or when Firestarter is up.", BLM.JobID)]
BLM_Fire_1to3 = 2005,
BLM_Fire_1to3 = 2054,

[ReplaceSkill(BLM.AetherialManipulation)]
[CustomComboInfo("Aetherial Manipulation Feature", "Replaces Aetherial Manipulation with Between the Lines when you are out of active Ley Lines and standing still.", BLM.JobID)]
BLM_Aetherial_Manipulation = 2046,
BLM_Aetherial_Manipulation = 2055,

[ReplaceSkill(BLM.Triplecast)]
[CustomComboInfo("Triplecast Protection", "Replaces Triplecast with Savage Blade when u already have triplecast active.", BLM.JobID)]
BLM_TriplecastProtection = 2056,

#endregion

// Last value = 2057
// Last value ST = 2112
//Last Value AoE = 2211

#endregion

Expand Down
Loading

0 comments on commit 459cb90

Please sign in to comment.