Merge pull request #635 from FFXIV-CombatReborn/meikyo

Added Meikyo countdown configuration, fixed aspect tracking

Author: LTS-FFXIV

BasicRotations/Melee/SAM_Default.cs

@@ -16,6 +16,10 @@ public enum STtoAOEStrategy : byte
         [Description("Setsugekka")] Setsugekka,
     }
 
+    [Range(0, 20, ConfigUnitType.None, 1)]
+    [RotationConfig(CombatType.PvE, Name = "When during countdown to use Meikyo Shisui")]
+    public int MeikyoCD { get; set; } = 5;
+
     [Range(0, 100, ConfigUnitType.None, 1)]
     [RotationConfig(CombatType.PvE, Name = "Kenki needed to use Shinten")]
     public int ShintenKenki { get; set; } = 75;
@@ -54,7 +58,7 @@ public enum STtoAOEStrategy : byte
     protected override IAction? CountDownAction(float remainTime)
     {
         // pre-pull: can be changed to -9 and -5 instead of 5 and 2, but it's hard to be universal !!! check later !!!
-        if (remainTime <= 5 && MeikyoShisuiPvE.CanUse(out var act)) return act;
+        if (remainTime <= MeikyoCD && MeikyoShisuiPvE.CanUse(out var act)) return act;
         if (remainTime <= 2 && TrueNorthPvE.CanUse(out act)) return act;
         return base.CountDownAction(remainTime);
     }

RotationSolver.Basic/Actions/ActionBasicInfo.cs

@@ -158,7 +158,7 @@ public ActionBasicInfo(IBaseAction action, bool isDutyAction)
         IsLimitBreak = (ActionCate?)_action.Action.ActionCategory.Value.RowId
             is ActionCate.LimitBreak or ActionCate.LimitBreak_15;
         IsDutyAction = isDutyAction;
-        //Aspect = (Aspect)_action.Action.Aspect; Resolved on next lumina update
+        Aspect = (Aspect)_action.Action.Aspect;
     }
 
     internal readonly bool BasicCheck(bool skipStatusProvideCheck, bool skipComboCheck, bool skipCastingCheck)