fix: change the delay to Not In Combat Delay. For something need to d…

…o Not In Combat.

RotationSolver/Configuration/PluginConfiguration.cs

@@ -117,8 +117,8 @@ public class PluginConfiguration : IPluginConfiguration
     public float InterruptDelayMin = 0.5f;
     public float InterruptDelayMax = 1;
 
-    public float PelotonDelayMin = 1f;
-    public float PelotonDelayMax = 2;
+    public float NotInCombatDelayMin = 1f;
+    public float NotInCombatDelayMax = 2;
 
     public bool UseWorkTask = true;
     public int WorkTaskDelay = 10;

RotationSolver/Helpers/TargetFilter.cs

@@ -258,7 +258,7 @@ internal static IEnumerable<BattleChara> GetJobCategory(this IEnumerable<BattleC
         });
     }
 
-    private static bool IsJobCategory(this BattleChara obj, JobRole role)
+    internal static bool IsJobCategory(this BattleChara obj, JobRole role)
     {
         SortedSet<byte> validJobs = new(Service.DataManager.GetExcelSheet<ClassJob>()
             .Where(job => role == job.GetJobRole())

RotationSolver/Localization/Localization.json

@@ -113,6 +113,7 @@
   "Configwindow_Param_UseItemDesc": "Use poison, WIP",
   "Configwindow_Param_Conditon": "Condition",
   "Configwindow_Param_StartOnCountdown": "Turn on auto-rotation on countdown",
+  "Configwindow_Param_EsunaAll": "Esuna All Statuses.",
   "Configwindow_Param_InterruptibleMoreCheck": "Interrupt the action with action type check.",
   "Configwindow_Param_HealOutOfCombat": "Heal party members outside of combat.",
   "Configwindow_Param_HealthDifference": "Set the HP standard deviation threshold for using AOE heal (ability & spell)",

RotationSolver/Localization/Strings_Major.cs

@@ -115,7 +115,7 @@ internal partial class Strings
 
     public string Configwindow_Param_HealDelay { get; set; } = "Set the range of random delay for healing people in second.";
 
-    public string Configwindow_Param_PelotonDelay { get; set; } = "Set the range of random delay for peloton usage in second.";
+    public string Configwindow_Param_NotInCombatDelay { get; set; } = "Set the range of random delay for Not In Combat in second.";
     public string Configwindow_Param_StopCastingDelay { get; set; } = "Set the range of random delay for stoping casting when target is dead in second.";
     public string Configwindow_Param_WorkTaskDelay { get; set; } = "Set the work task delay in millisecond. Smaller, more precise, more resource-intensive";
 

RotationSolver/Rotations/Basic/AST_Base.cs

@@ -117,6 +117,7 @@ internal abstract class AST_Base : CustomRotation.CustomRotation
     /// </summary>
     public static IBaseAction AspectedHelios { get; } = new BaseAction(ActionID.AspectedHelios, true, isEot: true, isTimeline: true)
     {
+        ActionCheck = b => !IsLastGCD(ActionID.AspectedHelios),
         StatusProvide = new StatusID[] { StatusID.AspectedHelios },
     };
 

RotationSolver/Rotations/CustomRotation/CustomRotation_Actions.cs

@@ -195,14 +195,12 @@ internal RoleAction(ActionID actionID, JobRole[] roles, bool isFriendly = false,
         StatusProvide = new StatusID[] { StatusID.TrueNorth },
     };
 
-    static RandomDelay _pelotonDelay = new RandomDelay(() => 
-        (Service.Configuration.PelotonDelayMin, Service.Configuration.PelotonDelayMax));
     /// <summary>
     /// 速行
     /// </summary>
     public static IBaseAction Peloton { get; } = new RoleAction(ActionID.Peloton, new JobRole[] { JobRole.RangedPhysical }, true)
     {
-        ActionCheck = b => _pelotonDelay.Delay(!InCombat) && TargetUpdater.PartyMembers.GetObjectInRadius(20)
+        ActionCheck = b => NotInCombatDelay && TargetUpdater.PartyMembers.GetObjectInRadius(20)
             .Any(p => p.WillStatusEnd(3, false, StatusID.Peloton)),
     };
 

RotationSolver/Rotations/CustomRotation/CustomRotation_OtherInfo.cs

@@ -50,11 +50,15 @@ internal abstract partial class CustomRotation
     /// </summary>
     protected static bool InBurst => RSCommands.SpecialType == SpecialCommandType.Burst || Service.Configuration.AutoBurst;
 
+    static RandomDelay _notInCombatDelay = new RandomDelay(() =>
+    (Service.Configuration.NotInCombatDelayMin, Service.Configuration.NotInCombatDelayMax));
     /// <summary>
     /// Is in combat.
     /// </summary>
     protected static bool InCombat => ActionUpdater.InCombat;
 
+    protected static bool NotInCombatDelay => _notInCombatDelay.Delay(!InCombat);
+
     /// <summary>
     /// The player's target.
     /// </summary>

RotationSolver/Rotations/Healer/AST/AST_Default.cs

@@ -8,6 +8,7 @@
 using RotationSolver.Rotations.CustomRotation;
 using RotationSolver.Updaters;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 
 namespace RotationSolver.Rotations.Healer.AST;
@@ -30,6 +31,7 @@ internal sealed class AST_Default : AST_Base
     private static IBaseAction AspectedBeneficDefense { get; } = new BaseAction(ActionID.AspectedBenefic, true, isEot: true)
     {
         ChoiceTarget = TargetFilter.FindAttackedTarget,
+        ActionCheck = b => b.IsJobCategory(JobRole.Tank),
         TargetStatus = new StatusID[] { StatusID.AspectedBenefic },
     };
 
@@ -54,8 +56,7 @@ private protected override bool DefenceAreaAbility(byte abilitiesRemaining, out
     private protected override bool GeneralGCD(out IAction act)
     {
         //Add AspectedBeneficwhen not in combat.
-        if (!InCombat && TargetUpdater.PartyTanks.Any(t => !t.HasStatus(true, StatusID.AspectedBenefic))
-            && AspectedBeneficDefense.CanUse(out act)) return true;
+        if (NotInCombatDelay && AspectedBeneficDefense.CanUse(out act)) return true;
 
         //群体输出
         if (Gravity.CanUse(out act)) return true;
@@ -85,6 +86,8 @@ private protected override bool EmergencyAbility(byte abilityRemain, IAction nex
     {
         if (base.EmergencyAbility(abilityRemain, nextGCD, out act)) return true;
 
+        if (!InCombat) return false;
+
         //如果要群奶了，先上个天宫图！
         if (nextGCD.IsTheSameTo(true, AspectedHelios, Helios))
         {

RotationSolver/Windows/RotationConfigWindow_Param.cs

@@ -97,8 +97,8 @@ private void DrawParamDelay()
         DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_HealDelay,
             ref Service.Configuration.HealDelayMin, ref Service.Configuration.HealDelayMax);
 
-        DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_PelotonDelay,
-            ref Service.Configuration.PelotonDelayMin, ref Service.Configuration.PelotonDelayMax);
+        DrawRangedFloat(LocalizationManager.RightLang.Configwindow_Param_NotInCombatDelay,
+            ref Service.Configuration.NotInCombatDelayMin, ref Service.Configuration.NotInCombatDelayMax);
 
         //if (Service.Configuration.UseStopCasting)
         //{