Merge pull request #817 from FFXIV-CombatReborn/goddamnsnakes

Adjustment to Viper Rework

Author: LTS-FFXIV

BasicRotations/Melee/VPR_Default.cs

@@ -300,7 +300,9 @@ protected override bool GeneralGCD(out IAction? act)
                 || !BurstUncoiledFuryHold)
                 && SerpentsIrePvE.Cooldown.JustUsedAfter(30)
                 && !HasReadyToReawaken
-                && NoAbilityReady)
+                && NoAbilityReady
+                && !WillSwiftEnd
+                && !WillHunterEnd)
             {
                 if (UncoiledFuryPvE.CanUse(out act, usedUp: true))
                 {
@@ -312,13 +314,13 @@ protected override bool GeneralGCD(out IAction? act)
         ////AOE Dread Combo
         if (PitActive)
         {
-            if (IsSwift && Player.WillStatusEndGCD(2, 0, true, StatusID.Swiftscaled))
+            if (WillSwiftEnd)
             {
                 if (SwiftskinsDenPvE.CanUse(out act, skipComboCheck: true, skipAoeCheck: true))
                     return true;
             }
 
-            if (IsHunter && Player.WillStatusEndGCD(2, 0, true, StatusID.HuntersInstinct))
+            if (WillHunterEnd)
             {
                 if (HuntersDenPvE.CanUse(out act, skipComboCheck: true, skipAoeCheck: true))
                     return true;

RotationSolver.Basic/Rotations/Basic/ViperRotation.cs

@@ -158,6 +158,8 @@ public override void DisplayStatus()
         ImGui.Text("UncoiledAbilityReady: " + UncoiledAbilityReady.ToString());
         ImGui.Spacing();
         ImGui.Text("HasHunterAndSwift: " + HasHunterAndSwift.ToString());
+        ImGui.Text("WillSwiftEnd: " + WillSwiftEnd.ToString());
+        ImGui.Text("WillHunterEnd: " + WillHunterEnd.ToString());
         ImGui.Text("IsSwift: " + IsSwift.ToString());
         ImGui.Text("SwiftTime: " + SwiftTime.ToString());
         ImGui.Text("IsHunter: " + IsHunter.ToString());
@@ -192,6 +194,16 @@ public override void DisplayStatus()
     /// </summary>
     public static bool HasHunterAndSwift => IsHunter && IsSwift;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool WillSwiftEnd => IsSwift && Player.WillStatusEndGCD(2, 0, true, StatusID.Swiftscaled);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool WillHunterEnd => IsHunter && Player.WillStatusEndGCD(2, 0, true, StatusID.HuntersInstinct);
+
     /// <summary>
     /// Indicates if the player has Swiftscaled.
     /// </summary>