Reassemble to Chainsaw now adjusted and "removed" [PUSH]

Due to the adjustments on how Chainsaw is used now with DT, it didn't make sense to keep Reassemble to Chainsaw in its current iteration. It's been adjusted, and is now "removed" and is a child to another "removed" feature.
Grammernatzi · Aug 13, 2024 · a298935 · a298935
1 parent 9a688b7
commit a298935
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/XIVComboExpanded/Combos/MCH.cs b/XIVComboExpanded/Combos/MCH.cs
@@ -153,12 +153,8 @@ internal class MachinistReassembleFeature : CustomCombo
 
         protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
         {
-            var currentAction = !CanUseAction(OriginalHook(MCH.Chainsaw)) && IsEnabled(CustomComboPreset.MachinistReassembleOption) ? MCH.Drill : OriginalHook(MCH.Chainsaw);
 
-            if (IsEnabled(CustomComboPreset.MachinistChainsawFeature))
-            {
-                currentAction = MachinistChainsawFeature.ChooseChainsawAction(level, this.FilteredLastComboMove);
-            }
+            var currentAction = MachinistChainsawFeature.ChooseChainsawAction(level, this.FilteredLastComboMove);
 
             var cooldownElapsed = GetCooldown(currentAction).CooldownElapsed;
             // This delay makes sure you don't fatfinger Reassemble twice if you are using it after it gets charges and are smashing the button.

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -605,15 +605,6 @@ public enum CustomComboPreset
         [CustomComboInfo("Hypercharge to Wildfire", "Hypercharge becomes Wildfire if Wildfire is off-cooldown and you have a target.", MCH.JobID, MCH.Hypercharge)]
         MachinistHyperfireFeature = 3107,
 
-        [OrderedEnum]
-        [CustomComboInfo("Reassemble to Chainsaw", "Reassemble becomes Chainsaw while Reassemble is active.", MCH.JobID, MCH.Reassemble)]
-        MachinistReassembleFeature = 3111,
-
-        [OrderedEnum]
-        [ParentCombo(MachinistReassembleFeature)]
-        [CustomComboInfo("Reassemble to Chainsaw: Drill Sync", "Chainsaw on Reassemble becomes Drill while synced, for muscle memory purposes.", MCH.JobID, MCH.Reassemble)]
-        MachinistReassembleOption = 3112,
-
         [OrderedEnum]
         [CustomComboInfo("Drill to Bioblaster", "Drill becomes Bioblaster if Reassemble is not active and your last combo action was Spread Shot/Scattergun.", MCH.JobID, MCH.Drill)]
         MachinistBioDrillFeature = 3114,
@@ -631,9 +622,15 @@ public enum CustomComboPreset
 
         [OrderedEnum]
         [SecretCustomCombo]
-        [CustomComboInfo("Chainsaw Cycling Feature", "Replace Chainsaw with Air Anchor and then Drill, in a priority system. Does not replace any other actions, so you can easily watch their cooldowns.", MCH.JobID, MCH.Chainsaw)]
+        [CustomComboInfo("Chainsaw Cycling Feature", "Replace Chainsaw with Air Anchor and Drill, based on the priority of each cooldown. Does not replace any other actions, so you can easily watch their cooldowns.", MCH.JobID, MCH.Chainsaw)]
         MachinistChainsawFeature = 3113,
 
+        [OrderedEnum]
+        [SecretCustomCombo]
+        [ParentCombo(MachinistChainsawFeature)]
+        [CustomComboInfo("Reassemble to Chainsaw", "Reassemble becomes Chainsaw's cycling actions while Reassemble is active.", MCH.JobID, MCH.Reassemble)]
+        MachinistReassembleFeature = 3111,
+
         #endregion
         // ====================================================================================
         #region MONK