Update RDM_Default.PvP.cs

FFXIV-CombatReborn · Apr 14, 2024 · 89f86a5 · 89f86a5
1 parent 9879efb
commit 89f86a5
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/BasicRotations/Magical/RDM_Default.PvP.cs b/BasicRotations/Magical/RDM_Default.PvP.cs
@@ -94,8 +94,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         #region PvP
         act = null;
         if (GuardCancel && Player.HasStatus(true, StatusID.Guard)) return false;
-        if (BlackShiftPvP.CanUse(out act)) return true;
-        if (WhiteShiftPvP.CanUse(out act)) return true;
+        //if (BlackShiftPvP.CanUse(out act)) return true;
+        //if (WhiteShiftPvP.CanUse(out act)) return true;
 
         #endregion
         return base.AttackAbility(nextGCD, out act);
@@ -109,14 +109,6 @@ protected override bool GeneralGCD(out IAction? act)
         if (GuardCancel && Player.HasStatus(true, StatusID.Guard)) return false;
         if (!Player.HasStatus(true, StatusID.Guard) && UseSprintPvP && !Player.HasStatus(true, StatusID.Sprint) && !InCombat && SprintPvP.CanUse(out act)) return true;
 
-        //White Magic
-        if (VerstonePvP.CanUse(out act)) return true;
-        if (VeraeroIiiPvP.CanUse(out act)) return true;
-
-        //Black Magic
-        if (VerfirePvP.CanUse(out act)) return true;
-        if (VerthunderIiiPvP.CanUse(out act)) return true;
-
         //White Magic
         if (EnchantedRipostePvP.CanUse(out act)) return true;
         if (EnchantedZwerchhauPvP.CanUse(out act)) return true;
@@ -131,6 +123,14 @@ protected override bool GeneralGCD(out IAction? act)
         if (VerflarePvP.CanUse(out act)) return true;
         if (ResolutionPvP_29696.CanUse(out act)) return true;
 
+        //White Magic
+        if (VerstonePvP.CanUse(out act)) return true;
+        if (VeraeroIiiPvP.CanUse(out act)) return true;
+
+        //Black Magic
+        if (VerfirePvP.CanUse(out act)) return true;
+        if (VerthunderIiiPvP.CanUse(out act)) return true;
+
         return base.GeneralGCD(out act);
     }
-}
+}