diff --git a/data/items/items.png b/data/items/items.png index 868d6bb..47c2d0f 100644 Binary files a/data/items/items.png and b/data/items/items.png differ 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 d786298..27b82e4 100644 Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ