Merge pull request #248 from Karaha-Baruha/main

bump RSR NuGet package and incorporate combo timer into drill hold logic
FFXIV-CombatReborn · Sep 21, 2024 · 5d64a9e · 5d64a9e
2 parents 2c49539 + cabe354
commit 5d64a9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/BasicRotations/Ranged/zMCH_Beta.cs b/BasicRotations/Ranged/zMCH_Beta.cs
@@ -12,8 +12,8 @@ public sealed class zMCH_Beta : MachinistRotation
     [RotationConfig(CombatType.PvE, Name = "Prioritize Barrel Stabilizer use")]
     private bool BSPrio { get; set; } = true;
 
-    [RotationConfig(CombatType.PvE, Name = "Pool Drill to preserve 123 combo (this is probably a slight DPS loss but it will make xivanalysis happy)")]
-    private bool PoolDrillForCombo { get; set; } = false;
+    [RotationConfig(CombatType.PvE, Name = "Delay Drill for combo GCD if have one charge and about to break combo")]
+    private bool HoldDrillForCombo { get; set; } = true;
     #endregion
 
     #region Countdown logic
@@ -141,7 +141,7 @@ protected override bool GeneralGCD(out IAction? act)
         if (EnhancedMultiweaponTrait.EnoughLevel 
             && !CombatElapsedLessGCD(6) 
             && !ChainSawPvE.Cooldown.WillHaveOneCharge(6) 
-            && (!PoolDrillForCombo || (!CleanShotPvE.CanUse(out _) && !SlugShotPvE.CanUse(out _)))
+            && (!HoldDrillForCombo || !(LiveComboTime <= 5) || (!CleanShotPvE.CanUse(out _) && !SlugShotPvE.CanUse(out _)))
             && DrillPvE.CanUse(out act, usedUp: true)) return true;
 
         // basic aoe

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.104" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.5.109" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">