diff --git a/BasicRotations/Melee/MNK_Default.cs b/BasicRotations/Melee/MNK_Default.cs index f9801c8ec..0d1cbd758 100644 --- 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 index 399e8ae1f..4a0f0f0db 100644 --- 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 index 49aeffa3d..86389e4aa 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit 49aeffa3d7b1c68b1490d9cb5ae832b21d52d0f5 +Subproject commit 86389e4aa809f4e484dbd6cb875e76feba574dbf diff --git a/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs b/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs index e34f99cab..a6e46a944 100644 --- 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)