Merge pull request #57 from FFXIV-CombatReborn/smn-base-crimson-cyclo…

…ne-fix SMN Crimson Cyclone fix for not respecting movement settings, and attempted combo fix for StalwartSoul
FFXIV-CombatReborn · Apr 3, 2024 · e797f12 · e797f12
2 parents 8f61491 + aef23a4
commit e797f12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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,

diff --git 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);
     }
-}
+
+    /// <inheritdoc/>
+    [RotationDesc(ActionID.CrimsonCyclonePvE)]
+    protected override bool MoveForwardGCD(out IAction? act)
+    {
+        if (CrimsonCyclonePvE.CanUse(out act)) return true;
+        return base.MoveForwardGCD(out act);
+    }
+}