From 8a80bffe4228ac025e08ae99f05c8df5095c6156 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Sun, 12 Apr 2026 11:47:22 +0200 Subject: [PATCH] =?UTF-8?q?-=20[NEW]=20Adaptat=20a=20l'=C3=BAltima=20versi?= =?UTF-8?q?=C3=B3=20de=20mini=20(1.5.dev)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/maps/rooms_background.gif | Bin 2764 -> 2841 bytes data/maps/rooms_foreground.gif | Bin 3619 -> 4009 bytes data/maps/rooms_items.gif | Bin 1328 -> 1329 bytes data/modules/menu.lua | 2 +- data/modules/rooms.lua | 2 +- data/modules/score.lua | 2 +- data/stages/editor.lua | 14 +++++++------- data/stages/game.lua | 18 +++++++++--------- data/utils/msgbox.lua | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/data/maps/rooms_background.gif b/data/maps/rooms_background.gif index 66bf4eb1d59dfe8405c8de67ca3bbdfedd1e8d09..7f61a8d8ef3b6c0058b3cb6bd7b7c8a7aa1fdc34 100644 GIT binary patch delta 2063 zcmV+q2=MpJ6`2;W3IhQElM4eKe_)G;5F<*QNU>r>h8Qzy+{m$`#(@euqG&jhVMr4e zQ>skqv8BtGFbBRYY2xI;lPh!TYyq>U&z}Wt&ZL=;=+2`Sfht|PQ6Lf|NqPzmN|cAy zt5~yY-O3d!)30C;V!@I{D$$!pk*d8Iwyj&2Q){MOyY{W!yBOmxq)QjCe_y|P5%R73 zx3Js52fHd>tk|&Q#|8(l1c?~3<*$-eQa*dRGe!WQLxVN}AR~axDL0E=&APSg*RW&D zc72z{-nE-6Zub0`AZM7i1>>fyn=)_5m1`EX!4PWjgLHFK+_Z0`<=KfaPbOf7|{_{CMeg-a$tgv|mBN<&Z)_ z{^bPVUCC)z7DG4G6rDqw$@Jh`5q88}V(noC5@X?Q$W%%D9T?Vy0!^l&iC+ykU|THK zmtlu6nl{^Lq?OhaUl^t~(2hhFY2=ZQHK^p0Og@BAa8M$6(?U@~f7j%dSfci%lqOV( z9+%x^Ddw2>9aN>47@>)VaAdaWCQoK^$$~)X8C0bTD`XVno_zM{=bv3|*(HK>rpcua zJ1m3*gKst}=97hX87Y-uYR9Ofm@)||3eV|fg z|0?UO3!Oxeia)BVe`{Z?l4Qbw@@=&1ut>d#Sg<4!N9?jIZLtN1n?)<_wA9sVBeRk@ z%h0JDu}~+q;6|$v4$8K`L=zUBi!DXkQo4|W1;P6yw`heM6kOjuQ?0V>Rm7OVVB%}j!=cB+X}o1*DtH_Wn2O|V1#mD0|9nxXHbdW?a;TN^o`^Q zbHSSk6_=A9K!k*unHydP#*w295OXMaUPBN#wTGZ^Cnj8y3Tp!tzV*!nt~*QN{|+Y+ zf8{VGe?RXYq7or8e@e-eGF?oR$S8e=tQZo{jlDr%)e<;M z``nS1wPak>K<75_{Shxg{9E^i7PDLK#F!$K$PHNuI^zT|j|#ETRayYXFIH14^qW;S z8Dqw+*w2#9jG$CJxh>X(3662h$tn55gj_~sm5=1e7JYI9De?y)K@^DFhKc{nhn!1^ ze@9f<98K9 z+9}bZp-iPNeIm{&fn|RT?V9zvsFgBWvzliUqg8UMn6mlQniPXyH_gb>^Zn8;^oeGW z(3wn-4lSThC1n#%s=%P3Frq_CWD62$e-@1<&S%0wlE9w?eSKEumMu`2K7uV4z_!PX`P5O z3T4Pj@hKgOh?0pEW8896Al-2N&AWC9?_MYbMAAW4gw@UB7Qt5{=Ays`?d`8V9gBj? z`sAAp6^O-dyVHun36|mW?_%|vf4=X!6egWzNPz1@L#8e;Xy-z)x$e_YlG*mC9) zFuN3ZzHBjqY?D3~+L(D2F6x@;MQE3{lw~U;-$9OQlS8A2&z!PNnirB?*tssweLHiZ zv;1aEb1czzX`Tt(=IAup2E}GRYV)Fd9V^odPZ)u;YWv_#A^4kj tNnrWLSG4t(GYjD@?|3#G1w7gal3%iM)9BY)NKTHoprmLQgC!sU0Xv~f>ZSky delta 1985 zcmV;y2R`_j7R(i}3IhRElM4eKe;~t$5F<*QNU@^DiwOs!u(+|H!i66(iX2I@q{)L0 zFLpE$66MO1Fk{L**%D(-k1uEH+{qIp3M5F9jJ(M*XV0TZV`9OQWvEe{Nux@g>hmE{ zs#vqqe5$pp*O*toiXB@qEZMVY)2dy|wyj%)0OHDxYXShoxp?#H-OIPHf8W1=0}IxR zl*QY_A_;Q6Xc)0$ie^0)w81cFoe@R+u4n{QPmR!nL zCOZ^tc!=buKVRFp)rX*3X^ zh<>=m7Cjm2=%bKEN|Zo}8o4M#Vn)OQZjyHTXhb*|${rI<$VY0W_+7dXhQk%qs(zW` z|KzD;9BIU!3opore=Dl@sT$L!6UDk!d%MP0EU)zW`m1%T3R{vuE&A|-jMBns?VF4? zc+qy4I!h9zx8`cBxX8|@DzjN)grT?JqChOU?;Trie5x{KTMp?mrZ2k;*}9&*?g2cn zd&+WaB1AbP+#7NH8pf|r?uM%?yaT(ZghnJKjITi(H+-;De<(ydZH(1kYch^neA+K@ z1~rE6NDmkF=)3HJ`!B^6v$w^?j?T#v%Lf?@mZy@o$3+)4N4(zAIm73(OCjy$XkIE2 zU3AkBKAjQ9L)~UI#9TwBw18I6Tp-j$)5?+8v-TUdtA+yY5s{IaT55b-x6Lt3(JB8J z+S>~)Cu>M3e+X_usB(|(p}-S+c~Gd4F4qzc{gMQ1LpHs=(ng_jNF?LqI{tX1P!$$4 zX@+9{5(;v+Na~8O^AP)*CEIv(j4eC_xkiE$6v9axH~UcE2FX46>YN>6xCu13P%P;4 zK~E(_kT3t72|3tce6Y?2MS0$<6UX{SN4(U0u}s_7e*=5zOPE-nFgq)>%!HRFIp)o` zkKg(rzMs_Ts1sD_a?lc^AuV9J;@^DMcdGR?@IVjA!SY6egYD@~L4iiSkkjk3gO2=0Sav(FpMGl{|=Zw zra7TLf9q?X{t6@z^bAI2nju|8P+%Uct%rr935gXCB*4;vB!G^xAW{hTo(Dc~RCk-u z8RxS`2c|K1njzG3b_YbQkP(3r!y|=qm`6RX2O?$>2+MXC#H0|Abq|Ucxdg^X{4~;e zIBS9a0BIU1nm~+=N=d|6)B+xuaAYmI-N|?$f65x25O!QC_5apaPFoLpHv#k2izQBu&!AoxFrosbfhl zqZuw{_OY1+0$3xr!b6i_lWVeEB)o9tO>VXTob73#JkuynoUL&y6D(&$e%Jppgb))U ze=z!_$Z9vj6%lksB}*tMr8T=#dJ>c?Y8Ojb*^}5P#9zl;=L^~iN%kl(ne?2YxZ1}~ zaxGDk2V@V(62lWs9%`E%9U@0(x>1u7F{ST%WP83<9;sloc`>~iO+DI8TB5P2M@{Mj zACokqwQ$C3rLGRO8&)f1av(^{dwt$*T^R6i00}sO|x)TFX|JuwvzV z#5^nL)=F26*q~=^)m&-xX%c+dig_;*sO*}+1F6;(h{ObI)dYA^zV`L6(oAXkv&(i0WhhGgVNr>s?;=!TOsnt2%5E)X>6dhT6@?O|8Uk*e?UX6 zH60ruyg8l_YS4rJ<;`&=5`wjxPl5UM(xB<2ARf z{t-zFo}yfLF%PEC6W2!YdN{mtS0kmx!D$<-k?*P!c}^K--QuIfo3@sI*1K#$Rrm%!L4sLkFO`6Da z!Diq=nZR&H0oFz?N5GakM8vO5Q;B^EGZO(2dzkEq;0PJsmKlb1mn+;t5cjMbi|NV! z5y*+Llwy&vvL#aHUQvKm6y>*VgXbt#Q@S%2(~o|%5JvN4(Li#vPJ&WDifl@PeyfOa z#pdLmybLW&skD}Z^$|Klgejc;H94o#GipJXnAApArJmF_ZJ1zDEG+c3rY=Womc}uw0|}2r>>?hD T*d^OkL=$YdooevTBp?7gi^;vB diff --git a/data/maps/rooms_foreground.gif b/data/maps/rooms_foreground.gif index 24b41b3a293126715394ba8e725ca69b955ae1fd..66ed4b0c5545bf1b12fd8f8b75859a268f851c58 100644 GIT binary patch delta 3237 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 diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif index 0da8a052ea77e0f2bf99c8bc775603e0665e9222..8b8a4285e969dc1b744367c5aaf95df79cfbfcd0 100644 GIT binary patch delta 529 zcmV+s0`C2=3b6{X3IhZC{QQ#*11EnA6=2-Rv7^U`5I%|=NwOrvMTE_EuRu=W;|R9c>nwCY#2 Trc`TaR%VuKtiXa55C8!?7+dv5 delta 527 zcmV+q0`UE@3a|>W3IhWf3x<;o11EnNGiuz(u_HkU9z%*8N%G*Mk|C-m%qFy~PGh?j-VH+gt8Y0EptX09Xnpz(jv*T3i(z5o5K36!6I84Y-ldR{?hkbxut=#+yAeFuPq z8cC=cff)8xUP=sx1lxzD0nnd9AjX#AQrJNR;fW)yxL`pYX5^xZ^f~n2K*B*3<8Udm zC=i7Ojkwj0KJGMQk%#q|9gGPPsStul5|kN`TOAqYQ%+u4U|2m`$<}|0S#sv(Q#Wdv z(wJh!*q?!fp=l;ZZp!$kRB@6N=0OU~d8L9cLUpH}4Uv_cpnw*tSe;OnNa8_QZ73i{ zhzi8#p9fKykfTFI%20=zrX(b4m@agmSmA|A-l7pv%8-&tnQG{(I~^5uR;MAU+7+!O R(fXOCl;H~NuU-WN06VWe{qg_+ diff --git a/data/modules/menu.lua b/data/modules/menu.lua index 1997af5..7fd2653 100644 --- a/data/modules/menu.lua +++ b/data/modules/menu.lua @@ -22,7 +22,7 @@ function me.draw() local sel = me.selected view.origin(0,me.pos_y) - view.clip() + surf.clip() local y = me.pos_y draw.rrectf(1,0,8,8,1,21) draw.rrectf(1,-1,8,8,1,6) diff --git a/data/modules/rooms.lua b/data/modules/rooms.lua index bce7622..1be6402 100644 --- a/data/modules/rooms.lua +++ b/data/modules/rooms.lua @@ -30,7 +30,7 @@ function rooms.convert(src) for rx=0,7 do for ty=0,11 do for tx=0,19 do - surf.pixel(rx*20+tx, ry*13+ty, surf.pixel(rx*20+tx, ry*12+ty)) + draw.pixel(rx*20+tx, ry*13+ty, draw.pixel(rx*20+tx, ry*12+ty)) end end end diff --git a/data/modules/score.lua b/data/modules/score.lua index b8409c9..84830ea 100644 --- a/data/modules/score.lua +++ b/data/modules/score.lua @@ -51,7 +51,7 @@ function me.draw() end view.origin(0,0) surf.target(0) - view.clip() + surf.clip() draw_text() diff --git a/data/stages/editor.lua b/data/stages/editor.lua index be312b6..a12e654 100644 --- a/data/stages/editor.lua +++ b/data/stages/editor.lua @@ -43,7 +43,7 @@ editor = { -- Pintar el mapa i sprites rooms.draw() - --view.origin(0,0) + local mx, my = mouse.pos() local tx, ty = (mx>>3), (my>>3) mx, my = tx<<3, ty<<3 @@ -283,7 +283,7 @@ editor = { surf.source(0) surf.target(editor.tilepicker.surf_back) view.origin(0,0) - view.clip() + surf.clip() draw.surf(0,0,160,104,0,0) app.push(editor.tilepicker.update_tiles) tweening.add(104,24,0.25,easing.easeOutCubic,function(value,n,finished)editor.tilepicker.pos_y=value end) @@ -297,7 +297,7 @@ editor = { surf.source(editor.tilepicker.surf_back) surf.target(0) view.origin(0,0) - view.clip() + surf.clip() draw.surf(0,0,160,104,0,0) view.origin(8,editor.tilepicker.pos_y) @@ -353,7 +353,7 @@ editor = { surf.source(0) surf.target(editor.itempicker.surf_back) view.origin(0,0) - view.clip() + surf.clip() draw.surf(0,0,160,104,0,0) app.push(editor.itempicker.update_items) tweening.add(104,24,0.25,easing.easeOutCubic,function(value,n,finished)editor.itempicker.pos_y=value end) @@ -367,7 +367,7 @@ editor = { surf.source(editor.itempicker.surf_back) surf.target(0) view.origin(0,0) - view.clip() + surf.clip() draw.surf(0,0,160,104,0,0) view.origin(8,editor.itempicker.pos_y) @@ -376,7 +376,7 @@ editor = { draw.text("CHOOSE ITEM:",8,2,17) view.origin(16,editor.itempicker.pos_y+8-editor.itempicker.scroll) - view.clip(16,editor.itempicker.pos_y+8,128,64) + surf.clip(16,editor.itempicker.pos_y+8,128,64) surf.source(surf_sprites) local mx, my = mouse.pos() @@ -404,7 +404,7 @@ editor = { local lift_y = math.floor(((64-lift_h)*editor.itempicker.scroll)/(y-64)) view.origin(16,editor.itempicker.pos_y+8) - view.clip() + surf.clip() draw.rrectf(124,0,5,64,1,17) draw.rrectf(124,lift_y,5,lift_h,1,2) diff --git a/data/stages/game.lua b/data/stages/game.lua index c990cc3..04bab03 100644 --- a/data/stages/game.lua +++ b/data/stages/game.lua @@ -60,7 +60,7 @@ game = { view.origin(0,0) surf.target(0) - view.clip() + surf.clip() surf.target(game.back_buf) @@ -104,7 +104,7 @@ game = { --if not sys.beat() then return end view.origin(0,0) surf.target(0) - view.clip() + surf.clip() surf.target(game.back_buf) --view.clip() @@ -148,8 +148,8 @@ game = { for x=0,159 do local water_level = math.sin(game.water_counter)*2 for y=88+water_level,104 do - local pixel = surf.pixel(x,y) - surf.pixel(x,y,game.water_pal[pixel+1]) + local pixel = draw.pixel(x,y) + draw.pixel(x,y,game.water_pal[pixel+1]) end end end @@ -165,15 +165,15 @@ game = { for y=0,103 do for x=0,159 do surf.source(game.back_buf) - local pixel = surf.pixel(x,y) + local pixel = draw.pixel(x,y) surf.source(game.circ_buf) - local light = surf.pixel(x,y) + local light = draw.pixel(x,y) if light==0 then - surf.pixel(x,y,1) + draw.pixel(x,y,1) elseif (light&2)==2 then - surf.pixel(x,y,pixel) + draw.pixel(x,y,pixel) else - surf.pixel(x,y,game.fade_pal[pixel+1]) + draw.pixel(x,y,game.fade_pal[pixel+1]) end end end diff --git a/data/utils/msgbox.lua b/data/utils/msgbox.lua index 06c6bb1..bfb8363 100644 --- a/data/utils/msgbox.lua +++ b/data/utils/msgbox.lua @@ -30,7 +30,7 @@ end function me.update() local top = (160-me.w)//2 local left = (104-me.h)//2 - view.clip(top, left, me.w, me.h) + surf.clip(top, left, me.w, me.h) view.origin(top, left) draw.rrectf(0,0,me.w, me.h,4,27)