From 67ff92bd42ac7829dbced822e37c87e77f7a2263 Mon Sep 17 00:00:00 2001
From: Tykku <matpmolle@gmail.com>
Date: Thu, 4 Jul 2024 23:07:07 -0400
Subject: [PATCH 1/2] GNB Fix again

---
 BasicRotations/Tank/GNB_Default.cs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/BasicRotations/Tank/GNB_Default.cs b/BasicRotations/Tank/GNB_Default.cs
index 17bc165..9bb2b61 100644
--- 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 (CanUseReignOfBeasts(out act)) return true;
+
         if (CanUseGnashingFang(out act)) return true;
 
         if (DemonSlaughterPvE.CanUse(out act)) return true;
@@ -154,18 +163,6 @@ protected override bool GeneralGCD(out IAction? act)
     //    return false;
     //}
 
-    private bool CanUseReignOfBeasts(out IAction? act)
-    {
-        if (ReignOfBeastsPvE.CanUse(out act))
-        {
-            if (DemonSlicePvE.CanUse(out _)) return true;
-
-            if (Player.HasStatus(true, StatusID.ReadyToReign)) return true;
-
-        }
-        return false;
-    }
-
     private bool CanUseGnashingFang(out IAction? act)
     {
         if (GnashingFangPvE.CanUse(out act))

From 000d693e3318274a365963d4282512c136d6f841 Mon Sep 17 00:00:00 2001
From: Tykku <matpmolle@gmail.com>
Date: Thu, 4 Jul 2024 23:07:54 -0400
Subject: [PATCH 2/2] Update RebornRotations.csproj

---
 BasicRotations/RebornRotations.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
index d830e67..59447f9 100644
--- 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">