fix: changed the logic of Provoke

ArchiDog1998 · Apr 16, 2023 · 783f023 · 783f023
1 parent 96935a6
commit 783f023
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs
@@ -174,10 +174,10 @@ internal static IEnumerable<BattleChara> ProvokeTarget(IEnumerable<BattleChara>
 
         var targets = inputCharas.Where(target =>
         {
-            //有目标
-            if (target.TargetObject?.IsValid() ?? false)
+            //Can attack and has a target
+            if (target.GetObjectNPC()?.Unknown12 == 0 && (target.TargetObject?.IsValid() ?? false))
             {
-                //居然在打非T！
+                //the target is not a tank role
                 if (!tankIDS.Contains(target.TargetObjectId) && (!needDistance || Vector3.Distance(target.Position, loc) > 5))
                 {
                     return true;
@@ -186,9 +186,7 @@ internal static IEnumerable<BattleChara> ProvokeTarget(IEnumerable<BattleChara>
             return false;
         });
 
-        //没有敌对势力，那随便用
         if (!targets.Any()) return inputCharas;
-        //返回在打队友的讨厌鬼！
         return targets;
     }
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -104,12 +104,13 @@ private unsafe void DrawTargetData()
             var npc = b.GetObjectNPC();
             if(npc != null)
             {
-                ImGui.Text("Unknown0: " + npc.Behavior.Value?.Unknown0.ToString());
-                ImGui.Text("Unknown1: " + npc.Behavior.Value?.Unknown1.ToString());
-                ImGui.Text("Condition0Type: " + npc.Behavior.Value?.Condition0Type.ToString());
-                ImGui.Text("Condition0Target: " + npc.Behavior.Value?.Condition0Target.ToString());
-                ImGui.Text("Condition1Type: " + npc.Behavior.Value?.Condition1Type.ToString());
-                ImGui.Text("Condition1Target: " + npc.Behavior.Value?.Condition1Target.ToString());
+                ImGui.Text("Unknown12: " + npc.Unknown12.ToString());
+
+                //ImGui.Text("Unknown15: " + npc.Unknown15.ToString());
+                //ImGui.Text("Unknown18: " + npc.Unknown18.ToString());
+                //ImGui.Text("Unknown19: " + npc.Unknown19.ToString());
+                //ImGui.Text("Unknown20: " + npc.Unknown20.ToString());
+                //ImGui.Text("Unknown21: " + npc.Unknown21.ToString());
             }
 
             foreach (var status in b.StatusList)