From 21d5ae817f2c59815b89014413a73084dfa47133 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Tue, 18 Jul 2023 22:26:58 +0100 Subject: Stage 15 --- data/stage15.json | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/data.h | 1 + src/game.c | 4 +- 3 files changed, 200 insertions(+), 2 deletions(-) create mode 100644 data/stage15.json diff --git a/data/stage15.json b/data/stage15.json new file mode 100644 index 0000000..4fcb83a --- /dev/null +++ b/data/stage15.json @@ -0,0 +1,197 @@ +{ "compressionlevel":-1, + "height":23, + "infinite":false, + "layers":[ + { + "data":[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, 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, 71, 72, 71, 72, 71, 72, 51, 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 71, 72, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 51, 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 51, 52, 71, 72, 5, 6, 23, 24, 23, 24, 23, 24, 23, 24, 5, 6, 51, 52, 23, 3, 4, 3, 4, 3, 4, 5, 6, 24, 71, 72, 23, 24, 23, 24, 23, 24, 23, 24, 5, 6, 71, 72, 51, 52, 3, 4, 3, 4, 23, 24, 23, 24, 5, 6, 23, 24, 48, 49, 23, 23, 24, 23, 24, 23, 24, 23, 24, 24, 71, 72, 3, 4, 3, 5, 6, 4, 3, 4, 3, 4, 51, 52, 71, 72, 23, 24, 23, 24, 3, 4, 3, 4, 3, 4, 3, 4, 68, 69, 4, 3, 5, 6, 4, 3, 4, 3, 4, 4, 51, 52, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 71, 72, 51, 52, 3, 4, 3, 4, 50, 50, 50, 50, 50, 50, 50, 50, 73, 74, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 71, 72, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 51, 52, 71, 72, 5, 6, 23, 24, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 23, 24, 23, 24, 23, 24, 23, 5, 6, 24, 71, 72, 51, 52, 3, 4, 3, 4, 3, 22, 3, 4, 22, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 51, 52, 71, 72, 23, 24, 23, 24, 50, 50, 50, 50, 50, 50, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 5, 6, 23, 24, 51, 52, 50, 50, 50, 50, 71, 72, 51, 52, 3, 4, 3, 4, 1, 2, 1, 1, 2, 1, 5, 6, 3, 4, 3, 4, 3, 4, 5, 6, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 71, 72, 1, 1, 1, 1, 51, 52, 71, 72, 23, 24, 23, 5, 6, 22, 23, 24, 22, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 51, 52, 23, 24, 5, 6, 71, 72, 51, 52, 3, 4, 50, 50, 50, 50, 53, 54, 50, 50, 50, 50, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 71, 72, 50, 50, 50, 50, 51, 52, 71, 72, 5, 6, 1, 1, 1, 1, 71, 72, 1, 1, 1, 1, 23, 24, 5, 6, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 5, 6, 51, 52, 1, 1, 1, 1, 71, 72, 51, 52, 3, 4, 3, 4, 3, 4, 51, 52, 3, 4, 3, 4, 3, 4, 3, 4, 3, 102, 102, 102, 102, 4, 5, 6, 3, 4, 3, 4, 3, 4, 71, 72, 3, 4, 3, 4, 51, 52, 71, 72, 23, 24, 50, 50, 50, 50, 71, 72, 50, 50, 50, 50, 53, 54, 53, 54, 53, 52, 51, 52, 51, 54, 53, 54, 53, 54, 50, 50, 23, 24, 51, 52, 50, 50, 50, 50, 71, 72, 51, 52, 3, 4, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 71, 72, 1, 1, 3, 4, 71, 72, 1, 1, 1, 1, 51, 52, 71, 72, 23, 24, 5, 6, 23, 22, 23, 24, 22, 24, 23, 24, 51, 52, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 51, 52, 5, 6, 23, 24, 51, 52, 23, 24, 23, 24, 71, 72, 51, 52, 3, 4, 3, 4, 50, 50, 50, 50, 50, 50, 3, 4, 71, 72, 23, 5, 6, 24, 23, 24, 23, 24, 23, 24, 71, 72, 50, 50, 3, 4, 71, 72, 50, 50, 50, 50, 51, 52, 71, 72, 11, 12, 23, 24, 1, 2, 1, 1, 2, 1, 23, 24, 46, 47, 3, 4, 3, 4, 3, 4, 5, 6, 3, 4, 46, 47, 1, 1, 23, 24, 1, 1, 1, 1, 1, 1, 71, 72, 51, 52, 31, 32, 3, 4, 3, 22, 3, 4, 22, 4, 5, 6, 66, 67, 23, 24, 23, 24, 23, 24, 23, 24, 23, 24, 66, 67, 3, 4, 3, 4, 3, 5, 6, 4, 3, 4, 51, 52, 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, 53, 54, 71, 72, 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, 71, 72, 51, 52], + "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, 0, 0, 21, 21, 21, 21, 21, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 21, 21, 21, 21, 0, 0, 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, 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], + "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", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":16, + "y":152 + }, + { + "height":16, + "id":28, + "name":"GoldKey", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":64, + "y":32 + }, + { + "height":16, + "id":30, + "name":"Bones", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":128, + "y":104 + }, + { + "height":16, + "id":34, + "name":"Old", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":48, + "y":80 + }, + { + "height":16, + "id":31, + "name":"Bones", + "properties":[ + { + "name":"dir", + "type":"string", + "value":"left" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":192, + "y":104 + }, + { + "height":16, + "id":33, + "name":"Old", + "properties":[ + { + "name":"dir", + "type":"string", + "value":"left" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":80, + "y":80 + }, + { + "height":16, + "id":29, + "name":"SilverKey", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":280, + "y":56 + }, + { + "height":16, + "id":35, + "name":"Time", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":64, + "y":152 + }, + { + "height":16, + "id":38, + "name":"Bonus", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":224, + "y":104 + }, + { + "height":16, + "id":36, + "name":"Pickaxe", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":64, + "y":56 + }, + { + "height":16, + "id":37, + "name":"Pickaxe", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":64, + "y":128 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }], + "nextlayerid":4, + "nextobjectid":39, + "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 8d77cdf..24bd449 100644 --- a/src/data.h +++ b/src/data.h @@ -28,6 +28,7 @@ extern const uint8_t binary_stage11_start[]; extern const uint8_t binary_stage12_start[]; extern const uint8_t binary_stage13_start[]; extern const uint8_t binary_stage14_start[]; +extern const uint8_t binary_stage15_start[]; /* sound */ extern const uint8_t binary_music_start[]; diff --git a/src/game.c b/src/game.c index 424d6c2..52ea64c 100644 --- a/src/game.c +++ b/src/game.c @@ -53,13 +53,13 @@ static Entity *tmonster; /* 0-index */ #define START_STAGE 0 -#define STAGES_LEN 14 +#define STAGES_LEN 15 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_stage13_start, binary_stage14_start, binary_stage15_start, }; static void hud_render() -- cgit v1.2.3