fix: fixed manual target thing.

ArchiDog1998 · Feb 25, 2024 · 6a5998c · 6a5998c
1 parent 8635306
commit 6a5998c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,5 +1,5 @@
 {
-  "ClickingCount": 77120,
-  "SayingHelloCount": 66,
+  "ClickingCount": 77828,
+  "SayingHelloCount": 67,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs
@@ -219,7 +219,7 @@ private readonly bool CheckTimeToKill(GameObject gameObject)
         {
             var t = Svc.Targets.Target as BattleChara;
 
-            if (t == null) return null;
+            if (t == null || !_action.Setting.CanTarget(t)) return null;
 
             if (type == TargetType.Move)
             {

diff --git a/RotationSolver.Basic/Actions/BaseAction.cs b/RotationSolver.Basic/Actions/BaseAction.cs
@@ -59,6 +59,10 @@ public ActionConfig Config
             {
                 Service.Config.RotationActionConfig[ID] = value 
                     = Setting.CreateConfig?.Invoke() ?? new();
+                if (Setting.TargetStatusProvide != null)
+                {
+                    value.TimeToKill = 10;
+                }
             }
             return value;
         }
@@ -100,7 +104,7 @@ public bool CanUse(out IAction act, bool skipStatusProvideCheck = false, bool sk
 
 
         if (Setting.IsMeleeRange && IActionHelper.IsLastAction(IActionHelper.MovingActions)) return false; //No range actions after moving.
-        if (Setting.IsFriendly && DataCenter.AverageTimeToKill < Config.TimeToKill) return false;
+        if (DataCenter.AverageTimeToKill < Config.TimeToKill) return false;
 
         PreviewTarget = TargetInfo.FindTarget(skipAoeCheck, skipStatusProvideCheck);
         if (PreviewTarget == null) return false;