diff --git a/data/config.txt b/data/config/config.txt similarity index 100% rename from data/config.txt rename to data/config/config.txt diff --git a/data/gamecontrollerdb.txt b/data/input/gamecontrollerdb.txt similarity index 100% rename from data/gamecontrollerdb.txt rename to data/input/gamecontrollerdb.txt diff --git a/data/room/03.tmx b/data/room/03.tmx index 9c0c32d..2908fb8 100644 --- a/data/room/03.tmx +++ b/data/room/03.tmx @@ -1,5 +1,5 @@ - + @@ -17,7 +17,7 @@ 21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,21,0,0,0,0,0,21,21, 21,21,0,0,0,0,0,0,0,213,213,213,213,213,213,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,21,21, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,253,253,253,0,0,0,0,0,0,0,0,21,21, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,253,253,253,0,0,0,361,361,361,361,0,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,21,21 diff --git a/data/room_old/01.room b/data/room_old/01.room deleted file mode 100644 index 87a4482..0000000 --- a/data/room_old/01.room +++ /dev/null @@ -1,60 +0,0 @@ -name=void main -bgColor=black -border=yellow -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=06.room -roomRight=02.room - - -01.tmx - - -[enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=1 -y=0 -vx=0 -vy=0.3 -x1=1 -y1=0 -x2=1 -y2=5 -color=magenta -[/enemy] - -[enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=5 -y=9 -vx=0.6 -vy=0 -x1=5 -y1=9 -x2=22 -y2=9 -color=white -[/enemy] - -[item] -tileset=items.png -tile=1 -x=1 -y=7 -counter=1 -[/item] - -[item] -tileset=items.png -tile=1 -x=17 -y=8 -counter=2 -[/item] diff --git a/data/room_old/01.tmx b/data/room_old/01.tmx deleted file mode 100644 index 6426a6c..0000000 --- a/data/room_old/01.tmx +++ /dev/null @@ -1,24 +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,0,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, -21,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, -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,21,21,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,0,0,0,0,21,21,21,21,0,0,0,0,0,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,211,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,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,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,0,0,0,0,0,0,0,0,0,0, -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, -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_old/02.room b/data/room_old/02.room deleted file mode 100644 index 5196bde..0000000 --- a/data/room_old/02.room +++ /dev/null @@ -1,35 +0,0 @@ -name=case switch -bgColor=black -border=cyan -tileset=standard.png -roomUp=0 -roomDown=04.room -roomLeft=01.room -roomRight=03.room - - -02.tmx - - -[enemy] -tileset=paco.png -animation=paco.ani -width=16 -height=16 -x=14 -y=0 -vx=0 -vy=1 -x1=14 -y1=0 -x2=14 -y2=12 -color=cyan -[/enemy] - -[item] -tileset=items.png -tile=7 -x=19 -y=5 -[/item] \ No newline at end of file diff --git a/data/room_old/02.tmx b/data/room_old/02.tmx deleted file mode 100644 index b732af4..0000000 --- a/data/room_old/02.tmx +++ /dev/null @@ -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,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, -0,0,0,0,0,0,0,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,203,203,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,24,24,24,24,24,0,0,0,0,0,0,0,0,0,24, -24,24,24,24,24,24,0,0,0,203,0,0,0,0,0,0,0,0,0,24,0,0,0,0,203,203,0,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,203,0,0,0,0,0,0,0,0,0,24,0,0,0,0,203,203,0,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,203,203,24, -0,0,0,0,0,0,0,203,203,203,203,203,203,0,0,0,0,0,0,24,0,0,0,0,203,203,0,0,0,0,0,24, -0,0,0,0,0,203,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, -44,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,84,84,84,84,84,84,84,84,84,84,84,84, -44,44,44,44,44,44,44,44,44,44,44,44,44,44,223,0,0,223,44,44,44,44,44,44,44,44,44,44,44,44,44,44 - - - diff --git a/data/room_old/03.room b/data/room_old/03.room deleted file mode 100644 index 17b8e01..0000000 --- a/data/room_old/03.room +++ /dev/null @@ -1,67 +0,0 @@ -name=the edge -bgColor=red -border=black -tileset=standard.png -roomUp=0 -roomDown=05.room -roomLeft=02.room -roomRight=11.room - - -03.tmx - - -[enemy] -tileset=chip.png -animation=chip.ani -width=8 -height=16 -x=4 -y=5 -vx=0 -vy=1 -x1=4 -y1=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=5 -x=12 -y=2 -[/item] \ No newline at end of file diff --git a/data/room_old/03.tmx b/data/room_old/03.tmx deleted file mode 100644 index eadf78e..0000000 --- a/data/room_old/03.tmx +++ /dev/null @@ -1,24 +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,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,232,0,0,0,232,232,232,232,232,232, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,0,0,0, -26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,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 - - - diff --git a/data/room_old/04.room b/data/room_old/04.room deleted file mode 100644 index 57ba90b..0000000 --- a/data/room_old/04.room +++ /dev/null @@ -1,82 +0,0 @@ -name=The Fridge -bgColor=blue -border=blue -tileset=standard.png -roomUp=02.room -roomDown=0 -roomLeft=07.room -roomRight=05.room - - -04.tmx - - -[enemy] -tileset=chip.png -animation=chip.ani -width=8 -height=16 -x=1 -y=3 -vx=1 -vy=0 -x1=1 -y1=3 -x2=14 -y2=3 -color=magenta -[/enemy] - -[enemy] -tileset=chip.png -animation=chip.ani -width=8 -height=16 -x=30 -y=7 -vx=-0.8 -vy=0 -x1=10 -y1=7 -x2=30 -y2=7 -color=bright_white -[/enemy] - -[enemy] -tileset=wave.png -animation=wave.ani -width=8 -height=8 -x=15 -y=12 -vx=0.5 -vy=0 -x1=15 -y1=12 -x2=30 -y2=12 -color=bright_magenta -[/enemy] - -[item] -tileset=items.png -tile=6 -x=2 -y=2 -[/item] - -[item] -tileset=items.png -tile=6 -x=29 -y=5 -[/item] - - -[item] -tileset=items.png -tile=6 -x=21 -y=12 -[/item] \ No newline at end of file diff --git a/data/room_old/04.tmx b/data/room_old/04.tmx deleted file mode 100644 index 7c48981..0000000 --- a/data/room_old/04.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -25,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,230,230,230,230,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,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,25,25,25,25,25,0,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,270,270,270,270,270,270,270,270,270,0,0,270,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,290,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,290,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,0,0,0,0,25,25,25,25,0,0,25,25,25,25,25,25,25,0,0,0,0,0,0,0,25, -25,0,0,0,0,229,229,229,229,229,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -25,0,0,0,0,0,0,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,249,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25, -0,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,381,0,0,0,0,0,0,381,0,0,0,0,0,0, -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/room_old/05.room b/data/room_old/05.room deleted file mode 100644 index 81dc960..0000000 --- a/data/room_old/05.room +++ /dev/null @@ -1,108 +0,0 @@ -name=sigmasua -bgColor=black -border=black -tileset=standard.png -roomUp=03.room -roomDown=0 -roomLeft=04.room -roomRight=12.room - - -05.tmx - - -[enemy] -tileset=sigmasua.png -animation=sigmasua.ani -width=16 -height=16 -x=15 -y=7 -vx=0.8 -vy=0 -x1=9 -y1=7 -x2=25 -y2=7 -color=bright_red -[/enemy] - -[enemy] -tileset=sigmasua.png -animation=sigmasua.ani -width=16 -height=16 -x=3 -y=8 -vx=0 -vy=0.4 -x1=3 -y1=5 -x2=3 -y2=12 -color=bright_red -[/enemy] - -[enemy] -tileset=sigmasua.png -animation=sigmasua.ani -width=16 -height=16 -x=10 -y=10 -vx=0 -vy=0.3 -x1=10 -y1=10 -x2=10 -y2=13 -color=bright_magenta -[/enemy] - -[enemy] -tileset=sigmasua.png -animation=sigmasua.ani -width=16 -height=16 -x=23 -y=13 -vx=0 -vy=-0.3 -x1=23 -y1=10 -x2=23 -y2=13 -color=bright_green -[/enemy] - -[item] -tileset=items.png -tile=9 -counter=1 -x=21 -y=3 -[/item] - -[item] -tileset=items.png -tile=9 -counter=2 -x=1 -y=8 -[/item] - -[item] -tileset=items.png -tile=9 -counter=3 -x=26 -y=14 -[/item] - -[item] -tileset=items.png -tile=9 -counter=4 -x=18 -y=5 -[/item] \ No newline at end of file diff --git a/data/room_old/05.tmx b/data/room_old/05.tmx deleted file mode 100644 index 2f6639d..0000000 --- a/data/room_old/05.tmx +++ /dev/null @@ -1,24 +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,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,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,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,0, -62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,68,0,0,68,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,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,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,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,0, -62,222,0,0,0,0,0,222,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,222,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,68,0,0,0,0, -62,0,0,0,0,0,0,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,222,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,68,0,0,0,0, -0,0,0,0,0,0,0,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,222,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,0,0, -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_old/06.room b/data/room_old/06.room deleted file mode 100644 index 59fb0b1..0000000 --- a/data/room_old/06.room +++ /dev/null @@ -1,11 +0,0 @@ -name=the test room -bgColor=black -border=blue -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=13.room -roomRight=01.room - - -06.tmx diff --git a/data/room_old/06.tmx b/data/room_old/06.tmx deleted file mode 100644 index 2390f97..0000000 --- a/data/room_old/06.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,86,86,86,0,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,26, -26,0,0,0,86,0,86,0,0,0,0,0,0,0,0,168,66,66,66,66,187,0,0,0,0,164,66,66,0,0,0,26, -26,0,0,0,86,0,86,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, -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, -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, -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, -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, -26,0,0,0,0,0,0,0,0,0,162,26,26,26,26,26,26,26,26,183,0,0,0,0,0,0,0,0,0,0,0,26, -0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,183,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,183,0,0,0,0,0,0,0,0,0,0, -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, -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.room b/data/room_old/07.room deleted file mode 100644 index 4f15f3b..0000000 --- a/data/room_old/07.room +++ /dev/null @@ -1,93 +0,0 @@ -name=chirping -bgColor=black -border=magenta -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=08.room -roomRight=04.room - - -07.tmx - - -[enemy] -tileset=bird.png -animation=bird.ani -width=16 -height=16 -x=4 -y=2 -vx=0 -vy=0.5 -x1=4 -y1=2 -x2=4 -y2=12 -color=yellow -flip=true -[/enemy] - -[enemy] -tileset=bird.png -animation=bird.ani -width=16 -height=16 -x=9 -y=11 -vx=0 -vy=-0.5 -x1=9 -y1=2 -x2=9 -y2=12 -color=green -[/enemy] - -[enemy] -tileset=bird.png -animation=bird.ani -width=16 -height=16 -x=26 -y=5 -vx=0 -vy=-0.5 -x1=26 -y1=2 -x2=26 -y2=12 -color=white -[/enemy] - -[item] -tileset=items.png -tile=10 -x=2 -y=8 -counter=1 -[/item] - -[item] -tileset=items.png -tile=10 -x=2 -y=3 -counter=2 -[/item] - -[item] -tileset=items.png -tile=10 -x=29 -y=8 -counter=3 -[/item] - -[item] -tileset=items.png -tile=10 -x=29 -y=3 -counter=4 -[/item] \ No newline at end of file diff --git a/data/room_old/07.tmx b/data/room_old/07.tmx deleted file mode 100644 index 088008c..0000000 --- a/data/room_old/07.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -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, -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, -0,0,0,0,0,0,0,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, -0,0,0,0,0,0,0,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, -73,345,345,345,0,0,345,345,345,0,0,345,345,345,345,345,345,345,345,345,345,0,0,162,345,345,0,0,345,345,345,73, -73,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,73, -73,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,73, -73,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,73, -73,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,73, -73,345,345,345,0,0,345,345,345,0,0,345,345,345,182,0,0,345,345,345,345,345,345,345,345,345,0,0,345,345,345,73, -73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73, -73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0, -73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73 - - - diff --git a/data/room_old/08.room b/data/room_old/08.room deleted file mode 100644 index e23f46d..0000000 --- a/data/room_old/08.room +++ /dev/null @@ -1,11 +0,0 @@ -name=still thinking -bgColor=black -border=blue -tileset=standard.png -roomUp=0 -roomDown=09.room -roomLeft=10.room -roomRight=07.room - - -08.tmx diff --git a/data/room_old/08.tmx b/data/room_old/08.tmx deleted file mode 100644 index af9ccf4..0000000 --- a/data/room_old/08.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -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, -33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,33, -33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -33,33,341,341,341,0,0,341,341,341,341,341,0,0,341,341,341,341,341,341,341,341,341,341,341,341,0,0,0,0,0,0, -33,33,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,33,33,33,33,33, -33,33,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,33,33, -33,33,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,33,33, -33,33,341,341,341,0,0,341,341,341,341,341,0,0,341,341,341,341,341,341,341,341,341,162,0,0,0,0,0,0,33,33, -33,33,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,33,33, -33,33,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,33,33, -33,33,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,33,33, -33,33,351,351,351,0,0,351,351,351,351,351,0,0,351,351,351,351,351,351,0,0,0,0,0,0,0,0,0,0,33,33, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,0,0,351,351,351,351,351,351,351,351,351,351,351,351 - - - diff --git a/data/room_old/09.room b/data/room_old/09.room deleted file mode 100644 index c427dbe..0000000 --- a/data/room_old/09.room +++ /dev/null @@ -1,11 +0,0 @@ -name=slope test -bgColor=blue -border=blue -tileset=standard.png -roomUp=08.room -roomDown=0 -roomLeft=0 -roomRight=0 - - -09.tmx diff --git a/data/room_old/09.tmx b/data/room_old/09.tmx deleted file mode 100644 index 7b7defe..0000000 --- a/data/room_old/09.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54, -54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54 - - - diff --git a/data/room_old/10.room b/data/room_old/10.room deleted file mode 100644 index b33119c..0000000 --- a/data/room_old/10.room +++ /dev/null @@ -1,11 +0,0 @@ -name=welcome to the jail -bgColor=black -border=bright_magenta -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=0 -roomRight=08.room - - -10.tmx diff --git a/data/room_old/10.tmx b/data/room_old/10.tmx deleted file mode 100644 index acf5b97..0000000 --- a/data/room_old/10.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,127,127,0,127,127,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,127,0,127,0,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,127,0,127,0,127,127,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,127,127,127,0,127,0,127,0,127,0,127,127,127,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -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.room b/data/room_old/11.room deleted file mode 100644 index 8a74a6c..0000000 --- a/data/room_old/11.room +++ /dev/null @@ -1,68 +0,0 @@ -name=qvoid -bgColor=bright_blue -border=white -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=03.room -roomRight=0 - - -11.tmx - - -[enemy] -tileset=qvoid.png -animation=qvoid.ani -width=16 -height=16 -x=13 -y=3 -vx=0 -vy=0.3 -x1=13 -y1=3 -x2=13 -y2=11 -color=white -[/enemy] - -[enemy] -tileset=qvoid.png -animation=qvoid.ani -width=16 -height=16 -x=19 -y=7 -vx=0 -vy=0.3 -x1=19 -y1=3 -x2=19 -y2=11 -color=bright_red -[/enemy] - -[item] -tileset=items.png -tile=20 -x=1 -y=12 -counter=1 -[/item] - -[item] -tileset=items.png -tile=20 -x=16 -y=5 -counter=2 -[/item] - -[item] -tileset=items.png -tile=20 -x=25 -y=11 -counter=3 -[/item] \ No newline at end of file diff --git a/data/room_old/11.tmx b/data/room_old/11.tmx deleted file mode 100644 index a76bc61..0000000 --- a/data/room_old/11.tmx +++ /dev/null @@ -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,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,113,113,113,182,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113, -113,113,113,113,113,0,182,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113, -113,113,0,0,0,0,0,182,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113, -113,0,0,0,0,0,162,113,113,113,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113, -113,0,0,0,0,162,0,113,113,113,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113, -113,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, -113,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, -113,113,113,113,101,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,103,113,113,113,113,113, -113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113 - - - diff --git a/data/room_old/12.room b/data/room_old/12.room deleted file mode 100644 index e4431b7..0000000 --- a/data/room_old/12.room +++ /dev/null @@ -1,60 +0,0 @@ -name=no name -bgColor=black -border=red -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=05.room -roomRight=0 - - -01.tmx - - -[enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=1 -y=0 -vx=0 -vy=0.3 -x1=1 -y1=0 -x2=1 -y2=5 -color=magenta -[/enemy] - -[enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=5 -y=9 -vx=0.6 -vy=0 -x1=5 -y1=9 -x2=22 -y2=9 -color=white -[/enemy] - -[item] -tileset=items.png -tile=1 -x=1 -y=7 -counter=1 -[/item] - -[item] -tileset=items.png -tile=1 -x=17 -y=8 -counter=2 -[/item] diff --git a/data/room_old/12.tmx b/data/room_old/12.tmx deleted file mode 100644 index 5465e22..0000000 --- a/data/room_old/12.tmx +++ /dev/null @@ -1,24 +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, -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, -326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,286,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,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, -0,0,0,0,0,0,0,0,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,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.room b/data/room_old/13.room deleted file mode 100644 index f732620..0000000 --- a/data/room_old/13.room +++ /dev/null @@ -1,236 +0,0 @@ -name=know your enemy -bgColor=black -border=red -tileset=standard.png -roomUp=0 -roomDown=0 -roomLeft=0 -roomRight=06.room - - -13.tmx - - -[enemy] -tileset=batman.png -animation=batman.ani -width=8 -height=16 -x=2 -y=2 -vx=0 -vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=bin.png -animation=bin.ani -width=16 -height=8 -x=5 -y=2 -vx=0 -vy=0 -x1=5 -y1=2 -x2=5 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=bird.png -animation=bird.ani -width=16 -height=16 -x=8 -y=2 -vx=0 -vy=0 -x1=8 -y1=2 -x2=8 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=chip.png -animation=chip.ani -width=8 -height=16 -x=11 -y=2 -vx=0 -vy=0 -x1=11 -y1=2 -x2=11 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=14 -y=2 -vx=0 -vy=0 -x1=14 -y1=2 -x2=14 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=matatunos.png -animation=matatunos.ani -width=16 -height=16 -x=17 -y=2 -vx=0 -vy=0 -x1=17 -y1=2 -x2=17 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=paco.png -animation=paco.ani -width=16 -height=16 -x=20 -y=2 -vx=0 -vy=0 -x1=20 -y1=2 -x2=20 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=qvoid.png -animation=qvoid.ani -width=16 -height=16 -x=23 -y=2 -vx=0 -vy=0 -x1=23 -y1=2 -x2=23 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=sigmasua.png -animation=sigmasua.ani -width=16 -height=16 -x=26 -y=2 -vx=0 -vy=0 -x1=26 -y1=2 -x2=26 -y2=2 -color=red -[/enemy] - -[enemy] -tileset=tuno.png -animation=tuno.ani -width=16 -height=16 -x=2 -y=5 -vx=0 -vy=0 -x1=2 -y1=5 -x2=2 -y2=5 -color=red -[/enemy] - -[enemy] -tileset=wave.png -animation=wave.ani -width=8 -height=8 -x=5 -y=5 -vx=0 -vy=0 -x1=5 -y1=5 -x2=5 -y2=5 -color=red -[/enemy] - -[enemy] -tileset=abad.png -animation=abad.ani -width=8 -height=16 -x=8 -y=5 -vx=0 -vy=0 -x1=8 -y1=5 -x2=8 -y2=5 -color=red -[/enemy] - -[enemy] -tileset=jailbattle_human.png -animation=jailbattle_human.ani -width=11 -height=13 -x=11 -y=5 -vx=0 -vy=0 -x1=11 -y1=5 -x2=11 -y2=5 -color=red -[/enemy] - -[enemy] -tileset=jailbattle_alien.png -animation=jailbattle_alien.ani -width=13 -height=15 -x=14 -y=5 -vx=0 -vy=0 -x1=14 -y1=5 -x2=14 -y2=5 -color=red -[/enemy] \ No newline at end of file diff --git a/data/room_old/13.tmx b/data/room_old/13.tmx deleted file mode 100644 index 3f01706..0000000 --- a/data/room_old/13.tmx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -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, -25,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,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,25 - - - diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 717f265..6e7b7cd 100644 Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ diff --git a/source/director.cpp b/source/director.cpp index 7c3b05d..64ad387 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -357,8 +357,8 @@ bool Director::setFileList() asset->add("/data/font/debug.png", font); asset->add("/data/font/debug.txt", font); - asset->add("/data/gamecontrollerdb.txt", data); - asset->add("/data/config.txt", data, false); + asset->add("/data/input/gamecontrollerdb.txt", data); + asset->add("/data/config/config.txt", data, false); asset->add("/data/room/01.room", room); asset->add("/data/room/02.room", room);