From b11722375653f65485fd912201eeacb4b300506e Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 19 Sep 2022 20:56:50 +0200 Subject: [PATCH] Creando mapas --- data/items/items.png | Bin 637 -> 688 bytes data/room/05.tmx | 33 +++++++------ data/room/07.tmx | 31 ++++++------ data/room/08.room | 49 ++++++++++++------- data/room/08.tmx | 6 +-- data/room/09.tmx | 32 ++++++------- data/room/10.room | 26 ++-------- data/room/10.tmx | 32 ++++++------- data/room/11.tmx | 23 +++++---- data/room/12.room | 4 +- data/room/12.tmx | 23 +++++---- data/room/13.room | 94 +++++++++++++++++++++++++++++++------ data/room/13.tmx | 19 ++++---- data/room/14.room | 81 +++++++++++++++++++++++++++----- data/room/14.tmx | 32 ++++++------- data/room/16.tmx | 1 - data/room/17.tmx | 1 - data/room/45.room | 63 ++++++++++++++++++------- data/room/45.tmx | 25 +++++----- data/room/58.tmx | 1 - data/room_old/01.tmx | 2 +- data/room_old/02.tmx | 2 +- data/room_old/03.tmx | 2 +- data/room_old/04.tmx | 2 +- data/room_old/05.tmx | 2 +- data/room_old/06.tmx | 2 +- data/room_old/07.tmx | 2 +- data/room_old/08.tmx | 2 +- data/room_old/09.tmx | 2 +- data/room_old/10.tmx | 2 +- data/room_old/11.tmx | 2 +- data/room_old/12.tmx | 2 +- data/room_old/13.tmx | 2 +- data/tilesets/standard.png | Bin 4745 -> 4791 bytes 34 files changed, 373 insertions(+), 229 deletions(-) diff --git a/data/items/items.png b/data/items/items.png index 868d6bb4877f8f0446e2d049f0f0c4cf6a9e188e..47c2d0f10e9009099869955ce2ea626bcfdd9f2f 100644 GIT binary patch delta 633 zcmV-<0*3wl1h55=F@I`FL_t(|ob8z1a^o-vM(vK@|CQaFs!PcC0rpO3>fLj05{n-p z1d@||`{F#$a|`VIzN>Mi)7kI)zAO2XWgl_O#ZcL~=R5JMIF#&LAvU{a=ui$-GwtjZGX^Yt~PF!Ja>bsfT{}VE z8`ho)%}Ql+rM;fOrCaXBut|bC+bW%>a;b&aE$GJnM~-}@Z=3&{DUMZ_MntvjJ&S1^on&F@HBnL_t(|ob8v(a>F1DMNP*4|I6;8B~{dWg>a{fPR`jRMh}E6 z0UpN}*L7V-V2m-;xYAkKk1>XlPg(X6$6O4RoqN6$zluZ2o(kEKdycx7A^Uamo%vN9 z&c5=O<9Gg7@tsO}nQ5b&|GULk^HgvCFSxGnE{O5O4#{!8=zqCn#h`z)DAm5%ZzYcl zRP(R=ckR{svrHxOR8HMwcc^S>q$cfDplad#-z|Do4Gxzy zXWxlsmq(nuvv0YHV>NY>H*K;XWwUyYKC0x!-#D)P?-+AEL#bTik*Gq&Yszocjs3L zu996v&A*Db6W^Hy6ZK{~i>azbwZMFvssfx$ z#i$OimsV?3VSHBc#^))QUn0A>Wbf=RmG0`m>7ZUvXMe6`+$wqQ1XBT36|$0732|d8 zmaN}RcI7YHR`ETuQC5tB*F{!TX>#= zaqQhWR~Cnex~i=1e(yx90;_w_yJNqFGu53AlYs&llaK-l835qF@BzqGGfM2xkD34g N002ovPDHLkV1mNUDh&Vt diff --git a/data/room/05.tmx b/data/room/05.tmx index 7dd09da..38d424d 100644 --- a/data/room/05.tmx +++ b/data/room/05.tmx @@ -1,25 +1,24 @@ - -551,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,551, -551,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,551, -551,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,551, -551,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,551, -551,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,551, -551,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,551, -551,0,0,0,0,0,0,0,0,0,0,730,730,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,551, -551,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,551,551,551,551,551,0,0,0,0,0,0,0,0,0,551, -551,551,551,551,551,551,0,0,0,730,0,0,0,0,0,0,0,0,0,551,0,0,0,0,730,730,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,551,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,730,0,0,0,0,0,0,0,0,0,551,0,0,0,0,730,730,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,551,0,0,0,0,0,0,0,0,0,730,730,551, -0,0,0,0,0,0,0,730,730,730,730,730,730,0,0,0,0,0,0,551,0,0,0,0,730,730,0,0,0,0,0,551, -0,0,0,0,0,730,0,0,0,0,0,0,0,0,0,0,0,0,0,551,0,0,0,0,0,0,0,0,0,0,0,551, -571,551,711,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,551,611,611,611,611,611,611,611,611,611,611,611,611, -571,571,571,571,571,571,571,571,571,571,571,571,571,571,750,0,0,750,571,571,571,571,571,571,571,571,571,571,571,571,571,571 +24,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,24, +24,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,24, +24,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,24, +24,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,24, +24,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,24, +24,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,24, +24,0,0,0,0,0,0,0,0,0,0,223,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24, +24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,44,44,0,0,0,0,0,0,0,0,0,24, +24,24,24,24,24,24,0,0,0,223,0,0,0,0,0,0,0,0,0,24,0,0,0,0,223,223,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,24,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,223,0,0,0,0,0,0,0,0,0,24,0,0,0,0,223,223,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,24,0,0,0,0,0,0,0,0,0,24,24,24, +0,0,0,0,0,0,0,223,223,223,223,223,223,0,0,0,0,0,0,24,0,0,0,0,223,223,0,0,0,0,0,24, +0,0,0,0,0,223,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,24, +24,24,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,44,44,44,44,44,44,44,44,44,44,44,24, +24,24,24,24,24,24,24,24,24,24,24,24,24,24,223,0,0,223,24,24,24,24,24,24,24,24,24,24,24,24,24,24 diff --git a/data/room/07.tmx b/data/room/07.tmx index ba3e5d3..6dd645f 100644 --- a/data/room/07.tmx +++ b/data/room/07.tmx @@ -1,25 +1,24 @@ - -589,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,62, -589,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,62, -589,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,62, -589,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,62, -589,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,62, -589,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,62, -589,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,62, -589,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,62, -589,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,62, -589,749,0,0,0,0,0,749,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,749,0,0,0,0,0,749,62, -589,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,62, -589,0,0,0,0,0,0,749,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,749,0,0,0,0,0,0,62, -589,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,62, -0,0,0,0,0,0,0,749,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,749,0,0,0,0,0,0,0, +62,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,62, +62,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,62, +62,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,62, +62,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,62, +62,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,62, +62,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,62, +62,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,62, +62,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,62, +62,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,62, +62,221,0,0,0,0,0,221,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,221,0,0,0,0,0,221,62, +62,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,62, +62,0,0,0,0,0,0,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,221,0,0,0,0,0,0,62, +62,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,62, +0,0,0,0,0,0,0,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,221,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,0,0,0,0,0,0,0, -595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595 +68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68 diff --git a/data/room/08.room b/data/room/08.room index e5492b2..3e2140d 100644 --- a/data/room/08.room +++ b/data/room/08.room @@ -1,6 +1,6 @@ -name=no 08 +name=THE GARDEN bgColor=black -border=red +border=cyan tileset=standard.png roomUp=09.room roomDown=0 @@ -12,25 +12,42 @@ roomRight=07.room [/tilemap] [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 +tileset=abad.png +animation=abad.ani +width=8 height=16 -x=2 -y=2 -vx=0 +x=1 +y=13 +vx=0.4 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=1 +y1=13 +x2=10 +y2=13 +color=green +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=18 +x=5 +y=5 counter=1 +[/item] + +[item] +tileset=items.png +tile=18 +x=25 +y=9 +counter=2 +[/item] + +[item] +tileset=items.png +tile=18 +x=10 +y=5 +counter=3 [/item] \ No newline at end of file diff --git a/data/room/08.tmx b/data/room/08.tmx index 871246d..c81453f 100644 --- a/data/room/08.tmx +++ b/data/room/08.tmx @@ -4,11 +4,11 @@ 70,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,178,70, -70,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,178,0,70, -70,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,0,0,0,0,0,0,0,0,0,0,0,0,178,0,0,70, +70,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,178,0,70, +70,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,178,0,0,70, 70,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,178,0,0,0,70, 70,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,258,0,0,0,0,70, -70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,0,0,258,0,0,0,0,0,0,0,70, +70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,0,258,0,0,0,0,0,0,0,0,70, 70,0,0,0,0,258,0,0,0,0,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70, 70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70, 70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,0,0,0,258,0,0,0,70, diff --git a/data/room/09.tmx b/data/room/09.tmx index b357ee0..db44b7d 100644 --- a/data/room/09.tmx +++ b/data/room/09.tmx @@ -3,22 +3,22 @@ -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,161,17,17, -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,161,17,17,17, -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,161,17,17,17,17, -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,257,17,17,17,17,17, -0,0,0,0,0,257,257,199,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,199,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,199,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,293,293,293,293,293,293,293,293,293,293,0,0,257,257,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,257,0,0,0,0,37,37,37,37,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,37,37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,257,257,199,0,0,0,0,0,0,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,199,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,199,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,293,293,293,293,293,293,293,293,293,293,199,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,0,0,0,0,199,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,0,0,0,0,0,293,293,293,293,293,0,0,293,293,293 +17,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,161,17,17, +17,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,161,17,17,17, +17,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,161,17,17,17,17, +17,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,161,17,17,17,17,17, +17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,161,17,17,17,17,17,17, +17,0,0,0,0,257,257,199,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,17,17,17,17,17,17,17, +17,0,0,0,0,0,0,0,257,257,199,0,0,0,0,0,0,0,0,0,0,257,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,0,0,199,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,0,0,0,293,293,293,293,293,293,0,0,0,0,0,0,257,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,257,0,0,0,37,37,37,37,0,0,0,257,257,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,257,257,199,0,0,0,0,0,0,37,37,0,0,257,0,0,0,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,199,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,199,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,0,293,293,293,293,293,293,293,293,293,293,293,190,0,0,0,0,0,0,0,0,0,17, +17,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,293,293,293,293,293,293,293,293,293,293,0,0,293,293,293 diff --git a/data/room/10.room b/data/room/10.room index fbcd749..cb92eb0 100644 --- a/data/room/10.room +++ b/data/room/10.room @@ -1,6 +1,6 @@ -name=no 10 +name=the hall bgColor=black -border=red +border=magenta tileset=standard.png roomUp=0 roomDown=09.room @@ -11,26 +11,10 @@ roomRight=11.room 10.tmx [/tilemap] -[enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=2 -y=2 -vx=0 -vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta -[/enemy] - [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=22 +x=20 +y=4 counter=1 [/item] \ No newline at end of file diff --git a/data/room/10.tmx b/data/room/10.tmx index 2294fa5..1a751f4 100644 --- a/data/room/10.tmx +++ b/data/room/10.tmx @@ -3,22 +3,22 @@ -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, -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, -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, -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, -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, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,35,35,35,35,35,35,35,35,35,35,35, -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, -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, -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, -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, -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, -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, -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, -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, -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,167,74,74, -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,167,74,74,74 +74,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, +74,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, +74,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, +74,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, +74,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, +74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,35,35,35,35,35,35,35,35,35,35,35, +74,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, +74,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, +74,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, +74,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, +74,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, +74,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, +74,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, +74,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, +74,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,172,74,74, +74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,0,0,74,74,74,74 diff --git a/data/room/11.tmx b/data/room/11.tmx index 8997422..a5323e6 100644 --- a/data/room/11.tmx +++ b/data/room/11.tmx @@ -1,25 +1,24 @@ - -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,601, -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,601, -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,601, -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,601, -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,601, -853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,813,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,813,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,813,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,813,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +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,24, +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,24, +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,24, +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,24, +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,24, +325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,305,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,285,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,285,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,285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74, 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, 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, 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, 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, 74,74,187,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, -601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601 +74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74 diff --git a/data/room/12.room b/data/room/12.room index 76307b7..d1c0424 100644 --- a/data/room/12.room +++ b/data/room/12.room @@ -1,6 +1,6 @@ -name=no 12 +name=THE PASSAGE bgColor=black -border=red +border=green tileset=standard.png roomUp=0 roomDown=0 diff --git a/data/room/12.tmx b/data/room/12.tmx index 7ec1334..70d187c 100644 --- a/data/room/12.tmx +++ b/data/room/12.tmx @@ -1,25 +1,24 @@ - -421,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, -421,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, -421,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, -421,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, -421,0,0,0,569,421,421,421,421,421,421,421,421,421,421,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,421,421,421,0,0,0,0,0,0,0,0,0,0,0,211,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,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,421,421,589,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,421,421,421,421,0,0,0,0,0,421,421,421,421,421, -421,421,421,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, +21,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, +21,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, +21,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, +21,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, +21,0,0,0,166,21,21,21,21,21,21,21,21,21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,21,21,21,0,0,0,0,0,0,0,0,0,0,0,211,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,0,0,0,0,0,0,0,0,0,0,0,0,0,166, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,186,0,0,0,0,0,0,0,0,0,166,21,21, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,21,21,0,0,0,0,0,21,21,21,21,21, +21,21,21,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,211,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,0,0,0,0,0,0,0, 0,0,0,0,0,331,331,331,331,311,331,331,331,331,331,331,331,331,331,331,331,331,331,331,331,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,271,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,291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421 +21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21 diff --git a/data/room/13.room b/data/room/13.room index a99655d..18f65c1 100644 --- a/data/room/13.room +++ b/data/room/13.room @@ -1,6 +1,6 @@ -name=no 13 +name=matatunos bgColor=black -border=red +border=blue tileset=standard.png roomUp=0 roomDown=0 @@ -12,25 +12,89 @@ roomRight=14.room [/tilemap] [enemy] -tileset=diskette.png -animation=diskette.ani +tileset=matatunos.png +animation=matatunos.ani width=16 height=16 -x=2 -y=2 +x=5 +y=1 vx=0 -vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +vy=1 +x1=5 +y1=1 +x2=5 +y2=13 +color=bright_blue +[/enemy] + +[enemy] +tileset=tuno.png +animation=tuno.ani +width=16 +height=16 +x=12 +y=4 +vx=0 +vy=0.9 +x1=12 +y1=1 +x2=12 +y2=13 +color=red +[/enemy] + +[enemy] +tileset=tuno.png +animation=tuno.ani +width=16 +height=16 +x=19 +y=7 +vx=0 +vy=0.8 +x1=19 +y1=1 +x2=19 +y2=13 +color=red +[/enemy] + +[enemy] +tileset=tuno.png +animation=tuno.ani +width=16 +height=16 +x=26 +y=11 +vx=0 +vy=0.7 +x1=26 +y1=1 +x2=26 +y2=13 +color=red [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=0 +x=9 +y=5 counter=1 +[/item] + +[item] +tileset=items.png +tile=0 +x=16 +y=5 +counter=2 +[/item] + +[item] +tileset=items.png +tile=0 +x=23 +y=5 +counter=3 [/item] \ No newline at end of file diff --git a/data/room/13.tmx b/data/room/13.tmx index 2ef3d8a..5a7037c 100644 --- a/data/room/13.tmx +++ b/data/room/13.tmx @@ -1,7 +1,6 @@ - 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, @@ -10,16 +9,16 @@ 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, 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, 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, +25,25,25,25,25,0,0,25,25,25,25,25,0,0,25,25,25,25,25,0,0,25,25,25,25,25,0,0,25,25,25,25, +26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26, +26,58,26,58,26,0,0,26,58,26,58,26,0,0,26,58,26,58,26,0,0,26,58,26,58,26,0,0,26,58,26,58, +26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26, +26,58,26,58,26,0,0,26,58,26,58,26,0,0,26,58,26,58,26,0,0,26,58,26,58,26,0,0,26,58,26,58, +26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26, +26,26,0,26,26,0,0,26,26,0,26,26,0,0,26,26,0,26,26,0,0,26,26,0,26,26,0,0,26,26,0,26, 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, -0,0,513,513,513,582,0,0,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,513,513, -513,513,513,513,513,0,582,0,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,513,513, -0,0,0,0,0,0,0,582,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,513,513, -0,0,0,0,0,0,562,513,513,513,513,513,0,0,0,0,513,513,0,0,0,0,513,513,0,0,0,0,513,513,513,513, -0,0,0,0,0,562,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,562,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,562,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,162,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, -513,513,513,513,101,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,103,513,513,513,513,513 +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, +293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293,293 diff --git a/data/room/14.room b/data/room/14.room index d19d348..fb5a7dd 100644 --- a/data/room/14.room +++ b/data/room/14.room @@ -1,6 +1,6 @@ -name=no 14 +name=KILLING SPREE bgColor=black -border=red +border=blue tileset=standard.png roomUp=0 roomDown=15.room @@ -12,25 +12,82 @@ roomRight=45.room [/tilemap] [enemy] -tileset=diskette.png -animation=diskette.ani +tileset=matatunos.png +animation=matatunos.ani width=16 height=16 -x=2 -y=2 +x=6 +y=5 vx=0 vy=0 -x1=2 +x1=6 +y1=5 +x2=6 +y2=5 +color=bright_blue +[/enemy] + +[enemy] +tileset=batman.png +animation=batman.ani +width=8 +height=16 +x=9 +y=13 +vx=0.5 +vy=0 +x1=7 +y1=13 +x2=13 +y2=13 +color=blue +flip=true +[/enemy] + +[enemy] +tileset=tuno.png +animation=tuno.ani +width=8 +height=16 +x=21 +y=2 +vx=0 +vy=0.4 +x1=21 y1=2 -x2=2 -y2=2 +x2=21 +y2=13 +color=red +[/enemy] + +[enemy] +tileset=tuno.png +animation=tuno.ani +width=8 +height=16 +x=28 +y=8 +vx=0 +vy=0.4 +x1=28 +y1=2 +x2=28 +y2=13 color=magenta [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=0 +x=30 +y=14 counter=1 +[/item] + +[item] +tileset=items.png +tile=0 +x=25 +y=4 +counter=2 [/item] \ No newline at end of file diff --git a/data/room/14.tmx b/data/room/14.tmx index 6d65257..dbfcfbb 100644 --- a/data/room/14.tmx +++ b/data/room/14.tmx @@ -3,22 +3,22 @@ -26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26, -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, -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, -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, -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, -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, -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, -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, -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, -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, -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, -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, -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, -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, -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, -26,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,26 +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,26, +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,26, +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,26, +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,26, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,307,0,0,0,0,0,0,0,307,0,0,26, +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,307,0,0,0,0,0,26, +24,24,24,24,24,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,26, +23,23,23,23,23,0,24,24,24,24,24,192,0,0,0,0,0,0,0,0,0,0,307,0,0,0,0,307,0,0,307,26, +23,58,23,58,23,0,23,23,23,23,23,23,192,0,0,0,0,0,0,0,0,0,0,0,307,0,0,0,0,0,0,0, +23,23,23,23,23,0,23,58,23,58,23,23,23,192,0,0,0,0,0,307,0,0,0,0,0,0,307,0,0,0,0,0, +23,58,23,58,23,0,23,23,23,23,23,23,23,23,192,0,0,0,0,0,0,0,0,307,0,0,0,0,0,307,0,0, +23,23,23,23,23,0,23,58,23,58,23,58,23,58,23,287,0,0,0,0,0,0,0,0,0,0,307,0,0,0,26,26, +23,23,23,23,23,0,23,23,23,23,23,23,23,23,23,287,287,0,0,0,0,307,0,0,0,0,0,0,0,0,0,26, +0,0,0,0,0,0,23,0,0,0,0,0,0,0,23,287,287,0,0,307,0,0,307,0,0,307,0,307,307,0,0,26, +0,0,0,0,0,0,23,0,0,0,0,0,0,0,23,287,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, +43,43,43,43,43,0,43,43,43,43,43,43,43,43,43,43,43,43,43,43,0,0,0,0,307,307,307,307,307,307,307,26 diff --git a/data/room/16.tmx b/data/room/16.tmx index 935ee9a..546f534 100644 --- a/data/room/16.tmx +++ b/data/room/16.tmx @@ -1,7 +1,6 @@ - 425,649,649,649,649,649,649,649,649,649,649,649,649,649,0,0,0,0,649,649,649,649,649,649,649,649,649,649,649,649,649,425, diff --git a/data/room/17.tmx b/data/room/17.tmx index d9bfa21..1e8b311 100644 --- a/data/room/17.tmx +++ b/data/room/17.tmx @@ -1,7 +1,6 @@ - 433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433, diff --git a/data/room/45.room b/data/room/45.room index 32ab691..4ed4f99 100644 --- a/data/room/45.room +++ b/data/room/45.room @@ -1,6 +1,6 @@ -name=no 45 -bgColor=black -border=red +name=FEEL THE HEAT +bgColor=red +border=black tileset=standard.png roomUp=0 roomDown=0 @@ -12,25 +12,56 @@ roomRight=46.room [/tilemap] [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 +tileset=chip.png +animation=chip.ani +width=8 height=16 -x=2 -y=2 +x=4 +y=5 vx=0 -vy=0 -x1=2 +vy=1 +x1=4 y1=2 -x2=2 -y2=2 +x2=4 +y2=13 +color=green +[/enemy] + +[enemy] +tileset=chip.png +animation=chip.ani +width=8 +height=16 +x=10 +y=4 +vx=0 +vy=1 +x1=10 +y1=2 +x2=10 +y2=13 +color=bright_blue +[/enemy] + +[enemy] +tileset=chip.png +animation=chip.ani +width=8 +height=16 +x=16 +y=3 +vx=0 +vy=1 +x1=16 +y1=2 +x2=16 +y2=13 color=magenta [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 -counter=1 +tile=5 +x=12 +y=2 [/item] \ No newline at end of file diff --git a/data/room/45.tmx b/data/room/45.tmx index 4ef20cb..8d5875f 100644 --- a/data/room/45.tmx +++ b/data/room/45.tmx @@ -1,25 +1,24 @@ - -426,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, -426,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, -426,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, -426,0,0,0,0,0,0,0,0,0,0,0,671,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -426,0,0,0,0,0,0,0,0,671,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -426,0,0,0,0,0,671,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, -426,0,0,671,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, -426,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,0,0,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,0,632,0,0,0,632,632,632,632,632,632, +26,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, +26,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, +26,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, +26,0,0,0,0,0,0,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +26,0,0,0,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +26,0,0,0,0,0,271,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, +26,0,0,271,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, +26,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,0,0,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,0,231,0,0,0,231,231,231,231,231,231, 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, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,632,0,0,0,0,0,0,0,0,0, -426,426,426,0,0,0,426,426,426,0,0,0,426,426,426,0,0,0,426,426,426,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,0,231,0,0,0,0,0,0,0,0,0, +26,26,26,0,0,0,231,231,231,0,0,0,231,231,231,0,0,0,231,231,231,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,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,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,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,0,0,0,0,0,0,0,0,0,0,0 +382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382 diff --git a/data/room/58.tmx b/data/room/58.tmx index d37463f..af58698 100644 --- a/data/room/58.tmx +++ b/data/room/58.tmx @@ -1,7 +1,6 @@ - 473,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,473, diff --git a/data/room_old/01.tmx b/data/room_old/01.tmx index 513b664..6426a6c 100644 --- a/data/room_old/01.tmx +++ b/data/room_old/01.tmx @@ -1,6 +1,6 @@ - + 21,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, diff --git a/data/room_old/02.tmx b/data/room_old/02.tmx index b275feb..b732af4 100644 --- a/data/room_old/02.tmx +++ b/data/room_old/02.tmx @@ -1,6 +1,6 @@ - + 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,24, diff --git a/data/room_old/03.tmx b/data/room_old/03.tmx index e2b00d3..eadf78e 100644 --- a/data/room_old/03.tmx +++ b/data/room_old/03.tmx @@ -1,6 +1,6 @@ - + 26,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, diff --git a/data/room_old/04.tmx b/data/room_old/04.tmx index 81442a2..7c48981 100644 --- a/data/room_old/04.tmx +++ b/data/room_old/04.tmx @@ -1,6 +1,6 @@ - + 25,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,249,249,249,249,249,249,249,249,249,249,249,249,249,25, diff --git a/data/room_old/05.tmx b/data/room_old/05.tmx index 167dd64..2f6639d 100644 --- a/data/room_old/05.tmx +++ b/data/room_old/05.tmx @@ -1,6 +1,6 @@ - + 62,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, diff --git a/data/room_old/06.tmx b/data/room_old/06.tmx index 36ae2d5..2390f97 100644 --- a/data/room_old/06.tmx +++ b/data/room_old/06.tmx @@ -1,6 +1,6 @@ - + 26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26, diff --git a/data/room_old/07.tmx b/data/room_old/07.tmx index c22ecac..088008c 100644 --- a/data/room_old/07.tmx +++ b/data/room_old/07.tmx @@ -1,6 +1,6 @@ - + 73,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,73, diff --git a/data/room_old/08.tmx b/data/room_old/08.tmx index 53e9c15..af9ccf4 100644 --- a/data/room_old/08.tmx +++ b/data/room_old/08.tmx @@ -1,6 +1,6 @@ - + 33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33, diff --git a/data/room_old/09.tmx b/data/room_old/09.tmx index 0e80816..7b7defe 100644 --- a/data/room_old/09.tmx +++ b/data/room_old/09.tmx @@ -1,6 +1,6 @@ - + 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,0,0,0,163,54,54,54,54,54,54,54,54,54,54,54,54, diff --git a/data/room_old/10.tmx b/data/room_old/10.tmx index f60dfa8..acf5b97 100644 --- a/data/room_old/10.tmx +++ b/data/room_old/10.tmx @@ -1,6 +1,6 @@ - + 94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94, diff --git a/data/room_old/11.tmx b/data/room_old/11.tmx index 99f501c..a76bc61 100644 --- a/data/room_old/11.tmx +++ b/data/room_old/11.tmx @@ -1,6 +1,6 @@ - + 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, diff --git a/data/room_old/12.tmx b/data/room_old/12.tmx index b50e781..5465e22 100644 --- a/data/room_old/12.tmx +++ b/data/room_old/12.tmx @@ -1,6 +1,6 @@ - + 74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74, diff --git a/data/room_old/13.tmx b/data/room_old/13.tmx index 8bb8137..3f01706 100644 --- a/data/room_old/13.tmx +++ b/data/room_old/13.tmx @@ -1,6 +1,6 @@ - + 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25, diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index d786298b67c73ef1792d22f7543254ffc8ecc2a3..27b82e412069d11882e43300240731a5cf6b0254 100644 GIT binary patch delta 4786 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 E4>^Z>HUIzs delta 4739 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