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

[GNB] fixes/adjustments #1778

Merged
merged 8 commits into from
Sep 14, 2024
+106 −105
Merged

[GNB] fixes/adjustments #1778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8d8a48
No Mercy HP% slider
Akechi-kun Aug 29, 2024
d085018
cleanup
Akechi-kun Aug 29, 2024
9baeb57
fixes
Akechi-kun Sep 1, 2024
987b9c9
big cleanup
Akechi-kun Sep 5, 2024
8e98543
.
Akechi-kun Sep 5, 2024
04026bb
Reign fixes
Akechi-kun Sep 5, 2024
3d06550
Revert ID changes
zbee Sep 6, 2024
2ac0555
Merge pull request #15 from zbee/gnb-ids
Akechi-kun Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 50 additions & 40 deletions XIVSlothCombo/Combos/CustomComboPreset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,108 +1481,118 @@ public enum CustomComboPreset
#region Advanced ST
[ConflictingCombos(GNB_ST_Simple)]
[ReplaceSkill(GNB.KeenEdge)]
[CustomComboInfo("Advanced Mode - Single Target", "Replace Keen Edge with its combo chain.\n Uses Burst Strike when you have 3 cartridges & your last combo action was Brutal Shell.", GNB.JobID)]
[CustomComboInfo("Advanced Mode - Single Target", "Replace Keen Edge with its combo chain.\nThis is the ideal selection for experienced users of the job.", GNB.JobID)]
GNB_ST_Advanced = 7003,

#region Lightning Shot
[ParentCombo(GNB_ST_Advanced)]
[CustomComboInfo("Lightning Shot Uptime Option", "Adds Lightning Shot to the main combo when you are out of range.", GNB.JobID)]
GNB_ST_RangedUptime = 7004,
#endregion

#region Gnashing Fang
[ParentCombo(GNB_ST_Advanced)]
[CustomComboInfo("Continuation Option", "Adds Continuation to the main combo.\n 'Gnashing Fang Starter' option must be enabled or started manually.", GNB.JobID)]
GNB_ST_Continuation = 7005,

[ParentCombo(GNB_ST_Continuation)]
[CustomComboInfo("Gnashing Fang Starter Option", "Begins Gnashing Fang for you on the main combo.", GNB.JobID)]
GNB_ST_GnashingStarter = 7006,
#endregion

#region Cooldowns
[ParentCombo(GNB_ST_Advanced)]
[CustomComboInfo("Cooldowns Option", "Adds various cooldowns to the main combo.", GNB.JobID)]
[CustomComboInfo("Cooldowns Option", "Adds various cooldowns into the rotation.", GNB.JobID)]
GNB_ST_Advanced_CooldownsGroup = 7007,

[ConflictingCombos(GNB_NM_Features)]
[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("No Mercy Option", "Adds No Mercy to the main combo when at full ammo.", GNB.JobID)]
[CustomComboInfo("No Mercy Option", "Adds No Mercy into the rotation when appropriate.", GNB.JobID)]
GNB_ST_NoMercy = 7008,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Danger/Blasting Zone Option", "Adds Danger/Blasting Zone to the main combo.", GNB.JobID)]
[CustomComboInfo("Sonic Break Option", "Adds Sonic Break into the rotation when appropriate.", GNB.JobID)]
GNB_ST_SonicBreak = 7012,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Danger/Blasting Zone Option", "Adds Danger/Blasting Zone into the rotation when available.", GNB.JobID)]
GNB_ST_BlastingZone = 7009,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Bow Shock Option", "Adds Bow Shock to the main combo.", GNB.JobID)]
[CustomComboInfo("Bow Shock Option", "Adds Bow Shock into the rotation when appropriate.", GNB.JobID)]
GNB_ST_BowShock = 7010,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Bloodfest Option", "Adds Bloodfest to the main combo when ammo is 0.", GNB.JobID)]
[CustomComboInfo("Bloodfest Option", "Adds Bloodfest into the rotation when appropriate.", GNB.JobID)]
GNB_ST_Bloodfest = 7011,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Sonic Break Option", "Adds Sonic Break to the main combo.", GNB.JobID)]
GNB_ST_SonicBreak = 7012,
[CustomComboInfo("Gnashing Fang Option", "Adds Gnashing Fang combo into the rotation.", GNB.JobID)]
GNB_ST_Gnashing = 7016,

[ParentCombo(GNB_ST_Gnashing)]
[CustomComboInfo("Continuation Option", "Adds Continuation & Hypervelocity into the rotation.\n'Gnashing Fang' option must be enabled or started manually.", GNB.JobID)]
GNB_ST_Continuation = 7005,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Double Down Option", "Adds Double Down to the main combo when under No Mercy buff.", GNB.JobID)]
GNB_ST_DoubleDown = 7013,
[CustomComboInfo("Double Down Option", "Adds Double Down into the rotation when appropriate.", GNB.JobID)]
GNB_ST_DoubleDown = 7017,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Reign combo Option", "Adds Reign/Noble/Lionheart to the main combo.", GNB.JobID)]
[CustomComboInfo("Reign Combo Option", "Adds Reign/Noble/Lionheart into the rotation when appropriate.", GNB.JobID)]
GNB_ST_Reign = 7014,

[ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
[CustomComboInfo("Burst Strike Option", "Adds Burst Strike and Hypervelocity (when available) to the main combo when under No Mercy and Gnashing Fang is over.", GNB.JobID)]
[CustomComboInfo("Burst Strike Option", "Adds Burst Strike into the rotation when appropriate.", GNB.JobID)]
GNB_ST_BurstStrike = 7015,

[ParentCombo(GNB_ST_Advanced)]
[CustomComboInfo("Ammo Overcap Option", "Adds Burst Strike into the rotation if you have max cartridges & your last combo action was Brutal Shell.", GNB.JobID)]
GNB_ST_Overcap = 7018,
#endregion

#region Lightning Shot
[ParentCombo(GNB_ST_Advanced)]
[CustomComboInfo("Lightning Shot Uptime Option", "Adds Lightning Shot to the main combo when you are out of range.", GNB.JobID)]
GNB_ST_RangedUptime = 7004,
#endregion

#endregion

#region Advanced AoE
[ConflictingCombos(GNB_AoE_Simple)]
[ReplaceSkill(GNB.DemonSlice)]
[CustomComboInfo("Advanced Mode - AoE", "Replace Demon Slice with its combo chain.", GNB.JobID)]
[CustomComboInfo("Advanced Mode - AoE", "Replace Demon Slice with its combo chain.\nThis is the ideal selection for experienced users of the job.", GNB.JobID)]
GNB_AoE_Advanced = 7200,

[ConflictingCombos(GNB_NM_Features)]
[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("No Mercy Option", "Adds No Mercy to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("No Mercy Option", "Adds No Mercy into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_NoMercy = 7201,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Danger/Blasting Zone Option", "Adds Danger/Blasting Zone to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Danger/Blasting Zone Option", "Adds Danger/Blasting Zone into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_DangerZone = 7202,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Bow Shock Option", "Adds Bow Shock onto the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Bow Shock Option", "Adds Bow Shock oninto the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_BowShock = 7203,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Bloodfest Option", "Adds Bloodfest to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Bloodfest Option", "Adds Bloodfest into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_Bloodfest = 7204,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Sonic Break Option", "Adds Sonic Break to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Sonic Break Option", "Adds Sonic Break into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_SonicBreak = 7205,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Double Down Option", "Adds Double Down to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Double Down Option", "Adds Double Down into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_DoubleDown = 7206,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Reign Combo Option", "Adds Reign/Noble/LionHeart to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Reign Combo Option", "Adds Reign/Noble/LionHeart into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_Reign = 7207,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Fated Circle Option", "Adds Fated Circle to the AoE combo when appropriate.", GNB.JobID)]
[CustomComboInfo("Fated Circle Option", "Adds Fated Circle into the AoE rotation when appropriate.", GNB.JobID)]
GNB_AoE_FatedCircle = 7208,

[ParentCombo(GNB_AoE_FatedCircle)]
[CustomComboInfo("Burst Strike Option", "Adds Burst Strike into the AoE rotation if you do not have Fated Circle unlocked yet.", GNB.JobID)]
GNB_AoE_noFatedCircle = 7212,

[ParentCombo(GNB_AoE_Advanced)]
[CustomComboInfo("Ammo Overcap Option", "Adds Fated Circle to the AoE combo when about to overcap.", GNB.JobID)]
[CustomComboInfo("Ammo Overcap Option", "Adds Fated Circle into the AoE rotation if you have max cartridges & your last combo action was Demon Slice.", GNB.JobID)]
GNB_AoE_Overcap = 7209,

[ParentCombo(GNB_AoE_Overcap)]
[CustomComboInfo("Ammo Overcap Burst Strike Option", "Adds Burst Strike into the AoE rotation if you have max cartridges, your last combo action was Demon Slice, & you do not have Fated Circle unlocked yet.", GNB.JobID)]
GNB_AoE_BSOvercap = 7211,
#endregion

#region Gnashing Fang
Expand All @@ -1594,7 +1604,7 @@ public enum CustomComboPreset
[CustomComboInfo("Continuation Option", "Adds Continuation to Gnashing Fang when available.", GNB.JobID)]
GNB_GF_Continuation = 7301,

[ConflictingCombos(GNB_ST_NoMercy)]
[ConflictingCombos(GNB_NM_Features)]
[ParentCombo(GNB_GF_Features)]
[CustomComboInfo("No Mercy Option", "Adds No Mercy to Gnashing Fang when available.", GNB.JobID)]
GNB_GF_NoMercy = 7302,
Expand Down Expand Up @@ -1652,7 +1662,7 @@ public enum CustomComboPreset
#endregion

#region No Mercy
[ConflictingCombos(GNB_ST_Simple, GNB_AoE_Simple, GNB_ST_NoMercy, GNB_AoE_NoMercy, GNB_GF_NoMercy)]
[ConflictingCombos(GNB_ST_Simple, GNB_AoE_Simple, GNB_GF_Features)]
[ReplaceSkill(GNB.NoMercy)]
[CustomComboInfo("No Mercy Features", "Collection of No Mercy related features.", GNB.JobID)]
GNB_NM_Features = 7500,
Expand Down
Loading