Improved enemy spawning in small buildings

Author: Vwing

Assets/Scripts/Game/Questing/Actions/CreateFoe.cs

@@ -258,6 +258,24 @@ bool PlaceFoeWilderness(GameObject[] gameObjects, bool placeEnemyBehindPlayer =
         bool PlaceFoeFreely(GameObject[] gameObjects, Transform parent, float minDistance = 5f, float maxDistance = 20f, bool placeEnemyBehindPlayer = true, bool lineOfSight = true, int spawnTries = 15)
         {
             const float maxFloorDistance = 4f;
+            const float overlapSphereRadius = 0.65f;
+
+            // override min/max distance in small interior spaces.
+            var dfInterior = GameObject.FindObjectOfType<DaggerfallInterior>();
+            if(dfInterior){
+                	Bounds bounds = new Bounds (dfInterior.transform.position, Vector3.one);
+                    Renderer[] renderers = dfInterior.GetComponentsInChildren<Renderer> ();
+                    foreach (Renderer renderer in renderers)
+                    {
+                        bounds.Encapsulate (renderer.bounds);
+                    }
+                    Vector3 playerPos = GameManager.Instance.PlayerController.transform.position;
+                    Vector3 boundsMin = bounds.min;
+                    Vector3 boundsMax = bounds.max;
+                    boundsMin.y = boundsMax.y = playerPos.y;
+                    maxDistance = Mathf.Max(Vector3.Distance(playerPos, boundsMin), Vector3.Distance(playerPos, boundsMax));
+                    minDistance = Mathf.Min(minDistance, maxDistance/4f);
+            }
 
             // Must have received a valid array
             if (gameObjects == null || gameObjects.Length == 0)
@@ -303,7 +321,8 @@ bool PlaceFoeFreely(GameObject[] gameObjects, Transform parent, float minDistanc
 
                 // Ensure this is open space
                 spawnPos = floorHit.point + enemyCC.center + (enemyCC.height/2f + .5f)*Vector3.up;
-                Collider[] colliders = Physics.OverlapCapsule(spawnPos - enemyCC.height/2f * Vector3.up, spawnPos + enemyCC.height/2f * Vector3.up, enemyCC.radius, DFULayerMasks.CorporealMask);
+                // Collider[] colliders = Physics.OverlapCapsule(spawnPos - enemyCC.height/2f * Vector3.up, spawnPos + enemyCC.height/2f * Vector3.up, enemyCC.radius, DFULayerMasks.CorporealMask);
+                Collider[] colliders = Physics.OverlapSphere(spawnPos, overlapSphereRadius);
                 if (colliders.Length > 0)
                     continue;
 

Assets/Scripts/Game/Utility/FoeSpawner.cs

@@ -119,6 +119,24 @@ bool PlaceFoeFreely(GameObject[] gameObjects, float minDistance = 5f, float maxD
         {
             const float separationDistance = 1.25f;
             const float maxFloorDistance = 4f;
+            const float overlapSphereRadius = 0.65f;
+
+            // override min/max distance in small interior spaces.
+            var dfInterior = FindObjectOfType<DaggerfallInterior>();
+            if(dfInterior){
+                	Bounds bounds = new Bounds (dfInterior.transform.position, Vector3.one);
+                    Renderer[] renderers = dfInterior.GetComponentsInChildren<Renderer> ();
+                    foreach (Renderer renderer in renderers)
+                    {
+                        bounds.Encapsulate (renderer.bounds);
+                    }
+                    Vector3 playerPos = GameManager.Instance.PlayerController.transform.position;
+                    Vector3 boundsMin = bounds.min;
+                    Vector3 boundsMax = bounds.max;
+                    boundsMin.y = boundsMax.y = playerPos.y;
+                    maxDistance = Mathf.Max(Vector3.Distance(playerPos, boundsMin), Vector3.Distance(playerPos, boundsMax));
+                    minDistance = Mathf.Min(minDistance, maxDistance/4f);
+            }
 
             // Must have received a valid array
             if (gameObjects == null || gameObjects.Length == 0)
@@ -159,7 +177,8 @@ bool PlaceFoeFreely(GameObject[] gameObjects, float minDistance = 5f, float maxD
 
                 // Ensure this is open space
                 spawnPos = floorHit.point + enemyCC.center + (enemyCC.height/2f + .5f)*Vector3.up;
-                Collider[] colliders = Physics.OverlapCapsule(spawnPos - enemyCC.height/2f * Vector3.up, spawnPos + enemyCC.height/2f * Vector3.up, enemyCC.radius, DFULayerMasks.CorporealMask);
+                // Collider[] colliders = Physics.OverlapCapsule(spawnPos - enemyCC.height/2f * Vector3.up, spawnPos + enemyCC.height/2f * Vector3.up, enemyCC.radius, DFULayerMasks.CorporealMask);
+                Collider[] colliders = Physics.OverlapSphere(spawnPos, overlapSphereRadius);
                 if (colliders.Length > 0)
                     continue;