From c1f5f92dae83152e892af0b63d9742fde8578481 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Tue, 24 Mar 2026 13:58:07 +0100 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20Ajustats=20alguns=20"edge=20cases"?= =?UTF-8?q?=20de=20algunes=20habitacions=20-=20[FIX]=20Ajustada=20la=20dif?= =?UTF-8?q?er=C3=A8ncia=20de=20cad=C3=A8ncia=20entre=20gotes=20-=20[FIX]?= =?UTF-8?q?=20Ajustat=20el=20nivell=20de=20l'aigua,=20que=20fallaba=20l'ul?= =?UTF-8?q?tima=20linia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/maps/rooms_background.gif | Bin 1817 -> 1817 bytes data/maps/rooms_foreground.gif | Bin 2610 -> 2619 bytes data/maps/rooms_items.gif | Bin 1171 -> 1171 bytes data/modules/ia/gota.lua | 3 +++ data/modules/templates.lua | 8 ++++++-- data/stages/game.lua | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/maps/rooms_background.gif b/data/maps/rooms_background.gif index 6afc01407a0be1c4f8acd55ce0b6372268a57d33..1864907d5e8cfa5b88e65a8898dd003cb774ff0a 100644 GIT binary patch delta 14 VcmbQqH9oXc$h>-y!`?zP2Dyiap-~1FZ8y*F} z#j%iNkRel>TJnDuLa9F7D+arROI7qj7lj-tTnz!9;{SSBuHr?2QSrNvhvLtoEt0Rf%mLvb&E+!}}6A?0!6!rb=Aps0vPO9P|B9beI0Ep7KIvD~84$y~^ zgu(nMvdUd41avr*lMEtY%9qFh1k6OyMAkSH5UBAYBZ5KuB()_OAW(q~Q3D(HkcKf* z#4OGeVK0AsnUgD7(;|=|C7Nb35DyWOYrU-Ie%_$}2R`&c4Njz)Mea4s)lKmvK7(ht zAkaGorEpMNiU0;oa8DlTb9gDFR2tqusXl6|WuQV}lD3n|2!NoGIRRTmAoI}sw3KuQ zdeuE=5=WX&z@|8b;{@nuNS8_o1oLYtz?3+FgPMPYXs!FDX2Ru7Dcw_dD9z=v21eBp zT$5l{W!4DJh!U->Z>cayV9xGYM-e{Lq_w3{8q(1WK(M7X%76kDz@j5x z>5wbUM4I|Zlt|{%BL*33RLv^o$pQ)hHC zB$I#AN)e=<<*k)XPoZ3A%G54WAyG;uR*SYBT>okff-0g4&Hzghl`bTEBM1Q%s32S_ zpwN@Cfxu=hlCzmu&9%6+DMkXg%ZK37et}$wFUdp`BkF}gdkS7vk}45@^)w@Pz;rAgq zvzou!`&!I|z_BjDFxTuTx&|ebju``2ReB18;hOlwy33I)0We^d`YetN@t?o^w_k@q zmxw$9fdAqsD;^j1#~^+cjD0LwIYp8oLZj{b_$n(y%1Xngl`2%Xx~vH67XT8*GS@#4 zyE-jPHL8sa^Hiz)Whsd{yCD#g0KvsGE=yz}U;&erizndO57$`BG}iH3)qAzbrK`t( N4m5~M%dvm}06X=w~}5v6R@8!-TE--~}YWX-Ay0al3ixf2?N zQ{;C@et)kmNR&>0_kGwOSiJC62??Q&TS~Zx8r;9EJf%4Y1_KCoOO&jvaXLwqX3#&& zWhi3G8>&+aq=;FX*Fjw3 zGACDxrbT}s^GP(#WFQ{;BiC>V&HcPV4}9o@8j?u=GmG5Im#TB(Nqn}>a6y1~3?kv6 zwiE#jm_VL9s;BTsNU1cufl_$XRLej$z$9&llo0>{B69+^iaWex19BakM+qROlh zh!G`PGoMjmK){^I6OJ8JW=LUqnfTbIkpnn^SD zlPHnQrAG`3BJY6YGu{PY1|%rKN#6R_ym@DqJd|lx_S3!z=t*@TK&H;<6i6nKl_Enu zi&}pno1Q|oE|jD-q(Y)Z%&8V_JG0c<0#!s6od4~WA|+i2^+pf^Do~-fR2X3%p zS|n#Pv07?p8B>h#&z29FCAkE7SBT`2Of(6iUKq3|;8lgF67d&KGg7y!iYWru1=9Oc z%Mw%mQ3mkUVNj2&keua@y3sY(TwSu?a7BL;p~EeSdn+=70+VZC^L=7CDk3(w z>{KUbSxQ{yW4MIWKXCEP$`Tn^z+{Eu31l`G!!M??i)pM@^Ii>d>AG>A_pD*iax5SK EJJ~|v%>V!Z diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif index 97a2a33e7583b86dc0a79a68683216ad6052381c..a5948a6310f2fd18e5ba5949518f97679e0a6646 100644 GIT binary patch delta 16 XcmbQtIhk_<7c+C_s!N-BncElvEYJlg delta 16 YcmbQtIhk_<7c=wkKYup!GPf}T05qBgHUIzs diff --git a/data/modules/ia/gota.lua b/data/modules/ia/gota.lua index 9a41e91..03744cd 100644 --- a/data/modules/ia/gota.lua +++ b/data/modules/ia/gota.lua @@ -2,6 +2,9 @@ function ia.update_gota(spr) if spr.timer > 0 then spr.timer = spr.timer-1 + if spr.timer == 0 then + sprites.set_animation(spr, "gota_generador") + end return else spr.invisible = nil; diff --git a/data/modules/templates.lua b/data/modules/templates.lua index 5dc2da4..5e84d9f 100644 --- a/data/modules/templates.lua +++ b/data/modules/templates.lua @@ -2,6 +2,8 @@ ia = {} require "ia.*" +local gota_wait = 1 + templates = { ALIVE = 0, DYING = 1, @@ -202,13 +204,15 @@ function me.create(type, options) current_wait = 1, flipped = options.flipped, surf = surf.load("gfx/gota.gif"), - animation = "gota_generador", + animation = "gota", state = me.ALIVE, enemy = true, - timer = math.random(0,100), + timer = gota_wait, room = options.room, ia = ia.update_gota } + gota_wait = gota_wait + 10 + if gota_wait > 40 then gota_wait = 1 end elseif key == "gota_caiguent" then sprite = { type = key, diff --git a/data/stages/game.lua b/data/stages/game.lua index 4e2968b..a0d35fb 100644 --- a/data/stages/game.lua +++ b/data/stages/game.lua @@ -130,7 +130,7 @@ game = { surf.source(game.back_buf) for x=0,159 do local water_level = math.sin(game.water_counter)*2 - for y=88+water_level,103 do + for y=88+water_level,104 do local pixel = surf.pixel(x,y) surf.pixel(x,y,game.water_pal[pixel+1]) end