From 29b9ec683ff6f47db4f4535fec3c79eee6fb4837 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Thu, 20 Jul 2023 22:59:06 +0100 Subject: Stage 18 --- data/stage18.json | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/data.h | 1 + src/game.c | 4 +- 3 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 data/stage18.json diff --git a/data/stage18.json b/data/stage18.json new file mode 100644 index 0000000..e57acc9 --- /dev/null +++ b/data/stage18.json @@ -0,0 +1,181 @@ +{ "compressionlevel":-1, + "height":23, + "infinite":false, + "layers":[ + { + "data":[1, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 1, 1, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 1, 1, 51, 52, 1, 1, 1, 1, 1, 1, 51, 52, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 51, 52, 1, 1, 1, 1, 1, 1, 51, 52, 1, 1, 71, 72, 23, 24, 23, 24, 5, 6, 71, 72, 23, 24, 23, 24, 23, 22, 23, 24, 23, 24, 23, 24, 22, 24, 23, 5, 6, 24, 71, 72, 23, 5, 6, 24, 23, 24, 71, 72, 1, 1, 51, 52, 3, 4, 3, 4, 3, 4, 51, 52, 3, 4, 3, 3, 4, 22, 4, 4, 3, 4, 3, 3, 22, 3, 4, 4, 3, 4, 51, 52, 3, 4, 3, 4, 3, 4, 51, 52, 1, 1, 71, 72, 23, 24, 23, 24, 23, 24, 51, 52, 23, 24, 23, 23, 24, 22, 24, 24, 5, 6, 23, 23, 22, 23, 24, 24, 23, 24, 51, 52, 23, 24, 23, 24, 5, 6, 71, 72, 1, 1, 51, 52, 3, 5, 6, 4, 3, 4, 71, 72, 5, 6, 3, 50, 50, 50, 50, 4, 3, 4, 3, 50, 50, 50, 50, 4, 3, 4, 71, 72, 3, 4, 3, 4, 3, 4, 51, 52, 1, 1, 71, 72, 23, 24, 23, 24, 23, 24, 48, 49, 23, 24, 23, 1, 1, 1, 1, 24, 53, 54, 23, 1, 1, 1, 1, 24, 23, 24, 48, 49, 23, 24, 23, 24, 23, 24, 71, 72, 1, 1, 51, 52, 3, 4, 3, 4, 5, 6, 68, 69, 3, 4, 102, 102, 102, 102, 102, 102, 71, 72, 102, 102, 102, 102, 102, 102, 3, 4, 68, 69, 3, 5, 6, 4, 3, 4, 51, 52, 1, 1, 71, 72, 23, 24, 23, 24, 50, 50, 50, 50, 53, 54, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 51, 52, 53, 54, 50, 50, 50, 50, 23, 24, 23, 24, 71, 72, 1, 1, 51, 52, 3, 4, 3, 4, 1, 1, 1, 1, 51, 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 51, 52, 1, 1, 1, 1, 3, 4, 3, 4, 51, 52, 1, 1, 71, 72, 23, 24, 23, 24, 23, 24, 5, 6, 71, 72, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 5, 6, 23, 24, 71, 72, 23, 24, 23, 24, 23, 24, 23, 24, 71, 72, 1, 1, 51, 52, 50, 50, 50, 50, 50, 50, 3, 4, 51, 52, 3, 4, 3, 5, 6, 4, 3, 4, 3, 4, 3, 4, 3, 4, 51, 52, 3, 4, 50, 50, 50, 50, 50, 50, 51, 52, 1, 1, 71, 72, 1, 1, 1, 1, 1, 1, 23, 24, 71, 72, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 71, 72, 23, 24, 1, 1, 1, 1, 1, 1, 71, 72, 1, 1, 51, 52, 3, 4, 3, 4, 3, 4, 3, 4, 51, 52, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 51, 52, 3, 4, 3, 4, 3, 4, 3, 4, 51, 52, 1, 1, 71, 72, 23, 5, 6, 24, 50, 50, 50, 50, 71, 72, 5, 6, 23, 51, 52, 50, 50, 50, 50, 50, 51, 52, 3, 4, 71, 72, 50, 50, 50, 50, 23, 24, 5, 6, 71, 72, 1, 1, 51, 52, 3, 4, 3, 4, 1, 1, 1, 1, 1, 1, 3, 4, 3, 71, 72, 1, 1, 1, 1, 1, 71, 72, 23, 24, 1, 1, 1, 1, 1, 1, 3, 4, 3, 4, 51, 52, 1, 1, 71, 72, 23, 24, 23, 24, 23, 5, 6, 24, 23, 24, 23, 24, 23, 51, 52, 24, 23, 24, 23, 24, 51, 52, 3, 4, 4, 24, 23, 24, 23, 24, 23, 24, 23, 24, 71, 72, 1, 1, 51, 52, 3, 4, 50, 50, 50, 50, 50, 4, 3, 4, 3, 4, 3, 71, 72, 50, 50, 50, 50, 50, 71, 72, 23, 24, 24, 4, 3, 50, 50, 50, 50, 50, 3, 4, 51, 52, 1, 1, 71, 72, 23, 24, 1, 1, 2, 1, 1, 24, 23, 24, 23, 24, 23, 1, 1, 2, 1, 1, 1, 2, 1, 1, 23, 24, 11, 12, 23, 1, 1, 2, 1, 1, 23, 24, 71, 72, 1, 1, 51, 52, 3, 4, 3, 4, 22, 4, 3, 4, 3, 4, 5, 6, 3, 4, 3, 22, 3, 4, 3, 22, 3, 4, 5, 6, 31, 32, 3, 4, 3, 22, 3, 5, 6, 4, 51, 52, 1, 1, 71, 72, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 53, 54, 71, 72, 1, 1, 51, 52, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 51, 52, 1], + "height":23, + "id":1, + "name":"Map", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":40, + "x":0, + "y":0 + }, + { + "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 0, 0, 0, 0, 21, 21, 21, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 21, 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "height":23, + "id":2, + "name":"Gold", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":40, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":3, + "name":"Entities", + "objects":[ + { + "height":16, + "id":1, + "name":"Player", + "properties":[ + { + "name":"dir", + "type":"string", + "value":"left" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":216, + "y":152 + }, + { + "height":16, + "id":28, + "name":"Bonus", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":152, + "y":40 + }, + { + "height":16, + "id":29, + "name":"Pickaxe", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":24, + "y":80 + }, + { + "height":16, + "id":35, + "name":"SilverKey", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":24, + "y":152 + }, + { + "height":16, + "id":31, + "name":"Old", + "properties":[ + { + "name":"dir", + "type":"string", + "value":"left" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":56, + "y":56 + }, + { + "height":16, + "id":32, + "name":"Bones", + "properties":[ + { + "name":"dir", + "type":"string", + "value":"left" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":184, + "y":104 + }, + { + "height":16, + "id":33, + "name":"Old", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":248, + "y":56 + }, + { + "height":16, + "id":34, + "name":"Bones", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":128, + "y":104 + }, + { + "height":16, + "id":30, + "name":"Time", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":280, + "y":80 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }], + "nextlayerid":4, + "nextobjectid":36, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.7.2", + "tileheight":8, + "tilesets":[ + { + "columns":20, + "firstgid":1, + "image":"tiles.png", + "imageheight":48, + "imagewidth":160, + "margin":0, + "name":"Map", + "spacing":0, + "tilecount":120, + "tileheight":8, + "tilewidth":8 + }], + "tilewidth":8, + "type":"map", + "version":"1.6", + "width":40 +} \ No newline at end of file diff --git a/src/data.h b/src/data.h index d87640e..adac22d 100644 --- a/src/data.h +++ b/src/data.h @@ -31,6 +31,7 @@ extern const uint8_t binary_stage14_start[]; extern const uint8_t binary_stage15_start[]; extern const uint8_t binary_stage16_start[]; extern const uint8_t binary_stage17_start[]; +extern const uint8_t binary_stage18_start[]; /* sound */ extern const uint8_t binary_music_start[]; diff --git a/src/game.c b/src/game.c index 28c0cca..9d7d1ed 100644 --- a/src/game.c +++ b/src/game.c @@ -53,14 +53,14 @@ static Entity *tmonster; /* 0-index */ #define START_STAGE 0 -#define STAGES_LEN 17 +#define STAGES_LEN 18 static const uint8_t *stages[STAGES_LEN] = { binary_stage01_start, binary_stage02_start, binary_stage03_start, binary_stage04_start, binary_stage05_start, binary_stage06_start, binary_stage07_start, binary_stage08_start, binary_stage09_start, binary_stage10_start, binary_stage11_start, binary_stage12_start, binary_stage13_start, binary_stage14_start, binary_stage15_start, binary_stage16_start, - binary_stage17_start, + binary_stage17_start, binary_stage18_start, }; static void hud_render() -- cgit v1.2.3