fix: add top priority hostile for hunting log.

ArchiDog1998 · Feb 12, 2023 · b468063 · b468063
1 parent c729c1c
commit b468063
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 41 deletions.
diff --git a/RotationSolver/Helpers/ObjectHelper.cs b/RotationSolver/Helpers/ObjectHelper.cs
@@ -48,7 +48,7 @@ internal static unsafe bool IsOthersPlayers(this GameObject obj)
     static readonly EventHandlerType[] _someSpecialEvent = new EventHandlerType[]
     {
         EventHandlerType.PublicContentDirector, //Island Sanctuary..
-        EventHandlerType.FateDirector, //Island Sanctuary..
+        EventHandlerType.FateDirector,
     };
     internal static unsafe bool IsNPCEnemy(this GameObject obj) 
         => obj.GetObjectKind() == ObjectKind.BattleNpc
@@ -63,6 +63,10 @@ private unsafe static bool CanAttack(this GameObject actor)
 
     internal static unsafe ObjectKind GetObjectKind(this GameObject obj) => (ObjectKind)obj.GetAddress()->ObjectKind;
 
+    internal static bool IsTopPriorityHostile(this GameObject obj)
+        //Hunting log and weapon.
+        => obj.GetNamePlateIcon() is 60092 or 60096;
+
     internal static unsafe uint GetNamePlateIcon(this GameObject obj) => obj.GetAddress()->NamePlateIconId;
     internal static unsafe EventHandlerType GetEventType(this GameObject obj) => obj.GetAddress()->EventId.Type;
 
@@ -186,4 +190,20 @@ private static uint GetHealthFromMulty(float mult)
 
         return (uint)(multi * Service.ClientState.LocalPlayer.MaxHp);
     }
+
+    /// <summary>
+    /// 对象<paramref name="obj"/>距玩家的距离
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    internal static float DistanceToPlayer(this GameObject obj)
+    {
+        if (obj == null) return float.MaxValue;
+        var player = Service.ClientState.LocalPlayer;
+        if (player == null) return float.MaxValue;
+
+        var distance = Vector3.Distance(player.Position, obj.Position) - player.HitboxRadius;
+        distance -= Math.Max(obj.HitboxRadius, Service.Configuration.ObjectMinRadius);
+        return distance;
+    }
 }
diff --git a/RotationSolver/Helpers/TargetFilter.cs b/RotationSolver/Helpers/TargetFilter.cs
@@ -46,9 +46,14 @@ internal static BattleChara DefaultFindHostile(IEnumerable<BattleChara> availabl
             if (charas?.Any() ?? false) availableCharas = charas;
         }
 
-        b = GetTopPriorityHostile(availableCharas);
+        b = availableCharas.FirstOrDefault(ObjectHelper.IsTopPriorityHostile); 
         if (b != null) return b;
 
+        if (TargetUpdater.TreasureCharas.Length > 0)
+        {
+            return availableCharas.FirstOrDefault(b => b.ObjectId == TargetUpdater.TreasureCharas[0]);
+        }
+
         //根据默认设置排序怪
         availableCharas = DefaultTargetingType(availableCharas.Where(b => 
             !TargetUpdater.TreasureCharas.Contains(b.ObjectId)));
@@ -57,27 +62,14 @@ internal static BattleChara DefaultFindHostile(IEnumerable<BattleChara> availabl
         float radius = availableCharas.FirstOrDefault().HitboxRadius;
 
         return availableCharas.Where(c => c.HitboxRadius == radius)
-            .OrderBy(DistanceToPlayer).FirstOrDefault();
-    }
-
-    private static BattleChara GetTopPriorityHostile(IEnumerable<BattleChara> availableCharas)
-    {
-        //Hunting log and weapon.
-        var b = availableCharas.FirstOrDefault(b => b.GetNamePlateIcon() is 60092 or 60096);
-        if (b != null) return b;
-
-        if(TargetUpdater.TreasureCharas.Length > 0)
-        {
-            return availableCharas.FirstOrDefault(b => b.ObjectId == TargetUpdater.TreasureCharas[0]);
-        }
-        return null;
+            .OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault();
     }
 
     internal static T FindTargetForMoving<T>(this IEnumerable<T> charas, bool mustUse) where T : GameObject
     {
         if (mustUse)
         {
-            var tar = charas.OrderBy(DistanceToPlayer).FirstOrDefault();
+            var tar = charas.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault();
             if(tar == null) return null;
             if (tar.DistanceToPlayer() < 1) return tar;
             return null;
@@ -108,7 +100,7 @@ private static T FindMoveTargetFaceDirection<T>(IEnumerable<T> charas) where T :
             Vector2 dirVec = new Vector2(dir.Z, dir.X);
             double angle = Math.Acos(Vector2.Dot(dirVec, faceVec) / dirVec.Length() / faceVec.Length());
             return angle <= Math.PI * Service.Configuration.MoveTargetAngle / 360;
-        }).OrderByDescending(DistanceToPlayer);
+        }).OrderByDescending(ObjectHelper.DistanceToPlayer);
 
         return tars.FirstOrDefault();
     }
@@ -129,7 +121,7 @@ private static T FindMoveTargetScreenCenter<T>(IEnumerable<T> charas) where T :
             if (dir.Y > 0) return false;
 
             return Math.Abs(dir.X / dir.Y) < Math.Tan(Math.PI * Service.Configuration.MoveTargetAngle / 360);
-        }).OrderByDescending(DistanceToPlayer);
+        }).OrderByDescending(ObjectHelper.DistanceToPlayer);
 
         return tars.FirstOrDefault();
     }
@@ -351,21 +343,7 @@ internal static IEnumerable<T> GetObjectInRadius<T>(this IEnumerable<T> objects,
         return objects.Where(o => o.DistanceToPlayer() <= radius);
     }
 
-    /// <summary>
-    /// 对象<paramref name="obj"/>距玩家的距离
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    internal static float DistanceToPlayer(this GameObject obj)
-    {
-        if (obj == null) return float.MaxValue;
-        var player = Service.ClientState.LocalPlayer;
-        if (player == null) return float.MaxValue;
 
-        var distance = Vector3.Distance(player.Position, obj.Position) - player.HitboxRadius;
-        distance -= Math.Max(obj.HitboxRadius, Service.Configuration.ObjectMinRadius);
-        return distance;
-    }
 
     private static IEnumerable<BattleChara> DefaultTargetingType(IEnumerable<BattleChara> charas)
     {

diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_Ability.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_Ability.cs
@@ -209,7 +209,7 @@ private bool MovingAbility(byte abilitiesRemaining, SpecialCommandType specialTy
         act = null;
         if (specialType == SpecialCommandType.MoveForward && MoveForwardAbility(abilitiesRemaining, out act))
         {
-            if (act is BaseAction b && TargetFilter.DistanceToPlayer(b.Target) > 5) return true;
+            if (act is BaseAction b && ObjectHelper.DistanceToPlayer(b.Target) > 5) return true;
         }
         else if (specialType == SpecialCommandType.MoveBack)
         {

diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_Actions.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_Actions.cs
@@ -52,11 +52,11 @@ internal RoleAction(ActionID actionID, JobRole[] roles, bool isFriendly = false,
         {
             if (TargetUpdater.DyingPeople.Any())
             {
-                return TargetUpdater.DyingPeople.OrderBy(b => TargetFilter.DistanceToPlayer(b)).First();
+                return TargetUpdater.DyingPeople.OrderBy(ObjectHelper.DistanceToPlayer).First();
             }
             else if (TargetUpdater.WeakenPeople.Any())
             {
-                return TargetUpdater.WeakenPeople.OrderBy(b => TargetFilter.DistanceToPlayer(b)).First();
+                return TargetUpdater.WeakenPeople.OrderBy(ObjectHelper.DistanceToPlayer).First();
             }
             return null;
         },

diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs
@@ -23,7 +23,7 @@ private IAction GCD(byte abilityRemain, bool helpDefenseAOE, bool helpDefenseSin
 
         if (specialType == SpecialCommandType.MoveForward && MoveGCD(out act))
         {
-            if (act is BaseAction b && TargetFilter.DistanceToPlayer(b.Target) > 5) return act;
+            if (act is BaseAction b && ObjectHelper.DistanceToPlayer(b.Target) > 5) return act;
         }
 
         //General Heal

diff --git a/RotationSolver/Updaters/TargetUpdater_Hostile.cs b/RotationSolver/Updaters/TargetUpdater_Hostile.cs
@@ -121,12 +121,13 @@ private static IEnumerable<BattleChara> GetHostileTargets(IEnumerable<BattleChar
 
         var hostiles = allattackableTargets.Where(t =>
         {
-            if (ids.Contains(t.ObjectId)) return true;
-            if (t.TargetObject == Service.ClientState.LocalPlayer) return true;
-
             //Remove other's treasure.
             if (t.IsOthersPlayers()) return false;
 
+            if (ids.Contains(t.ObjectId)) return true;
+            if (t.TargetObject == Service.ClientState.LocalPlayer) return true;
+            if (t.IsTopPriorityHostile()) return true;
+
             return fateId > 0 ? t.FateId() == fateId : t.TargetObject is BattleChara;
         });
 

diff --git a/RotationSolver/Updaters/TargetUpdater_NamePlate.cs b/RotationSolver/Updaters/TargetUpdater_NamePlate.cs
@@ -10,7 +10,7 @@ namespace RotationSolver.Updaters;
 
 internal static partial class TargetUpdater
 {
-    public static uint[] TreasureCharas { get; private set; }
+    public static uint[] TreasureCharas { get; private set; } = new uint[0];
     private static void UpdateNamePlate(IEnumerable<BattleChara> allTargets)
     {
         List<uint> charas = new List<uint>(5);