From 67192623fe85f1f1653616ba669b25b96561b1f8 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Thu, 13 Nov 2025 17:44:56 +0100 Subject: [PATCH] =?UTF-8?q?-Treballant=20en=20l'edicio=20de=20items,=20per?= =?UTF-8?q?o=20els=20GIFs=20est=C3=A1n=20donant=20pel=20cul?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/editor.lua | 7 ++++--- data/game.lua | 1 + data/main.lua | 12 +++++++----- data/rooms.lua | 14 ++++++++------ data/rooms_background.gif | Bin 0 -> 227 bytes data/rooms_foreground.gif | Bin 0 -> 962 bytes data/rooms_items.gif | Bin 0 -> 285 bytes data/sprites.lua | 10 +++++++++- 8 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 data/rooms_background.gif create mode 100644 data/rooms_foreground.gif create mode 100644 data/rooms_items.gif diff --git a/data/editor.lua b/data/editor.lua index cf95e59..372b125 100644 --- a/data/editor.lua +++ b/data/editor.lua @@ -74,10 +74,11 @@ editor = { else if mouse.press(mouse.LEFT) then if editor.item_selected then - surf.target(rooms.surf_items) - surf.pixel(tx,ty,editor.item_selected) + map.surf(rooms.surf_items) + --print(editor.item_selected) + map.tile(tx,ty,editor.item_selected) editor.modified = true - surf.target(0) + --surf.target(0) end end if mouse.press(mouse.RIGHT) then diff --git a/data/game.lua b/data/game.lua index c80df19..c504b14 100644 --- a/data/game.lua +++ b/data/game.lua @@ -31,6 +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() app.push(game.update_change_room) end, diff --git a/data/main.lua b/data/main.lua index ced4471..0cf2a27 100644 --- a/data/main.lua +++ b/data/main.lua @@ -8,8 +8,9 @@ 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") - + surf_tiles = surf.load("test.gif") + surf.save(surf_tiles, "data/test2.gif",pal.load("test.gif")) + sys.quit() pal.set(pal.load("tiles.gif")) end @@ -17,12 +18,13 @@ function mini.init() reload_textures() pal.trans(0) - rooms.init() - shader.init("lynx.glsl") - editor.enable() + --rooms.init() + --shader.init("lynx.glsl") + --editor.enable() end function mini.update() app.update() + sys.quit() end diff --git a/data/rooms.lua b/data/rooms.lua index a070958..24e392a 100644 --- a/data/rooms.lua +++ b/data/rooms.lua @@ -6,6 +6,7 @@ LAYER_ITEMS = 4 LAYER_SPRITES = 8 LAYER_SHADOWS = 16 LAYER_ALL = 31 +ROOM_FILE_EXT = ".gif" rooms = { surf_background = nil, @@ -22,15 +23,15 @@ rooms = { init = function() rooms.pos.x, rooms.pos.y = 0,4*12 if rooms.surf_background ~= nil then surf.free(rooms.surf_background) end - rooms.surf_background = surf.load("rooms_background.bin") + rooms.surf_background = surf.load("rooms_background"..ROOM_FILE_EXT) --rooms.surf_background = surf.new(20*8,12*8) if rooms.surf_foreground ~= nil then surf.free(rooms.surf_foreground) end - rooms.surf_foreground = surf.load("rooms_foreground.bin") + rooms.surf_foreground = surf.load("rooms_foreground"..ROOM_FILE_EXT) --rooms.surf_foreground = surf.new(20*8,12*8) if rooms.surf_items ~= nil then surf.free(rooms.surf_items) end - rooms.surf_items = surf.load("rooms_items.bin") + rooms.surf_items = surf.load("rooms_items"..ROOM_FILE_EXT) --rooms.surf_items = surf.new(20*8,12*8) rooms.surf_original_items = surf.new(20*8,12*8) @@ -55,9 +56,10 @@ rooms = { end, save = function() - surf.save(rooms.surf_background, "data/rooms_background.bin") - surf.save(rooms.surf_foreground, "data/rooms_foreground.bin") - surf.save(rooms.surf_items, "data/rooms_items.bin") + local p = pal.load("tiles.gif") + surf.save(rooms.surf_background, "data/rooms_background"..ROOM_FILE_EXT, p) + surf.save(rooms.surf_foreground, "data/rooms_foreground"..ROOM_FILE_EXT, p) + surf.save(rooms.surf_items, "data/rooms_items"..ROOM_FILE_EXT, p) editor.modified = false end, diff --git a/data/rooms_background.gif b/data/rooms_background.gif new file mode 100644 index 0000000000000000000000000000000000000000..f33e26d2ec7ac33cda7e44d90d6383c0cfbef353 GIT binary patch literal 227 zcmZ?wbhEHbT)>dPaD)L05-f%NwNr-jDq8flf(ZrFf>IQcBNV`str7t6J5Q@ z@Ap}$nQf&r+RKkl3^_Zm;Kj`14|~fU8y1wT-Mw%3rsEst{k}i@*rCJ!e?Iy5|G$j5 z0mNt>5CyV}fi+`+W?xF=q8BqKy}r@4UUIc@^ltMxr>*ZlE?6zED=Iy$X+;c=hOla@ zyHLnV<5stm_YKo0M;%;tN8EFpX|Bd*9rv}5qAryFGF9JK`s2?$^DXoLbh32qU9fS^ XM;SBTRV}J!R=1uQxJ_$eV6X-NcYR{M literal 0 HcmV?d00001 diff --git a/data/rooms_foreground.gif b/data/rooms_foreground.gif new file mode 100644 index 0000000000000000000000000000000000000000..8b7a9a4d4ca2d736f0c28368cffb2001914dfd11 GIT binary patch literal 962 zcmV;z13mmlNk%w1VW0qD0K@us^J4d@POIKT8V`pn`b9Z}xgNKWclb4&H zqo=E{v$wnB)V+JQ$v@K9C&u%Lk@ffE`*jaT9W-wryRSd zWn};)N|;7{T6JpED5%;(oLI9B&v*gdt(@A1>8x%eSH6tnGFrl42iG%AL&y*nrsdiQ zG1_i$70YMThG&~)au?KFn1(Uw?(vP6t+U|X0{dR=q*tV`;aq(2@xUvrIL~5vfaU9L zkoOLJ_%XMFEv?ak$7iwsO?Mv+w$wI7f*pO9TM7;~S3+-hTs2=<-o+3V4Z|&Ai*FUq zfP-lYLR5uE_61-=j8Ca|pIR^g=#FV6(xBpVG*DAs1v_3>0W|E@p`l$m-q7P=9YIH& zY!yJYf{XwNS3v~61?6I50?uHX3>{u&Ukwh5SiuZqifQCVU&6pjk2gXVmt=-XX#*>l zK@r6ie*Ot4paJ~J=Y};D%Fdg&nFdB#a00+*qlVHTDLWs^Fl3$pG+Jn;Fd({)qAqwk z1EEng8t9;)vQX(dm%0!lntTFEX&AE#Iz_7hy-B4Dj5-=aq(rf@Dn8!z8pEDZ;K1p! zEUH~fj}pn>}7g0AUYhHMt3x?t@&+=Yn6xh;r`&Z|$|5S6m@ kfC_50QQSIhztbX`t~uEHT7tN(>e?v0;Toc_IUxW5J5oWw5dZ)H literal 0 HcmV?d00001 diff --git a/data/rooms_items.gif b/data/rooms_items.gif new file mode 100644 index 0000000000000000000000000000000000000000..64a91f9e68a7cb43e51fab91cf07bcb321ac008d GIT binary patch literal 285 zcmZ?wbhEHbT)>dPaD)L05-f%NwNr-jDq8flf(ZrFf>IQcBNV`str7t6J5Q@ z@Ap}$nQf&r+RKkl3^_Zm;Kj`14|~fU8y1wT-Mw%3rsEst{k}i@*rCJ!e?Iy5|G$j5 z0mNt>5CyV}fpw9BLSIVeyo^=ra$fH%&^cd{d%t4c`#VzF`yUqmoD;YG{>RF{^X`BD&&bBbCnP2% zr=+H(XJlq&=j7()7Zes1mz0*3S5#J2*VNY4H)-0ed5e~7&ojP~v+O2z! gp1pea>D#Y=OzhnJ!s62M%Iezs#^%=Z+ZY(E0bhEAvj6}9 literal 0 HcmV?d00001 diff --git a/data/sprites.lua b/data/sprites.lua index a67cc3c..2f737e3 100644 --- a/data/sprites.lua +++ b/data/sprites.lua @@ -26,7 +26,15 @@ sprites = { end, add_from_room = function() - + 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 + end + io.write("\n") + end end, init = function()