From 4e7a50879e13de339a24969bb4fdd5595b12bb4e Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Tue, 24 Mar 2026 19:01:32 +0100 Subject: [PATCH] =?UTF-8?q?-=20[NEW]=20M=C3=A9s=20tiles=20-=20[FIX]=20L'he?= =?UTF-8?q?roi=20se=20clavaba=20en=20les=20pareds=20quan=20li=20pegaven=20?= =?UTF-8?q?-=20[NEW]=20Alguns=20fondos=20enhancechats=20-=20[FIX]=20Augmen?= =?UTF-8?q?tada=20la=20velocitat=20de=20Nemesio=20-=20[NEW]=20Shortcuts=20?= =?UTF-8?q?de=20teclat=20per=20a=20canviar=20de=20mode=20a=20l'editor=20-?= =?UTF-8?q?=20[NEW]=20Habitacions=20al=2040%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/gfx/tiles.gif | Bin 1579 -> 1590 bytes data/maps/rooms_background.gif | Bin 1817 -> 2105 bytes data/maps/rooms_foreground.gif | Bin 2619 -> 2817 bytes data/maps/rooms_items.gif | Bin 1171 -> 1183 bytes data/modules/ia/hero.lua | 12 ++++++------ data/modules/ia/nemesio.lua | 2 +- data/stages/editor.lua | 21 +++++++++++++++++++-- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/data/gfx/tiles.gif b/data/gfx/tiles.gif index cc127121ad520818d03fce4576c2b8288e0845d9..47fc9f6026af5968dc446121e8781002940d38a8 100644 GIT binary patch delta 829 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 Y5fK8-AqEX-LT^b=f0l%y6A1_aJ3?_CEC2ui delta 816 zcmV-01JC@q5Sb3J3IhQElM4g#e;%IF_CSHmFPb*7ykLmfXIK^;0l907ny)8f0?-AjX37m zB8VRrs2+_hF1wUt_h?}b{5JZMS7mOVh@Zq z>gc178agIL4Z?+^6PRYIf9a;1O3ETn8=Ao4mO1)n>ZxpkblpigxQQdGusZ*zDv98g z)T*nm#;WURTGe_ht~c%~tPQgv`r&*kT_+i-fbt-ru$0~KE2@tjdtS23idrhP+|KzJ zbl!@D-?YG{IA5$c+#sWBIJA4iX~7*7?nDtPL~gk#o*Qcl_lia$f4u!^wBI?qTVzVgnM1_%?nqg)P!1d|!V7oH>tqxonkYo|9^^2o!FKnc!W=`}E)MT@ zELq6~}G4Y{JXxy8E)bLnHlRW;C1dmeUbIrDl3&)>d^-HrMzW z3oIzqbwXboG})jHe|7zJ*bPnmPpE1~^c#(z6Bb#NAAQ*HBXqCi2&)eg z{X4NAL0oq$8%S?`&>Px=4kEwzAuud9Kvn|d_O)L{@PMoP4rH1}KXUo+E&>eC`3Cqv u|IA5G=0i&eB6)YV2R;OaS%XMWBm#hn)UY8p+))lwNWm7CgohCc2mm|J_Ka@; diff --git a/data/maps/rooms_foreground.gif b/data/maps/rooms_foreground.gif index bbad1c8989ac988d89be34ed5726fbcd5a95eba9..ee6f1ac77025e9264139db24f6bbd9c89cdebcf8 100644 GIT binary patch delta 1730 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 diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif index a5948a6310f2fd18e5ba5949518f97679e0a6646..ee77d8023947c73be054ec6e1c5a0a604771e372 100644 GIT binary patch delta 260 zcmV+f0sH=w37-kD3IhZC{QQ#*1D}6(>);?GkpTu{9H5Xf+{B6_bA%95faJ@V(OS;T z5wg`l2tAYB95@2PNSssKl<<`GK-U6cBRtHYq3qkLPac*?I`_riH-T#uKHQ;Wf(Igs z#=Bdv>4vp^OP|iOIpTuLscY8GGdp*O-hEnx2S7Y)d4u8Co-ca*J8!M&2S#)UkpA#` z_Y?1f)Q?{zf0Xe#q(Fajffia%0TM`%Y0oVPK!XZKh|_;Y;kJ-$uf?`df(TK_kbwem z*bsyeVQ75geX|O}zNb-y(Yp zRBqg??dCI?LuV-cCvpJKvt~C~o$dCbxu-vP{0_A{!QlYRmnJWM{7UxiKf-87Y5t*t z_;3RytREde!{EUc1fYKe)-<0{sx34cXre8|UqS~mq~AafIuxKp3)&Q6VGC`z5_)ZA yh*e@DhE!sMyn%F`O(z!U;z9+VHKvqfLKgzi<5@etDC9{20RTJE-EKPo diff --git a/data/modules/ia/hero.lua b/data/modules/ia/hero.lua index c887ea2..432f05e 100644 --- a/data/modules/ia/hero.lua +++ b/data/modules/ia/hero.lua @@ -52,19 +52,19 @@ function ia.update_hero() -- Si li han pegat... if sprites.hero.has_been_hit then if sprites.hero.flipped then - local tx, ty = (sprites.hero.pos.x+3)>>3, (sprites.hero.pos.y+16)>>3 + local tx, ty = (sprites.hero.pos.x+12)>>3, (sprites.hero.pos.y+16)>>3 if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 then - if txrooms.pos.x+19 then + game.change_room(1,0) else sprites.hero.pos.x = sprites.hero.pos.x + 1 end end else - local tx, ty = (sprites.hero.pos.x+12)>>3, (sprites.hero.pos.y+16)>>3 + local tx, ty = (sprites.hero.pos.x+3)>>3, (sprites.hero.pos.y+16)>>3 if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 then - if tx>rooms.pos.x+19 then - game.change_room(1,0) + if tx 0 then + editor.msg_timeout = editor.msg_timeout - 1 + draw.text(editor.msg, 10, 96, 8) + end + menu.draw() end,