diff --git a/data/enemies/bell.ani b/data/enemies/bell.ani index 19d50e2..06fc9a4 100644 --- a/data/enemies/bell.ani +++ b/data/enemies/bell.ani @@ -3,7 +3,7 @@ frameHeight=16 [animation] name=default -speed=7 +speed=6 loop=0 frames=0,1,2,3,4,5,6,7,8,9,10,11 [/animation] \ No newline at end of file diff --git a/data/enemies/bell.png b/data/enemies/bell.png index 14b0f53..fc41e19 100644 Binary files a/data/enemies/bell.png and b/data/enemies/bell.png differ diff --git a/data/room/25.room b/data/room/25.room index 75bf792..419c167 100644 --- a/data/room/25.room +++ b/data/room/25.room @@ -39,9 +39,278 @@ x1=14 y1=2 x2=14 y2=2 +color=yellow +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=5 +y=3 +vx=0 +vy=0 +x1=5 +y1=3 +x2=5 +y2=3 +color=bright_blue +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=6 +y=3 +vx=0 +vy=0 +x1=6 +y1=3 +x2=6 +y2=3 +color=bright_red +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=7 +y=3 +vx=0 +vy=0 +x1=7 +y1=3 +x2=7 +y2=3 +color=bright_magenta +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=8 +y=3 +vx=0 +vy=0 +x1=8 +y1=3 +x2=8 +y2=3 +color=bright_green +[/enemy] + + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=9 +y=3 +vx=0 +vy=0 +x1=9 +y1=3 +x2=9 +y2=3 +color=bright_cyan +[/enemy] + + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=10 +y=3 +vx=0 +vy=0 +x1=10 +y1=3 +x2=10 +y2=3 color=bright_yellow [/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=11 +y=3 +vx=0 +vy=0 +x1=11 +y1=3 +x2=11 +y2=3 +color=bright_white +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=12 +y=3 +vx=0 +vy=0 +x1=12 +y1=3 +x2=12 +y2=3 +color=bright_black +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=5 +y=7 +vx=0 +vy=0 +x1=5 +y1=7 +x2=5 +y2=7 +color=blue +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=6 +y=7 +vx=0 +vy=0 +x1=6 +y1=7 +x2=6 +y2=7 +color=red +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=7 +y=7 +vx=0 +vy=0 +x1=7 +y1=7 +x2=7 +y2=7 +color=magenta +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=8 +y=7 +vx=0 +vy=0 +x1=8 +y1=7 +x2=8 +y2=7 +color=green +[/enemy] + + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=9 +y=7 +vx=0 +vy=0 +x1=9 +y1=7 +x2=9 +y2=7 +color=cyan +[/enemy] + + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=10 +y=7 +vx=0 +vy=0 +x1=10 +y1=7 +x2=10 +y2=7 +color=yellow +[/enemy] + + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=11 +y=7 +vx=0 +vy=0 +x1=11 +y1=7 +x2=11 +y2=7 +color=white +[/enemy] + +[enemy] +tileSetFile=chip.png +animation=chip.ani +width=8 +height=16 +x=12 +y=7 +vx=0 +vy=0 +x1=12 +y1=7 +x2=12 +y2=7 +color=black +[/enemy] + + + + + + + + [item] tileSetFile=items.png tile=48 diff --git a/data/room/25.tmx b/data/room/25.tmx index 4825542..d2f78ea 100644 --- a/data/room/25.tmx +++ b/data/room/25.tmx @@ -8,8 +8,8 @@ 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,157,158,159,160,161,162,163,164,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +117,0,0,0,0,181,182,183,184,185,186,187,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,32,32, @@ -18,7 +18,7 @@ 32,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,32,32, 0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,32,32, 0,0,0,0,0,0,0,0,0,0,0,0,141,0,0,0,0,141,0,0,0,0,0,0,0,0,0,0,0,0,32,32, -426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427,426,427 +89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index c2665f0..28470a3 100644 Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png index db13785..54fcce1 100644 Binary files a/data/tilesets/standard_zxarne.png and b/data/tilesets/standard_zxarne.png differ