some cleanup

Nik-Potokar · Nov 16, 2024 · 2332f40 · 2332f40
1 parent b53889d
commit 2332f40
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 61 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/MNK.cs b/XIVSlothCombo/Combos/JobHelpers/MNK.cs
@@ -12,15 +12,21 @@ namespace XIVSlothCombo.Combos.JobHelpers;
 internal class MNK
 {
     // MNK Gauge & Extensions
-    public static float GCD => GetCooldown(OriginalHook(Bootshine)).CooldownTotal;
+    public static float GCD = GetCooldown(OriginalHook(Bootshine)).CooldownTotal;
+    public static MNKOpenerLogic MNKOpener = new();
+    public static MNKGauge Gauge = GetJobGauge<MNKGauge>();
+
     public static bool bothNadisOpen => Gauge.Nadi.ToString() == "LUNAR, SOLAR";
+
     public static bool solarNadi => Gauge.Nadi == Nadi.SOLAR;
+
     public static bool lunarNadi => Gauge.Nadi == Nadi.LUNAR;
+
     public static int opoOpoChakra => Gauge.BeastChakra.Count(x => x == BeastChakra.OPOOPO);
+
     public static int raptorChakra => Gauge.BeastChakra.Count(x => x == BeastChakra.RAPTOR);
+
     public static int coeurlChakra => Gauge.BeastChakra.Count(x => x == BeastChakra.COEURL);
-    public static MNKOpenerLogic MNKOpener = new();
-    public static MNKGauge Gauge => GetJobGauge<MNKGauge>();
 
     internal class MNKHelper
     {

diff --git a/XIVSlothCombo/Combos/PvE/MNK.cs b/XIVSlothCombo/Combos/PvE/MNK.cs
@@ -8,64 +8,6 @@ namespace XIVSlothCombo.Combos.PvE;
 
 internal class MNK
 {
-    public const byte ClassID = 2;
-    public const byte JobID = 20;
-
-    public const uint
-        Bootshine = 53,
-        TrueStrike = 54,
-        SnapPunch = 56,
-        Meditation = 36940,
-        SteelPeak = 25761,
-        TwinSnakes = 61,
-        ArmOfTheDestroyer = 62,
-        Demolish = 66,
-        Mantra = 65,
-        DragonKick = 74,
-        Rockbreaker = 70,
-        Thunderclap = 25762,
-        HowlingFist = 25763,
-        FourPointFury = 16473,
-        PerfectBalance = 69,
-        FormShift = 4262,
-        TheForbiddenChakra = 3547,
-        MasterfulBlitz = 25764,
-        RiddleOfEarth = 7394,
-        EarthsReply = 36944,
-        RiddleOfFire = 7395,
-        Brotherhood = 7396,
-        RiddleOfWind = 25766,
-        EnlightenedMeditation = 36943,
-        Enlightenment = 16474,
-        SixSidedStar = 16476,
-        ShadowOfTheDestroyer = 25767,
-        RisingPhoenix = 25768,
-        WindsReply = 36949,
-        ForbiddenMeditation = 36942,
-        LeapingOpo = 36945,
-        RisingRaptor = 36946,
-        PouncingCoeurl = 36947,
-        TrueNorth = 7546,
-        ElixirBurst = 36948,
-        FiresReply = 36950;
-
-    public static class Buffs
-    {
-        public const ushort
-            TwinSnakes = 101,
-            OpoOpoForm = 107,
-            RaptorForm = 108,
-            CoeurlForm = 109,
-            PerfectBalance = 110,
-            RiddleOfFire = 1181,
-            RiddleOfWind = 2687,
-            FormlessFist = 2513,
-            TrueNorth = 1250,
-            WindsRumination = 3842,
-            FiresRumination = 3843,
-            Brotherhood = 1185;
-    }
-
     public static class Config
     {
         public static UserInt
@@ -661,6 +603,68 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
         }
     }
 
+    #region ID's
+
+    public const byte ClassID = 2;
+    public const byte JobID = 20;
+
+    public const uint
+        Bootshine = 53,
+        TrueStrike = 54,
+        SnapPunch = 56,
+        Meditation = 36940,
+        SteelPeak = 25761,
+        TwinSnakes = 61,
+        ArmOfTheDestroyer = 62,
+        Demolish = 66,
+        Mantra = 65,
+        DragonKick = 74,
+        Rockbreaker = 70,
+        Thunderclap = 25762,
+        HowlingFist = 25763,
+        FourPointFury = 16473,
+        PerfectBalance = 69,
+        FormShift = 4262,
+        TheForbiddenChakra = 3547,
+        MasterfulBlitz = 25764,
+        RiddleOfEarth = 7394,
+        EarthsReply = 36944,
+        RiddleOfFire = 7395,
+        Brotherhood = 7396,
+        RiddleOfWind = 25766,
+        EnlightenedMeditation = 36943,
+        Enlightenment = 16474,
+        SixSidedStar = 16476,
+        ShadowOfTheDestroyer = 25767,
+        RisingPhoenix = 25768,
+        WindsReply = 36949,
+        ForbiddenMeditation = 36942,
+        LeapingOpo = 36945,
+        RisingRaptor = 36946,
+        PouncingCoeurl = 36947,
+        TrueNorth = 7546,
+        ElixirBurst = 36948,
+        FiresReply = 36950;
+
+    public static class Buffs
+    {
+        public const ushort
+            TwinSnakes = 101,
+            OpoOpoForm = 107,
+            RaptorForm = 108,
+            CoeurlForm = 109,
+            PerfectBalance = 110,
+            RiddleOfFire = 1181,
+            RiddleOfWind = 2687,
+            FormlessFist = 2513,
+            TrueNorth = 1250,
+            WindsRumination = 3842,
+            FiresRumination = 3843,
+            Brotherhood = 1185;
+    }
+
+    #endregion
+
     #region Beast Chakras
 
     internal class MNK_BeastChakra_OpoOpo : CustomCombo