Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNK] Various #192

Merged
merged 6 commits into from
Dec 15, 2024
Merged

[MNK] Various #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cf390c
Add localization
Kagekazu Dec 13, 2024
f5993d9
cleanup conflictingcombo's MCH
Kagekazu Dec 13, 2024
4f958fd
add missing skill mnk ST
Kagekazu Dec 13, 2024
9e60344
add SAM conflict
Kagekazu Dec 13, 2024
331a2ff
better wording meikyo option
Kagekazu Dec 13, 2024
6507405
forgotten from cleanup
Kagekazu Dec 13, 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
83 changes: 48 additions & 35 deletions WrathCombo/Combos/CustomComboPreset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ public enum CustomComboPreset
[ReplaceSkill(BRD.HeavyShot, BRD.BurstShot)]
[ConflictingCombos(BRD_ST_AdvMode)]
[CustomComboInfo("Simple Mode - Single Target",
"Replaces Heavy shot with a full one-button single target rotation.\nThis is the ideal option for newcomers to the job.",
"Replaces Heavy Shot with a full one-button single target rotation.\nThis is the ideal option for newcomers to the job.",
BRD.JobID)]
BRD_ST_SimpleMode = 3036,

Expand Down Expand Up @@ -2557,7 +2557,6 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
MCH_ST_AdvancedMode = 8100,

[ParentCombo(MCH_ST_AdvancedMode)]
[ConflictingCombos(MCH_GaussRoundRicochet, MCH_Heatblast_GaussRound)]
[CustomComboInfo("Level 100 Opener Option", "Uses the Balance opener.", MCH.JobID)]
MCH_ST_Adv_Opener = 8101,

Expand All @@ -2572,7 +2571,6 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
MCH_ST_Adv_Reassemble = 8103,

[ParentCombo(MCH_ST_AdvancedMode)]
[ConflictingCombos(MCH_GaussRoundRicochet, MCH_Heatblast_GaussRound)]
[CustomComboInfo("Gauss Round / Ricochet \nDouble Check / Checkmate option",
"Adds Gauss Round and Ricochet or Double Check and Checkmate to the rotation. Will prevent overcapping.",
MCH.JobID)]
Expand All @@ -2591,10 +2589,12 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
"Adds Rook Autoturret or Automaton Queen to the rotation.", MCH.JobID)]
MCH_Adv_TurretQueen = 8107,

[ParentCombo(MCH_ST_AdvancedMode)] [CustomComboInfo("Wildfire Option", "Adds Wildfire to the rotation.", MCH.JobID)]
[ParentCombo(MCH_ST_AdvancedMode)]
[CustomComboInfo("Wildfire Option", "Adds Wildfire to the rotation.", MCH.JobID)]
MCH_ST_Adv_WildFire = 8108,

[ParentCombo(MCH_ST_AdvancedMode)] [CustomComboInfo("Drill Option", "Adds Drill to the rotation.", MCH.JobID)]
[ParentCombo(MCH_ST_AdvancedMode)]
[CustomComboInfo("Drill Option", "Adds Drill to the rotation.", MCH.JobID)]
MCH_ST_Adv_Drill = 8109,

[ParentCombo(MCH_ST_AdvancedMode)]
Expand Down Expand Up @@ -2643,7 +2643,6 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
MCH_AoE_Adv_Reassemble = 8301,

[ParentCombo(MCH_AoE_AdvancedMode)]
[ConflictingCombos(MCH_GaussRoundRicochet, MCH_Heatblast_GaussRound)]
[CustomComboInfo("Gauss Round / Ricochet \nDouble Check / Checkmate option",
"Adds Gauss Round and Ricochet or Double Check and Checkmate to the rotation.", MCH.JobID)]
MCH_AoE_Adv_GaussRicochet = 8302,
Expand Down Expand Up @@ -2717,8 +2716,6 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
MCH_Overdrive = 8002,

[ReplaceSkill(MCH.GaussRound, MCH.Ricochet, MCH.CheckMate, MCH.DoubleCheck)]
[ConflictingCombos(MCH_ST_Adv_Opener, MCH_ST_Adv_GaussRicochet, MCH_AoE_Adv_GaussRicochet,
MCH_Heatblast_GaussRound)]
[CustomComboInfo("Gauss Round / Ricochet \nDouble Check / Checkmate Feature",
"Replace Gauss Round and Ricochet or Double Check and Checkmate with one or the other depending on which has more charges.",
MCH.JobID)]
Expand All @@ -2744,7 +2741,6 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
MCH_Heatblast_Wildfire = 8015,

[ParentCombo(MCH_Heatblast)]
[ConflictingCombos(MCH_ST_Adv_Opener, MCH_ST_Adv_GaussRicochet, MCH_AoE_Adv_GaussRicochet, MCH_GaussRoundRicochet)]
[CustomComboInfo("Gauss Round / Ricochet \nDouble Check / Checkmate Option",
"Switches between Heat Blast and either Gauss Round and Ricochet or Double Check and Checkmate, depending on cooldown timers.",
MCH.JobID)]
Expand Down Expand Up @@ -2804,7 +2800,7 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
#region Monk Advanced ST

[AutoAction(false, false)]
[ReplaceSkill(MNK.Bootshine)]
[ReplaceSkill(MNK.Bootshine, MNK.LeapingOpo)]
[ConflictingCombos(MNK_ST_BeastChakras, MNK_ST_SimpleMode)]
[CustomComboInfo("Advanced Mode - Single Target",
"Replaces Bootshine with a full one-button single target rotation.\nThese features are ideal if you want to customize the rotation.",
Expand Down Expand Up @@ -4037,10 +4033,12 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
[CustomComboInfo("Plentiful Harvest Option", "Adds Plentiful Harvest to the rotation.", RPR.JobID)]
RPR_AoE_PlentifulHarvest = 12106,

[ParentCombo(RPR_AoE_CDs)] [CustomComboInfo("Grim Swathe Option", "Adds Grim Swathe to the rotation.", RPR.JobID)]
[ParentCombo(RPR_AoE_CDs)]
[CustomComboInfo("Grim Swathe Option", "Adds Grim Swathe to the rotation.", RPR.JobID)]
RPR_AoE_GrimSwathe = 12107,

[ParentCombo(RPR_AoE_CDs)] [CustomComboInfo("Gluttony Option", "Adds Gluttony to the rotation.", RPR.JobID)]
[ParentCombo(RPR_AoE_CDs)]
[CustomComboInfo("Gluttony Option", "Adds Gluttony to the rotation.", RPR.JobID)]
RPR_AoE_Gluttony = 12108,

#endregion
Expand Down Expand Up @@ -4133,13 +4131,7 @@ [Bozja] [CustomComboInfo("Lost Rampage Option", "Use Lost Rampage when available
"Adds Soulsow to the skills selected below when out of combat. \nWill also add Soulsow to Harpe when in combat and no target is selected.",
RPR.JobID)]
RPR_Soulsow = 12302,

[ReplaceSkill(RPR.Harpe)]
[ParentCombo(RPR_Soulsow)]
[CustomComboInfo("Harpe Harvest Moon Feature",
"Replaces Harpe with Harvest Moon when you are in combat with Soulsow active.", RPR.JobID)]
RPR_Soulsow_HarpeHarvestMoon = 12303,


[ReplaceSkill(RPR.Enshroud)]
[CustomComboInfo("Enshroud Protection Feature", "Turns Enshroud into Gibbet/Gallows to protect Soul Reaver waste.",
RPR.JobID)]
Expand Down Expand Up @@ -4288,14 +4280,25 @@ The three digets after RDM.JobID can be used to reorder items in the list
[ParentCombo(RDM_ST_DPS)]
[CustomComboInfo("Melee Finisher Option", "Add Verflare/Verholy and other finishing moves.", RDM.JobID)]
RDM_ST_MeleeFinisher = 13510,


#endregion

[ParentCombo(RDM_ST_DPS)]
[CustomComboInfo("Lucid Dreaming Option", "Weaves Lucid Dreaming when your MP drops below the specified value.",
RDM.JobID)]
RDM_ST_Lucid = 13610,

#endregion
[ParentCombo(RDM_ST_MeleeCombo)]
[CustomComboInfo("Melee combo overcap protection",
"Adds melee combo to the rotation when mana is at a certain threshold.", RDM.JobID)]
RDM_ST_Melee_Overcap_Protection = 13660,

[ParentCombo(RDM_ST_MeleeCombo)]
[CustomComboInfo("Melee Combo Fill Option",
"Adds the melee combo to the rotation." + "\nRiposte itself must be initiated manually when using this option.",
RDM.JobID)]
RDM_ST_Adv_MeleeFill = 13710,

#region AoE DPS

[AutoAction(true, false)]
Expand Down Expand Up @@ -4411,7 +4414,7 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
#endregion

//Last Used 13838

#endregion

#region SAGE
Expand Down Expand Up @@ -4795,10 +4798,12 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
SAM.JobID)]
SAM_AoE_AdvancedMode = 15103,

[ParentCombo(SAM_AoE_AdvancedMode)] [CustomComboInfo("Oka Combo", "Adds Oka combo to the rotation.", SAM.JobID)]
[ParentCombo(SAM_AoE_AdvancedMode)]
[CustomComboInfo("Oka Combo", "Adds Oka combo to the rotation.", SAM.JobID)]
SAM_AoE_Oka = 15104,

[ParentCombo(SAM_AoE_AdvancedMode)] [CustomComboInfo("Kyuten Option", "Adds Kyuten to the rotation.", SAM.JobID)]
[ParentCombo(SAM_AoE_AdvancedMode)]
[CustomComboInfo("Kyuten Option", "Adds Kyuten to the rotation.", SAM.JobID)]
SAM_AoE_Kyuten = 15105,

[ParentCombo(SAM_AoE_AdvancedMode)]
Expand All @@ -4818,14 +4823,16 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
"Adds Ogi Namikiri and Kaeshi: Namikiri when ready and when you're not moving to the rotation.", SAM.JobID)]
SAM_AoE_OgiNamikiri = 15109,

[ParentCombo(SAM_AoE_AdvancedMode)] [CustomComboInfo("Zanshin Option", "Adds Zanshin to the rotation.", SAM.JobID)]
[ParentCombo(SAM_AoE_AdvancedMode)]
[CustomComboInfo("Zanshin Option", "Adds Zanshin to the rotation.", SAM.JobID)]
SAM_AoE_Zanshin = 15110,

[ParentCombo(SAM_AoE_AdvancedMode)]
[CustomComboInfo("Shoha Option", "Adds Shoha when you have 3 meditation stacks.", SAM.JobID)]
SAM_AoE_Shoha = 15111,

[ParentCombo(SAM_AoE_AdvancedMode)] [CustomComboInfo("Guren Option", "Adds Guren to the rotation.", SAM.JobID)]
[ParentCombo(SAM_AoE_AdvancedMode)]
[CustomComboInfo("Guren Option", "Adds Guren to the rotation.", SAM.JobID)]
SAM_AoE_Guren = 15112,

[ParentCombo(SAM_AoE_AdvancedMode)]
Expand All @@ -4849,17 +4856,20 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
[CustomComboInfo("Yukikaze Combo", "Replace Yukikaze with its combo chain.", SAM.JobID)]
SAM_ST_YukikazeCombo = 15000,

[ReplaceSkill(SAM.Kasha)] [CustomComboInfo("Kasha Combo", "Replace Kasha with its combo chain.", SAM.JobID)]
[ReplaceSkill(SAM.Kasha)]
[CustomComboInfo("Kasha Combo", "Replace Kasha with its combo chain.", SAM.JobID)]
SAM_ST_KashaCombo = 15001,

[ReplaceSkill(SAM.Gekko)] [CustomComboInfo("Gekko Combo", "Replace Gekko with its combo chain.", SAM.JobID)]
[ReplaceSkill(SAM.Gekko)]
[CustomComboInfo("Gekko Combo", "Replace Gekko with its combo chain.", SAM.JobID)]
SAM_ST_GekkoCombo = 15010,

#endregion

#region AoE Oka Combo

[ReplaceSkill(SAM.Oka)] [CustomComboInfo("Oka Combo", "Replace Oka with its combo chain.", SAM.JobID)]
[ReplaceSkill(SAM.Oka)]
[CustomComboInfo("Oka Combo", "Replace Oka with its combo chain.", SAM.JobID)]
SAM_AoE_OkaCombo = 15100,

[ReplaceSkill(SAM.Mangetsu)]
Expand All @@ -4871,11 +4881,13 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
#region Meikyo Features

[ReplaceSkill(SAM.MeikyoShisui)]
[CustomComboInfo("Jinpu/Shifu Feature",
"Replace Meikyo Shisui with Jinpu, Shifu, and Yukikaze depending on what is needed.", SAM.JobID)]
SAM_JinpuShifu = 15200,
[ConflictingCombos(SAM_MeikyoShisuiProtection)]
[CustomComboInfo("Sens Feature",
"Replace Meikyo Shisui with Gekko, Kasha, and Yukikaze depending on what is needed.", SAM.JobID)]
SAM_MeikyoSens = 15200,

[ReplaceSkill(SAM.MeikyoShisui)]
[ConflictingCombos(SAM_MeikyoSens)]
[CustomComboInfo("Meikyo Shisui Protection",
"Replaces Meikyo Shisui with Savage Blade when u already have Meikyo Shisui active.", SAM.JobID)]
SAM_MeikyoShisuiProtection = 15214,
Expand All @@ -4884,7 +4896,8 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari

#region Iaijutsu Features

[ReplaceSkill(SAM.Iaijutsu)] [CustomComboInfo("Iaijutsu Features", "Collection of Iaijutsu Features.", SAM.JobID)]
[ReplaceSkill(SAM.Iaijutsu)]
[CustomComboInfo("Iaijutsu Features", "Collection of Iaijutsu Features.", SAM.JobID)]
SAM_Iaijutsu = 15201,

[ParentCombo(SAM_Iaijutsu)]
Expand Down Expand Up @@ -5745,7 +5758,7 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
WAR_AoE_Simple = 18001,

#endregion

#region Advanced ST

[AutoAction(false, false)]
Expand Down Expand Up @@ -6335,7 +6348,7 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari
// Last value = 51011

#endregion

#endregion

#region PvP Combos
Expand Down
Loading