From 5b4e4be005d6e6e46a71bf2b2a878149e45767c8 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Thu, 26 Mar 2026 17:46:32 +0100 Subject: [PATCH] =?UTF-8?q?-=20[NEW]=20M=C3=A9s=20gr=C3=A0fics=20-=20[NEW]?= =?UTF-8?q?=20Retocs=20en=20habitacions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/gfx/abad.gif | Bin 0 -> 347 bytes data/gfx/paku.gif | Bin 0 -> 238 bytes data/gfx/sprites.gif | Bin 3103 -> 3120 bytes data/maps/rooms_foreground.gif | Bin 3169 -> 3169 bytes data/maps/rooms_items.gif | Bin 1242 -> 1243 bytes data/modules/animations.lua | 8 ++++++++ data/modules/items.lua | 1 + data/modules/templates.lua | 16 ++++++++++++++++ 8 files changed, 25 insertions(+) create mode 100644 data/gfx/abad.gif create mode 100644 data/gfx/paku.gif diff --git a/data/gfx/abad.gif b/data/gfx/abad.gif new file mode 100644 index 0000000000000000000000000000000000000000..841968742c43cd41d85f9b0d239e97c96c6ab9dd GIT binary patch literal 347 zcmZ?wbh9u|G++>7IKlu036{eC+A3Pgp0ySZM#1sL$>IMQ7@DFDyHc$e)dn8SiLTz{ z_xr5W%(l`Q?d3-&hMb*O@M321hrQ*F4GT)v?%ub1)A0@Se&3&c?9k!=KcD>j57Z3> zia%L6xqxgP5FcbG1M3Y1g+7ObSt(WPGI#FNmDDhiU9l+g_S$`)H_p^_-m@~TD={!k zn5{!{u@+~mSLyOsMNg`;mRd%abUfnfezLlEmTvLvqq&*Sdr!rNyuLde_mov zrjMVQle>DSr)^JdU%peVx?_Y+zu&ZOX2y9AM)MYXBv>w4Fv*CKiFw_;`ODPSu2-Aq zzGdCEO-yU|?%cC)?^dnD`;QoH*?)M?y3=dVGN0dma{lE#*G^xFVY+#IQ*ue5*297a qH92!{HS68GuxZ=tWvZ9XfBtg*uH)C!-{0;1_v0_u41X^U25SIDwxA6F literal 0 HcmV?d00001 diff --git a/data/gfx/paku.gif b/data/gfx/paku.gif new file mode 100644 index 0000000000000000000000000000000000000000..987e9d8f2fb805d28cbf3e001b4a5e007eaef548 GIT binary patch literal 238 zcmZ?wbh9u|6kw2GIKlu036{eC+A3Pgp0ySZM#1sL$>IMQ7@DFDyHc$e)dn8SiLTz{ z_xr5W%(l`Q?d3-&hMb*O@M321hrQ*F4GT)v?%ub1)A0@Se&3&c?9k!=KcD>j57Z3> zia%L6xqxgP5FcbG18cT|LSIVeyo^=ra$a{iUSQ)@nqBC3KXt($2iE*2*&L7IE0F72zGynhq literal 0 HcmV?d00001 diff --git a/data/gfx/sprites.gif b/data/gfx/sprites.gif index ff071d66bc898f952ab8a0d160ae163a17c12610..3f7d17404f8576e242d6ed9706934722e038b45e 100644 GIT binary patch delta 3014 zcmV;%3pw5h2X+HbB9t46ZLUb^NQi;UXV8bHj_zFag z&7GBq4f3{9DwI3T-bzDq*&I-mGH^5PT2`Uy>)uvsQAdx3p_c!*kRfn6kS zaFQ8WcYHQhMtF6DjgDeaj-MqDgrTBgI+>`CKWVS8HiJx*Z-26#tX+4aLzu9?w|2j< zq`{2CX}-w4rZf)E3==k90da9c%Zr11$(7Fz(bLt2VOnu((K~U z_2*sz>v@R6?LYCRdxnB?0kf&PsBl znHVtOfZj?34=-NZ zHVoq%D6DAD#Wl4s;bHF>CeYjjkI0#VY1IabhS$~{Pym@ADB?Vw7np@JaC!Tiv>EnGM z(&=2GPR0pkpM=IaXO|`ASHhw+KHBA@l}L&yqc9ABD5s!?D(a}DmTKy$sKPL4s;su^ zDnAanD(kGYu2Ac(xaO+suDtf@>#w2a;D@lB607QDU@{2oZF>H)5e^49>m*P;tY_{2 zvwwkJdl}g2gDL{406aHmw(`~&L01auoOHi?1;(?E1Rt+l^8a}wUs>W z@ykvG(z2>nmy5L&R}UR@$q6UR!o5&uJVm<62y-?uOP}1s(Lcalh1}m}{c*WMSDUiY z@xttgyK^)GI4(r6eeBp(D1A7DgV6mh(M4zL_8=xZPQtlSM2mPQ>_*&&EMQnYY=8gd zM2npks12`RH_&~1jkm~T0J7dnv1h*R<(+GO`U;9aZuvKi_xW(^)sozEoI)9T5}uw?v($F1!7r0&%F3@nyhCqCLE2J z3DomGe<3ap-?jc5As#o3U_HN`t$%!aaGEC2M}w)E0$hH=-auM5w$o{^f}o>d{XDi3 z4T4Kt1VmuKLg=LRxQ`G#%U=WgcLvD0YlD#69}RpKFBZ;ld^?jN@a(5UKkY4B_~MqH z-UlrkR)IY#q+I{jg}wL9F9y(iR}){zo)bh7cyw`s7MI1vVA;ehvHD6FZGY9p|1z%3 z0TD=J1Y*UHG>#EgSu~>@)zZdiWPpumydxOnILAJI0gZOVV+8alMn3xSkT7t-B=87_ zH$KCVh>WBdA6dwGjB$pNq?NIlg+7sSCX@Q=Ruat^fCiY-lqR@|32Mel6I9@puMA!b z2tdmK(DIf9Faa)0iOO1@vVWI)o18ps_Jz$YZU&}2Km!cZ09dWjjWk0*0i-$20KC!w z6)*rcS9MEU;EkOep2Fs%(@n?5riTU>k8Uh@$!^8 z9mgtpYE7Sl4wO9jY-mNxKgMm9na)HbSOH5-vi?(>XQcsfwSO>KIo;8Y|0uKoEG^)N z!rt?%5lAdQ{n^-nu4KAr2$2>XQUdl?^r!yBC~D_hL6@Qz2I@Tn9=Q@mYyQNizI|y- z+pE)Pwz8+Nl)-J8N=i2AHCv1Uc}qU^Utrphujpa-pr<{f{~ZAuOg-k`kacQU{;5`RGSXFzx2dFm1e|CY`H^ytcE2T&4| zri`KWNPS3De>6Z%9`uyIL+C>v$I&sQbO|-x(8Wp)*WY2NeW)ECZ)&?2cz&m^o2lmy z0J{ScAoj-YV~S`Wwxfn9ceh`P@Q_jq-F@!$ypMzLM)y0ZHc4W|1GMgDG63e`0d}H8 zet+zv(rD!yqv~rp*7Pg4Ny|eo`q68B-+=Bn>vwu!*O%MZus=1@MYY?R%`EVsbT)v8 zPkaDZd-gTc=g2Fcd)SwX_WN8un6$m*Q8j+y zefPX~Jxdw0>UUN@9jo7_!3Tb1Ae&dr<$sTZG@1`&9DzOsO`5&+odGle4uVpdilc67K0Xua}(nluhXuws6o zd(akx&*pqTMt_w80c*qzgfN2BCWHEhf|4{uRTeB3Cqe}{Y0~ywN=RwNM{Niggn#ft zfW@*3PWA#vhlDX$f+rYf>js5#B`L#p08F=Z1~LObn1MWaNI9S>(pN3#VIpN{gC+Fh={m)Wi%%i2t(u(el${Eg1B84 z@N;Jpbc6Uxgjk83c!`pShnes>IDaICwL*#7wTOmTiHo?2t%C@9Qg(651$eiDik66p zcxM2v*omx|h<6x^5yKUfFk7x-i>e5BDu;*_z>BHqi@T?WAP8`zm@CHkiko);x~N^t z$cwiaijkBF^P(=i5{QeaO{kZRuc(OW=#AfaKI1rtX!vEn_>CsQbWTT&XFnK^R|s4I zuykgZ8~bM}!q&l1O^`2!#B1iVgW^4>^$(S&?JDs$ilmGw# delta 2997 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 diff --git a/data/maps/rooms_foreground.gif b/data/maps/rooms_foreground.gif index 08925c35f0b4839f7edff8b8cfc50917f9d3c3c5..f546f17d915be15bde5003579e512b21d2261aaf 100644 GIT binary patch delta 16 XcmaDT@lav|7c;YhbJu2G<`7N*FmnXJ delta 16 YcmaDT@lav|7c=wkKYup!GKX*i06zu>#sB~S diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif index b9fcd4d0b177ac768bb28e90380ee2df0dcb58e4..cc12c02335266a941cc998ab7c798bfb24bc02ac 100644 GIT binary patch delta 277 zcmV+w0qXwR3EK&<3IhWmLvoW11IvFu6^%Ko=9B{{0YIG*LP*7})8fv}JK=7GhgtW2 zC_FRLKnRPA{QZ-;O~?oF4xb)WHA&?kNo!w7mqEkr1FciQKM6Xb^YIwZFD#Bdqxy>P z;X9-~@Ib`&cFX66&d@ti{OF++Uw~EV7g|C10qD?c)ZxY-QUelrlY$c7SCoH&5lR&y zg?c$fUxn^zMWKHH;73=6AXFabmUA+N|a!gCym(Fl(qrDrAJ(TdC-#(6=;)~Kc?xC0WU3} a5tasC1!qZf7UW=*W!0(Xo;d^s1OPh$AcBhk diff --git a/data/modules/animations.lua b/data/modules/animations.lua index 02b29ca..cfccc67 100644 --- a/data/modules/animations.lua +++ b/data/modules/animations.lua @@ -232,4 +232,12 @@ animations = { { frame={x=56,y=0,w=8,h=8}, wait=100 } } }, + ["abad"] = { + cycle = {1,2}, + loop = true, + frames = { + { frame={x=16,y=0,w=16,h=18}, offset={flipped={x=0,y=-2}}, wait=2 }, + { frame={x=32,y=0,w=16,h=18}, offset={flipped={x=0,y=-2}}, wait=2 } + } + }, } \ No newline at end of file diff --git a/data/modules/items.lua b/data/modules/items.lua index 14622c2..8d21fe9 100644 --- a/data/modules/items.lua +++ b/data/modules/items.lua @@ -18,4 +18,5 @@ items = { { name="rata", label="rata", visual={x=80, y=48, w=9, h=8} }, { name="gota", label="gota", visual={x=80, y=56, w=8, h=8} }, { name="berserk", label="berserk", visual={x=16, y=24, w=16, h=16} }, + { name="abad", label="abad", visual={x=16, y=0, w=16, h=16} }, } diff --git a/data/modules/templates.lua b/data/modules/templates.lua index 0288a64..f593e18 100644 --- a/data/modules/templates.lua +++ b/data/modules/templates.lua @@ -262,6 +262,22 @@ function me.create(type, options) room = options.room, ia = ia.update_berserk } + elseif key == "abad" then + sprite = { + type = key, + pos = options.pos,--{ x=100, y=4*12*8+71 }, + size = { w=16,h=18 }, + bbo = { left=3, top=2, right=3, bottom=0 }, + current_frame = 1, + current_wait = 1, + flipped = options.flipped, + surf = surf.load("gfx/abad.gif"), + animation = "abad", + state = me.ALIVE, + enemy = true, + room = options.room, + ia = ia.update_coin + } else error("Template not recognized") end