From 714673fab58f4aec6add37a236a3c016803be8a1 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Mon, 23 Dec 2024 04:15:43 -0600 Subject: [PATCH] Forbidden chakra fix and Doton Mudra fix --- BasicRotations/Melee/MNK_Default.cs | 4 +--- BasicRotations/Melee/NIN_Default.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/BasicRotations/Melee/MNK_Default.cs b/BasicRotations/Melee/MNK_Default.cs index 06db5fe2c..58bfc8113 100644 --- a/BasicRotations/Melee/MNK_Default.cs +++ b/BasicRotations/Melee/MNK_Default.cs @@ -133,10 +133,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 (SteelPeakPvE.CanUse(out act)) return true; if (TheForbiddenChakraPvE.CanUse(out act)) return true; + if (SteelPeakPvE.CanUse(out act)) return true; // use bh when bh and rof are ready (opener) or ask bh to wait for rof's cd to be close and then use bh if (!CombatElapsedLessGCD(2) diff --git a/BasicRotations/Melee/NIN_Default.cs b/BasicRotations/Melee/NIN_Default.cs index 56ade5d14..6d0ea30e6 100644 --- a/BasicRotations/Melee/NIN_Default.cs +++ b/BasicRotations/Melee/NIN_Default.cs @@ -139,7 +139,7 @@ private bool ChoiceNinjutsu(out IAction? act) //Aoe if (KatonPvE.CanUse(out _) && ChiPvE.CanUse(out _) && TenPvE.CanUse(out _)) { - if (!Player.HasStatus(true, StatusID.Doton) && !IsMoving && !IsLastGCD(false, DotonPvE) && (!TenChiJinPvE.Cooldown.WillHaveOneCharge(6)) || !TenChiJinPvE.Cooldown.IsCoolingDown && TenPvE.CanUse(out _) && ChiPvE.CanUse(out _) && JinPvE.CanUse(out _)) + if (!Player.HasStatus(true, StatusID.Doton) && !IsMoving && !IsLastGCD(false, DotonPvE) && (!TenChiJinPvE.Cooldown.WillHaveOneCharge(6)) || !Player.HasStatus(true, StatusID.Doton) && !TenChiJinPvE.Cooldown.IsCoolingDown && TenPvE.CanUse(out _) && ChiPvE.CanUse(out _) && JinPvE.CanUse(out _)) SetNinjutsu(DotonPvE); else SetNinjutsu(KatonPvE); return false;