diff --git a/data/enemies/jailer.ani b/data/enemies/jailer.ani new file mode 100644 index 0000000..663c0ef --- /dev/null +++ b/data/enemies/jailer.ani @@ -0,0 +1,10 @@ +frames_per_row=4 +frame_width=16 +frame_height=16 + +[animation] +name=default +speed=4 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/data/enemies/jailer.png b/data/enemies/jailer.png new file mode 100644 index 0000000..0a4f570 Binary files /dev/null and b/data/enemies/jailer.png differ diff --git a/data/enemies/jailer2.ani b/data/enemies/jailer2.ani new file mode 100644 index 0000000..44892ce --- /dev/null +++ b/data/enemies/jailer2.ani @@ -0,0 +1,10 @@ +frames_per_row=6 +frame_width=16 +frame_height=16 + +[animation] +name=default +speed=4 +loop=0 +frames=0,1,2,3,4,5,0,1,2,3,4,5,0,1,2,3,4,5,0,1,2,3,4,5,0,1,2,3,4,5,1,3,5,1,3,5,1,3,5 +[/animation] \ No newline at end of file diff --git a/data/enemies/jailer2.png b/data/enemies/jailer2.png new file mode 100644 index 0000000..2ad1e1e Binary files /dev/null and b/data/enemies/jailer2.png differ diff --git a/data/enemies/jailer3.ani b/data/enemies/jailer3.ani new file mode 100644 index 0000000..663c0ef --- /dev/null +++ b/data/enemies/jailer3.ani @@ -0,0 +1,10 @@ +frames_per_row=4 +frame_width=16 +frame_height=16 + +[animation] +name=default +speed=4 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/data/enemies/jailer3.png b/data/enemies/jailer3.png new file mode 100644 index 0000000..41f4eb2 Binary files /dev/null and b/data/enemies/jailer3.png differ diff --git a/data/enemies/printer.ani b/data/enemies/printer.ani new file mode 100644 index 0000000..98b9ec2 --- /dev/null +++ b/data/enemies/printer.ani @@ -0,0 +1,10 @@ +frames_per_row=6 +frame_width=16 +frame_height=16 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3,4,5 +[/animation] \ No newline at end of file diff --git a/data/enemies/printer.png b/data/enemies/printer.png new file mode 100644 index 0000000..53ad56a Binary files /dev/null and b/data/enemies/printer.png differ diff --git a/data/room/01.room b/data/room/01.room index 2f38598..ea38dcb 100644 --- a/data/room/01.room +++ b/data/room/01.room @@ -9,4 +9,116 @@ roomRight=02.room [tilemap] 01.tmx -[/tilemap] \ No newline at end of file +[/tilemap] + +[enemy] +tileset=jailer.png +animation=jailer.ani +width=16 +height=16 +x=1 +y=13 +vx=0 +vy=0 +x1=1 +y1=13 +x2=1 +y2=13 +color=white +[/enemy] + +[enemy] +tileset=jailer3.png +animation=jailer3.ani +width=16 +height=16 +x=4 +y=13 +vx=0 +vy=0 +x1=4 +y1=13 +x2=4 +y2=13 +color=white +[/enemy] + +[enemy] +tileset=jailer.png +animation=jailer.ani +width=16 +height=16 +x=7 +y=13 +vx=0 +vy=0 +x1=7 +y1=13 +x2=7 +y2=13 +color=white +[/enemy] + +[enemy] +tileset=jailer2.png +animation=jailer2.ani +width=16 +height=16 +x=10 +y=13 +vx=0 +vy=0 +x1=10 +y1=13 +x2=10 +y2=13 +color=white +[/enemy] + +[enemy] +tileset=jailer.png +animation=jailer.ani +width=16 +height=16 +x=13 +y=13 +vx=0 +vy=0 +x1=13 +y1=13 +x2=13 +y2=13 +color=white +[/enemy] + +[enemy] +tileset=printer.png +animation=printer.ani +width=16 +height=16 +x=2 +y=9 +vx=0 +vy=0 +x1=2 +y1=9 +x2=2 +y2=9 +color=white +[/enemy] + +[enemy] +tileset=printer.png +animation=printer.ani +width=16 +height=16 +x=5 +y=9 +vx=0 +vy=0 +x1=5 +y1=9 +x2=5 +y2=9 +color=white +[/enemy] \ No newline at end of file diff --git a/data/room/01.tmx b/data/room/01.tmx index 16a4f87..c5556ba 100644 --- a/data/room/01.tmx +++ b/data/room/01.tmx @@ -1,5 +1,5 @@ - + @@ -10,14 +10,14 @@ 30,0,127,0,127,0,127,127,127,0,127,0,127,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, 30,0,127,127,127,0,127,0,127,0,127,0,127,127,127,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, 30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +30,30,30,30,30,30,30,30,30,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, 30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 27b82e4..717f265 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 f5b177a..72d525f 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -512,6 +512,14 @@ bool Director::setFileList() asset->add("/data/enemies/jailbattle_human.ani", data); asset->add("/data/enemies/jailbattle_alien.png", bitmap); asset->add("/data/enemies/jailbattle_alien.ani", data); + asset->add("/data/enemies/jailer.png", bitmap); + asset->add("/data/enemies/jailer.ani", data); + asset->add("/data/enemies/jailer2.png", bitmap); + asset->add("/data/enemies/jailer2.ani", data); + asset->add("/data/enemies/jailer3.png", bitmap); + asset->add("/data/enemies/jailer3.ani", data); + asset->add("/data/enemies/printer.png", bitmap); + asset->add("/data/enemies/printer.ani", data); asset->add("/data/player/player.png", bitmap); asset->add("/data/player/player.ani", data);