diff options
14 files changed, 58 insertions, 58 deletions
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 Binary files differnew file mode 100644 index 0000000..13d0928 --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/bottom.png diff --git a/dist/resources/sprite/tile/stone/wall/bottom_left.png b/dist/resources/sprite/tile/stone/wall/bottom_left.png Binary files differnew file mode 100644 index 0000000..861565a --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/bottom_left.png diff --git a/dist/resources/sprite/tile/stone/wall/bottom_left_inner.png b/dist/resources/sprite/tile/stone/wall/bottom_left_inner.png Binary files differnew file mode 100644 index 0000000..348821c --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/bottom_left_inner.png diff --git a/dist/resources/sprite/tile/stone/wall/bottom_right.png b/dist/resources/sprite/tile/stone/wall/bottom_right.png Binary files differnew file mode 100644 index 0000000..4290010 --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/bottom_right.png diff --git a/dist/resources/sprite/tile/stone/wall/bottom_right_inner.png b/dist/resources/sprite/tile/stone/wall/bottom_right_inner.png Binary files differnew file mode 100644 index 0000000..2c235ea --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/bottom_right_inner.png diff --git a/dist/resources/sprite/tile/stone/wall/left.png b/dist/resources/sprite/tile/stone/wall/left.png Binary files differnew file mode 100644 index 0000000..a7791ec --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/left.png diff --git a/dist/resources/sprite/tile/stone/wall/right.png b/dist/resources/sprite/tile/stone/wall/right.png Binary files differnew file mode 100644 index 0000000..5f78ced --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/right.png diff --git a/dist/resources/sprite/tile/stone/wall/top.png b/dist/resources/sprite/tile/stone/wall/top.png Binary files differnew file mode 100644 index 0000000..6ecad42 --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/top.png diff --git a/dist/resources/sprite/tile/stone/wall/top_left.png b/dist/resources/sprite/tile/stone/wall/top_left.png Binary files differnew file mode 100644 index 0000000..3a0c4fa --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/top_left.png diff --git a/dist/resources/sprite/tile/stone/wall/top_left_inner.png b/dist/resources/sprite/tile/stone/wall/top_left_inner.png Binary files differnew file mode 100644 index 0000000..60d4b68 --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/top_left_inner.png diff --git a/dist/resources/sprite/tile/stone/wall/top_right.png b/dist/resources/sprite/tile/stone/wall/top_right.png Binary files differnew file mode 100644 index 0000000..9d06f10 --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/top_right.png diff --git a/dist/resources/sprite/tile/stone/wall/top_right_inner.png b/dist/resources/sprite/tile/stone/wall/top_right_inner.png Binary files differnew file mode 100644 index 0000000..20cb074 --- /dev/null +++ b/dist/resources/sprite/tile/stone/wall/top_right_inner.png 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, |