Merge pull request #264 from Karaha-Baruha/main

Use Reassemble on Spread/Scatter in low level AOE situations
FFXIV-CombatReborn · Sep 28, 2024 · 6614e43 · 6614e43
2 parents e3efbbd + 4faadef
commit 6614e43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -16,7 +16,7 @@
     <Compile Include="Duty\EmanationDefault" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.132" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.134" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">