neocturne/rpgedit
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resources: add walls to test level

Browse source
This commit is contained in:
Matthias Schiffer 2018-11-11 15:49:42 +01:00
parent 236151ba9c
commit e77b54f01b
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
14 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
dist/resources/map/test.json vendored
View file

@ -1,72 +1,72 @@
{ {
"tiles": [ "tiles": [
"stone/floor", "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": [ "layers": [
[ [
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0], [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0], [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0], [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 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], [5, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 5],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0], [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0], [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0], [0, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 0],
[0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 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, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 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, 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, 0, 2, 2, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 2, 2, 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, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
] ]
], ],
"collision": [ "collision": [
{ {
"type": "polygon", "type": "polygon",
"vertices": [ "vertices": [
[1, 1], [ 2, 1],
[11, 1], [12, 1],
[11, 5], [12, 5],
[12, 5], [14, 5],
[12, 7], [14, 7],
[11, 7], [12, 7],
[11, 11], [12, 11],
[7, 11], [ 8, 11],
[7, 12], [ 8, 13],
[5, 12], [ 6, 13],
[5, 11], [ 6, 11],
[1, 11], [ 2, 11],
[1, 7], [ 2, 7],
[0, 7], [ 0, 7],
[0, 5], [ 0, 5],
[1, 5] [ 2, 5]
] ]
} }
] ]

BIN
dist/resources/sprite/tile/stone/wall/bottom.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
dist/resources/sprite/tile/stone/wall/bottom_left.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/resources/sprite/tile/stone/wall/bottom_left_inner.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
dist/resources/sprite/tile/stone/wall/bottom_right.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/resources/sprite/tile/stone/wall/bottom_right_inner.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
dist/resources/sprite/tile/stone/wall/left.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
dist/resources/sprite/tile/stone/wall/right.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
dist/resources/sprite/tile/stone/wall/top.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
dist/resources/sprite/tile/stone/wall/top_left.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/resources/sprite/tile/stone/wall/top_left_inner.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
dist/resources/sprite/tile/stone/wall/top_right.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/resources/sprite/tile/stone/wall/top_right_inner.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

6
src/controller/gamecontext.ts
View file

@ -26,9 +26,9 @@ export class GameContext implements CollidableGroup {
const entity = await loadEntity; const entity = await loadEntity;
const entity2 = await loadEntity2; const entity2 = await loadEntity2;
vec2.set(player.pos, 6, 6); vec2.set(player.pos, 7, 6);
vec2.set(entity.pos, 3, 3); vec2.set(entity.pos, 4, 3);
vec2.set(entity2.pos, 3, 8); vec2.set(entity2.pos, 4, 8);
return new GameContext( return new GameContext(
renderer, renderer,