some cleanup

Nik-Potokar · Nov 16, 2024 · d146cb6 · d146cb6
1 parent e7baddc
commit d146cb6
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 78 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/MCH.cs b/XIVSlothCombo/Combos/JobHelpers/MCH.cs
@@ -13,23 +13,24 @@ namespace XIVSlothCombo.Combos.JobHelpers;
 internal class MCH
 {
     // MCH Gauge & Extensions
-    public static float GCD => GetCooldown(OriginalHook(SplitShot)).CooldownTotal;
-    public static float heatblastRC => GetCooldown(Heatblast).CooldownTotal;
-    public static bool drillCD => !LevelChecked(Drill) || (!TraitLevelChecked(Traits.EnhancedMultiWeapon) &&
-                                                           GetCooldownRemainingTime(Drill) > heatblastRC * 6) ||
-                                  (TraitLevelChecked(Traits.EnhancedMultiWeapon) &&
-                                   GetRemainingCharges(Drill) < GetMaxCharges(Drill) &&
-                                   GetCooldownRemainingTime(Drill) > heatblastRC * 6);
-    public static bool anchorCD => !LevelChecked(AirAnchor) ||
-                                   (LevelChecked(AirAnchor) && GetCooldownRemainingTime(AirAnchor) > heatblastRC * 6);
-    public static bool sawCD => !LevelChecked(Chainsaw) ||
-                                (LevelChecked(Chainsaw) && GetCooldownRemainingTime(Chainsaw) > heatblastRC * 6);
-    public static bool interruptReady => ActionReady(All.HeadGraze) && CanInterruptEnemy() &&
-                                         CanDelayedWeave(ActionWatching.LastWeaponskill);
-    public static MCHGauge Gauge => GetJobGauge<MCHGauge>();
-    public static int BSUsed => ActionWatching.CombatActions.Count(x => x == BarrelStabilizer);
     public static MCHOpenerLogic MCHOpener = new();
 
+    public static float GCD = GetCooldown(OriginalHook(SplitShot)).CooldownTotal;
+    public static float heatblastRC = GetCooldown(Heatblast).CooldownTotal;
+    public static bool drillCD = !LevelChecked(Drill) || (!TraitLevelChecked(Traits.EnhancedMultiWeapon) &&
+                                                          GetCooldownRemainingTime(Drill) > heatblastRC * 6) ||
+                                 (TraitLevelChecked(Traits.EnhancedMultiWeapon) &&
+                                  GetRemainingCharges(Drill) < GetMaxCharges(Drill) &&
+                                  GetCooldownRemainingTime(Drill) > heatblastRC * 6);
+    public static bool anchorCD = !LevelChecked(AirAnchor) ||
+                                  (LevelChecked(AirAnchor) && GetCooldownRemainingTime(AirAnchor) > heatblastRC * 6);
+    public static bool sawCD = !LevelChecked(Chainsaw) ||
+                               (LevelChecked(Chainsaw) && GetCooldownRemainingTime(Chainsaw) > heatblastRC * 6);
+    public static bool interruptReady = ActionReady(All.HeadGraze) && CanInterruptEnemy() &&
+                                        CanDelayedWeave(ActionWatching.LastWeaponskill);
+    public static MCHGauge Gauge = GetJobGauge<MCHGauge>();
+    public static int BSUsed => ActionWatching.CombatActions.Count(x => x == BarrelStabilizer);
+
     internal class MCHOpenerLogic
     {
         private OpenerState currentState = OpenerState.PrePull;

diff --git a/XIVSlothCombo/Combos/PvE/MCH.cs b/XIVSlothCombo/Combos/PvE/MCH.cs
@@ -11,69 +11,6 @@ namespace XIVSlothCombo.Combos.PvE;
 
 internal class MCH
 {
-    public const byte JobID = 31;
-
-    public const uint
-        CleanShot = 2873,
-        HeatedCleanShot = 7413,
-        SplitShot = 2866,
-        HeatedSplitShot = 7411,
-        SlugShot = 2868,
-        HeatedSlugShot = 7412,
-        GaussRound = 2874,
-        Ricochet = 2890,
-        Reassemble = 2876,
-        Drill = 16498,
-        HotShot = 2872,
-        AirAnchor = 16500,
-        Hypercharge = 17209,
-        Heatblast = 7410,
-        SpreadShot = 2870,
-        Scattergun = 25786,
-        AutoCrossbow = 16497,
-        RookAutoturret = 2864,
-        RookOverdrive = 7415,
-        AutomatonQueen = 16501,
-        QueenOverdrive = 16502,
-        Tactician = 16889,
-        Chainsaw = 25788,
-        BioBlaster = 16499,
-        BarrelStabilizer = 7414,
-        Wildfire = 2878,
-        Dismantle = 2887,
-        Flamethrower = 7418,
-        BlazingShot = 36978,
-        DoubleCheck = 36979,
-        CheckMate = 36980,
-        Excavator = 36981,
-        FullMetalField = 36982;
-
-    public static class Buffs
-    {
-        public const ushort
-            Reassembled = 851,
-            Tactician = 1951,
-            Wildfire = 1946,
-            Overheated = 2688,
-            Flamethrower = 1205,
-            Hypercharged = 3864,
-            ExcavatorReady = 3865,
-            FullMetalMachinist = 3866;
-    }
-
-    public static class Debuffs
-    {
-        public const ushort
-            Dismantled = 2887,
-            Bioblaster = 1866;
-    }
-
-    public static class Traits
-    {
-        public const ushort
-            EnhancedMultiWeapon = 605;
-    }
-
     public static class Config
     {
         public static UserInt
@@ -951,4 +888,71 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             return actionID;
         }
     }
+
+    #region ID's
+
+    public const byte JobID = 31;
+
+    public const uint
+        CleanShot = 2873,
+        HeatedCleanShot = 7413,
+        SplitShot = 2866,
+        HeatedSplitShot = 7411,
+        SlugShot = 2868,
+        HeatedSlugShot = 7412,
+        GaussRound = 2874,
+        Ricochet = 2890,
+        Reassemble = 2876,
+        Drill = 16498,
+        HotShot = 2872,
+        AirAnchor = 16500,
+        Hypercharge = 17209,
+        Heatblast = 7410,
+        SpreadShot = 2870,
+        Scattergun = 25786,
+        AutoCrossbow = 16497,
+        RookAutoturret = 2864,
+        RookOverdrive = 7415,
+        AutomatonQueen = 16501,
+        QueenOverdrive = 16502,
+        Tactician = 16889,
+        Chainsaw = 25788,
+        BioBlaster = 16499,
+        BarrelStabilizer = 7414,
+        Wildfire = 2878,
+        Dismantle = 2887,
+        Flamethrower = 7418,
+        BlazingShot = 36978,
+        DoubleCheck = 36979,
+        CheckMate = 36980,
+        Excavator = 36981,
+        FullMetalField = 36982;
+
+    public static class Buffs
+    {
+        public const ushort
+            Reassembled = 851,
+            Tactician = 1951,
+            Wildfire = 1946,
+            Overheated = 2688,
+            Flamethrower = 1205,
+            Hypercharged = 3864,
+            ExcavatorReady = 3865,
+            FullMetalMachinist = 3866;
+    }
+
+    public static class Debuffs
+    {
+        public const ushort
+            Dismantled = 2887,
+            Bioblaster = 1866;
+    }
+
+    public static class Traits
+    {
+        public const ushort
+            EnhancedMultiWeapon = 605;
+    }
+
+    #endregion
 }