From e456f0f781e4c81c1d9e864d57eba62189e93687 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Wed, 25 Jun 2025 13:56:08 +0200 Subject: [PATCH] -[NEW] Ara es poden reloadar les textures des de l'editor amb F11 - [FIX] No es podia tilepickar quan editaves el tilemap de fondo - Habitacions, tiles... --- data/editor.lua | 7 +++++++ data/main.lua | 9 ++++++++- data/rooms_background.bin | Bin 383 -> 394 bytes data/rooms_foreground.bin | Bin 921 -> 960 bytes data/tiles.gif | Bin 1364 -> 1757 bytes 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/data/editor.lua b/data/editor.lua index 7f4da88..3444d41 100644 --- a/data/editor.lua +++ b/data/editor.lua @@ -91,10 +91,17 @@ editor = { sprites.hero.pos.y = ty*8-9 elseif key.press(key.F9) then editor.play() + elseif key.press(key.F11 ) then + reload_textures() end end, create_stamp=function() + if editor.layer == LAYER_FOREGROUND then + map.surf(rooms.surf_foreground) + elseif editor.layer == LAYER_BACKGROUND then + map.surf(rooms.surf_background) + end local tx1,ty1,tx2,ty2=editor.selection.x1,editor.selection.y1,editor.selection.x2,editor.selection.y2 if tx1>tx2 then tx1,tx2=tx2,tx1 end if ty1>ty2 then ty1,ty2=ty2,ty1 end diff --git a/data/main.lua b/data/main.lua index e36c3f3..ced4471 100644 --- a/data/main.lua +++ b/data/main.lua @@ -4,10 +4,17 @@ require "rooms" require "editor" require "game" -function mini.init() +function reload_textures() + if surf_sprites then surf.free(surf_sprites) end surf_sprites = surf.load("sprites.gif") + if surf_tiles then surf.free(surf_tiles) end surf_tiles = surf.load("tiles.gif") + pal.set(pal.load("tiles.gif")) +end + +function mini.init() + reload_textures() pal.trans(0) rooms.init() diff --git a/data/rooms_background.bin b/data/rooms_background.bin index 1c164d79e9dae4457367c8a1564e6dadc2ca846e..81d1746d641a75414ad87f59f62648d6f13fa580 100644 GIT binary patch delta 256 zcmV+b0ssF00*V8Wl7A}@h1<7qJbAcmG~tV}a-E+ZV3CeEa_XRR^F$oedbBdZHOY)}ZYUszzKJ#>i35R%B5f3|XrhZS#wg>AG}dV2jX370S54KEjG-IisFjn6(MlukXe_ zjav0*->DnF?(7-(?AWkh^OkJ!0r#JI$o)2;LIHwS-hl)qc;A8yMkt|9 v_)X|g4*prF;f5z+$l-?|hFFw`B9>_4i72M1;)*P`=;Dho#wcS+0RaFzLivB| diff --git a/data/rooms_foreground.bin b/data/rooms_foreground.bin index 364d5237f3da51548da116abd084d950ec18587e..64bdfa1d51ad50bb824e93673e9a24d46aaf06ef 100644 GIT binary patch delta 700 zcmV;t0z>_o2fzog5dnXlqZl&a!H@shUQ#>8I%w#SM``||oH^^+)65!wYy0|6@8ciZ zeZT+X5ri;PP*oK;-%KdTVBmuDp@71FJk?}YL{yV>98qSBoMf&Y` z(}WSl0D+41QKTY=4F&iWMg1v6!;LsLR3d&S(nym86F3A!5JP|J7{O>TDkQ^bC_*%o z2qQRDqfITsIKz$%2{_+HAb^mhQdLegrI=wtC}VkL0)SgY5))eknzUT zstRkIqJm11qaWM$;g^Am3~U9nRcmL!UplI?L?nkflZOq3(CW7p+_(_O8Z#7V1Rs_R zfW>sKJCUO@5Zo}&714lkpfflvk%veosWe25)eM7yT2`f3y48U@QDcEZ5ycd2x9zsu z0ko|)!xVqb{oK}I0pKVYVOXWqnA&{PJyGD#nJv-G{_;IH;t$#F9NrEwE|J_(@cnk& zjx$8KbA~&FaKaU+?KVYzk*}xAf7=&VO+ delta 661 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