Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #31 from FFXIV-CombatReborn/MCH-Beta-Chainsaw-Fix
Browse files Browse the repository at this point in the history
MCH Beta Chainsaw Fix
  • Loading branch information
Toshi authored Apr 7, 2024
2 parents b17961d + 35df15b commit 0231580
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions BasicRotations/Ranged/MCH_Beta.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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))
||
Expand Down

0 comments on commit 0231580

Please sign in to comment.