From e77b54f01b86f095363ee5217f7179a38b324c63 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 11 Nov 2018 15:49:42 +0100
Subject: resources: add walls to test level

---
 dist/resources/map/test.json                       | 110 ++++++++++-----------
 dist/resources/sprite/tile/stone/wall/bottom.png   | Bin 0 -> 1399 bytes
 .../sprite/tile/stone/wall/bottom_left.png         | Bin 0 -> 1643 bytes
 .../sprite/tile/stone/wall/bottom_left_inner.png   | Bin 0 -> 1458 bytes
 .../sprite/tile/stone/wall/bottom_right.png        | Bin 0 -> 1676 bytes
 .../sprite/tile/stone/wall/bottom_right_inner.png  | Bin 0 -> 1478 bytes
 dist/resources/sprite/tile/stone/wall/left.png     | Bin 0 -> 1505 bytes
 dist/resources/sprite/tile/stone/wall/right.png    | Bin 0 -> 1498 bytes
 dist/resources/sprite/tile/stone/wall/top.png      | Bin 0 -> 1374 bytes
 dist/resources/sprite/tile/stone/wall/top_left.png | Bin 0 -> 1680 bytes
 .../sprite/tile/stone/wall/top_left_inner.png      | Bin 0 -> 1459 bytes
 .../resources/sprite/tile/stone/wall/top_right.png | Bin 0 -> 1640 bytes
 .../sprite/tile/stone/wall/top_right_inner.png     | Bin 0 -> 1459 bytes
 src/controller/gamecontext.ts                      |   6 +-
 14 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 dist/resources/sprite/tile/stone/wall/bottom.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/bottom_left.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/bottom_left_inner.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/bottom_right.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/bottom_right_inner.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/left.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/right.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/top.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/top_left.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/top_left_inner.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/top_right.png
 create mode 100644 dist/resources/sprite/tile/stone/wall/top_right_inner.png

diff --git a/dist/resources/map/test.json b/dist/resources/map/test.json
index 0fede44..57e5a23 100644
--- a/dist/resources/map/test.json
+++ b/dist/resources/map/test.json
@@ -1,72 +1,72 @@
 {
 	"tiles": [
 		"stone/floor",
-		"stone/plate"
+		"stone/plate",
+		"stone/wall/top",
+		"stone/wall/right",
+		"stone/wall/bottom",
+		"stone/wall/left",
+		"stone/wall/top_left",
+		"stone/wall/top_right",
+		"stone/wall/bottom_right",
+		"stone/wall/bottom_left",
+		"stone/wall/top_left_inner",
+		"stone/wall/top_right_inner",
+		"stone/wall/bottom_right_inner",
+		"stone/wall/bottom_left_inner"
 	],
 	"layers": [
 		[
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-			[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
-			[0, 0, 0, 0, 0, 1, 1, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[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],
-			[0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 2, 2, 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, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+			[0, 0, 0, 0, 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]
 		]
 	],
 	"collision": [
 		{
 			"type": "polygon",
 			"vertices": [
-				[1, 1],
-				[11, 1],
-				[11, 5],
-				[12, 5],
-				[12, 7],
-				[11, 7],
-				[11, 11],
-				[7, 11],
-				[7, 12],
-				[5, 12],
-				[5, 11],
-				[1, 11],
-				[1, 7],
-				[0, 7],
-				[0, 5],
-				[1, 5]
+				[ 2,  1],
+				[12,  1],
+				[12,  5],
+				[14,  5],
+				[14,  7],
+				[12,  7],
+				[12, 11],
+				[ 8, 11],
+				[ 8, 13],
+				[ 6, 13],
+				[ 6, 11],
+				[ 2, 11],
+				[ 2,  7],
+				[ 0,  7],
+				[ 0,  5],
+				[ 2,  5]
 			]
 		}
 	]
diff --git a/dist/resources/sprite/tile/stone/wall/bottom.png b/dist/resources/sprite/tile/stone/wall/bottom.png
new file mode 100644
index 0000000..13d0928
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/bottom.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/bottom_left.png b/dist/resources/sprite/tile/stone/wall/bottom_left.png
new file mode 100644
index 0000000..861565a
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/bottom_left.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/bottom_left_inner.png b/dist/resources/sprite/tile/stone/wall/bottom_left_inner.png
new file mode 100644
index 0000000..348821c
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/bottom_left_inner.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/bottom_right.png b/dist/resources/sprite/tile/stone/wall/bottom_right.png
new file mode 100644
index 0000000..4290010
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/bottom_right.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/bottom_right_inner.png b/dist/resources/sprite/tile/stone/wall/bottom_right_inner.png
new file mode 100644
index 0000000..2c235ea
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/bottom_right_inner.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/left.png b/dist/resources/sprite/tile/stone/wall/left.png
new file mode 100644
index 0000000..a7791ec
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/left.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/right.png b/dist/resources/sprite/tile/stone/wall/right.png
new file mode 100644
index 0000000..5f78ced
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/right.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/top.png b/dist/resources/sprite/tile/stone/wall/top.png
new file mode 100644
index 0000000..6ecad42
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/top.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/top_left.png b/dist/resources/sprite/tile/stone/wall/top_left.png
new file mode 100644
index 0000000..3a0c4fa
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/top_left.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/top_left_inner.png b/dist/resources/sprite/tile/stone/wall/top_left_inner.png
new file mode 100644
index 0000000..60d4b68
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/top_left_inner.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/top_right.png b/dist/resources/sprite/tile/stone/wall/top_right.png
new file mode 100644
index 0000000..9d06f10
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/top_right.png differ
diff --git a/dist/resources/sprite/tile/stone/wall/top_right_inner.png b/dist/resources/sprite/tile/stone/wall/top_right_inner.png
new file mode 100644
index 0000000..20cb074
Binary files /dev/null and b/dist/resources/sprite/tile/stone/wall/top_right_inner.png differ
diff --git a/src/controller/gamecontext.ts b/src/controller/gamecontext.ts
index 771affa..9bb87e5 100644
--- a/src/controller/gamecontext.ts
+++ b/src/controller/gamecontext.ts
@@ -26,9 +26,9 @@ export class GameContext implements CollidableGroup {
 		const entity = await loadEntity;
 		const entity2 = await loadEntity2;
 
-		vec2.set(player.pos, 6, 6);
-		vec2.set(entity.pos, 3, 3);
-		vec2.set(entity2.pos, 3, 8);
+		vec2.set(player.pos, 7, 6);
+		vec2.set(entity.pos, 4, 3);
+		vec2.set(entity2.pos, 4, 8);
 
 		return new GameContext(
 			renderer,
-- 
cgit v1.2.3