diff --git a/data/room/03.room b/data/room/03.room index 77f6284..65b66de 100644 --- a/data/room/03.room +++ b/data/room/03.room @@ -5,7 +5,7 @@ tileset=standard.png roomUp=0 roomDown=05.room roomLeft=02.room -roomRight=0 +roomRight=11.room [tilemap] 03.tmx diff --git a/data/room/03.tmx b/data/room/03.tmx index 07ba055..e2b00d3 100644 --- a/data/room/03.tmx +++ b/data/room/03.tmx @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ 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,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, diff --git a/data/room/05.room b/data/room/05.room index 1fcc375..b68d623 100644 --- a/data/room/05.room +++ b/data/room/05.room @@ -5,7 +5,7 @@ tileset=standard.png roomUp=03.room roomDown=0 roomLeft=04.room -roomRight=0 +roomRight=12.room [tilemap] 05.tmx @@ -24,7 +24,7 @@ x1=9 y1=7 x2=25 y2=7 -color=bright_yellow +color=bright_red [/enemy] [enemy] diff --git a/data/room/11.room b/data/room/11.room new file mode 100644 index 0000000..6049df6 --- /dev/null +++ b/data/room/11.room @@ -0,0 +1,68 @@ +name=qvoid +bgColor=bright_blue +border=white +tileset=standard.png +roomUp=0 +roomDown=0 +roomLeft=03.room +roomRight=0 + +[tilemap] +11.tmx +[/tilemap] + +[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.6 +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/11.tmx b/data/room/11.tmx new file mode 100644 index 0000000..02d80b5 --- /dev/null +++ b/data/room/11.tmx @@ -0,0 +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,113,113,113,183,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,183,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,0,183,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,163,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,163,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,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,0,0, +113,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,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/12.room b/data/room/12.room new file mode 100644 index 0000000..8d51499 --- /dev/null +++ b/data/room/12.room @@ -0,0 +1,60 @@ +name=no name +bgColor=black +border=red +tileset=standard.png +roomUp=0 +roomDown=0 +roomLeft=05.room +roomRight=0 + +[tilemap] +01.tmx +[/tilemap] + +[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/12.tmx b/data/room/12.tmx new file mode 100644 index 0000000..b50e781 --- /dev/null +++ b/data/room/12.tmx @@ -0,0 +1,24 @@ + + + + + +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/media/enemies/bin.ani b/media/enemies/bin.ani new file mode 100644 index 0000000..e2fe6bb --- /dev/null +++ b/media/enemies/bin.ani @@ -0,0 +1,10 @@ +frames_per_row=5 +frame_width=16 +frame_height=8 + +[animation] +name=default +speed=10 +loop=0 +frames=0,1,2,3,4 +[/animation] \ No newline at end of file diff --git a/media/enemies/bin.png b/media/enemies/bin.png new file mode 100644 index 0000000..592229e Binary files /dev/null and b/media/enemies/bin.png differ diff --git a/media/enemies/qvoid.ani b/media/enemies/qvoid.ani new file mode 100644 index 0000000..d7b2d89 --- /dev/null +++ b/media/enemies/qvoid.ani @@ -0,0 +1,10 @@ +frames_per_row=8 +frame_width=16 +frame_height=16 + +[animation] +name=default +speed=8 +loop=0 +frames=0,1,2,3,4,5,6,7 +[/animation] \ No newline at end of file diff --git a/media/enemies/qvoid.png b/media/enemies/qvoid.png new file mode 100644 index 0000000..8192c3f Binary files /dev/null and b/media/enemies/qvoid.png differ diff --git a/media/items/items.png b/media/items/items.png index 18ed563..6585289 100644 Binary files a/media/items/items.png and b/media/items/items.png differ diff --git a/media/tilesets/standard.png b/media/tilesets/standard.png index 316e2fa..6a3670b 100644 Binary files a/media/tilesets/standard.png and b/media/tilesets/standard.png differ diff --git a/source/director.cpp b/source/director.cpp index 0a0e1cd..4c2eb4c 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -360,6 +360,8 @@ bool Director::setFileList() asset->add("/data/room/08.room", room); asset->add("/data/room/09.room", room); asset->add("/data/room/10.room", room); + asset->add("/data/room/11.room", room); + asset->add("/data/room/12.room", room); asset->add("/data/room/01.tmx", room); asset->add("/data/room/02.tmx", room); asset->add("/data/room/03.tmx", room); @@ -370,6 +372,8 @@ bool Director::setFileList() asset->add("/data/room/08.tmx", room); asset->add("/data/room/09.tmx", room); asset->add("/data/room/10.tmx", room); + asset->add("/data/room/11.tmx", room); + asset->add("/data/room/12.tmx", room); asset->add("/media/tilesets/standard.png", bitmap); @@ -385,6 +389,10 @@ bool Director::setFileList() asset->add("/media/enemies/diskette.ani", data); asset->add("/media/enemies/bird.png", bitmap); asset->add("/media/enemies/bird.ani", data); + asset->add("/media/enemies/bin.png", bitmap); + asset->add("/media/enemies/bin.ani", data); + asset->add("/media/enemies/qvoid.png", bitmap); + asset->add("/media/enemies/qvoid.ani", data); asset->add("/media/player/player.png", bitmap); asset->add("/media/player/player.ani", data);