From aef6e97df002e6a587c328649bca515a5e057d27 Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Mon, 17 Nov 2025 11:19:43 +0000
Subject: [PATCH] fix: Update item spawn positioning to respect room GU
 boundaries and padding

- Modified createSpriteAtRandomPosition() to accept map parameter
- Items now use actual room dimensions based on tilemap (respects room GU)
- Applied correct padding constraints:
  * 1 tile (32px) from left and right sides
  * 2 tiles (64px) from top and bottom
- Random item placement now works correctly with variable room sizes
- Ensures items stay within playable room bounds

Related to new room layout system (Grid Unit based positioning)
---
 js/core/rooms.js | 56 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/js/core/rooms.js b/js/core/rooms.js
index 947c5c6..246bf26 100644
--- a/js/core/rooms.js
+++ b/js/core/rooms.js
@@ -485,31 +485,59 @@ function createSpriteFromMatch(tiledItem, scenarioObj, position, roomId, index,
 /**
  * Helper: Create sprite at random position when no matching Tiled item found
  * Ensures position doesn't overlap with existing items
+ * Items are placed within room GU boundaries with proper padding:
+ * - 1 tile (32px) from left and right sides
+ * - 2 tiles (64px) from top and bottom
  */
-function createSpriteAtRandomPosition(scenarioObj, position, roomId, index) {
-    const roomWidth = 10 * TILE_SIZE;
-    const roomHeight = 9 * TILE_SIZE;
-    const padding = TILE_SIZE * 2;
-    
+function createSpriteAtRandomPosition(scenarioObj, position, roomId, index, map) {
+    // Get actual room dimensions from the tilemap
+    let roomWidth = 10 * TILE_SIZE;   // fallback
+    let roomHeight = 10 * TILE_SIZE;  // fallback
+
+    if (map) {
+        let width, height;
+        if (map.json) {
+            width = map.json.width;
+            height = map.json.height;
+        } else if (map.data) {
+            width = map.data.width;
+            height = map.data.height;
+        } else {
+            width = map.width;
+            height = map.height;
+        }
+
+        if (width && height) {
+            roomWidth = width * TILE_SIZE;
+            roomHeight = height * TILE_SIZE;
+        }
+    }
+
+    // Apply proper padding based on requirements:
+    // - 1 tile (32px) from left and right sides
+    // - 2 tiles (64px) from top and bottom
+    const paddingX = TILE_SIZE * 1;  // 32px from sides
+    const paddingY = TILE_SIZE * 2;  // 64px from top/bottom
+
     // Find a valid position that doesn't overlap with existing items
     let randomX, randomY;
     let attempts = 0;
     const maxAttempts = 50;
-    
+
     do {
-        randomX = position.x + padding + Math.random() * (roomWidth - padding * 2);
-        randomY = position.y + padding + Math.random() * (roomHeight - padding * 2);
+        randomX = position.x + paddingX + Math.random() * (roomWidth - paddingX * 2);
+        randomY = position.y + paddingY + Math.random() * (roomHeight - paddingY * 2);
         attempts++;
     } while (attempts < maxAttempts && isPositionOverlapping(randomX, randomY, roomId, TILE_SIZE));
-    
+
     const sprite = gameRef.add.sprite(Math.round(randomX), Math.round(randomY), scenarioObj.type);
-    
+
     console.log(`Created ${scenarioObj.type} at random position - no matching item found (attempts: ${attempts})`);
-    
+
     // Apply properties
     sprite.setOrigin(0, 0);
     applyScenarioProperties(sprite, scenarioObj, roomId, index);
-    
+
     return sprite;
 }
 
@@ -1834,8 +1862,8 @@ export function createRoom(roomId, roomData, position) {
                     
                 } else {
                     // No matching item found, create at random position (existing fallback behavior)
-                    sprite = createSpriteAtRandomPosition(scenarioObj, position, roomId, index);
-                    
+                    sprite = createSpriteAtRandomPosition(scenarioObj, position, roomId, index, map);
+
                     // Set depth and store
                     setDepthAndStore(sprite, position, roomId, false);
                 }