more fixes

PunishXIV · Nov 18, 2024 · 1c004fe · 1c004fe
1 parent 3e20b59
commit 1c004fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/DRG/DRG.cs b/XIVSlothCombo/Combos/PvE/DRG/DRG.cs
@@ -1,9 +1,6 @@
-using Dalamud.Game.ClientState.JobGauge.Types;
 using XIVSlothCombo.Combos.PvE.Content;
 using XIVSlothCombo.CustomComboNS;
 using XIVSlothCombo.Extensions;
-using static XIVSlothCombo.Combos.JobHelpers.DRG;
-using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
 
 namespace XIVSlothCombo.Combos.PvE;
 
@@ -47,8 +44,6 @@ public const uint
         SpiralBlow = 36955,
         Starcross = 36956;
 
-    protected static DRGGauge? Gauge = GetJobGauge<DRGGauge>();
-
     public static class Buffs
     {
         public const ushort

diff --git a/XIVSlothCombo/Combos/PvE/DRG/DRG_Helper.cs b/XIVSlothCombo/Combos/PvE/DRG/DRG_Helper.cs
@@ -4,15 +4,13 @@
 using Dalamud.Game.ClientState.Statuses;
 using ECommons.DalamudServices;
 using XIVSlothCombo.Combos.JobHelpers.Enums;
-using XIVSlothCombo.Combos.PvE;
 using XIVSlothCombo.Combos.PvE.Content;
 using XIVSlothCombo.Data;
-using static XIVSlothCombo.Combos.PvE.DRG;
 using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
 
-namespace XIVSlothCombo.Combos.JobHelpers;
+namespace XIVSlothCombo.Combos.PvE;
 
-internal class DRG
+internal partial class DRG
 {
     // DRG Gauge & Extensions
     public static DRGGauge Gauge = GetJobGauge<DRGGauge>();

diff --git a/XIVSlothCombo/Combos/PvE/RPR/RPR_Helper.cs b/XIVSlothCombo/Combos/PvE/RPR/RPR_Helper.cs
@@ -2,21 +2,20 @@
 using ECommons.DalamudServices;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using XIVSlothCombo.Combos.JobHelpers.Enums;
-using XIVSlothCombo.Combos.PvE;
 using XIVSlothCombo.Data;
-using static XIVSlothCombo.Combos.PvE.RPR;
 using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
 
 namespace XIVSlothCombo.Combos.PvE;
 
 internal partial class RPR
 {
-    // RPR Gauge & Extensions
-    public static float GCD => GetCooldown(Slice).CooldownTotal;
-
     public static RPROpenerLogic RPROpener = new();
+
     public static RPRGauge Gauge = GetJobGauge<RPRGauge>();
 
+    // RPR Gauge & Extensions
+    public static float GCD => GetCooldown(Slice).CooldownTotal;
+
     public static bool trueNorthReady => TargetNeedsPositionals() && ActionReady(All.TrueNorth) &&
                                          !HasEffect(All.Buffs.TrueNorth);
 
@@ -221,15 +220,7 @@ public static unsafe bool IsComboExpiring(float Times)
 
             return ActionManager.Instance()->Combo.Timer != 0 && ActionManager.Instance()->Combo.Timer < GCD;
         }
-
-        public static bool IsBuffExpiring(float Times)
-        {
-            float GCD = GetCooldown(Slice).CooldownTotal * Times;
-
-            return (HasEffect(Buffs.EnhancedGallows) && GetBuffRemainingTime(Buffs.EnhancedGallows) < GCD) ||
-                   (HasEffect(Buffs.EnhancedGibbet) && GetBuffRemainingTime(Buffs.EnhancedGibbet) < GCD);
-        }
-
+
         public static bool IsDebuffExpiring(float Times)
         {
             float GCD = GetCooldown(Slice).CooldownTotal * Times;