Merge pull request #21 from FFXIV-CombatReborn/DT-RPR-Clean-up

DT RPR Cleanup
FFXIV-CombatReborn · Jul 3, 2024 · 4eff5bd · 4eff5bd
2 parents dfba724 + c46ebdc
commit 4eff5bd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/BasicRotations/Melee/RPR_Default.cs b/BasicRotations/Melee/RPR_Default.cs
@@ -53,9 +53,10 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             if (EnshroudPvE.CanUse(out act)) return true;
         }
 
+        if (SacrificiumPvE.CanUse(out act, skipAoeCheck: true, usedUp: true)) return true;
+
         if (HasEnshrouded && (Player.HasStatus(true, StatusID.ArcaneCircle) || LemureShroud < 3))
         {
-            if (SacrificiumPvE.CanUse(out act, skipAoeCheck: true)) return true;
             if (LemuresScythePvE.CanUse(out act, usedUp: true)) return true;
             if (LemuresSlicePvE.CanUse(out act, usedUp: true)) return true;
         }
@@ -80,11 +81,14 @@ protected override bool GeneralGCD(out IAction? act)
     {
         if (SoulsowPvE.CanUse(out act)) return true;
 
+        if (!HasExecutioner && !HasSoulReaver)
+        {
+            if (PerfectioPvE.CanUse(out act, skipAoeCheck: true)) return true;
+        }
+
         if (WhorlOfDeathPvE.CanUse(out act)) return true;
         if (ShadowOfDeathPvE.CanUse(out act)) return true;
 
-        if (PerfectioPvE.CanUse(out act)) return true;
-
         if (HasEnshrouded)
         {
             if (ShadowOfDeathPvE.CanUse(out act)) return true;
@@ -118,17 +122,30 @@ protected override bool GeneralGCD(out IAction? act)
                 }
             }
         }
+
+        if (HasExecutioner)
+        {
+            if (ExecutionersGuillotinePvE.CanUse(out act)) return true;
+            if (Player.HasStatus(true, StatusID.EnhancedGallows))
+            {
+                if (ExecutionersGallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
+            }
+            else
+            {
+                if (ExecutionersGibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
+            }
+        }
 
         if (HasSoulReaver)
         {
             if (GuillotinePvE.CanUse(out act)) return true;
-            if (Player.HasStatus(true, StatusID.EnhancedGibbet))
+            if (Player.HasStatus(true, StatusID.EnhancedGallows))
             {
-                if (GibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
+                if (GallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
             }
             else
             {
-                if (GallowsPvE.CanUse(out act, skipComboCheck: true)) return true;
+                if (GibbetPvE.CanUse(out act, skipComboCheck: true)) return true;
             }
         }
 

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.7" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.0.11" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">