From 4d8a96990a0d0548bc2ec236f46b9ffeeb28a852 Mon Sep 17 00:00:00 2001 From: Tykku Date: Fri, 12 Apr 2024 14:07:50 -0400 Subject: [PATCH] Mch Wildfire further fix Fix for Wildfire to ALWAYS YEP SUPER DUPER ALWAYS cast hypercharge if you wildfire. (Thanks Richieer) --- BasicRotations/Ranged/MCH_Beta.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/BasicRotations/Ranged/MCH_Beta.cs b/BasicRotations/Ranged/MCH_Beta.cs index 3877eba..65b3b23 100644 --- a/BasicRotations/Ranged/MCH_Beta.cs +++ b/BasicRotations/Ranged/MCH_Beta.cs @@ -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; @@ -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; }