diff --git a/data/room/01.room b/data/room/01.room index b77a0cd..f935c2a 100644 --- a/data/room/01.room +++ b/data/room/01.room @@ -7,11 +7,11 @@ room_left=0 room_right=02.room [tilemap] -room1.tmx +01.tmx [tilemap-end] [enemy] -tileset=enemy01.png +tileset=paco.png width=16 height=16 x=1 @@ -26,7 +26,7 @@ color=red [enemy-end] [enemy] -tileset=enemy01.png +tileset=paco.png width=16 height=16 x=5 diff --git a/data/room/room1.tmx b/data/room/01.tmx similarity index 94% rename from data/room/room1.tmx rename to data/room/01.tmx index bc91374..cec00da 100644 --- a/data/room/room1.tmx +++ b/data/room/01.tmx @@ -1,6 +1,6 @@ - + 21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/data/room/02.room b/data/room/02.room index 66c2a2b..4c5899f 100644 --- a/data/room/02.room +++ b/data/room/02.room @@ -7,11 +7,11 @@ room_left=01.room room_right=03.room [tilemap] -room2.tmx +02.tmx [tilemap-end] [enemy] -tileset=enemy01.png +tileset=paco.png width=16 height=16 x=14 diff --git a/data/room/room2.tmx b/data/room/02.tmx similarity index 94% rename from data/room/room2.tmx rename to data/room/02.tmx index 2d8f957..66c977a 100644 --- a/data/room/room2.tmx +++ b/data/room/02.tmx @@ -1,6 +1,6 @@ - + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23, diff --git a/data/room/03.room b/data/room/03.room index 2715667..3756800 100644 --- a/data/room/03.room +++ b/data/room/03.room @@ -7,11 +7,11 @@ room_left=02.room room_right=0 [tilemap] -room3.tmx +03.tmx [tilemap-end] [enemy] -tileset=enemy02.png +tileset=chip.png width=8 height=16 x=4 @@ -26,7 +26,7 @@ color=green [enemy-end] [enemy] -tileset=enemy02.png +tileset=chip.png width=8 height=16 x=10 @@ -41,7 +41,7 @@ color=light_blue [enemy-end] [enemy] -tileset=enemy02.png +tileset=chip.png width=8 height=16 x=16 diff --git a/data/room/room3.tmx b/data/room/03.tmx similarity index 94% rename from data/room/room3.tmx rename to data/room/03.tmx index 957bd75..1212339 100644 --- a/data/room/room3.tmx +++ b/data/room/03.tmx @@ -1,6 +1,6 @@ - + 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, diff --git a/data/room/04.room b/data/room/04.room index 1f3098c..16ca4ac 100644 --- a/data/room/04.room +++ b/data/room/04.room @@ -7,11 +7,11 @@ room_left=0 room_right=05.room [tilemap] -room4.tmx +04.tmx [tilemap-end] [enemy] -tileset=enemy02.png +tileset=chip.png width=8 height=16 x=1 @@ -26,7 +26,7 @@ color=purple [enemy-end] [enemy] -tileset=enemy02.png +tileset=chip.png width=8 height=16 x=30 @@ -41,7 +41,7 @@ color=light_white [enemy-end] [enemy] -tileset=enemy03.png +tileset=wave.png width=8 height=8 x=15 diff --git a/data/room/room4.tmx b/data/room/04.tmx similarity index 94% rename from data/room/room4.tmx rename to data/room/04.tmx index 660ba8e..0785ed9 100644 --- a/data/room/room4.tmx +++ b/data/room/04.tmx @@ -1,6 +1,6 @@ - + 25,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,249,249,249,249,249,249,249,249,249,249,249,249,249,25, diff --git a/data/room/05.room b/data/room/05.room index 16a8c23..2c92349 100644 --- a/data/room/05.room +++ b/data/room/05.room @@ -7,5 +7,5 @@ room_left=04.room room_right=0 [tilemap] -room5.tmx +05.tmx [tilemap-end] \ No newline at end of file diff --git a/data/room/room5.tmx b/data/room/05.tmx similarity index 94% rename from data/room/room5.tmx rename to data/room/05.tmx index cf30a7f..c8f9a75 100644 --- a/data/room/room5.tmx +++ b/data/room/05.tmx @@ -1,6 +1,6 @@ - + 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, diff --git a/media/enemies/enemy02.png b/media/enemies/chip.png similarity index 100% rename from media/enemies/enemy02.png rename to media/enemies/chip.png diff --git a/media/enemies/enemy01.png b/media/enemies/paco.png similarity index 100% rename from media/enemies/enemy01.png rename to media/enemies/paco.png diff --git a/media/enemies/enemy03.png b/media/enemies/wave.png similarity index 100% rename from media/enemies/enemy03.png rename to media/enemies/wave.png diff --git a/media/tilesets/room1.png b/media/tilesets/standard.png similarity index 100% rename from media/tilesets/room1.png rename to media/tilesets/standard.png diff --git a/source/director.cpp b/source/director.cpp index acbd016..d508e48 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -202,15 +202,15 @@ void Director::setFileList() mAsset->add("/data/room/03.room", room); mAsset->add("/data/room/04.room", room); mAsset->add("/data/room/05.room", room); - mAsset->add("/data/room/room1.tmx", room); - mAsset->add("/data/room/room2.tmx", room); - mAsset->add("/data/room/room3.tmx", room); - mAsset->add("/data/room/room4.tmx", room); - mAsset->add("/data/room/room5.tmx", room); - mAsset->add("/media/tilesets/room1.png", bitmap); - mAsset->add("/media/enemies/enemy01.png", bitmap); - mAsset->add("/media/enemies/enemy02.png", bitmap); - mAsset->add("/media/enemies/enemy03.png", bitmap); + mAsset->add("/data/room/01.tmx", room); + mAsset->add("/data/room/02.tmx", room); + mAsset->add("/data/room/03.tmx", room); + mAsset->add("/data/room/04.tmx", room); + mAsset->add("/data/room/05.tmx", room); + mAsset->add("/media/tilesets/standard.png", bitmap); + mAsset->add("/media/enemies/paco.png", bitmap); + mAsset->add("/media/enemies/chip.png", bitmap); + mAsset->add("/media/enemies/wave.png", bitmap); mAsset->add("/media/player/player01.png", bitmap); mAsset->add("/media/items/items.png", bitmap); }