Excluded Automap layer from all raycasts

Made sure we keep using the implicit Physics.DefaultRaycastLayers for casts that were using that, but with Automap excluded. Added a PhysicsLayers utility script to expose that mask as a static PhysicsLayers.DefaultRaycastLayersWithoutAutomap.

Author: Vwing

Assets/Game/Addons/RmbBlockEditor/Placeholder.cs

@@ -7,6 +7,7 @@
 
 using System;
 using DaggerfallConnect.Arena2;
+using DaggerfallWorkshop.Game.Utility;
 using UnityEditor;
 using UnityEngine;
 
@@ -84,7 +85,7 @@ protected void OnSceneGUI(SceneView sceneView)
 
             Vector3 mousePosition = Event.current.mousePosition;
             Ray ray = HandleUtility.GUIPointToWorldRay(mousePosition);
-            if (Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity) && !mouseHasDragged)
+            if (Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity, PhysicsLayers.DefaultRaycastLayersWithoutAutomap) && !mouseHasDragged)
             {
                 OnRaycastHit(hit);
             }
@@ -351,4 +352,4 @@ protected override void OnRaycastHit(RaycastHit hit)
         }
     }
 #endif
-}
+}

Assets/Game/Addons/UnityConsole/Console/Scripts/DefaultCommands.cs

@@ -19,6 +19,7 @@
 using DaggerfallWorkshop.Game.Formulas;
 using DaggerfallConnect;
 using DaggerfallWorkshop.Game.Serialization;
+using DaggerfallWorkshop.Game.Utility;
 using DaggerfallWorkshop.Utility.AssetInjection;
 using DaggerfallConnect.FallExe;
 using DaggerfallWorkshop.Game.Utility.ModSupport;
@@ -1521,7 +1522,7 @@ public static string Execute(params string[] args)
                     DaggerfallActionDoor door;
                     RaycastHit hitInfo;
                     Ray ray = Camera.main.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
-                    if (!(Physics.Raycast(ray, out hitInfo)))
+                    if (!(Physics.Raycast(ray, out hitInfo, Mathf.Infinity, PhysicsLayers.DefaultRaycastLayersWithoutAutomap)))
                         return error;
                     else
                     {
@@ -1550,7 +1551,7 @@ public static string Execute(params string[] args)
                 DaggerfallAction action;
                 RaycastHit hitInfo;
                 Ray ray = Camera.main.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
-                if (!(Physics.Raycast(ray, out hitInfo)))
+                if (!(Physics.Raycast(ray, out hitInfo, Mathf.Infinity, PhysicsLayers.DefaultRaycastLayersWithoutAutomap)))
                     return error;
                 else
                 {
@@ -1672,7 +1673,7 @@ public static string Execute(params string[] args)
                 Vector3 origin = Camera.main.ViewportToWorldPoint(new Vector3(0.5f, 0.5f, 0));
                 Ray ray = new Ray(origin + Camera.main.transform.forward * .2f, Camera.main.transform.forward);
                 GameManager.Instance.AcrobatMotor.ClearFallingDamage();
-                if (!(Physics.Raycast(ray, out hitInfo, maxDistance)))
+                if (!(Physics.Raycast(ray, out hitInfo, maxDistance, PhysicsLayers.DefaultRaycastLayersWithoutAutomap)))
                 {
                     Console.Log("Didn't hit anything...");
                     if (forceTeleOnNoHit)
@@ -2171,7 +2172,7 @@ public static string Execute(params string[] args)
                 Vector3 origin = frictionMotor.ContactPoint;
                 origin.y += cc.height;
                 Ray ray = new Ray(origin, Vector3.down);
-                if (!(Physics.Raycast(ray, out hitInfo, cc.height * 2)))
+                if (!(Physics.Raycast(ray, out hitInfo, cc.height * 2, PhysicsLayers.DefaultRaycastLayersWithoutAutomap)))
                 {
                     return "Failed to reposition - try Teleport or if inside tele2exit";
                 }

Assets/Game/Addons/WorldDataEditor/Editor/WorldDataEditor.cs

@@ -14,6 +14,7 @@
 using DaggerfallConnect.Arena2;
 using DaggerfallWorkshop.Utility.AssetInjection;
 using DaggerfallWorkshop.Utility;
+using DaggerfallWorkshop.Game.Utility;
 
 namespace DaggerfallWorkshop.Game.Utility.WorldDataEditor
 {
@@ -924,7 +925,7 @@ private void AddItemWindow()
                     // Try to position where the camera is looking
                     Ray newRay = new Ray(SceneView.lastActiveSceneView.camera.transform.position, SceneView.lastActiveSceneView.camera.transform.forward);
                     RaycastHit hit = new RaycastHit();
-                    if (Physics.Raycast(newRay, out hit, 200))
+                    if (Physics.Raycast(newRay, out hit, 200, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                         go.transform.position = hit.point;
                     else
                         go.transform.position = SceneView.lastActiveSceneView.camera.transform.position + (SceneView.lastActiveSceneView.camera.transform.forward * 10);

Assets/Scripts/Game/DaggerfallMissile.cs

@@ -14,6 +14,7 @@
 using DaggerfallWorkshop.Utility;
 using DaggerfallWorkshop.Game.MagicAndEffects;
 using DaggerfallWorkshop.Game.Entity;
+using DaggerfallWorkshop.Game.Utility;
 
 namespace DaggerfallWorkshop.Game
 {
@@ -395,7 +396,7 @@ public static DaggerfallEntityBehaviour GetEntityTargetInTouchRange(Vector3 aimP
             RaycastHit hit;
             aimPosition -= aimDirection * 0.1f;
             Ray ray = new Ray(aimPosition, aimDirection);
-            if (Physics.SphereCast(ray, SphereCastRadius, out hit, TouchRange))
+            if (Physics.SphereCast(ray, SphereCastRadius, out hit, TouchRange, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                 return hit.transform.GetComponent<DaggerfallEntityBehaviour>();
             else
                 return null;
@@ -443,7 +444,7 @@ void DoAreaOfEffect(Vector3 position, bool ignoreCaster = false)
             transform.position = position;
 
             // Collect AOE targets and ignore duplicates
-            Collider[] overlaps = Physics.OverlapSphere(position, ExplosionRadius);
+            Collider[] overlaps = Physics.OverlapSphere(position, ExplosionRadius, PhysicsLayers.DefaultRaycastLayersWithoutAutomap);
             for (int i = 0; i < overlaps.Length; i++)
             {
                 DaggerfallEntityBehaviour aoeEntity = overlaps[i].GetComponent<DaggerfallEntityBehaviour>();

Assets/Scripts/Game/EnemyMotor.cs

@@ -12,6 +12,7 @@
 using UnityEngine;
 using DaggerfallWorkshop.Game.Entity;
 using DaggerfallWorkshop.Game.MagicAndEffects;
+using DaggerfallWorkshop.Game.Utility;
 using System.Collections.Generic;
 using DaggerfallWorkshop.Utility;
 using System.Linq;
@@ -137,10 +138,10 @@ void Start()
                 (mobile.Enemy.HasRangedAttack1 && (!mobile.Enemy.CastsMagic || mobile.Enemy.HasRangedAttack2));
 
             // Add things AI should ignore when checking for a clear path to shoot.
-            ignoreMaskForShooting = ~(1 << LayerMask.NameToLayer("SpellMissiles") | 1 << LayerMask.NameToLayer("Ignore Raycast"));
+            ignoreMaskForShooting = ~(1 << LayerMask.NameToLayer("SpellMissiles") | 1 << LayerMask.NameToLayer("Ignore Raycast") | 1 << LayerMask.NameToLayer("Automap"));
 
             // Also ignore arrows and "Ignore Raycast" layer for obstacles
-            ignoreMaskForObstacles = ~(1 << LayerMask.NameToLayer("SpellMissiles") | 1 << LayerMask.NameToLayer("Ignore Raycast"));
+            ignoreMaskForObstacles = ~(1 << LayerMask.NameToLayer("SpellMissiles") | 1 << LayerMask.NameToLayer("Ignore Raycast") | 1 << LayerMask.NameToLayer("Automap"));
 
             LastGroundedY = transform.position.y;
 
@@ -222,7 +223,7 @@ public Vector3 FindGroundPosition(float distance = 16)
         {
             RaycastHit hit;
             Ray ray = new Ray(transform.position, Vector3.down);
-            if (Physics.Raycast(ray, out hit, distance))
+            if (Physics.Raycast(ray, out hit, distance, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                 return hit.point;
 
             return transform.position;
@@ -1188,7 +1189,7 @@ void ObstacleCheck(Vector3 direction)
                     p1 = transform.position + (Vector3.up * -originalHeight * 0.25f);
                     p2 = p1 + (Vector3.up * originalHeight * 0.75f);
 
-                    if (!Physics.CapsuleCast(p1, p2, controller.radius / 2, direction, checkDistance))
+                    if (!Physics.CapsuleCast(p1, p2, controller.radius / 2, direction, checkDistance, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                     {
                         ObstacleDetected = false;
                         foundUpwardSlope = true;
@@ -1216,7 +1217,7 @@ void FallCheck(Vector3 direction)
             Ray ray = new Ray(rayOrigin + direction, Vector3.down);
             RaycastHit hit;
 
-            fallDetected = !Physics.Raycast(ray, out hit, (originalHeight * 0.5f) + 1.5f);
+            fallDetected = !Physics.Raycast(ray, out hit, (originalHeight * 0.5f) + 1.5f, PhysicsLayers.DefaultRaycastLayersWithoutAutomap);
         }
 
         /// <summary>

Assets/Scripts/Game/EnemySenses.cs

@@ -550,7 +550,7 @@ public Vector3 PredictNextTargetPos(float interceptSpeed)
 
             // If aware of target, if distance is too far or can see nothing is there, use last known position as assumed current position
             if (targetInSight || targetInEarshot || (predictedTargetPos - transform.position).magnitude > SightRadius + mobile.Enemy.SightModifier
-                || !Physics.Raycast(transform.position, (predictedTargetPosWithoutLead - transform.position).normalized, out tempHit, SightRadius + mobile.Enemy.SightModifier))
+                || !Physics.Raycast(transform.position, (predictedTargetPosWithoutLead - transform.position).normalized, out tempHit, SightRadius + mobile.Enemy.SightModifier, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
             {
                 assumedCurrentPosition = lastKnownTargetPos;
             }
@@ -605,7 +605,7 @@ public Vector3 PredictNextTargetPos(float interceptSpeed)
                 // Don't predict target will move through obstacles (prevent predicting movement through walls)
                 RaycastHit hit;
                 Ray ray = new Ray(assumedCurrentPosition, (prediction - assumedCurrentPosition).normalized);
-                if (Physics.Raycast(ray, out hit, (prediction - assumedCurrentPosition).magnitude))
+                if (Physics.Raycast(ray, out hit, (prediction - assumedCurrentPosition).magnitude, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                     prediction = assumedCurrentPosition;
             }
 
@@ -902,7 +902,7 @@ bool CanSeeTarget(DaggerfallEntityBehaviour target)
                     Vector3 eyeDirectionToTarget = eyeToTarget.normalized;
                     Ray ray = new Ray(eyePos, eyeDirectionToTarget);
 
-                    if (Physics.Raycast(ray, out hit, SightRadius))
+                    if (Physics.Raycast(ray, out hit, SightRadius, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                     {
                         // Check if hit was target
                         DaggerfallEntityBehaviour entity = hit.transform.gameObject.GetComponent<DaggerfallEntityBehaviour>();

Assets/Scripts/Game/EnemySounds.cs

@@ -13,6 +13,7 @@
 using System.Collections;
 using DaggerfallWorkshop.Utility;
 using DaggerfallWorkshop.Game.Entity;
+using DaggerfallWorkshop.Game.Utility;
 
 namespace DaggerfallWorkshop.Game
 {
@@ -235,7 +236,7 @@ private void SetVolumeScale()
             // Only checks when enemy plays attract sound, so not very expensive.
             RaycastHit hit;
             Ray ray = new Ray(transform.position, directionToPlayer);
-            if (Physics.Raycast(ray, out hit))
+            if (Physics.Raycast(ray, out hit, Mathf.Infinity, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
             {
                 // Ignore player hit
                 if (hit.transform.gameObject == player)
@@ -252,4 +253,4 @@ private void SetVolumeScale()
 
         #endregion
     }
-}
+}

Assets/Scripts/Game/Entities/PlayerEntity.cs

@@ -715,7 +715,7 @@ public void SpawnCityGuards(bool immediateSpawn)
                             // Check if npc sees player
                             Vector3 eyeToTarget = playerEyePos - eyePos;
                             Ray ray = new Ray(eyePos, eyeToTarget.normalized);
-                            if (Physics.Raycast(ray, out hit, 77.5f))
+                            if (Physics.Raycast(ray, out hit, 77.5f, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                             {
                                 // Check if hit was player
                                 DaggerfallEntityBehaviour entity = hit.transform.gameObject.GetComponent<DaggerfallEntityBehaviour>();

Assets/Scripts/Game/MobilePersonMotor.cs

@@ -416,7 +416,7 @@ bool IsDirectionClear(MobileDirection direction)
             // Aim low to better detect stairs
             tempTargetScenePosition.y += 0.1f;
             Ray ray = new Ray(transform.position, tempTargetScenePosition - transform.position);
-            bool collision = Physics.Raycast(transform.position, tempTargetScenePosition - transform.position, Vector3.Distance(transform.position, tempTargetScenePosition), ~mobileAsset.GetLayerMask());
+            bool collision = Physics.Raycast(transform.position, tempTargetScenePosition - transform.position, Vector3.Distance(transform.position, tempTargetScenePosition), ~mobileAsset.GetLayerMask() & ~(1 << LayerMask.NameToLayer("Automap")));
             // Debug.DrawRay(transform.position, tempTargetScenePosition - transform.position, collision ? Color.red : Color.green, 1f);
             return !collision;
         }
@@ -545,4 +545,4 @@ private void FloatingOrigin_OnPositionUpdate(Vector3 offset)
 
         #endregion
     }
-}
+}

Assets/Scripts/Game/Player/ClimbingMotor.cs

@@ -317,7 +317,7 @@ public void ClimbingCheck()
             // boolean that means ground directly below us is too close for climbing or rappelling
             bool tooCloseToGroundForClimb = (((isClimbing && (inputBack || isSlipping)) || airborneGraspWall)
                 // short circuit evaluate the raycast, also prevents bug where you could teleport across town
-                && Physics.Raycast(controller.transform.position, Vector3.down, controller.height / 2 + 0.12f));
+                && Physics.Raycast(controller.transform.position, Vector3.down, controller.height / 2 + 0.12f, PhysicsLayers.DefaultRaycastLayersWithoutAutomap));
 
             CalcFrequencyAndToleranceOfWallChecks(airborneGraspWall);
 
@@ -371,9 +371,9 @@ public void ClimbingCheck()
                 // Test close to front of head for backward sloping wall like Scourg Barrow and bump a little backwards
                 // Then slightly further back for short overhangs like eaves and bump more backwards and a little upwards
                 // Height of raycast test is extended to help ensure there is clear space above not just an angled ceiling
-                if (!Physics.Raycast(frontTestPosition, Vector3.up, controller.height / 2 + 0.3f))
+                if (!Physics.Raycast(frontTestPosition, Vector3.up, controller.height / 2 + 0.3f, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                     controller.transform.position += -wallDirection * 0.1f;
-                else if (!Physics.Raycast(backTestPosition, Vector3.up, controller.height / 2 + 0.5f))
+                else if (!Physics.Raycast(backTestPosition, Vector3.up, controller.height / 2 + 0.5f, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
                     controller.transform.position += -wallDirection * 0.4f + Vector3.up * 0.3f;
             }
 
@@ -588,7 +588,7 @@ private void GetClimbedWallInfo()
                 wallDirection = -cornerNormalRay.direction;
             // Cast character controller shape forward to see if it is about to hit anything.
             Debug.DrawRay(controller.transform.position, wallDirection, Color.gray);
-            if (Physics.CapsuleCast(p1, p2, controller.radius, wallDirection, out hit, controller.radius + 0.1f))
+            if (Physics.CapsuleCast(p1, p2, controller.radius, wallDirection, out hit, controller.radius + 0.1f, PhysicsLayers.DefaultRaycastLayersWithoutAutomap))
             {
                 // Immediately stop climbing if object not valid
                 if (!IsClimable(hit.transform))