From b6ff50f71d14f26280806435e7f7f0d11a357ee2 Mon Sep 17 00:00:00 2001 From: Ehl'tee Es <127939494+LTS-FFXIV@users.noreply.github.com> Date: Wed, 3 Apr 2024 08:41:52 -0500 Subject: [PATCH 1/3] Fix actiontype on crimson cyclone --- .../Rotations/Basic/SummonerRotation.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs b/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs index 2c84851ba..9159e52e9 100644 --- a/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs +++ b/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs @@ -183,6 +183,7 @@ static partial void ModifyRekindlePvE(ref ActionSetting setting) static partial void ModifyCrimsonCyclonePvE(ref ActionSetting setting) { setting.StatusNeed = [StatusID.IfritsFavor]; + setting.SpecialType = SpecialActionType.MovingForward; } static partial void ModifyMountainBusterPvE(ref ActionSetting setting) @@ -261,4 +262,12 @@ protected override bool DefenseAreaAbility(out IAction? act) if (AddlePvE.CanUse(out act)) return true; return base.DefenseAreaAbility(out act); } -} \ No newline at end of file + + /// + [RotationDesc(ActionID.CrimsonCyclonePvE)] + protected override bool MoveForwardAbility(out IAction? act) + { + if (CrimsonCyclonePvE.CanUse(out act)) return true; + return base.MoveForwardAbility(out act); + } +} From 39523c6a68585691739ebd350e6e43e8f6123f4e Mon Sep 17 00:00:00 2001 From: Ehl'tee Es <127939494+LTS-FFXIV@users.noreply.github.com> Date: Wed, 3 Apr 2024 08:51:16 -0500 Subject: [PATCH 2/3] woops its a gcd --- RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs b/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs index 9159e52e9..221cc4483 100644 --- a/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs +++ b/RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs @@ -265,9 +265,9 @@ protected override bool DefenseAreaAbility(out IAction? act) /// [RotationDesc(ActionID.CrimsonCyclonePvE)] - protected override bool MoveForwardAbility(out IAction? act) + protected override bool MoveForwardGCD(out IAction? act) { if (CrimsonCyclonePvE.CanUse(out act)) return true; - return base.MoveForwardAbility(out act); + return base.MoveForwardGCD(out act); } } From aef23a449919f7d558dc76db158739d5ef065a1e Mon Sep 17 00:00:00 2001 From: Ehl'tee Es <127939494+LTS-FFXIV@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:57:25 -0500 Subject: [PATCH 3/3] also sneaking in a combo fix for StalwartSoul not being associated with Unleash --- RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs b/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs index 6ae84de69..de217a657 100644 --- a/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs +++ b/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs @@ -88,7 +88,7 @@ static partial void ModifyQuietusPvE(ref ActionSetting setting) static partial void ModifyStalwartSoulPvE(ref ActionSetting setting) { - setting.StatusNeed = [StatusID.SaltedEarth]; + setting.ComboIds = [ActionID.UnleashPvE]; setting.CreateConfig = () => new() { AoeCount = 2,