From 35df15b71b7f2f36ed6da7e3c56cedde9c1febca Mon Sep 17 00:00:00 2001 From: Toshi Date: Sun, 7 Apr 2024 18:39:33 -0400 Subject: [PATCH] MCH Beta Chainsaw Fix Fixes Chainsaw on MCH and adds prepull reassemble for first Air Anchor. Further opener optimizations to come --- BasicRotations/Ranged/MCH_Beta.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/BasicRotations/Ranged/MCH_Beta.cs b/BasicRotations/Ranged/MCH_Beta.cs index f73acda..d605d97 100644 --- a/BasicRotations/Ranged/MCH_Beta.cs +++ b/BasicRotations/Ranged/MCH_Beta.cs @@ -10,7 +10,14 @@ public sealed class MCH_Beta : MachinistRotation // Defines logic for actions to take during the countdown before combat starts. protected override IAction? CountDownAction(float remainTime) { - if (remainTime < 2 && UseBurstMedicine(out var act)) return act; + if (remainTime < 2) + { + if (UseBurstMedicine(out var act)) return act; + } + if (remainTime < 5) + { + if (ReassemblePvE.CanUse(out var act)) return act; + } return base.CountDownAction(remainTime); } #endregion @@ -72,9 +79,9 @@ protected override bool AttackAbility(out IAction? act) } } - if (!WildfirePvE.Cooldown.WillHaveOneCharge(30) || (Heat == 100)) + if (!CombatElapsedLess(12) && (!WildfirePvE.Cooldown.WillHaveOneCharge(30) || (Heat == 100))) { - return (CanUseHyperchargePvE(out act)); + if (!CombatElapsedLess(12) && CanUseHyperchargePvE(out act)) return true; } if (CanUseRookAutoturretPvE(out act)) return true; @@ -148,9 +155,9 @@ private bool CanUseHyperchargePvE(out IAction? act) //Cannot AOE ((!SpreadShotPvE.CanUse(out _)) && - //Combat elapsed 12 seconds - (!CombatElapsedLess(12)) - && + ////Combat elapsed 12 seconds + //(!CombatElapsedLess(12)) + //&& // AirAnchor Enough Level % AirAnchor ((AirAnchorPvE.EnoughLevel && AirAnchorPvE.Cooldown.WillHaveOneCharge(REST_TIME)) ||