Merge pull request #270 from Karaha-Baruha/main

Handle scarlet delirium combo via IsLastGCD
FFXIV-CombatReborn · Oct 6, 2024 · d18bbfb · d18bbfb
2 parents c6abb68 + f8a464a
commit d18bbfb
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/BasicRotations/Tank/DRK_Default.cs b/BasicRotations/Tank/DRK_Default.cs
@@ -136,26 +136,27 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     #region GCD Logic
     protected override bool GeneralGCD(out IAction? act)
     {
-        if (DisesteemPvE.CanUse(out act)) return true;
-
-        if (QuietusPvE.CanUse(out act, skipComboCheck: true)) return true;
         if (ImpalementPvE.CanUse(out act, skipComboCheck: true)) return true;
+        if (QuietusPvE.CanUse(out act, skipComboCheck: true)) return true;
+
+        if (IsLastGCD(true, ComeuppancePvE) && TorcleaverPvE.CanUse(out act, skipComboCheck: true)) return true;
+        if (IsLastGCD(true, ScarletDeliriumPvE) && ComeuppancePvE.CanUse(out act, skipComboCheck: true)) return true;
         if (ScarletDeliriumPvE.CanUse(out act, skipComboCheck: true)) return true;
-        if (ComeuppancePvE.CanUse(out act, skipComboCheck: true)) return true;
-        if (TorcleaverPvE.CanUse(out act, skipComboCheck: true)) return true;
+
+        if (DisesteemPvE.CanUse(out act)) return true;
+
         if (BloodspillerPvE.CanUse(out act, skipComboCheck: true)) return true;
 
+
+
         //AOE
         if (StalwartSoulPvE.CanUse(out act)) return true;
         if (UnleashPvE.CanUse(out act)) return true;
 
         //Single Target
-        if (!Player.HasStatus(true, StatusID.Delirium_1972) && !Player.HasStatus(true, StatusID.Delirium_3836))
-        {
-            if (SouleaterPvE.CanUse(out act)) return true;
-            if (SyphonStrikePvE.CanUse(out act)) return true;
-            if (HardSlashPvE.CanUse(out act)) return true;
-        }
+        if (SouleaterPvE.CanUse(out act)) return true;
+        if (SyphonStrikePvE.CanUse(out act)) return true;
+        if (HardSlashPvE.CanUse(out act)) return true;
 
         if (UnmendPvE.CanUse(out act)) return true;