Merge pull request #488 from FFXIV-CombatReborn/chakra

Forbidden chakra fix and Doton Mudra fix
FFXIV-CombatReborn · Dec 23, 2024 · b5c95e8 · b5c95e8
2 parents af9185d + 714673f
commit b5c95e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;