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

WILDFIRE FIX AGAIN?! #36

Merged
merged 1 commit into from
Apr 12, 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
14 changes: 9 additions & 5 deletions BasicRotations/Ranged/MCH_Beta.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
// Logic for using attack abilities outside of GCD, focusing on burst windows and cooldown management.
protected override bool AttackAbility(out IAction? act)
{
if (Player.HasStatus(true, StatusID.Wildfire_1946))
{
return HyperchargePvE.CanUse(out act, skipClippingCheck: true);
}

if (IsBurst)
{
if (UseBurstMedicine(out act)) return true;
Expand Down Expand Up @@ -133,12 +138,11 @@ protected override bool GeneralGCD(out IAction? act)
// These methods simplify the main logic by encapsulating specific checks related to abilities' cooldowns and prerequisites.
private bool CanUseRookAutoturretPvE(out IAction? act)
{
act = null;

//
if ((AirAnchorPvE.EnoughLevel && (!AirAnchorPvE.Cooldown.IsCoolingDown || AirAnchorPvE.Cooldown.ElapsedAfter(18))) ||
(!AirAnchorPvE.EnoughLevel && (!HotShotPvE.Cooldown.IsCoolingDown || HotShotPvE.Cooldown.ElapsedAfter(18))))

if (!AirAnchorPvE.Cooldown.IsCoolingDown || AirAnchorPvE.Cooldown.ElapsedAfter(18) ||
(!AirAnchorPvE.EnoughLevel && !HotShotPvE.Cooldown.IsCoolingDown || HotShotPvE.Cooldown.ElapsedAfter(18)))
{
act = null;
return false;
}

Expand Down