Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust cooldowns and streamline Monk action checks #528

Merged
merged 1 commit into from
Jan 5, 2025
Merged

Adjust cooldowns and streamline Monk action checks #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BasicRotations/Healer/AST_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ protected override bool GeneralAbility(IAction nextGCD, out IAction? act)

if (AstralDrawPvE.CanUse(out act)) return true;
if (UmbralDrawPvE.CanUse(out act)) return true;
if ((Player.HasStatus(true, StatusID.Divination) || !DivinationPvE.Cooldown.WillHaveOneCharge(45) || !DivinationPvE.EnoughLevel || UmbralDrawPvE.Cooldown.WillHaveOneCharge(3)) && InCombat && TheBalancePvE.CanUse(out act)) return true;
if ((Player.HasStatus(true, StatusID.Divination) || !DivinationPvE.Cooldown.WillHaveOneCharge(45) || !DivinationPvE.EnoughLevel || AstralDrawPvE.Cooldown.WillHaveOneCharge(3)) && InCombat && TheSpearPvE.CanUse(out act)) return true;
if ((Player.HasStatus(true, StatusID.Divination) || !DivinationPvE.Cooldown.WillHaveOneCharge(66) || !DivinationPvE.EnoughLevel) && InCombat && TheBalancePvE.CanUse(out act)) return true;
if ((Player.HasStatus(true, StatusID.Divination) || !DivinationPvE.Cooldown.WillHaveOneCharge(66) || !DivinationPvE.EnoughLevel) && InCombat && TheSpearPvE.CanUse(out act)) return true;
return base.GeneralAbility(nextGCD, out act);
}

Expand Down
16 changes: 7 additions & 9 deletions BasicRotations/Melee/MNK_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,20 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)

if (InBrotherhood)
{
// 'If you are in brotherhood, and you have 10 chakra, and forbidden chakra is available, use it.'
if (Chakra == 10 && TheForbiddenChakraPvE.CanUse(out act)) return true;
// 'If you are in brotherhood, and forbidden chakra is available, use it regardless of stacks.'
if (Player.WillStatusEndGCD(1, 0, true, StatusID.Brotherhood) && TheForbiddenChakraPvE.CanUse(out act)) return true;
// 'If you are in brotherhood and forbidden chakra is available, use it.'
if (TheForbiddenChakraPvE.CanUse(out act)) return true;
}
if (!InBrotherhood)
{
// 'If you are not in brotherhood, have 5 chakra, and brotherhood is about to be available, hold.'
if (Chakra == 5 && BrotherhoodPvE.Cooldown.WillHaveOneChargeGCD(1) && TheForbiddenChakraPvE.CanUse(out act)) return false;
// 'If you are not in brotherhood, have 5 chakra, and brotherhood is in cooldown, use it.'
if (Chakra == 5 && BrotherhoodPvE.Cooldown.IsCoolingDown && TheForbiddenChakraPvE.CanUse(out act)) return true;
// 'If you are not in brotherhood and brotherhood is about to be available, hold for burst.'
if (BrotherhoodPvE.Cooldown.WillHaveOneChargeGCD(1) && TheForbiddenChakraPvE.CanUse(out act)) return false;
// 'If you are not in brotherhood use it.'
if (TheForbiddenChakraPvE.CanUse(out act)) return true;
}
if (!TheForbiddenChakraPvE.EnoughLevel)
{
// 'If you are not high enough level for TheForbiddenChakra, use immediately at 5 chakra.'
if (Chakra == 5 && SteelPeakPvE.CanUse(out act)) return true;
if (SteelPeakPvE.CanUse(out act)) return true;
}

return base.EmergencyAbility(nextGCD, out act);
Expand Down
16 changes: 8 additions & 8 deletions RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ static partial void ModifySnapPunchPvE(ref ActionSetting setting)

static partial void ModifySteeledMeditationPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => Chakra < 5;
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
}

static partial void ModifySteelPeakPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => InCombat && Chakra == 5;
setting.ActionCheck = () => InCombat && (!InBrotherhood && Chakra == 5 || InBrotherhood && Chakra >= 5);
setting.UnlockedByQuestID = 66094;
}

Expand Down Expand Up @@ -134,12 +134,12 @@ static partial void ModifyThunderclapPvE(ref ActionSetting setting)

static partial void ModifyInspiritedMeditationPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => Chakra < 5;
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
}

static partial void ModifyHowlingFistPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => InCombat && Chakra == 5;
setting.ActionCheck = () => InCombat && (!InBrotherhood && Chakra == 5 || InBrotherhood && Chakra >= 5);
setting.UnlockedByQuestID = 66599;
setting.CreateConfig = () => new ActionConfig()
{
Expand Down Expand Up @@ -189,12 +189,12 @@ static partial void ModifyFormShiftPvE(ref ActionSetting setting)

static partial void ModifyForbiddenMeditationPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => Chakra < 5;
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
}

static partial void ModifyTheForbiddenChakraPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => InCombat;
setting.ActionCheck = () => InCombat && (!InBrotherhood && Chakra == 5 || InBrotherhood && Chakra >= 5);
setting.UnlockedByQuestID = 67564;
}

Expand Down Expand Up @@ -294,12 +294,12 @@ static partial void ModifyRiddleOfWindPvE(ref ActionSetting setting)

static partial void ModifyEnlightenedMeditationPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => Chakra < 5;
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
}

static partial void ModifyEnlightenmentPvE(ref ActionSetting setting)
{
setting.ActionCheck = () => InCombat && Chakra == 5;
setting.ActionCheck = () => InCombat && (!InBrotherhood && Chakra == 5 || InBrotherhood && Chakra >= 5);
setting.CreateConfig = () => new ActionConfig()
{
AoeCount = 3,
Expand Down