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

warrior low level fixes #273

Merged
merged 1 commit into from
Oct 18, 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
13 changes: 4 additions & 9 deletions BasicRotations/Tank/WAR_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)

if (CombatElapsedLessGCD(1)) return false;

if (Player.HasStatus(false, StatusID.SurgingTempest)
&& !Player.WillStatusEndGCD(2, 0, true, StatusID.SurgingTempest)
|| !MythrilTempestPvE.EnoughLevel)
if (!Player.WillStatusEndGCD(2, 0, true, StatusID.SurgingTempest)
|| !StormsEyePvE.EnoughLevel)
{
if (BerserkPvE.CanUse(out act)) return true;
}
Expand Down Expand Up @@ -159,19 +158,15 @@ protected override bool GeneralGCD(out IAction? act)
if (PrimalRuinationPvE.CanUse(out act)) return true;
}

if (!Player.WillStatusEndGCD(3, 0, true, StatusID.SurgingTempest) && !Player.HasStatus(true, StatusID.NascentChaos) && Player.Level <= 60)
{
if (SteelCyclonePvE.CanUse(out act)) return true;
if (InnerBeastPvE.CanUse(out act)) return true;
}

// AOE
if (!Player.WillStatusEndGCD(3, 0, true, StatusID.SurgingTempest) && DecimatePvE.CanUse(out act, skipStatusProvideCheck: true)) return true;
if (!SteelCycloneMasteryTrait.IsEnabled && !Player.WillStatusEndGCD(3, 0, true, StatusID.SurgingTempest) && SteelCyclonePvE.CanUse(out act)) return true;
if (MythrilTempestPvE.CanUse(out act)) return true;
if (OverpowerPvE.CanUse(out act)) return true;

// Single Target
if (!Player.WillStatusEndGCD(3, 0, true, StatusID.SurgingTempest) && FellCleavePvE.CanUse(out act, skipStatusProvideCheck: true)) return true;
if (!InnerBeastMasteryTrait.IsEnabled && (!StormsEyePvE.EnoughLevel || !Player.WillStatusEndGCD(3, 0, true, StatusID.SurgingTempest)) && InnerBeastPvE.CanUse(out act)) return true;
if (StormsEyePvE.CanUse(out act)) return true;
if (StormsPathPvE.CanUse(out act)) return true;
if (MaimPvE.CanUse(out act)) return true;
Expand Down