Skip to content

Commit

Permalink
Merge pull request #225 from Kagekazu/MCH-BLM
Browse files Browse the repository at this point in the history
[BLM] + [MCH] Updates
Taurenkey authored Dec 23, 2024
2 parents 2b8c118 + 634f310 commit 3087dd4
Showing 4 changed files with 692 additions and 697 deletions.
8 changes: 7 additions & 1 deletion WrathCombo/Combos/CustomComboPreset.cs
Original file line number Diff line number Diff line change
@@ -2718,6 +2718,10 @@ public enum CustomComboPreset
[CustomComboInfo("Full Metal Field Option", "Adds Full Metal Field to the rotation.", MCH.JobID)]
MCH_AoE_Adv_Stabilizer_FullMetalField = 8308,

[ParentCombo(MCH_AoE_AdvancedMode)]
[CustomComboInfo("Air Anchor Option", "Adds Air Anchor to the the rotation.", MCH.JobID)]
MCH_AoE_Adv_AirAnchor = 8313,

[ParentCombo(MCH_AoE_AdvancedMode)]
[CustomComboInfo("Chain Saw Option", "Adds Chain Saw to the the rotation.", MCH.JobID)]
MCH_AoE_Adv_Chainsaw = 8309,
@@ -2812,7 +2816,9 @@ public enum CustomComboPreset
MCH.JobID)]
MCH_DismantleTactician = 8058,

// Last value = 8058
// Last value ST = 8116
// Last value AoE = 8313
// Last value Misc = 8058

#endregion

819 changes: 410 additions & 409 deletions WrathCombo/Combos/PvE/BLM/BLM.cs

Large diffs are not rendered by default.

530 changes: 266 additions & 264 deletions WrathCombo/Combos/PvE/MCH/MCH.cs

Large diffs are not rendered by default.

32 changes: 9 additions & 23 deletions WrathCombo/Combos/PvE/MCH/MCH_Config.cs
Original file line number Diff line number Diff line change
@@ -40,36 +40,22 @@ internal static void Draw(CustomComboPreset preset)

DrawSliderInt(0, 1, MCH_ST_ReassemblePool, "Number of Charges to Save for Manual Use");

DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(Excavator)}",
"", 5, 0);

DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(Chainsaw)}",
"", 5, 1);

DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(AirAnchor)}",
"", 5, 2);

DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(Drill)}", "",
5, 3);

DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(CleanShot)}",
"", 5, 4);
DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(Excavator)}", "", 5, 0);
DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(Chainsaw)}", "", 5, 1);
DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(AirAnchor)}", "", 5, 2);
DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(Drill)}", "", 5, 3);
DrawHorizontalMultiChoice(MCH_ST_Reassembled, $"Use on {ActionWatching.GetActionName(CleanShot)}", "", 5, 4);

break;

case CustomComboPreset.MCH_AoE_Adv_Reassemble:

DrawSliderInt(0, 1, MCH_AoE_ReassemblePool, "Number of Charges to Save for Manual Use");

DrawHorizontalMultiChoice(MCH_AoE_Reassembled,
$"Use on {ActionWatching.GetActionName(SpreadShot)}/{ActionWatching.GetActionName(Scattergun)}",
"", 4, 0);

DrawHorizontalMultiChoice(MCH_AoE_Reassembled, $"Use on {ActionWatching.GetActionName(Chainsaw)}",
"", 4, 2);

DrawHorizontalMultiChoice(MCH_AoE_Reassembled, $"Use on {ActionWatching.GetActionName(Excavator)}",
"", 4, 3);
DrawHorizontalMultiChoice(MCH_AoE_Reassembled, $"Use on {ActionWatching.GetActionName(SpreadShot)}/{ActionWatching.GetActionName(Scattergun)}", "", 4, 0);
DrawHorizontalMultiChoice(MCH_AoE_Reassembled, $"Use on {ActionWatching.GetActionName(AirAnchor)}", "", 4, 1);
DrawHorizontalMultiChoice(MCH_AoE_Reassembled, $"Use on {ActionWatching.GetActionName(Chainsaw)}", "", 4, 2);
DrawHorizontalMultiChoice(MCH_AoE_Reassembled, $"Use on {ActionWatching.GetActionName(Excavator)}", "", 4, 3);

break;

0 comments on commit 3087dd4

Please sign in to comment.