Merge pull request #1861 from petchema/careful-casters

Prevent point blank spellcasting into low obstacles
Interkarma · Aug 15, 2020 · 8039b4c · 8039b4c
2 parents 0daf8d5 + 94d9565
commit 8039b4c
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/Assets/Scripts/Game/EnemyMotor.cs b/Assets/Scripts/Game/EnemyMotor.cs
@@ -78,6 +78,7 @@ public class EnemyMotor : MonoBehaviour
         Vector3 detourDestination;
         CharacterController controller;
         DaggerfallMobileUnit mobile;
+        Collider myCollider;
         DaggerfallEntityBehaviour entityBehaviour;
         EnemyBlood entityBlood;
         EntityEffectManager entityEffectManager;
@@ -103,6 +104,7 @@ void Start()
             senses = GetComponent<EnemySenses>();
             controller = GetComponent<CharacterController>();
             mobile = GetComponentInChildren<DaggerfallMobileUnit>();
+            myCollider = gameObject.GetComponent<Collider>();
             IsHostile = mobile.Summary.Enemy.Reactions == MobileReactions.Hostile;
             flies = CanFly();
             swims = mobile.Summary.Enemy.Behaviour == MobileBehaviour.Aquatic;
@@ -651,6 +653,22 @@ bool HasClearPathToShootProjectile(float speed, float radius)
             if (sphereCastDir == EnemySenses.ResetPlayerPos)
                 return false;
 
+            // No point blank shooting special handling here, makes enemies favor other attack types (melee, touch spells,...)
+
+            bool myColliderWasEnabled = false;
+            if (myCollider)
+            {
+                myColliderWasEnabled = myCollider.enabled;
+                // Exclude enemy collider from CheckSphere test
+                myCollider.enabled = false;
+            }
+            bool isSpaceInsufficient = Physics.CheckSphere(transform.position, radius, ignoreMaskForShooting);
+            if (myCollider)
+                myCollider.enabled = myColliderWasEnabled;
+
+            if (isSpaceInsufficient)
+                return false;
+
             float sphereCastDist = (sphereCastDir - transform.position).magnitude;
             sphereCastDir = (sphereCastDir - transform.position).normalized;