fix: delay healing.

RotationSolver/Configuration/PluginConfiguration.cs

@@ -105,6 +105,9 @@ public class PluginConfiguration : IPluginConfiguration
     public float HostileDelayMin = 0;
     public float HostileDelayMax = 0;
 
+    public float HealDelayMin = 0;
+    public float HealDelayMax = 0;
+
     public string PositionalErrorText = string.Empty;
 
     public int MoveTargetAngle = 24;

RotationSolver/Data/RandomDelay.cs

@@ -11,37 +11,37 @@ internal struct RandomDelay
 {
 	DateTime _startDelayTime = DateTime.MinValue;
 	float _delayTime = -1;
-    Func<bool> _getCheck;
     Func<(float min, float max)> _getRange;
 	Random _ran = new Random(DateTime.Now.Millisecond);
-
-    public bool Check => _getCheck?.Invoke() ?? false;
-    public RandomDelay(Func<bool> getCheck, Func<(float min, float max)> getRange)
+    bool _lastValue = false;
+    public RandomDelay(Func<(float min, float max)> getRange)
 	{
-        _getCheck = getCheck;
         _getRange = getRange;
 	}
 
-	public bool Update()
+	public bool Delay(bool originData)
 	{
-        if(_getCheck == null || _getRange == null) return false;
+        if(_getRange == null) return false;
 
-        if (!Check)
+        if (!originData)
         {
+            _lastValue = false;
             _delayTime = -1;
             return false;
         }
 
-        //Not start
-        if (_delayTime < 0)
+        //Not start And changed.
+        if (_delayTime < 0 && !_lastValue)
         {
+            _lastValue = true;
             _startDelayTime = DateTime.Now;
             var range = _getRange();
             _delayTime = range.min + (float)_ran.NextDouble() * (range.max - range.min);
         }
         //Times up
         else if ((DateTime.Now - _startDelayTime).TotalSeconds >= _delayTime)
         {
+            //I set it.
             _delayTime = -1;
             return true;
         }

RotationSolver/Helpers/TargetFilter.cs

@@ -57,7 +57,7 @@ internal static BattleChara DefaultFindHostile(IEnumerable<BattleChara> availabl
             .OrderBy(DistanceToPlayer).First();
     }
 
-    internal static GameObject FindTargetForMoving(this IEnumerable<GameObject> charas, bool mustUse)
+    internal static T FindTargetForMoving<T>(this IEnumerable<T> charas, bool mustUse) where T : GameObject
     {
         if (mustUse)
         {
@@ -78,7 +78,7 @@ internal static GameObject FindTargetForMoving(this IEnumerable<GameObject> char
     }
 
     const float DISTANCE_TO_MOVE = 3;
-    private static GameObject FindMoveTargetFaceDirection(IEnumerable<GameObject> charas)
+    private static T FindMoveTargetFaceDirection<T>(IEnumerable<T> charas) where T : GameObject
     {
         Vector3 pPosition = Service.ClientState.LocalPlayer.Position;
         float rotation = Service.ClientState.LocalPlayer.Rotation;
@@ -97,7 +97,7 @@ private static GameObject FindMoveTargetFaceDirection(IEnumerable<GameObject> ch
         return tars.FirstOrDefault();
     }
 
-    private static GameObject FindMoveTargetScreenCenter(IEnumerable<GameObject> charas)
+    private static T FindMoveTargetScreenCenter<T>(IEnumerable<T> charas) where T : GameObject
     {
         var pPosition = Service.ClientState.LocalPlayer.Position;
         if (!Service.GameGui.WorldToScreen(pPosition, out var playerScrPos)) return null;

RotationSolver/Rotations/Basic/DRK_Base.cs

@@ -1,4 +1,5 @@
 using Dalamud.Game.ClientState.JobGauge.Types;
+using Dalamud.Game.ClientState.Objects.Types;
 using RotationSolver.Actions;
 using RotationSolver.Actions.BaseAction;
 using RotationSolver.Data;

RotationSolver/Rotations/Basic/GNB_Base.cs

@@ -1,4 +1,5 @@
 using Dalamud.Game.ClientState.JobGauge.Types;
+using Dalamud.Game.ClientState.Objects.Types;
 using RotationSolver.Actions;
 using RotationSolver.Actions.BaseAction;
 using RotationSolver.Data;

RotationSolver/Updaters/ActionUpdater.cs

@@ -26,8 +26,7 @@ public static TimeSpan CombatTime
         }
     }
 
-    private static  RandomDelay _GCDDelay = new RandomDelay(() => WeaponRemain <= Service.Configuration.WeaponFaster,
-    () => (Service.Configuration.WeaponDelayMin, Service.Configuration.WeaponDelayMax));
+    private static  RandomDelay _GCDDelay = new RandomDelay(() => (Service.Configuration.WeaponDelayMin, Service.Configuration.WeaponDelayMax));
 
     internal static float WeaponRemain { get; private set; } = 0;
 
@@ -188,9 +187,10 @@ internal unsafe static void DoAction()
             || *(bool*)((IntPtr)ActionManager.Instance() + 0x68)) return;
 
         //GCD
-        if (_GCDDelay.Check)
+        var canUseGCD = WeaponRemain <= Service.Configuration.WeaponFaster;
+        if (canUseGCD)
         {
-            if (_GCDDelay.Update()) RSCommands.DoAnAction(true);
+            if (_GCDDelay.Delay(canUseGCD)) RSCommands.DoAnAction(true);
             return;
         }
 

RotationSolver/Updaters/TargetUpdater_Friends.cs

@@ -141,6 +141,9 @@ private unsafe static void UpdateFriends(IEnumerable<BattleChara> allTargets)
         #endregion
     }
 
+    private static RandomDelay _healDelay = new RandomDelay(() => (Service.Configuration.HealDelayMin, Service.Configuration.HealDelayMax));
+
+
     static void UpdateCanHeal(PlayerCharacter player)
     {
         var job = (ClassJobID)player.ClassJob.Id;
@@ -165,6 +168,12 @@ static void UpdateCanHeal(PlayerCharacter player)
                 CanHealAreaSpell = PartyMembersDifferHP < Service.Configuration.HealthDifference && PartyMembersAverHP < ConfigurationHelper.GetHealAreafSpell(job) - ratio;
         }
 
+        //Delay
+        CanHealSingleAbility = _healDelay.Delay(CanHealSingleAbility);
+        CanHealSingleSpell = _healDelay.Delay(CanHealSingleSpell);
+        CanHealAreaAbility = _healDelay.Delay(CanHealAreaAbility);
+        CanHealAreaSpell = _healDelay.Delay(CanHealAreaSpell);
+
         PartyMembersMinHP = PartyMembersHP.Any() ? PartyMembersHP.Min() : 0;
         HPNotFull = PartyMembersMinHP < 1;
     }