cleanup ogcd buttons

Nik-Potokar · Jul 23, 2024 · 388ef43 · 388ef43
1 parent 500d2bf
commit 388ef43
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/VPR.cs b/XIVSlothCombo/Combos/PvE/VPR.cs
@@ -1022,14 +1022,14 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                 if (actionID is Dreadwinder)
                 {
-                    if (IsEnabled(CustomComboPreset.VPR_DreadwinderCoils_oGCDs) &&
-                        (WasLastWeaponskill(HuntersCoil) || WasLastWeaponskill(SwiftskinsCoil)))
+                    if (IsEnabled(CustomComboPreset.VPR_DreadwinderCoils_oGCDs))
                     {
                         if (HasEffect(Buffs.HuntersVenom))
                             return OriginalHook(Twinfang);
 
-                    if (HasEffect(Buffs.SwiftskinsVenom))
-                        return OriginalHook(Twinblood);
+                        if (HasEffect(Buffs.SwiftskinsVenom))
+                            return OriginalHook(Twinblood);
+                    }
 
                     if (positionalChoice is 0)
                     {
@@ -1065,14 +1065,14 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                 if (actionID is PitofDread)
                 {
-                    if (IsEnabled(CustomComboPreset.VPR_PitOfDreadDens_oGCDs) && 
-                        (WasLastWeaponskill(HuntersDen) || WasLastWeaponskill(SwiftskinsDen)))
+                    if (IsEnabled(CustomComboPreset.VPR_PitOfDreadDens_oGCDs))
                     {
                         if (HasEffect(Buffs.FellhuntersVenom))
                             return OriginalHook(Twinfang);
 
-                    if (HasEffect(Buffs.FellskinsVenom))
-                        return OriginalHook(Twinblood);
+                        if (HasEffect(Buffs.FellskinsVenom))
+                            return OriginalHook(Twinblood);
+                    }
 
                     if (SwiftskinsDenReady)
                         return HuntersDen;