Better corridor generation

Added door as first corridor
Changing from unlit and lit corridor

3D blobici/Assets/Scripts/MapGen/MapGenManager.cs

@@ -14,13 +14,15 @@ public class MapGenManager : MonoBehaviour
 
     [Header("Corridor Prefabs")]
     [SerializeField] private GameObject CorridorStraight;
+    [SerializeField] private GameObject CorridorStraightUnlit;
+    [SerializeField] private GameObject DoorCorridor;
     /*[SerializeField] private GameObject CorridorL;
     [SerializeField] private GameObject CorridorT;
     [SerializeField] private GameObject CorridorCross;
     [SerializeField] private GameObject CorridorEnd;*/
 
     [Header("Generation Settings")]
-    [SerializeField] private int RoomDistance = 5;
+    [SerializeField] private int RoomDistance = 3;
     [SerializeField] private int minRoomsNumber = 3;
     [SerializeField] private int maxRoomsNumber = 7;
 
@@ -53,15 +55,15 @@ public class MapGenManager : MonoBehaviour
         // Place Generate Rooms
         for (int i = 0; i < roomCount; i++)
         {
-            Vector3 roomPos = GetGridPosition();
             GameObject roomPrefab = mapPrefab[Random.Range(0, mapPrefab.Count)];
+            Vector3 roomPos = GetGridPosition(roomPrefab);
             GameObject room = Instantiate(roomPrefab, roomPos, Quaternion.identity, transform);
             placedRooms.Add(room);
             roomPositions.Add(roomPos);
         }
 
         // Add End Point
-        GameObject endPoint = Instantiate(EndPoint, GetGridPosition(), Quaternion.identity, transform);
+        GameObject endPoint = Instantiate(EndPoint, GetGridPosition(EndPoint), Quaternion.identity, transform);
         roomPositions.Add(endPoint.transform.position);
         placedRooms.Add(endPoint);
 
@@ -73,31 +75,31 @@ public class MapGenManager : MonoBehaviour
             Vector3 endRoomPos = roomPositions[i + 1];
             PrefabSize endRoom = placedRooms[i + 1].GetComponent<PrefabSize>();
             Vector3 firstCorridorPos = new Vector3(
-                startRoomPos.x + startRoom.prefabSize.x / 2,
+                startRoomPos.x,
                 startRoomPos.y,
-                startRoomPos.z
+                startRoomPos.z + startRoom.prefabSize.y / 2
             );
             Vector3 lastCorridorPos = new Vector3(
-                endRoomPos.x - endRoom.prefabSize.x / 2,
+                endRoomPos.x,
                 endRoomPos.y,
-                endRoomPos.z
+                endRoomPos.z - endRoom.prefabSize.y / 2
             );
             CreateCorridor(firstCorridorPos, lastCorridorPos);
         }
     }
 
-    private Vector3 GetGridPosition()
+    private Vector3 GetGridPosition(GameObject roomPrefab)
     {
         Vector3 lastRoomPos = roomPositions[roomPositions.Count - 1];
+        PrefabSize lastRoom = placedRooms[placedRooms.Count - 1].GetComponent<PrefabSize>();
+        PrefabSize roomSize = roomPrefab.GetComponent<PrefabSize>();
 
-        // Convert grid units to world position
         Vector3 roomPos = new Vector3(
-            lastRoomPos.x + RoomDistance,
+            lastRoomPos.x,
             lastRoomPos.y,
-            lastRoomPos.z
+            lastRoomPos.z + lastRoom.prefabSize.y / 2f + roomSize.prefabSize.y / 2f + RoomDistance
         );
 
-
         return roomPos;
     }
 
@@ -106,21 +108,53 @@ public class MapGenManager : MonoBehaviour
         // Calculate the distance
         float distance = Vector3.Distance(start, end);
         PrefabSize corridorSize = CorridorStraight.GetComponent<PrefabSize>();
+        PrefabSize corridorUnlitSize = CorridorStraightUnlit.GetComponent<PrefabSize>();
+        PrefabSize doorSize = DoorCorridor.GetComponent<PrefabSize>();
 
         // Calculate the number of corridors needed
-        int corridorCount = Mathf.FloorToInt(distance / corridorSize.prefabSize.x);
+        int corridorCount = Mathf.FloorToInt(distance / corridorSize.prefabSize.y);
         Debug.Log($"Creating {corridorCount} corridors from {start} to {end}");
 
         // Create corridors
-        for (int i = 0; i < corridorCount; i++)
+        //Start with door
+        if (corridorCount > 0)
         {
-            Vector3 pos = new Vector3(
-                start.x + i * corridorSize.prefabSize.x + corridorSize.prefabSize.x * 0.5f,
+            Vector3 doorPos = new Vector3(
+                start.x,
                 start.y,
-                start.z
+                start.z + doorSize.prefabSize.y * 0.5f
             );
-            Quaternion rotation = Quaternion.Euler(0, 90, 0);
-            GameObject corridor = Instantiate(CorridorStraight, pos, rotation, transform);
+            Quaternion doorRotation = Quaternion.Euler(0, 0, 0);
+            GameObject doorCorridor = Instantiate(DoorCorridor, doorPos, doorRotation, transform);
+
+
+            for (int i = 1; i < corridorCount; i++)
+            {
+                if(i % 2 != 0)
+                {
+                    // Create straight corridor
+                    Vector3 pos = new Vector3(
+                        start.x,
+                        start.y,
+                        start.z + i * corridorSize.prefabSize.y + corridorSize.prefabSize.y * 0.5f
+                    );
+                    Quaternion rotation = Quaternion.Euler(0, 0, 0);
+                    GameObject corridor = Instantiate(CorridorStraight, pos, rotation, transform);
+                }
+                else
+                {
+                    // Create unlit corridor
+                    Vector3 pos = new Vector3(
+                        start.x,
+                        start.y,
+                        start.z + i * corridorUnlitSize.prefabSize.y + corridorUnlitSize.prefabSize.y * 0.5f
+                    );
+                    Quaternion rotation = Quaternion.Euler(0, 0, 0);
+                    GameObject corridorUnlit = Instantiate(CorridorStraightUnlit, pos, rotation, transform);
+                }
+            } 
         }
+        // If there is not enough space to create corridors, throw an exception
+        else throw new System.Exception("Not enough space to create corridors");
     }
 }