Merge pull request #40 from FFXIV-CombatReborn/GNB-Fix-Redux-2

Gnb fix redux 2
FFXIV-CombatReborn · Jul 5, 2024 · 4c1cbab · 4c1cbab
2 parents 213f99d + 25a52f2
commit 4c1cbab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
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.0.15" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.0.16" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">

diff --git a/BasicRotations/Tank/GNB_Default.cs b/BasicRotations/Tank/GNB_Default.cs
@@ -1,5 +1,3 @@
-using RotationSolver.Basic.Data;
-
 namespace DefaultRotations.Tank;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
@@ -98,9 +96,20 @@ 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 (LionHeartPvE.CanUse(out act, skipAoeCheck: true)) return true;
+
+        if (NobleBloodPvE.CanUse(out act, skipAoeCheck: true)) return true;
+
+        if (IsReadyToReign)
+        {
+            if (ReignOfBeastsPvE.CanUse(out act, skipAoeCheck: true)) return true;
+        }
+
         if (FatedCirclePvE.CanUse(out act)) return true;
-        if (CanUseReignOfBeastsComboChain(out act)) return true;
+
         if (CanUseGnashingFang(out act)) return true;
 
         if (DemonSlaughterPvE.CanUse(out act)) return true;
@@ -154,16 +163,6 @@ protected override bool GeneralGCD(out IAction? act)
     //    return false;
     //}
 
-    private bool CanUseReignOfBeastsComboChain(out IAction? act)
-    {
-        bool IsReadyToReign = (Player.HasStatus(true, StatusID.ReadyToReign));
-
-        if (LionHeartPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        if (NobleBloodPvE.CanUse(out act, skipAoeCheck: true)) return true;
-        if (ReignOfBeastsPvE.CanUse(out act, skipAoeCheck: true, skipStatusProvideCheck: IsReadyToReign)) return true;
-        return false;
-    }
-
     private bool CanUseGnashingFang(out IAction? act)
     {
         if (GnashingFangPvE.CanUse(out act))