diff --git a/BossMod/Autorotation/MNK/MNKRotation.cs b/BossMod/Autorotation/MNK/MNKRotation.cs index dfbd767d26..b6486e6e1a 100644 --- a/BossMod/Autorotation/MNK/MNKRotation.cs +++ b/BossMod/Autorotation/MNK/MNKRotation.cs @@ -328,14 +328,12 @@ public static ActionID GetNextBestOGCD(State state, Strategy strategy, float dea state.Unlocked(AID.SteelPeak) && state.Chakra == 5 && state.CanWeave(CDGroup.SteelPeak, 0.6f, deadline) - && ( - // prevent early use in opener - state.CD(CDGroup.RiddleOfFire) > 0 + && (state.CD(CDGroup.RiddleOfFire) > 0 // prevent early use in opener || strategy.FireUse == Strategy.FireStrategy.Delay || strategy.FireUse == Strategy.FireStrategy.DelayUntilBrotherhood || !state.Unlocked(AID.RiddleOfFire) + ) ) - ) { // L15 Steel Peak is 180p // L40 Howling Fist is 100p/target => HF at 2+ targets @@ -506,8 +504,7 @@ private static bool ShouldUseBrotherhood(State state, Strategy strategy, float d // the default opener is bhood after first bootshine state.LeadenFistLeft == 0 // later uses can be asap - || strategy.CombatTimer > 30 - ); + || strategy.CombatTimer > 30); } private static bool ShouldUsePB(State state, Strategy strategy, float deadline) diff --git a/BossMod/Autorotation/SAM/SAMRotation.cs b/BossMod/Autorotation/SAM/SAMRotation.cs index bceba72500..561ce8f444 100644 --- a/BossMod/Autorotation/SAM/SAMRotation.cs +++ b/BossMod/Autorotation/SAM/SAMRotation.cs @@ -460,10 +460,8 @@ private static bool ShouldUseTrueNorth(State state, Strategy strategy) private static bool ShouldUseBurst(State state, Strategy strategy, float deadline) { return state.RaidBuffsLeft > deadline - // fight will end before next window, use everything - || strategy.RaidBuffsIn > strategy.FightEndIn - // general combat, no module active. yolo - || strategy.RaidBuffsIn > 9000; + || strategy.RaidBuffsIn > strategy.FightEndIn // fight will end before next window, use everything + || strategy.RaidBuffsIn > 9000; // general combat, no module active. yolo } private static bool ShouldRefreshHiganbana(State state, Strategy strategy, uint gcdsInAdvance = 0)