Merge pull request #493 from FFXIV-CombatReborn/DRKfixes

Fixes to MNK chakra usage, fixes to DRK delirium combo
FFXIV-CombatReborn · Dec 27, 2024 · e12022c · e12022c
2 parents bd90ebe + 1127282
commit e12022c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/BasicRotations/Melee/MNK_Default.cs b/BasicRotations/Melee/MNK_Default.cs
@@ -165,6 +165,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             if (PerfectBalancePvE.CanUse(out act, usedUp: true)) return true;
         }
 
+        if (EnlightenmentPvE.CanUse(out act)) return true; // Enlightment
+        if (HowlingFistPvE.CanUse(out act)) return true; // Howling Fist
         if (TheForbiddenChakraPvE.CanUse(out act)) return true;
         if (SteelPeakPvE.CanUse(out act)) return true;
 
@@ -178,8 +180,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         // 'Use on cooldown, unless you know your killtime. You should aim to get as many casts of RoW as you can, and then shift those usages to align with burst as much as possible without losing a use.'
         if (!CombatElapsedLessGCD(3) && RiddleOfWindPvE.CanUse(out act)) return true; // Riddle Of Wind
 
-        if (EnlightenmentPvE.CanUse(out act, skipAoeCheck: HowlingSingle)) return true; // Enlightment
-        if (HowlingFistPvE.CanUse(out act, skipAoeCheck: HowlingSingle)) return true; // Howling Fist
+        if (HowlingSingle && EnlightenmentPvE.CanUse(out act, skipAoeCheck: true)) return true; // Enlightment
+        if (HowlingSingle && HowlingFistPvE.CanUse(out act, skipAoeCheck: true)) return true; // Howling Fist
 
         return base.AttackAbility(nextGCD, out act);
     }

diff --git a/BasicRotations/Tank/DRK_Default.cs b/BasicRotations/Tank/DRK_Default.cs
@@ -1,7 +1,7 @@
 namespace DefaultRotations.Tank;
 
-[Rotation("Default", CombatType.PvE, GameVersion = "7.05")]
-[SourceCode(Path = "main/BasicRotations/Tank/DRK_Balance.cs")]
+[Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
+[SourceCode(Path = "main/BasicRotations/Tank/DRK_Default.cs")]
 [Api(4)]
 public sealed class DRK_Default : DarkKnightRotation
 {
@@ -136,27 +136,24 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     #region GCD Logic
     protected override bool GeneralGCD(out IAction? act)
     {
+
+        //AOE
         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 (TorcleaverPvE.CanUse(out act)) 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 (SouleaterPvE.CanUse(out act)) return true;
-        if (SyphonStrikePvE.CanUse(out act)) return true;
-        if (HardSlashPvE.CanUse(out act)) return true;
+        if (DeliriumStacks == 0 && LowDeliriumStacks == 0 && SouleaterPvE.CanUse(out act)) return true;
+        if (DeliriumStacks == 0 && LowDeliriumStacks == 0 && SyphonStrikePvE.CanUse(out act)) return true;
+        if (DeliriumStacks == 0 && LowDeliriumStacks == 0 && HardSlashPvE.CanUse(out act)) return true;
 
         if (UnmendPvE.CanUse(out act)) return true;
 

diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs b/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs
@@ -333,17 +333,17 @@ static partial void ModifyShadowedVigilPvE(ref ActionSetting setting)
 
     static partial void ModifyScarletDeliriumPvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => !Player.WillStatusEnd(0, true, StatusID.Delirium_3836);
+
     }
 
     static partial void ModifyComeuppancePvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => !Player.WillStatusEnd(0, true, StatusID.Delirium_3836);
+
     }
 
     static partial void ModifyTorcleaverPvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => !Player.WillStatusEnd(0, true, StatusID.Delirium_3836);
+
     }
 
     static partial void ModifyImpalementPvE(ref ActionSetting setting)