From 6db92c3df640408d2bdfeaabfe3ef72a5ab14263 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Fri, 14 Nov 2025 18:43:30 +0100 Subject: [PATCH] - [FIX] Ja funciona tot be amb els gifs --- data/main.lua | 12 +++++------- data/rooms.lua | 3 ++- data/rooms_background.bin | Bin 394 -> 0 bytes data/rooms_background.gif | Bin 227 -> 1162 bytes data/rooms_foreground.bin | Bin 960 -> 0 bytes data/rooms_foreground.gif | Bin 962 -> 1728 bytes data/rooms_items.bin | Bin 227 -> 0 bytes data/rooms_items.gif | Bin 285 -> 995 bytes 8 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 data/rooms_background.bin delete mode 100644 data/rooms_foreground.bin delete mode 100644 data/rooms_items.bin diff --git a/data/main.lua b/data/main.lua index 0cf2a27..ced4471 100644 --- a/data/main.lua +++ b/data/main.lua @@ -8,9 +8,8 @@ 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("test.gif") - surf.save(surf_tiles, "data/test2.gif",pal.load("test.gif")) - sys.quit() + surf_tiles = surf.load("tiles.gif") + pal.set(pal.load("tiles.gif")) end @@ -18,13 +17,12 @@ 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 24e392a..fef978a 100644 --- a/data/rooms.lua +++ b/data/rooms.lua @@ -56,7 +56,8 @@ rooms = { end, save = function() - local p = pal.load("tiles.gif") + local p = {} + for i=0,255 do p[i] = {r=i,g=i,b=i} end 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) diff --git a/data/rooms_background.bin b/data/rooms_background.bin deleted file mode 100644 index 81d1746d641a75414ad87f59f62648d6f13fa580..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmV;50d@XINk%w1VW0qD0C4{REC2ui0H6S1000R808I!SNU)&6g9sBUT*$DY!-o(f zN}NcsqQ#3CGiuz(v7^V2AVZ2ANwTELlPFWFT*w->WDb_-dK&IAdZ8zUn7j2n6_?=yy4FF9pd*z-oxAG zW|+f93gZu1Lm#|+dc+*bDdKo;y}Ngt(!XDC3?Gp%ckvBT%ntrGJNkugxd(UuUSVT_ z=j+=SuD^Wy{{B@5phKMv7@c~e8E7AU3O48{0D=aK5EiElB zE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG` zKR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$ zQBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRon zVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{t zxw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve z%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO z+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08 z?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6w->WDb_-dK&IAdZ8zUn7j2n6_?=yy4FF9pd*z-oxAGW|+f93gZu1Lm#|+ zdc+*bDdKo;y}Ngt(!XDC3?Gp%ckvBT%ntrGJNkugxd(UuUSVT_=j+=SuD^Wy{{B@5 zphKMv7@c~e8E7AU3O48nE(I) 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 diff --git a/data/rooms_foreground.bin b/data/rooms_foreground.bin deleted file mode 100644 index 64bdfa1d51ad50bb824e93673e9a24d46aaf06ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 960 zcmV;x13&ynNk%w1VW0qD0C4{REC2ui0H6S1000R80Aa)sNN}LRf&~F6T*$DY!-o(f zN}NcsqQ#3C84k?Iv7^V2AVYE#D6*uZ4uuw&Cg^%@ba z+P6YOgit8AuHCzM1K`~&7p~umUJ)J~EI2@nzlcLh?HC}jV~=bZKb{;F2FS*gGfx!E znXqTgpm|yjP1DI6%u8vLH;p^JCbL-yCySMM(z=I1PPQ1AB~M>Rzy^xFoOjbR74eo4uxhC(=lh1QR#}L=Z#j7{O>TDkQ^b zC_*%o2qQRDqfITsIKz$%2{_+HAb^mhQdLegrI=wtC}VkL0)SqMPS=jnd3I@GH} zj>0e(m~Fxs=&uYF+fc9!H4CG(72Ue5t1WIw=dl1l%Mh&r&`PaE)?$aPueC0OS*28A zm1u*hR)krnGszp^yrSA`YYC=a<>R)zsyY#lG_V?_z&`dX5e?CnFmF>e37BdC5Cf3$ z#?z__Yn-BjN|B=<+xFp?fr<=l1+!IaXTV=Ns+n(&zUXJ%>ME{H{uW3?Ht|?F)oqZQSkkC z+>SFuxO0X(gmA(YsO>gIimwg#6q}Q`wa>_wkb2#f_x&jVnQsR!>k*|L1xBTx1%TyL z1RwkqwJ!(xLwn0!QQMZs{WjYUy}n$axaTB!L&YmsEW$WluetKgb#7zE8sDh<6bw1; iIPp=4K85h`3vYM!$sOPN>zk*}xAf7=&VO{0D=aK5EiElB zE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG` zKR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$ zQBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRon zVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{t zxw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve z%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO z+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08 z?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6Z4uuw&Cg^%@ba+P6YOgit8AuHCzM z1K`~&7p~umUJ)J~EI2@nzlcLh?HC}jV~=bZKb{;F2FS*gGfx!EnXqTgpm|yjP1DI6%u8vLH;p^JCbL-yCySMM(z=I1PPQ1AB~M>Rzy^xFoOjbR74eo4uxhC(=lh1QR#}L=Z#j7{O>TDkQ^bC_*%o2qQRDqfITs zIKz$%2{_+HAb^mhQdLegrI=wtC}VkL0)SqMPS=jnd3I@GH}j>0e(m~Fxs=&uYF z+fc9!H4CG(72Ue5t1WIw=dl1l%Mh&r&`PaE)?$aPueC0OS*28Am1u*hR)krnGszp^ zyrSA`YYC=a<>R)zsyY#lG_V?_z&`dX5e?CnFmF>e37BdC5Cf3$#?z__Yn-BjN|B=< z+xFp?fr<=l1+!IaXTV=Ns+n(&zUXJ%>ME{H{uW3?Ht|?F)oqZQSkkC+>SFuxO0X(gmA(Y zsO>gIimwg#6q}Q`wa>_wkb2#f_x&jVnQsR!>k*|L1xBTx1%TyL1RwkqwJ!(xLwn0! zQQMZs{WjYUy}n$axaTB!L&YmsEW$WluetKgb#7zE8sDh<6bw1;IPp=4K85h`3vYM! W$sOPN>zk*}xAf7=&VOv 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 diff --git a/data/rooms_items.bin b/data/rooms_items.bin deleted file mode 100644 index ff7db0799fc8b918ca2adbd20c98bdc1bcaad2f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmV<90382ENk%w1VW0qD0C4{REC2ui0H6S1000Qc009UbNU)&6g9sBUT*$DY!-o(f zN}NcsqQ#3CGiuz(v7^V2AVZ2ANwTELlPFWFT*%##706RT>b$S2* diff --git a/data/rooms_items.gif b/data/rooms_items.gif index 64a91f9e68a7cb43e51fab91cf07bcb321ac008d..07a68a572ec6c6d487fc33b79e311fc26e6cc5cb 100644 GIT binary patch literal 995 zcmV<9104KENk%w1VW0qD0QUd@0RaI50s;dA0|W#F1qB5L1_lQQ2M7oV2?+@b3JMDg z3k(bl4Gj$r4h|0w4-gO#5fKp*5)u;=6BHB_6%`d078Vy57Z?~A85tQG8X6lL8yp-Q z9UUDW9v&YbA0QwgAt50mA|fLrBP1jwB_$;$CMG8*CnzW=DJdx`Dk>{0D=aK5EiElB zE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG` zKR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$ zQBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRon zVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{t zxw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve z%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO z+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08 z?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6%##706U#W^N|1m 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