some cleanup

Nik-Potokar · Nov 16, 2024 · 5e85cce · 5e85cce
1 parent f91b105
commit 5e85cce
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 70 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/DRG.cs b/XIVSlothCombo/Combos/JobHelpers/DRG.cs
@@ -15,13 +15,15 @@ namespace XIVSlothCombo.Combos.JobHelpers;
 internal class DRG
 {
     // DRG Gauge & Extensions
-    public static DRGGauge Gauge => GetJobGauge<DRGGauge>();
+    public static DRGGauge Gauge = GetJobGauge<DRGGauge>();
     public static DRGOpenerLogic DRGOpener = new();
-    public static Status? ChaosDoTDebuff => FindTargetEffect(LevelChecked(ChaoticSpring)
+
+    public static Status? ChaosDoTDebuff = FindTargetEffect(LevelChecked(ChaoticSpring)
         ? Debuffs.ChaoticSpring
         : Debuffs.ChaosThrust);
-    public static bool trueNorthReady => TargetNeedsPositionals() && ActionReady(All.TrueNorth) &&
-                                         !HasEffect(All.Buffs.TrueNorth);
+
+    public static bool trueNorthReady = TargetNeedsPositionals() && ActionReady(All.TrueNorth) &&
+                                        !HasEffect(All.Buffs.TrueNorth);
 
     internal class DRGOpenerLogic
     {

diff --git a/XIVSlothCombo/Combos/PvE/DRG.cs b/XIVSlothCombo/Combos/PvE/DRG.cs
@@ -8,72 +8,6 @@ namespace XIVSlothCombo.Combos.PvE;
 
 internal class DRG
 {
-    public const byte ClassID = 4;
-    public const byte JobID = 22;
-
-    public const uint
-        PiercingTalon = 90,
-        ElusiveJump = 94,
-        LanceCharge = 85,
-        BattleLitany = 3557,
-        Jump = 92,
-        LifeSurge = 83,
-        HighJump = 16478,
-        MirageDive = 7399,
-        BloodOfTheDragon = 3553,
-        Stardiver = 16480,
-        CoerthanTorment = 16477,
-        DoomSpike = 86,
-        SonicThrust = 7397,
-        ChaosThrust = 88,
-        RaidenThrust = 16479,
-        TrueThrust = 75,
-        Disembowel = 87,
-        FangAndClaw = 3554,
-        WheelingThrust = 3556,
-        FullThrust = 84,
-        VorpalThrust = 78,
-        WyrmwindThrust = 25773,
-        DraconianFury = 25770,
-        ChaoticSpring = 25772,
-        DragonfireDive = 96,
-        Geirskogul = 3555,
-        Nastrond = 7400,
-        HeavensThrust = 25771,
-        Drakesbane = 36952,
-        RiseOfTheDragon = 36953,
-        LanceBarrage = 36954,
-        SpiralBlow = 36955,
-        Starcross = 36956;
-
-    public static class Buffs
-    {
-        public const ushort
-            LanceCharge = 1864,
-            BattleLitany = 786,
-            DiveReady = 1243,
-            RaidenThrustReady = 1863,
-            PowerSurge = 2720,
-            LifeSurge = 116,
-            DraconianFire = 1863,
-            NastrondReady = 3844,
-            StarcrossReady = 3846,
-            DragonsFlight = 3845;
-    }
-
-    public static class Debuffs
-    {
-        public const ushort
-            ChaosThrust = 118,
-            ChaoticSpring = 2719;
-    }
-
-    public static class Traits
-    {
-        public const uint
-            EnhancedLifeSurge = 438;
-    }
-
     public static class Config
     {
         public static UserInt
@@ -748,4 +682,74 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 : actionID;
         }
     }
+
+    #region ID's
+
+    public const byte ClassID = 4;
+    public const byte JobID = 22;
+
+    public const uint
+        PiercingTalon = 90,
+        ElusiveJump = 94,
+        LanceCharge = 85,
+        BattleLitany = 3557,
+        Jump = 92,
+        LifeSurge = 83,
+        HighJump = 16478,
+        MirageDive = 7399,
+        BloodOfTheDragon = 3553,
+        Stardiver = 16480,
+        CoerthanTorment = 16477,
+        DoomSpike = 86,
+        SonicThrust = 7397,
+        ChaosThrust = 88,
+        RaidenThrust = 16479,
+        TrueThrust = 75,
+        Disembowel = 87,
+        FangAndClaw = 3554,
+        WheelingThrust = 3556,
+        FullThrust = 84,
+        VorpalThrust = 78,
+        WyrmwindThrust = 25773,
+        DraconianFury = 25770,
+        ChaoticSpring = 25772,
+        DragonfireDive = 96,
+        Geirskogul = 3555,
+        Nastrond = 7400,
+        HeavensThrust = 25771,
+        Drakesbane = 36952,
+        RiseOfTheDragon = 36953,
+        LanceBarrage = 36954,
+        SpiralBlow = 36955,
+        Starcross = 36956;
+
+    public static class Buffs
+    {
+        public const ushort
+            LanceCharge = 1864,
+            BattleLitany = 786,
+            DiveReady = 1243,
+            RaidenThrustReady = 1863,
+            PowerSurge = 2720,
+            LifeSurge = 116,
+            DraconianFire = 1863,
+            NastrondReady = 3844,
+            StarcrossReady = 3846,
+            DragonsFlight = 3845;
+    }
+
+    public static class Debuffs
+    {
+        public const ushort
+            ChaosThrust = 118,
+            ChaoticSpring = 2719;
+    }
+
+    public static class Traits
+    {
+        public const uint
+            EnhancedLifeSurge = 438;
+    }
+
+    #endregion
 }