From 8dc76e13822aaab492fe2be08bb6d56faa5d9b5d Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Fri, 14 Nov 2025 20:08:26 +0100
Subject: [PATCH] =?UTF-8?q?-=20[NEW]=20Ja=20lleva=20o=20fica=20els=20items?=
 =?UTF-8?q?=20segons=20l'habitaci=C3=B3=20que=20entra?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/game.lua        |   2 +-
 data/rooms_items.gif | Bin 995 -> 999 bytes
 data/sprites.lua     |  24 ++++++++++++++----------
 data/templates.lua   |   3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/data/game.lua b/data/game.lua
index c504b14..4b02945 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -31,7 +31,7 @@ game = {
         game.chg_step = 8
         sprites.pause_ia = true
         -- [TODO] Crear els sprites per als items de l'habitació a la que entrem
-        sprites.add_from_room()
+        sprites.add_from_room(rooms.pos.x+x*20, rooms.pos.y+y*12)
         app.push(game.update_change_room)
     end,
 
diff --git a/data/rooms_items.gif b/data/rooms_items.gif
index 07a68a572ec6c6d487fc33b79e311fc26e6cc5cb..047665e6f4c529a924ecd66fb9b191b2d33f9cad 100644
GIT binary patch
delta 56
zcmaFN{+xXS7c+kt1A`6&5G-IwU|`@lGg*?kpRbqkAD5iZjtvhFcNDYvP2R?=!Fhc{
L^65570S0RT#<&r_

delta 52
zcmaFP{+N9O7c)Nt1A`6_Gb~_8U|`@lF<FwipKpHyGq;@2jtvhFcL;08P2R?=!FrgH
Hk--`OV=@j+

diff --git a/data/sprites.lua b/data/sprites.lua
index 2f737e3..339b4ce 100644
--- a/data/sprites.lua
+++ b/data/sprites.lua
@@ -17,23 +17,27 @@ sprites = {
     end,
 
     remove_out_of_room = function()
+        print("Current room: "..rooms.current())
         for i,v in ipairs(sprites.list) do
             if v.room ~= rooms.current() then
                 table.remove(sprites.list, i)
-                print("Sprite removed: "..v.type)
+                local room = v.room or 0
+                print("Sprite at room "..room.." removed: "..v.type)
             end
         end
     end,
 
-    add_from_room = function()
+    add_from_room = function(rx,ry)
         map.surf(rooms.surf_items)
-        for y = rooms.pos.y, rooms.pos.y+19 do
-            for x = rooms.pos.x, rooms.pos.x+11 do
-                --if surf.pixel(x,y) ~= 0 then
-                    io.write(map.tile(x,y)..",")
-                --end
+        for y = ry, ry+11 do
+            for x = rx, rx+19 do
+                if map.tile(x,y) ~= 0 then
+                    local room = (rx//20) + (ry//12) * 8
+                    io.write("crear "..items[map.tile(x,y)].name.." en hab "..room.." ("..x..","..y..")...\n")
+                    table.insert(sprites.list, templates.create(items[map.tile(x,y)].name, {pos={x=x*8, y=y*8},flipped=true, room=room}))
+                end
             end
-            io.write("\n")
+            --io.write("\n")
         end
     end,
 
@@ -113,14 +117,14 @@ sprites = {
     update_mummy = function(spr)
         if spr.state == templates.ALIVE then
             if spr.flipped then
-                local tx, ty = (spr.pos.x+3)>>3, (spr.pos.y+16)>>3
+                local tx, ty = (spr.pos.x+3)>>3, (spr.pos.y+15)>>3
                 if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 and map.tile(tx,ty+1) > 0 then
                     spr.pos.x = spr.pos.x - 1
                 else
                     spr.flipped = not spr.flipped
                 end
             else
-                local tx, ty = (spr.pos.x+12)>>3, (spr.pos.y+16)>>3
+                local tx, ty = (spr.pos.x+12)>>3, (spr.pos.y+15)>>3
                 if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 and map.tile(tx,ty+1) > 0 then
                     spr.pos.x = spr.pos.x + 1
                 else
diff --git a/data/templates.lua b/data/templates.lua
index 2ba945f..6cad3bf 100644
--- a/data/templates.lua
+++ b/data/templates.lua
@@ -18,6 +18,7 @@ templates = {
                 animation = "mummy_walk",
                 state = templates.ALIVE,
                 enemy = true,
+                room = options.room,
                 ia = sprites.update_mummy
             }
         elseif type == "bullet" then
@@ -35,7 +36,7 @@ templates = {
         else
             error("Template not recognized")
         end
-        sprite.room = rooms.current()
+        --sprite.room = rooms.current()
         print("creat sprite de tipus "..type)
         return sprite
     end,