From 4faadef04807f1174b616667cc542b83f5e716fe Mon Sep 17 00:00:00 2001 From: Karaha-Baruha Date: Sat, 28 Sep 2024 02:39:28 -0500 Subject: [PATCH] Use Reassemble on Spread/Scatter in low level AOE situations --- BasicRotations/Ranged/zMCH_Beta.cs | 10 ++++++---- BasicRotations/RebornRotations.csproj | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BasicRotations/Ranged/zMCH_Beta.cs b/BasicRotations/Ranged/zMCH_Beta.cs index 7af6b88..0264f7f 100644 --- a/BasicRotations/Ranged/zMCH_Beta.cs +++ b/BasicRotations/Ranged/zMCH_Beta.cs @@ -44,10 +44,12 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act) bool isReassembleUsable = //Reassemble current # of charges and double proc protection ReassemblePvE.Cooldown.CurrentCharges > 0 && !Player.HasStatus(true, StatusID.Reassembled) && - (nextGCD.IsTheSameTo(true, [ChainSawPvE, ExcavatorPvE]) || nextGCD.IsTheSameTo(false, [AirAnchorPvE]) || - (!ChainSawPvE.EnoughLevel && nextGCD.IsTheSameTo(true, DrillPvE)) || - (!DrillPvE.EnoughLevel && nextGCD.IsTheSameTo(true, CleanShotPvE)) || - (!CleanShotPvE.EnoughLevel && nextGCD.IsTheSameTo(false, HotShotPvE))); + (nextGCD.IsTheSameTo(true, [ChainSawPvE, ExcavatorPvE]) + || (!ChainSawPvE.EnoughLevel && nextGCD.IsTheSameTo(true, SpreadShotPvE) && ((IBaseAction)nextGCD).Target.AffectedTargets.Length >= (SpreadShotMasteryTrait.EnoughLevel ? 4 : 5)) + || nextGCD.IsTheSameTo(false, [AirAnchorPvE]) + || (!ChainSawPvE.EnoughLevel && nextGCD.IsTheSameTo(true, DrillPvE)) + || (!DrillPvE.EnoughLevel && nextGCD.IsTheSameTo(true, CleanShotPvE)) + || (!CleanShotPvE.EnoughLevel && nextGCD.IsTheSameTo(false, HotShotPvE))); // Attempt to use Reassemble if it's ready if (isReassembleUsable) { diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj index 4dfbeee..e998f2c 100644 --- a/BasicRotations/RebornRotations.csproj +++ b/BasicRotations/RebornRotations.csproj @@ -16,7 +16,7 @@ - +