Merge pull request #127 from FFXIV-CombatReborn/Theres-A-Snake-In-My-…

…Boot Nuget bump, ranged viper GCD fix, and GND fix attempt
FFXIV-CombatReborn · Jul 22, 2024 · b4289be · b4289be
2 parents 2abcbe2 + f31a89b
commit b4289be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/BasicRotations/Melee/VPR_Default.cs b/BasicRotations/Melee/VPR_Default.cs
@@ -245,6 +245,7 @@ protected override bool GeneralGCD(out IAction? act)
             if (UnCoilCoil.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true)) return true;
         }
 
+        if (WrithingSnapPvE.CanUse(out act)) return true;
 
         return base.GeneralGCD(out act);
     }

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
     <None Remove="Duty\PVPRotations\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.19" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.22" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">

diff --git a/BasicRotations/Tank/GNB_Default.cs b/BasicRotations/Tank/GNB_Default.cs
@@ -96,17 +96,11 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     #region GCD Logic
     protected override bool GeneralGCD(out IAction? act)
     {
-        bool IsReadyToReign = (Player.HasStatus(true, StatusID.ReadyToReign));
         bool areDDTargetsInRange = AllHostileTargets.Any(hostile => hostile.DistanceToPlayer() < 4.5f);
 
-        if (IsLastGCD(true, NobleBloodPvE) && LionHeartPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true)) return true;
-
-        if (IsLastGCD(true, ReignOfBeastsPvE) && NobleBloodPvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true)) return true;
-
-        if (IsReadyToReign)
-        {
-            if (ReignOfBeastsPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        }
+        if (LionHeartPvE.CanUse(out act)) return true;
+        if (NobleBloodPvE.CanUse(out act)) return true;
+        if (ReignOfBeastsPvE.CanUse(out act)) return true;
 
         if (FatedCirclePvE.CanUse(out act)) return true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -245,6 +245,7 @@ protected override bool GeneralGCD(out IAction? act) @@
                 if (UnCoilCoil.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true)) return true;
             }
+            if (WrithingSnapPvE.CanUse(out act)) return true;
             return base.GeneralGCD(out act);
         }
@@ Expand Down @@