From eb7c43a4f15ea9dd872a83f01e367855b4b898b4 Mon Sep 17 00:00:00 2001
From: Max <mjdodd01@comcast.net>
Date: Thu, 6 Feb 2025 15:02:21 +0100
Subject: [PATCH] Implemented bi-directional linking between rooms

---
 .../DungeonGenerator/DungeonGenerator.cs      |  9 +--
 .../Assets/Scripts/DungeonGenerator/Room.cs   | 68 ++++++++-----------
 2 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonGenerator.cs b/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonGenerator.cs
index 3da0ab8..f39023c 100644
--- a/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonGenerator.cs
+++ b/PuzzleGameProject/Assets/Scripts/DungeonGenerator/DungeonGenerator.cs
@@ -46,14 +46,6 @@ namespace DungeonGenerator
             return dungeonMap;
         }
 
-        enum RoomSide
-        {
-            Top,
-            Bottom,
-            Left,
-            Right
-        }
-
         private void AddNormalRoomsAroundMonsterRooms(DungeonMap dungeon)
         {
             HashSet<Point> unoccupiedPoints = dungeon.GetUnoccupiedPoints();
@@ -130,6 +122,7 @@ namespace DungeonGenerator
                     Room newRoom = CreateAdjacentRoom(RoomType.Normal, unoccupiedPointsOnSide, side);
                     if (newRoom != null)
                     {
+                        monsterRoom.AddAdjacentRoom(newRoom, side);
                         newRooms.Add(newRoom);
                     }
                 }
diff --git a/PuzzleGameProject/Assets/Scripts/DungeonGenerator/Room.cs b/PuzzleGameProject/Assets/Scripts/DungeonGenerator/Room.cs
index 18719a8..b988324 100644
--- a/PuzzleGameProject/Assets/Scripts/DungeonGenerator/Room.cs
+++ b/PuzzleGameProject/Assets/Scripts/DungeonGenerator/Room.cs
@@ -1,9 +1,17 @@
+using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using Unity.VisualScripting;
 
 namespace DungeonGenerator
 {
+    public enum RoomSide
+    {
+        Top,
+        Bottom,
+        Left,
+        Right
+    }
     public enum RoomType
     {
         Normal,
@@ -22,10 +30,7 @@ namespace DungeonGenerator
             PositionOfTopLeft = positionOfTopLeft;
         }
 
-        private List<Room> _topAdjacentRooms = new List<Room>();
-        private List<Room> _bottomAdjacentRooms = new List<Room>();
-        private List<Room> _leftAdjacentRooms = new List<Room>();
-        private List<Room> _rightAdjacentRooms = new List<Room>();
+        private readonly Dictionary<RoomSide, List<Room>> _adjacentRooms = new();
 
         public RoomType TypeOfRoom { get; set; }
         public int Height { get; set; }
@@ -58,44 +63,29 @@ namespace DungeonGenerator
             return new Point(PositionOfTopLeft.X + Width / 2, PositionOfTopLeft.Y + Height / 2);
         }
         
-        public void AddTopAdjacentRoom(Room room)
+        public void AddAdjacentRoom(Room room, RoomSide side)
         {
-            _topAdjacentRooms.Add(room);
+            if (!_adjacentRooms.ContainsKey(side))
+            {
+                _adjacentRooms[side] = new List<Room>();
+            }
+
+            // Prevent duplicates
+            if (!_adjacentRooms[side].Contains(room))
+            {
+                _adjacentRooms[side].Add(room);
+                room.AddAdjacentRoom(this, GetOppositeSide(side)); // Ensure bidirectional linkage
+            }
         }
 
-        public List<Room> GetTopAdjaceRooms()
+        // Helper method to get the opposite side
+        private RoomSide GetOppositeSide(RoomSide side) => side switch
         {
-            return _topAdjacentRooms;
-        }
-
-        public void AddBottomAdjacentRoom(Room room)
-        {
-            _bottomAdjacentRooms.Add(room);
-        }
-        
-        public List<Room> GetBottomAdjaceRooms()
-        {
-            return _bottomAdjacentRooms;
-        }
-
-        public void AddLeftAdjacentRoom(Room room)
-        {
-            _leftAdjacentRooms.Add(room);
-        }
-        
-        public List<Room> GetLeftAdjaceRooms()
-        {
-            return _leftAdjacentRooms;
-        }
-
-        public void AddRightAdjacentRoom(Room room)
-        {
-            _rightAdjacentRooms.Add(room);
-        }
-        
-        public List<Room> GetRightAdjaceRooms()
-        {
-            return _rightAdjacentRooms;
-        }
+            RoomSide.Top => RoomSide.Bottom,
+            RoomSide.Bottom => RoomSide.Top,
+            RoomSide.Left => RoomSide.Right,
+            RoomSide.Right => RoomSide.Left,
+            _ => throw new ArgumentException("Invalid RoomSide", nameof(side))
+        };
     }
 }
\ No newline at end of file