Fix mage-bolt friendly fire [GOMPS-299]

Many actions can cause the player to "look like" they're hitting another player (e.g. selecting a target and using the Attack action on them makes them play the reaction anim) but that's just amusing fluff... the problem is that mage bolt did actual damage to other players. This is fixed.

Also fixed: if the target of the mage bolt had disappeared since the mage queued the attack, the attack was simply aborted because we had no target. Now, the attack is not aborted, and just turns into a normal "missed" bolt. To do this, the client sends the click-position along with all bolt attacks.

Author: eheimburg

Assets/BossRoom/Scripts/Client/Game/Action/FXProjectileTargetedActionFX.cs

@@ -28,17 +28,12 @@ public override bool Start()
             bool wasAnticipated = Anticipated;
             base.Start();
             m_Target = GetTarget();
-            if (HasTarget() && m_Target == null)
-            {
-                // target has disappeared! Abort.
-                return false;
-            }
 
             if (Description.Projectiles.Length < 1 || Description.Projectiles[0].ProjectilePrefab == null)
                 throw new System.Exception($"Action {Description.ActionTypeEnum} has no valid ProjectileInfo!");
 
             // animate shooting the projectile
-            if( !wasAnticipated )
+            if (!wasAnticipated)
             {
                 PlayFireAnim();
             }
@@ -56,7 +51,7 @@ public override bool Update()
             if (TimeRunning >= Description.ExecTimeSeconds && m_Projectile == null)
             {
                 // figure out how long the pretend-projectile will be flying to the target
-                Vector3 targetPos = HasTarget() ? m_Target.transform.position : m_Data.Position;
+                Vector3 targetPos = m_Target ? m_Target.transform.position : m_Data.Position;
                 float initialDistance = Vector3.Distance(targetPos, m_Parent.transform.position);
                 m_ProjectileDuration = initialDistance / Description.Projectiles[0].Speed_m_s;
 
@@ -100,14 +95,6 @@ private void PlayHitReact()
             }
         }
 
-        /// <summary>
-        /// Do we even have a target? (If false, it means player clicked on nothing, and we're rendering a "missed" fake bolt.)
-        /// </summary>
-        private bool HasTarget()
-        {
-            return Data.TargetIds != null && Data.TargetIds.Length > 0;
-        }
-
         private NetworkObject GetTarget()
         {
             if (Data.TargetIds == null || Data.TargetIds.Length == 0)

Assets/BossRoom/Scripts/Client/Game/Character/ClientInputSender.cs

@@ -322,7 +322,7 @@ private void PopulateSkillRequest(Vector3 hitPoint, ActionType action, ref Actio
                     resultData.CancelMovement = true;
                     return;
                 case ActionLogic.RangedFXTargeted:
-                    if (resultData.TargetIds == null) { resultData.Position = hitPoint; }
+                    resultData.Position = hitPoint;
                     return;
             }
         }

Assets/BossRoom/Scripts/Server/Game/Action/FXProjectileTargetedAction.cs

@@ -22,14 +22,9 @@ public FXProjectileTargetedAction(ServerCharacter parent, ref ActionRequestData
         public override bool Start()
         {
             m_Target = GetTarget();
-            if (m_Target == null && HasTarget())
-            {
-                // target has disappeared! Abort.
-                return false;
-            }
 
             // figure out where the player wants us to aim at...
-            Vector3 targetPos = HasTarget() ? m_Target.transform.position : m_Data.Position;
+            Vector3 targetPos = m_Target != null ? m_Target.transform.position : m_Data.Position;
 
             // then make sure we can actually see that point!
             if (!ActionUtils.HasLineOfSight(m_Parent.transform.position, targetPos, out Vector3 collidePos))
@@ -76,14 +71,6 @@ public override void Cancel()
             }
         }
 
-        /// <summary>
-        /// Are we even supposed to have a target? (If not, we're representing a "missed" bolt that just hits nothing.)
-        /// </summary>
-        private bool HasTarget()
-        {
-            return Data.TargetIds != null && Data.TargetIds.Length > 0;
-        }
-
         /// <summary>
         /// Returns our intended target, or null if not found/no target.
         /// </summary>
@@ -97,6 +84,13 @@ private IDamageable GetTarget()
             NetworkObject obj;
             if (NetworkSpawnManager.SpawnedObjects.TryGetValue(Data.TargetIds[0], out obj) && obj != null)
             {
+                // make sure this isn't a friend (or if it is, make sure this is a friendly-fire action)
+                var serverChar = obj.GetComponent<ServerCharacter>();
+                if (serverChar && serverChar.IsNpc == (Description.IsFriendly ^ m_Parent.IsNpc))
+                {
+                    // not a valid target
+                    return null;
+                }
                 return obj.GetComponent<IDamageable>();
             }
             else