From 31299e79130fe75219cd0e2b821d524d999c332a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 11 Nov 2018 20:32:11 +0100 Subject: resources: more test level elements --- dist/resources/map/test.json | 61 ++++++++++++--------- .../sprite/tile/stone/border/bottom_left.png | Bin 0 -> 930 bytes .../sprite/tile/stone/border/bottom_right.png | Bin 0 -> 927 bytes dist/resources/sprite/tile/water.png | Bin 0 -> 778 bytes 4 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 dist/resources/sprite/tile/stone/border/bottom_left.png create mode 100644 dist/resources/sprite/tile/stone/border/bottom_right.png create mode 100644 dist/resources/sprite/tile/water.png diff --git a/dist/resources/map/test.json b/dist/resources/map/test.json index c4f4f22..ec3b3fb 100644 --- a/dist/resources/map/test.json +++ b/dist/resources/map/test.json @@ -13,41 +13,44 @@ "stone/wall/top_left_inner", "stone/wall/top_right_inner", "stone/wall/bottom_right_inner", - "stone/wall/bottom_left_inner" + "stone/wall/bottom_left_inner", + "water", + "stone/border/bottom_right", + "stone/border/bottom_left" ], "layers": [ { "tiles": [ - [0, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 0], - [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], - [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], - [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], - [3, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 3], - [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], - [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], - [5, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 5], - [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], - [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], - [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], - [0, 10, 5, 5, 5, 14, 1, 1, 13, 5, 5, 5, 9, 0], - [0, 0, 0, 0, 0, 6, 1, 1, 4, 0, 0, 0, 0, 0] + [0, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 0], + [0, 6, 1, 1, 1, 1, 15, 15, 1, 1, 1, 1, 4, 0], + [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], + [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], + [3, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 3], + [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + [5, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 5], + [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], + [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], + [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0], + [0, 10, 5, 5, 5, 14, 1, 1, 13, 5, 5, 5, 9, 0], + [0, 0, 0, 0, 0, 6, 1, 1, 4, 0, 0, 0, 0, 0] ] }, { "tiles": [ - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], - [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], - [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], - [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0] + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 17, 16, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], + [2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2], + [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0] ] } ], @@ -56,6 +59,10 @@ "type": "polygon", "vertices": [ [ 2, 1], + [ 6, 1], + [ 6, 2], + [ 8, 2], + [ 8, 1], [12, 1], [12, 5], [14, 5], diff --git a/dist/resources/sprite/tile/stone/border/bottom_left.png b/dist/resources/sprite/tile/stone/border/bottom_left.png new file mode 100644 index 0000000..ed9be55 Binary files /dev/null and b/dist/resources/sprite/tile/stone/border/bottom_left.png differ diff --git a/dist/resources/sprite/tile/stone/border/bottom_right.png b/dist/resources/sprite/tile/stone/border/bottom_right.png new file mode 100644 index 0000000..71782d2 Binary files /dev/null and b/dist/resources/sprite/tile/stone/border/bottom_right.png differ diff --git a/dist/resources/sprite/tile/water.png b/dist/resources/sprite/tile/water.png new file mode 100644 index 0000000..4a96543 Binary files /dev/null and b/dist/resources/sprite/tile/water.png differ -- cgit v1.2.3