Introduce CanTarget()

Author: pandinocoder

Intersect.Server.Core/Entities/Entity.cs

@@ -48,7 +48,7 @@ public abstract partial class Entity : IEntity
     public IReadOnlyDictionary<Vital, long> VitalsLookup => _vitals.Select((value, index) => (value, index))
         .ToDictionary(t => (Vital)t.index, t => t.value).AsReadOnly();
 
-    [NotMapped, JsonIgnore] public Entity Target { get; set; } = null;
+    [NotMapped, JsonIgnore] public Entity? Target { get; set; }
 
     public Entity() : this(Guid.NewGuid(), Guid.Empty)
     {
@@ -318,6 +318,8 @@ public virtual void Dispose()
         }
     }
 
+    public bool HasStatusEffect(SpellEffect spellEffect) => CachedStatuses.Any(s => s.Type == spellEffect);
+
     public virtual void Update(long timeMs)
     {
         var lockObtained = false;
@@ -1261,7 +1263,7 @@ public virtual void Move(Direction moveDir, Player forPlayer, bool doNotUpdate =
 
     protected virtual bool CanLookInDirection(Direction direction) => true;
 
-    public virtual void ChangeDir(Direction dir)
+    public void ChangeDir(Direction dir)
     {
         if (!CanLookInDirection(dir))
         {
@@ -1408,6 +1410,24 @@ public virtual int GetWeaponDamage()
 
     public virtual bool CanAttack(Entity entity, SpellBase spell) => !IsCasting;
 
+    public virtual bool CanTarget(Entity? entity)
+    {
+        if (entity == null)
+        {
+            // If it's not an entity we can't target it
+            return false;
+        }
+
+        if (IsAllyOf(entity))
+        {
+            // If it's an ally we can always target them
+            return true;
+        }
+
+        // If it's not an ally we can't target it if it's stealthed
+        return !entity.HasStatusEffect(SpellEffect.Stealth);
+    }
+
     public virtual void ProcessRegen()
     {
     }

Intersect.Server.Core/Entities/Npc.cs

@@ -190,7 +190,7 @@ public bool TargetHasStealth(Entity target)
     }
 
     //Targeting
-    public void AssignTarget(Entity en)
+    public void AssignTarget(Entity? en)
     {
         var oldTarget = Target;
 
@@ -199,16 +199,7 @@ public void AssignTarget(Entity en)
         if (AggroCenterMap != null && pathTarget != null &&
             pathTarget.TargetMapId == AggroCenterMap.Id && pathTarget.TargetX == AggroCenterX && pathTarget.TargetY == AggroCenterY)
         {
-            if (en == null)
-            {
-                return;
-
-            }
-            else
-            {
-                return;
-
-            }
+            return;
         }
 
         //Why are we doing all of this logic if we are assigning a target that we already have?
@@ -229,7 +220,7 @@ public void AssignTarget(Entity en)
 
             if (en is Projectile projectile)
             {
-                if (projectile.Owner != this && !TargetHasStealth(projectile))
+                if (projectile.Owner != this && !projectile.HasStatusEffect(SpellEffect.Stealth))
                 {
                     Target = projectile.Owner;
                 }
@@ -246,21 +237,17 @@ public void AssignTarget(Entity en)
                         }
                     }
                 }
-
-                if (en is Player)
+                else if (en is Player player)
                 {
                     //TODO Make sure that the npc can target the player
-                    if (this != en && !TargetHasStealth(en))
+                    if (CanTarget(player))
                     {
-                        Target = en;
+                        Target = player;
                     }
                 }
-                else
+                else if (CanTarget(en))
                 {
-                    if (this != en && !TargetHasStealth(en))
-                    {
-                        Target = en;
-                    }
+                    Target = en;
                 }
             }
 
@@ -310,16 +297,6 @@ public override int CalculateAttackTime()
         return base.CalculateAttackTime();
     }
 
-    public override void ChangeDir(Direction dir)
-    {
-        if (Target.CachedStatuses.Any(s => s.Type == SpellEffect.Stealth))
-        {
-            return;
-        }
-
-        base.ChangeDir(dir);
-    }
-
     public override bool CanAttack(Entity entity, SpellBase spell)
     {
         if (!base.CanAttack(entity, spell))
@@ -341,7 +318,7 @@ public override bool CanAttack(Entity entity, SpellBase spell)
             }
         }
 
-        if (TargetHasStealth(entity))
+        if (entity.HasStatusEffect(SpellEffect.Stealth))
         {
             // if spell is area or projectile, we can attack without knowing the target location
             if (spell?.Combat is { TargetType: SpellTargetType.AoE or SpellTargetType.Projectile })
@@ -692,10 +669,10 @@ private void TryCastSpells()
         }
 
         //TODO: try cast spell to find out hidden targets?
-        if (TargetHasStealth(target) /* && spellBase.Combat.TargetType != SpellTargetType.AoE*/)
-        {
-            return;
-        }
+        // if (target.HasStatusEffect(SpellEffect.Stealth) /* && spellBase.Combat.TargetType != SpellTargetType.AoE*/)
+        // {
+        //     return;
+        // }
 
         // Check if we are even allowed to cast this spell.
         if (!CanCastSpell(spellBase, target, true, out _))
@@ -803,12 +780,12 @@ public override void Update(long timeMs)
             {
                 var curMapLink = MapId;
                 base.Update(timeMs);
+
                 var tempTarget = Target;
-                var targetIsHidden = TargetHasStealth(tempTarget);
 
                 foreach (var status in CachedStatuses)
                 {
-                    if (status.Type == SpellEffect.Stun || status.Type == SpellEffect.Sleep)
+                    if (status.Type is SpellEffect.Stun or SpellEffect.Sleep)
                     {
                         return;
                     }
@@ -823,6 +800,12 @@ public override void Update(long timeMs)
                     var targetY = 0;
                     var targetZ = 0;
 
+                    if (tempTarget != null && (tempTarget.IsDead() || !InRangeOf(tempTarget, Options.MapWidth * 2) || !CanTarget(tempTarget)))
+                    {
+                        _ = TryFindNewTarget(Timing.Global.Milliseconds, tempTarget.Id, !CanTarget(tempTarget));
+                        tempTarget = Target;
+                    }
+
                     //TODO Clear Damage Map if out of combat (target is null and combat timer is to the point that regen has started)
                     if (tempTarget != null && (Options.Instance.NpcOpts.ResetIfCombatTimerExceeded && Timing.Global.Milliseconds > CombatTimer))
                     {
@@ -868,14 +851,8 @@ public override void Update(long timeMs)
                         }
                     }
 
-                    if (tempTarget != null && (tempTarget.IsDead() || !InRangeOf(tempTarget, Options.MapWidth * 2) || targetIsHidden))
-                    {
-                        TryFindNewTarget(Timing.Global.Milliseconds, tempTarget.Id, targetIsHidden);
-                        tempTarget = Target;
-                    }
-
                     //Check if there is a target, if so, run their ass down.
-                    if (tempTarget != null && !targetIsHidden)
+                    if (tempTarget != null && CanTarget(tempTarget))
                     {
                         if (!tempTarget.IsDead() && CanAttack(tempTarget, null))
                         {
@@ -929,7 +906,7 @@ public override void Update(long timeMs)
                         {
                             mPathFinder.SetTarget(new PathfinderTarget(targetMap, targetX, targetY, targetZ));
 
-                            if (tempTarget != Target)
+                            if (tempTarget != null && tempTarget != Target)
                             {
                                 tempTarget = Target;
                             }
@@ -1397,11 +1374,11 @@ public bool ShouldAttackPlayerOnSight(Player en)
         return false;
     }
 
-    public void TryFindNewTarget(long timeMs, Guid avoidId = new Guid(), bool ignoreTimer = false, Entity attackedBy = null)
+    public bool TryFindNewTarget(long timeMs, Guid avoidId = new(), bool ignoreTimer = false, Entity attackedBy = null)
     {
         if (!ignoreTimer && FindTargetWaitTime > timeMs)
         {
-            return;
+            return false;
         }
 
         // Are we resetting? If so, do not allow for a new target.
@@ -1411,16 +1388,14 @@ public bool ShouldAttackPlayerOnSight(Player en)
         {
             if (!Options.Instance.NpcOpts.AllowEngagingWhileResetting || attackedBy == null || attackedBy.GetDistanceTo(AggroCenterMap, AggroCenterX, AggroCenterY) > Math.Max(Options.Instance.NpcOpts.ResetRadius, Base.ResetRadius))
             {
-                return;
-            }
-            else
-            {
-                //We're resetting and just got attacked, and we allow reengagement.. let's stop resetting and fight!
-                mPathFinder?.SetTarget(null);
-                mResetting = false;
-                AssignTarget(attackedBy);
-                return;
+                return false;
             }
+
+            //We're resetting and just got attacked, and we allow reengagement.. let's stop resetting and fight!
+            mPathFinder?.SetTarget(null);
+            mResetting = false;
+            AssignTarget(attackedBy);
+            return true;
         }
 
         var possibleTargets = new List<Entity>();
@@ -1557,9 +1532,12 @@ public bool ShouldAttackPlayerOnSight(Player en)
             {
                 CheckForResetLocation(true);
             }
+
+            AssignTarget(null);
         }
 
         FindTargetWaitTime = timeMs + FindTargetDelay;
+        return Target != null;
     }
 
     public override void ProcessRegen()