diff --git a/data/enemies/breakout.ani b/data/enemies/breakout.ani new file mode 100644 index 0000000..2f61c4e --- /dev/null +++ b/data/enemies/breakout.ani @@ -0,0 +1,9 @@ +frameWidth=24 +frameHeight=32 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3,4,5,6,7,6,5,4,3,2,1 +[/animation] \ No newline at end of file diff --git a/data/enemies/breakout.png b/data/enemies/breakout.png new file mode 100644 index 0000000..fd51236 Binary files /dev/null and b/data/enemies/breakout.png differ diff --git a/data/room/52.room b/data/room/52.room index e6c5100..c23312d 100644 --- a/data/room/52.room +++ b/data/room/52.room @@ -1,33 +1,35 @@ -name=no 52 +name=breakout.lua bgColor=black -border=red +border=black tilemap=52.tmx tileset=standard.png roomUp=0 roomDown=0 roomLeft=0 roomRight=51.room +itemColor1=bright_white +itemColor2=black [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=2 -y=2 -vx=0 +tileset=breakout.png +animation=breakout.ani +width=24 +height=32 +x=1 +y=6 +vx=2.2 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=1 +y1=6 +x2=22 +y2=6 +color=white [/enemy] [item] tileset=items.png -tile=1 +tile=39 x=1 -y=1 +y=13 counter=1 [/item] \ No newline at end of file diff --git a/data/room/52.tmx b/data/room/52.tmx index 4c7dc21..2d06356 100644 --- a/data/room/52.tmx +++ b/data/room/52.tmx @@ -3,22 +3,22 @@ -184,182,182,182,182,182,182,182,182,182,182,182,187,187,187,187,187,187,187,187,187,187,187,187,187,187,185,185,185,185,185,185, +184,182,182,182,182,182,182,182,291,291,182,182,187,187,187,187,187,187,310,187,187,187,187,187,187,187,185,185,185,185,297,297, +184,0,0,0,0,0,0,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, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, -184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, -184,0,0,0,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,0,0,0,0,0,0,0,0,0,181, -184,0,0,0,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,0,0,0,0,0,0,0,0,0,181, -184,0,0,0,183,183,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,0,0,0,0,0,0,0,0,0,181, +184,0,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,185,185,183,183,0,0,0,0,0,0,0,181, +184,0,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,185,185,0,0,0,0,0,0,0,181, +184,0,183,183,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,0,0,0,0,0,0,0,181, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -183,183,183,183,183,183,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,185,185,185,185,185,185,185,185,185,185 +186,0,184,184,184,185,0,0,184,0,0,0,184,0,0,0,0,0,185,0,0,183,293,293,183,0,0,0,0,0,0,0, +186,0,184,187,187,187,0,0,186,184,0,183,183,183,0,0,185,185,297,185,0,183,183,183,183,0,0,0,0,0,0,0, +186,182,182,291,182,182,182,182,184,184,184,184,295,184,184,184,184,186,186,299,186,186,186,186,186,186,0,0,0,0,0,0, +183,183,183,183,183,293,289,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,185,185,185,185,185,185,185,185,185,185 diff --git a/source/director.cpp b/source/director.cpp index 919da72..c415802 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -543,6 +543,8 @@ bool Director::setFileList() asset->add("/../data/enemies/sam.ani", t_data); asset->add("/../data/enemies/amstrad_character_set.png", t_bitmap); asset->add("/../data/enemies/amstrad_character_set.ani", t_data); + asset->add("/../data/enemies/breakout.png", t_bitmap); + asset->add("/../data/enemies/breakout.ani", t_data); asset->add("/../data/player/player.png", t_bitmap); asset->add("/../data/player/player.ani", t_data);