From 7eb8162621935eab71e3a9dfc26ef74147f0a3e3 Mon Sep 17 00:00:00 2001
From: JailGamer <jailgamer@gmail.com>
Date: Sat, 2 May 2026 22:01:44 +0200
Subject: [PATCH] [NEW] Afegida una capa al mapa per a fer coses especials

---
 data/game.lua         |   5 ++++-
 data/stage1.lua       |  48 +++++++++++++++++++++++++-----------------
 data/tiles.gif        | Bin 12113 -> 12102 bytes
 data/tiles_layer2.lua |  41 ++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 data/tiles_layer2.lua

diff --git a/data/game.lua b/data/game.lua
index 1d3ba2f..fd7046e 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -25,8 +25,9 @@ require "trigger_event"
 
 require "batman"
 require "health_potion"
+require "tiles_layer2"
 
-local DEBUG = false
+local DEBUG = true
 
 local tile_w = arcade_config.tiles_width
 local tile_h = arcade_config.tiles_height
@@ -187,6 +188,7 @@ end
 function world_update()
     -- Actualitzar moviment del mapa (ex: tiles animats)
     arc_mapa_update()
+    tiles_layer2.update()
     
     -- Moure a tots
     for key,actor in pairs(actors) do
@@ -227,6 +229,7 @@ end
 function world_draw()
     -- Pintar la finestra del mon
     render_map(sf_mapa, tiles, viewp.x, viewp.y)
+    tiles_layer2.draw()
     
     if stages.boss_loaded then stage_draw_back() end
     
diff --git a/data/stage1.lua b/data/stage1.lua
index 9038cfe..49bb740 100644
--- a/data/stage1.lua
+++ b/data/stage1.lua
@@ -91,8 +91,11 @@ function stages.stage1_init()
     table.insert( actors, zombie.new(73, 7, 3,false) )
     table.insert( actors, zombie.new(75, 3, 3,true) )
     
-    local hp_x, hp_y = coords.room_to_world(11, 7, 4)
-    table.insert( actors, health_potion.new(11, hp_x, hp_y, 0, 0, 1) )
+    local hp_x, hp_y = coords.room_to_world(14, 10, 4)
+    table.insert( actors, health_potion.new(14, hp_x, hp_y, 0, 0, 2) )
+    local hp_x, hp_y = coords.room_to_world(77, 7, 4)
+    table.insert( actors, health_potion.new(77, hp_x, hp_y, 0, 0, 3) )
+    
     
     -- TRIGGERS
     -- if not menu then table.insert(actors,trigger.new(10,57,32,triggers.escena_abad_inici)) end
@@ -149,6 +152,10 @@ function stages.stage1_init()
                        nil,
                        elalien, abad, 150, "I les tisores de podar?", 250)
 
+    tiles_layer2.new(13,11,3,144,144,16,16)
+    tiles_layer2.new(13,11,4,144,144,16,16)
+    tiles_layer2.new(11,10,2,128,208,16,16)
+    
     local abad_x, abad_y = coords.room_to_world ( 10, 4, 3 )
     -- local abad_x, abad_y = coords.room_to_world ( 54, 8, 3 )
     -- local abad_x, abad_y = coords.room_to_world ( 18, 9, 3 )
@@ -347,33 +354,36 @@ stage1_mapa={
     -- 12
     {
         -- 28,29,28,29,28,29,29,256,256,256,26,27,
-        28,29,28,29,28,29,29,1,256,256,26,27,
-        256,256,256,256,256,256,256,256,256,25,72,256,
-        256,256,73,74,256,256,256,256,1,256,88,256,
-        256,256,89,90,256,256,256,1,256,256,256,256,
-        256,256,256,256,256,256,1,256,256,256,256,256,
-        28,29,28,29,28,29,28,29,28,29,28,29,
+         28, 29, 28, 29, 28, 29, 29,  1,256,256, 26, 27,
+        256,256,256,256,256,256,256,256,256, 25, 72,256,
+        -- 256,256, 73, 74,256,256,256,256,  1,256, 88,256,
+        256,256, 73, 74,256,256,256,256,  1,256,256,256,
+        256,256, 89, 90,256,256,256,  1,256,256,256,256,
+        256,256,256,256,256,256,  1,256,256,256,256,256,
+         28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29,
         
     },
     -- 13
     {
-        28,29,26,27,26,27,28,29,28,29,28,29,
-        256,256,256,26,27,256,256,256,256,256,256,256,
-        256,256,256,256,256,256,256,256,73,74,256,256,
-        256,256,256,98,98,256,256,256,89,90,256,256,
+         28, 29, 26, 27, 26, 27, 28, 29, 28, 29, 28, 29,
+        256,256,256, 26, 27,256,256,256,256,256,256,256,
+        256,256,256,256,256,256,256,256, 73, 74,256,256,
+        256,256,256, 98, 98,256,256,256, 89, 90,256,256,
         256,256,104,101,102,103,256,256,256,256,256,256,
         -- 28,29,28,29,28,29,29,256,81,25,28,29,
-        28,29,28,29,28,29,29,256,256,1,28,29,
+         28, 29, 28, 29, 28, 29, 29,256,256,  1, 28, 29,
         
     },
     -- 14
     {
-        28,29,28,29,28,29,28,29,10,11,28,25,
-        256,256,256,256,256,256,256,256,10,11,256,25,
-        256,73,74,256,256,256,256,256,10,11,256,256,
-        256,89,90,256,256,75,76,256,10,11,256,25,
-        256,256,256,256,256,91,92,256,10,11,256,25,
-        28,29,28,29,28,29,28,29,28,29,28,29,
+         28, 29, 28, 29, 28, 29, 28, 29, 10, 11, 28, 25,
+        256,256,256,256,256,256,256,256, 10, 11,256, 25,
+        -- 256, 73, 74,256,256,256,256,256, 10, 11,256,256,
+        256, 73, 74,256,256,256,256,256, 10, 11,256, 25,
+        256, 89, 90,256,256, 75, 76,256, 10, 11,256,256,
+        -- 256,256,256,256,256, 91, 92,256, 10, 11,256, 25,
+        256,256,256,256,256, 91, 92,256, 10, 11,256,256,
+         28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29,
         
     },
     -- 15
diff --git a/data/tiles.gif b/data/tiles.gif
index 798ce18d3d4c8bbc68fbe48547521258f834d678..e0aceb7cd2e80d2cc13e61d63f45c5ec499a6426 100644
GIT binary patch
delta 2229
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
D%6o1#

delta 2240
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
OL4i7OCZ9wG1OPj3;CTiB

diff --git a/data/tiles_layer2.lua b/data/tiles_layer2.lua
new file mode 100644
index 0000000..b5dab03
--- /dev/null
+++ b/data/tiles_layer2.lua
@@ -0,0 +1,41 @@
+tiles_layer2={
+    surf = nil,
+    tiles = {},
+}
+
+function tiles_layer2.new(_hab, _x, _y, _tx, _ty, _tw, _th)
+    local world_x, world_y = coords.room_to_world(_hab,_x,_y)
+    print(world_x.." "..world_y)
+    table.insert( 
+        tiles_layer2.tiles,
+        { hab = _hab,
+            x = world_x,
+            y = world_y,
+            w = _tw,
+            h = _th,
+            tx = _tx,
+            ty = _ty,
+            tw = _tw,
+            th = _th,
+        }
+    )
+end
+
+function tiles_layer2.draw()
+    for i, tile in ipairs(tiles_layer2.tiles) do
+        if viewp:inside(tile.x, tile.y, tile.w, tile.h) then
+            local curr_surf = surf.source() 
+            if tiles_layer2.surf ~= nil then
+                surf.source(tiles_layer2.surf)
+            end
+            local scr_x, scr_y = viewp:screen_coords( tile.x, tile.y )
+            draw.surf(tile.tx, tile.ty, tile.tw, tile.th,
+                      scr_x, scr_y, tile.tw, tile.th)
+            surf.source(curr_surf)
+        end
+    end
+end
+
+function tiles_layer2.update()
+
+end
\ No newline at end of file