fix: add some ids.

Directory.Build.props

@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>3.2.8</Version>
+		<Version>3.2.8.1</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs

@@ -132,7 +132,7 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO
             //Is knocking back.
             if (DateTime.Now > DataCenter.KnockbackStart && DateTime.Now < DataCenter.KnockbackFinished) return false;
 
-            if (DataCenter.NoPoslock && DataCenter.IsMovingOrJumping && !option.HasFlag(CanUseOption.IgnoreCastCheck)) return false;
+            if (DataCenter.NoPoslock && DataCenter.IsMoving && !option.HasFlag(CanUseOption.IgnoreCastCheck)) return false;
         }
 
         if (IsGeneralGCD && IsEot && IsFriendly && IActionHelper.IsLastGCD(true, this)

RotationSolver.Basic/Actions/BaseAction_Target.cs

@@ -196,7 +196,7 @@ private bool TargetAreaMove(float range, bool mustUse)
     private bool TargetAreaFriend(float range, bool mustUse, PlayerCharacter player)
     {
         if (!Service.Config.GetValue(PluginConfigBool.UseGroundBeneficialAbility)) return false;
-        if (!Service.Config.GetValue(PluginConfigBool.UseGroundBeneficialAbilityWhenMoving) && DataCenter.IsMovingOrJumping) return false;
+        if (!Service.Config.GetValue(PluginConfigBool.UseGroundBeneficialAbilityWhenMoving) && DataCenter.IsMoving) return false;
 
         var strategy = Service.Config.GetValue(PluginConfigInt.BeneficialAreaStrategy);
         switch (strategy)

RotationSolver.Basic/Data/StatusID.cs

@@ -1341,4 +1341,19 @@ public enum StatusID : ushort
     /// 
     /// </summary>
     MagicResistance = 942,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Exaltation = 2717,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Macrocosmos = 2718,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    CollectiveUnconscious = 849,
 }

RotationSolver.Basic/DataCenter.cs

@@ -117,7 +117,7 @@ public static TargetingType TargetingType
         }
     }
 
-    public static bool IsMovingOrJumping { get; internal set; }
+    public static bool IsMoving { get; internal set; }
 
     internal static float StopMovingRaw { get; set; }
 

RotationSolver.Basic/Rotations/Basic/AST_Base.cs

@@ -136,7 +136,10 @@ public abstract class AST_Base : CustomRotation
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction Macrocosmos { get; } = new BaseAction(ActionID.Macrocosmos, ActionOption.Heal);
+    public static IBaseAction Macrocosmos { get; } = new BaseAction(ActionID.Macrocosmos, ActionOption.Heal)
+    {
+        StatusProvide = new StatusID[] { StatusID.Macrocosmos }
+    };
     #endregion
 
     #region Defense Single
@@ -155,14 +158,18 @@ public abstract class AST_Base : CustomRotation
     public static IBaseAction Exaltation { get; } = new BaseAction(ActionID.Exaltation, ActionOption.Heal)
     {
         ChoiceTarget = TargetFilter.FindAttackedTarget,
+        TargetStatus = new StatusID[] { StatusID.Exaltation },
     };
     #endregion
 
     #region Defense Area
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction CollectiveUnconscious { get; } = new BaseAction(ActionID.CollectiveUnconscious, ActionOption.Defense);
+    public static IBaseAction CollectiveUnconscious { get; } = new BaseAction(ActionID.CollectiveUnconscious, ActionOption.Defense)
+    {
+        StatusProvide = new StatusID[] { StatusID.CollectiveUnconscious },
+    };
 
     #endregion
 

RotationSolver.Basic/Rotations/Basic/SAM_Base.cs

@@ -156,7 +156,7 @@ public static bool IsMoonTimeLessThanFlower
     public static IBaseAction OgiNamikiri { get; } = new BaseAction(ActionID.OgiNamikiri)
     {
         StatusNeed = new[] { StatusID.OgiNamikiriReady },
-        ActionCheck = (b, m) => !IsMovingOrJumping
+        ActionCheck = (b, m) => !IsMoving
     };
 
     /// <summary>
@@ -174,7 +174,7 @@ public static bool IsMoonTimeLessThanFlower
     /// </summary>
     public static IBaseAction Higanbana { get; } = new BaseAction(ActionID.Higanbana, ActionOption.Dot)
     {
-        ActionCheck = (b, m) => !IsMovingOrJumping && SenCount == 1,
+        ActionCheck = (b, m) => !IsMoving && SenCount == 1,
         TargetStatus = new[] { StatusID.Higanbana },
         TimeToDie = 40,
     };
@@ -184,15 +184,15 @@ public static bool IsMoonTimeLessThanFlower
     /// </summary>
     public static IBaseAction TenkaGoken { get; } = new BaseAction(ActionID.TenkaGoken)
     {
-        ActionCheck = (b, m) => !IsMovingOrJumping && SenCount == 2,
+        ActionCheck = (b, m) => !IsMoving && SenCount == 2,
     };
 
     /// <summary>
     /// 
     /// </summary>
     public static IBaseAction MidareSetsugekka { get; } = new BaseAction(ActionID.MidareSetsugekka)
     {
-        ActionCheck = (b, m) => !IsMovingOrJumping && SenCount == 3,
+        ActionCheck = (b, m) => !IsMoving && SenCount == 3,
     };
 
     /// <summary>

RotationSolver.Basic/Rotations/Basic/SCH_Base.cs

@@ -83,7 +83,7 @@ public abstract class SCH_Base : CustomRotation
     /// </summary>
     public static IBaseAction SacredSoil { get; } = new BaseAction(ActionID.SacredSoil, ActionOption.Heal)
     {
-        ActionCheck = (b, m) => HasAetherflow && !IsMovingOrJumping,
+        ActionCheck = (b, m) => HasAetherflow && !IsMoving,
     };
 
     /// <summary>

RotationSolver.Basic/Rotations/Basic/WHM_Base.cs

@@ -204,7 +204,7 @@ protected static bool LilyAfterGCD(uint gcdCount = 0, float offset = 0)
     /// </summary>
     public static IBaseAction PresenceOfMind { get; } = new BaseAction(ActionID.PresenceOfMind, ActionOption.Buff)
     {
-        ActionCheck = (b, m) => !IsMovingOrJumping && IsLongerThan(10),
+        ActionCheck = (b, m) => !IsMoving && IsLongerThan(10),
     };
 
     /// <summary>

RotationSolver.Basic/Rotations/CustomRotation_Ability.cs

@@ -60,7 +60,7 @@ private bool Ability(IAction nextGCD, out IAction act, bool helpDefenseAOE, bool
         if (GeneralAbility(out act)) return true;
 
         //Run!
-        if (IsMovingOrJumping && NotInCombatDelay && Service.Config.GetValue(PluginConfigBool.AutoSpeedOutOfCombat) 
+        if (IsMoving && NotInCombatDelay && Service.Config.GetValue(PluginConfigBool.AutoSpeedOutOfCombat) 
             && SpeedAbility(out act)) return true;
 
         return false;

RotationSolver.Basic/Rotations/CustomRotation_Actions.cs

@@ -166,13 +166,13 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// </summary>
     public static IBaseAction LowBlow { get; } = new RoleAction(ActionID.LowBlow, new JobRole[] { JobRole.Tank })
     {
-        FilterForHostiles = bs => bs.Where(b =>
+        FilterForHostiles = bs => bs.Where((Func<BattleChara, bool>)(b =>
         {
-            if (b.IsBoss() || IsMovingOrJumping || b.CastActionId == 0) return false;
+            if (b.IsBoss() || CustomRotation.IsMoving || b.CastActionId == 0) return false;
 
             if (!b.IsCastInterruptible || Interject.IsCoolingDown) return true;
             return false;
-        }),
+        })),
     };
 
     /// <summary>
@@ -211,8 +211,13 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// </summary>
     public static IBaseAction Peloton { get; } = new RoleAction(ActionID.Peloton, new JobRole[] { JobRole.RangedPhysical }, ActionOption.Friendly)
     {
-        ActionCheck = (b, m) => NotInCombatDelay && PartyMembers.GetObjectInRadius(20)
-            .Any(p => p.WillStatusEnd(3, false, StatusID.Peloton) && !p.InCombat()),
+        ActionCheck = (b, m) =>
+        {
+            if (!NotInCombatDelay) return false;
+            var players = PartyMembers.GetObjectInRadius(20);
+            if (players.Any(ObjectHelper.InCombat)) return false;
+            return players.Any(p => p.WillStatusEnd(3, false, StatusID.Peloton));
+        },
     };
 
     /// <summary>

RotationSolver.Basic/Rotations/CustomRotation_GCD.cs

@@ -79,7 +79,7 @@ private bool RaiseSpell(SpecialCommandType specialType, out IAction act, bool mu
                 {
                     return DataCenter.SetAutoStatus(AutoStatus.Raise, true);
                 }
-                else if(!IsMovingOrJumping)
+                else if(!IsMoving)
                 {
                     act = action;
                     return DataCenter.SetAutoStatus(AutoStatus.Raise, true);

RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs

@@ -25,13 +25,7 @@ public abstract partial class CustomRotation
     /// <summary>
     /// Check the player is moving, such as running, walking or jumping.
     /// </summary>
-    public static bool IsMovingOrJumping => DataCenter.IsMovingOrJumping;
-
-    /// <summary>
-    /// Is moving.
-    /// </summary>
-    [Obsolete("Please use IsMovingOrJumping Instead")]
-    public static bool IsMoving => IsMovingOrJumping;
+    public static bool IsMoving => DataCenter.IsMoving;
 
     /// <summary>
     /// Is in combat.
@@ -487,7 +481,7 @@ public static float CombatTime
     /// The time of stopping moving.
     /// <br>WARNING: Do Not make this method the main of your rotation.</br>
     /// </summary>
-    public static float StopMovingTime => IsMovingOrJumping ? 0 : DataCenter.StopMovingRaw + DataCenter.WeaponRemain;
+    public static float StopMovingTime => IsMoving ? 0 : DataCenter.StopMovingRaw + DataCenter.WeaponRemain;
 
     /// <summary>
     /// Time from GCD.

RotationSolver/Localization/Localization.json

@@ -214,6 +214,7 @@
   "ActionSequencer_Adjusted": "Adjusted",
   "ActionSequencer_StatusSelf": "From Self",
   "ActionSequencer_StatusAll": "From All",
+  "ActionSequencer_Delay_Description": "How many seconds do you want to delay its turning to true.",
   "Action_Friendly": "Support",
   "Action_Ability": "0GCD",
   "Action_Attack": "Attack",
@@ -255,6 +256,7 @@
   "TargetConditionType_HasStatus": "Has Status",
   "TargetConditionType_IsDying": "Is Dying",
   "TargetConditionType_IsBoss": "Is Boss",
+  "TargetConditionType_InCombat": "In Combat",
   "TargetConditionType_Distance": "Distance",
   "TargetConditionType_StatusEnd": "Status End",
   "TargetConditionType_DeadTime": "Dead Time",
@@ -275,7 +277,7 @@
   "DescType_MoveBackAbility": "Move Back Ability",
   "DescType_SpeedAbility": "Speed Ability",
   "MemberInfoName": {
-    "IsMoving": "Is Moving",
+    "IsMoving": "Is Moving or Jumping",
     "HasSwift": "Has Swift",
     "HasTankStance": "Has tank stance",
     "InCombat": "In Combat",
@@ -291,6 +293,8 @@
     "HasHostilesInRange": "Has hostiles in Range",
     "NumberOfHostilesInRange": "The number of hostiles in Range",
     "NumberOfHostilesInMaxRange": "The number of hostiles in max Range",
+    "NumberOfAllHostilesInRange": "The number of all hostiles in Range",
+    "NumberOfAllHostilesInMaxRange": "The number of all hostiles in max Range",
     "InBurst": "In burst.",
     "CanHealAreaAbility": "Can heal area ability",
     "CanHealAreaSpell": "Can heal area spell",
@@ -500,5 +504,7 @@
   "ConfigWindow_UI_StateIconSize": "State Icon size",
   "ConfigWindow_UI_ShowStateIcon": "Show State Icon",
   "ConfigWindow_Auto_UseGroundBeneficialAbilityWhenMoving": "Use beneficial area action when moving.",
-  "ConfigWindow_Auto_AutoDefenseNumber": "The count of hostiles who target on me. If it's larger than this, defense single."
+  "ConfigWindow_Auto_AutoDefenseNumber": "The count of hostiles who target on me. If it's larger than this, defense single.",
+  "ConfigWindow_Target_OnlyAttackInSight": "Only attack the targets in sight",
+  "ConfigWindow_Target_AngleOfSight": "The angle of your sight"
 }

RotationSolver/Localization/Strings.cs

@@ -402,7 +402,7 @@ internal partial class Strings
     public Dictionary<string, string> MemberInfoName { get; set; } = new Dictionary<string, string>()
     {
         #region Rotation
-        { nameof(CustomRotation.IsMovingOrJumping), "Is Moving or Jumping"},
+        { nameof(CustomRotation.IsMoving), "Is Moving or Jumping"},
         { nameof(CustomRotation.HasSwift), "Has Swift"},
         { nameof(CustomRotation.HasTankStance), "Has tank stance"},
         { nameof(CustomRotation.InCombat), "In Combat"},

RotationSolver/UI/RotationConfigWindow.cs

@@ -2030,7 +2030,7 @@ private static unsafe void DrawStatus()
         {
             ImGui.Text("Fate: " + DataCenter.FateId.ToString());
         }
-        ImGui.Text("Moving: " + DataCenter.IsMovingOrJumping.ToString());
+        ImGui.Text("Moving: " + DataCenter.IsMoving.ToString());
         ImGui.Text("Stop Moving: " + DataCenter.StopMovingRaw.ToString());
 
         ImGui.Text("TerritoryType: " + DataCenter.TerritoryContentType.ToString());

RotationSolver/Updaters/ActionUpdater.cs

@@ -101,13 +101,13 @@ private unsafe static void UpdateSlots()
     static DateTime _stopMovingTime = DateTime.MinValue;
     private unsafe static void UpdateMoving()
     {
-        var last = DataCenter.IsMovingOrJumping;
-        DataCenter.IsMovingOrJumping = AgentMap.Instance()->IsPlayerMoving > 0 || Player.GameObject->GetHeight() > 0;
-        if (last && !DataCenter.IsMovingOrJumping)
+        var last = DataCenter.IsMoving;
+        DataCenter.IsMoving = AgentMap.Instance()->IsPlayerMoving > 0;
+        if (last && !DataCenter.IsMoving)
         {
             _stopMovingTime = DateTime.Now;
         }
-        else if (DataCenter.IsMovingOrJumping)
+        else if (DataCenter.IsMoving)
         {
             _stopMovingTime = DateTime.MinValue;
         }