From 274a96c89f9358ff14eb0792d96040fd2742cde2 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 12 Nov 2022 15:04:21 +0100 Subject: [PATCH] =?UTF-8?q?A=C3=B1adida=20Road=20to=20the=20Jail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/enemies/{macaronni_ted.ani => robot.ani} | 0 data/enemies/{macaronni_ted.png => robot.png} | Bin data/enemies/upv_student.ani | 4 +-- data/enemies/upv_student.png | Bin 256 -> 258 bytes data/room/02.room | 6 ++-- data/room/04.tmx | 28 +++++++++--------- 6 files changed, 19 insertions(+), 19 deletions(-) rename data/enemies/{macaronni_ted.ani => robot.ani} (100%) rename data/enemies/{macaronni_ted.png => robot.png} (100%) diff --git a/data/enemies/macaronni_ted.ani b/data/enemies/robot.ani similarity index 100% rename from data/enemies/macaronni_ted.ani rename to data/enemies/robot.ani diff --git a/data/enemies/macaronni_ted.png b/data/enemies/robot.png similarity index 100% rename from data/enemies/macaronni_ted.png rename to data/enemies/robot.png diff --git a/data/enemies/upv_student.ani b/data/enemies/upv_student.ani index 18b077b..b5e817c 100644 --- a/data/enemies/upv_student.ani +++ b/data/enemies/upv_student.ani @@ -3,7 +3,7 @@ frameHeight=16 [animation] name=default -speed=6 +speed=8 loop=0 -frames=0,1,2,4 +frames=0,1,2,3 [/animation] \ No newline at end of file diff --git a/data/enemies/upv_student.png b/data/enemies/upv_student.png index 2c559d6b8d5b76dbecf78a416bc5c44be9648149..29fad5f608ac5a964f8eea1f891a07efee9fa756 100644 GIT binary patch delta 217 zcmV;~04D!{0)hgNF@L;CL_t(YiKUZ45`ZuW0}KEEGhW1D(on#1(J5?z8rN!unVCQR zeG(;qDqy)zO`AUzU~bx=;>FBNL|Vb=l=_&+-Nh8`Ug(*bbviL0@pyfNXG9abXM`GkJ}B00)PULF@L&AL_t(YiKUWD5`ZuWLxua_88_l!Oj_Eqv9>%unOxTs5fS;# z^XRRU)8};@Q!c=YXi1zEx66A4QjC+1-kq@l`;sP zS)&vFw@sZKo2czhcxN)PEmdK5r-J3WYN&=_fw?QJGufCb`B2YXj+`2T@s1!XhC_|s zX7!N&d4MS~3YF9K#>WFn`c8CAOb1Z1?U>M>SmB*ro+z=(Pt8+9Ilfzi@i)lAr*0Or RB0vBD002ovPDHLkV1mWUWorNc diff --git a/data/room/02.room b/data/room/02.room index 0f038b7..79d7f0b 100644 --- a/data/room/02.room +++ b/data/room/02.room @@ -27,8 +27,8 @@ color=green [/enemy] [enemy] -tileSetFile=batman.png -animation=batman.ani +tileSetFile=upv_student.png +animation=upv_student.ani width=8 height=16 x=4 @@ -39,7 +39,7 @@ x1=4 y1=13 x2=19 y2=13 -color=white +color=cyan flip=true [/enemy] diff --git a/data/room/04.tmx b/data/room/04.tmx index 764c456..32b46f7 100644 --- a/data/room/04.tmx +++ b/data/room/04.tmx @@ -3,21 +3,21 @@ -15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,15,15,15,15,15,15,15,15, -15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,0,15,15,15,15,15,15,15,15, -15,15,15,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,0,0,15,15,15,15,15,15,15,15, -15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,528,0,0,0,15,15,15,15,15,15,15,15, -15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,528,0,0,0,0,15,15,15,15,15,15,15,15, -15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,528,0,0,0,0,0,15,15,15,15,15,15,15,15, -15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,0,15,15,15,15,15,0,0,0, -15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0, +189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,191,0,0,0,528,189,190,189,190,189,190,189,190, +15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,528,0,15,15,15,15,15,15,15,15, +15,15,15,0,0,0,0,15,15,15,15,15,15,15,302,0,0,0,0,0,0,528,0,0,15,15,15,15,15,15,15,15, +15,15,0,0,0,0,0,302,15,15,15,15,15,0,0,0,0,0,0,0,528,0,0,0,15,15,15,15,15,15,15,15, +15,15,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,528,0,0,0,0,15,15,15,15,15,15,15,15, +15,15,0,0,0,0,0,0,15,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,15,15,15,15,15,15,15,15, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,0,15,15,15,15,15,302,0,0, +15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,15,15,302,0,0,0, 15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0, -15,15,415,0,0,0,0,0,15,15,415,415,552,0,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,415,415,15,15,0,0,0,552,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,519,15,63,15,63,543,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,519,15,63,15,63,15,63,15,63, +15,15,415,0,0,0,0,0,15,15,415,415,415,552,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,415,415,15,15,0,0,0,0,552,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,519,15,63,15,63,543,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,519,15,63,15,63,15,63,15,63, 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63