Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Doton fix final #54

Merged
merged 1 commit into from
Apr 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions BasicRotations/Melee/NIN_Beta.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ private bool ChoiceNinjutsu(out IAction? act)
//Aoe
if (KatonPvE.CanUse(out _))
{
if (!Player.HasStatus(true, StatusID.Doton) && !IsMoving
&& (!TenChiJinPvE.Cooldown.WillHaveOneCharge(6)) || !TenChiJinPvE.Cooldown.IsCoolingDown)
if (!Player.HasStatus(true, StatusID.Doton) && !IsMoving && !IsLastGCD(false, DotonPvE) && (!TenChiJinPvE.Cooldown.WillHaveOneCharge(6)) || !TenChiJinPvE.Cooldown.IsCoolingDown)
SetNinjutsu(DotonPvE);
else SetNinjutsu(KatonPvE);
return false;
Expand Down Expand Up @@ -229,7 +228,7 @@ private bool DoNinjutsu(out IAction? act)
{
if (RaitonPvE_18877.CanUse(out act, skipAoeCheck: true)) return true;
}
else if (chiId == DotonPvE_18880.ID && !IsLastAction(false, DotonPvE_18880))
else if (chiId == DotonPvE_18880.ID && !IsLastAction(false, DotonPvE_18880) && !Player.HasStatus(true, StatusID.Doton))
{
if (DotonPvE_18880.CanUse(out act, skipAoeCheck: true)) return true;
}
Expand Down