diff --git a/data/room/05.room b/data/room/05.room index 0b592ad..51bda39 100644 --- a/data/room/05.room +++ b/data/room/05.room @@ -1,5 +1,5 @@ -name=coruscant -bgColor=light_black +name=sigmasua +bgColor=black tileset=standard.png roomUp=03.room roomDown=0 @@ -8,4 +8,100 @@ roomRight=0 [tilemap] 05.tmx -[/tilemap] \ No newline at end of file +[/tilemap] + +[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=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=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=light_red +[/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=light_red +[/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/05.tmx b/data/room/05.tmx index a93d500..167dd64 100644 --- a/data/room/05.tmx +++ b/data/room/05.tmx @@ -1,24 +1,24 @@ - + -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,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,49,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,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,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,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,48,0,0,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,48,48,382,382,48,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,48,48,48,47,47,48,48,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48 +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/media/enemies/sigmasua.ani b/media/enemies/sigmasua.ani new file mode 100644 index 0000000..b9685cb --- /dev/null +++ b/media/enemies/sigmasua.ani @@ -0,0 +1,10 @@ +frames_per_row=4 +frame_width=16 +frame_height=16 + +[animation] +name=default +speed=8 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/media/enemies/sigmasua.png b/media/enemies/sigmasua.png new file mode 100644 index 0000000..111075e Binary files /dev/null and b/media/enemies/sigmasua.png differ diff --git a/media/items/items.png b/media/items/items.png index 243cc8e..aabdc93 100644 Binary files a/media/items/items.png and b/media/items/items.png differ diff --git a/source/director.cpp b/source/director.cpp index 5f5c158..4e30f6c 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -37,7 +37,7 @@ Director::Director(std::string path) // Inicializa JailAudio initJailAudio(); - + // Crea los objetos input = new Input(asset->get("gamecontrollerdb.txt")); initInput(); @@ -156,9 +156,9 @@ bool Director::setFileList() asset->add("/media/font/smb2.txt", font); asset->add("/media/font/debug.png", font); asset->add("/media/font/debug.txt", font); - + asset->add("/data/gamecontrollerdb.txt", data); - + asset->add("/data/room/01.room", room); asset->add("/data/room/02.room", room); asset->add("/data/room/03.room", room); @@ -169,23 +169,25 @@ bool Director::setFileList() asset->add("/data/room/03.tmx", room); asset->add("/data/room/04.tmx", room); asset->add("/data/room/05.tmx", room); - + asset->add("/media/tilesets/standard.png", bitmap); - + asset->add("/media/enemies/paco.png", bitmap); asset->add("/media/enemies/paco.ani", data); asset->add("/media/enemies/chip.png", bitmap); asset->add("/media/enemies/chip.ani", data); asset->add("/media/enemies/wave.png", bitmap); asset->add("/media/enemies/wave.ani", data); - + asset->add("/media/enemies/sigmasua.png", bitmap); + asset->add("/media/enemies/sigmasua.ani", data); + asset->add("/media/player/player01.png", bitmap); asset->add("/media/player/player01.ani", data); - + asset->add("/media/items/items.png", bitmap); - + asset->add("/media/music/jd.ogg", music); - + asset->add("/media/sound/item.wav", sound); return asset->check(); diff --git a/todo.txt b/todo.txt index 5664cd5..590e93f 100644 --- a/todo.txt +++ b/todo.txt @@ -32,7 +32,7 @@ jail battle arounders race aee gba matatunos -sigmasua +x sigmasua calculin doom leaper reaper mini ascii