lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

tileIndex setting got merged out

Browse source
This commit is contained in:
jonny 2021-06-19 15:46:32 +02:00
parent c1d9b2c9ed
commit 92485a02cf
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
front/src/Phaser/Game/GameMap.ts
View file

@ -81,15 +81,19 @@ export class GameMap {
const properties = new Map<string, string | boolean | number>(); const properties = new Map<string, string | boolean | number>();
for (const layer of this.layersIterator) { for (const layer of this.layersIterator) {
let tileIndex: number | undefined = undefined;
if (layer.type !== 'tilelayer') { if (layer.type !== 'tilelayer') {
continue; continue;
} }
const tiles = layer.data as number[];
if (tiles[key] == 0) { let tileIndex: number | undefined = undefined;
continue; if (layer.data) {
const tiles = layer.data as number[];
if (tiles[key] == 0) {
continue;
}
tileIndex = tiles[key]
} }
// There is a tile in this layer, let's embed the properties // There is a tile in this layer, let's embed the properties
if (layer.properties !== undefined) { if (layer.properties !== undefined) {
for (const layerProperty of layer.properties) { for (const layerProperty of layer.properties) {
@ -104,15 +108,13 @@ export class GameMap {
const tileset = this.map.tilesets.find(tileset => tileset.firstgid + tileset.tilecount > (tileIndex as number)) const tileset = this.map.tilesets.find(tileset => tileset.firstgid + tileset.tilecount > (tileIndex as number))
if (tileset) { if (tileset) {
const tileProperties = this.tileSetPropertyMap[tileset?.firstgid][tileIndex - tileset.firstgid] const tileProperties = this.tileSetPropertyMap[tileset?.firstgid][tileIndex - tileset.firstgid]
if (tileProperties) { tileProperties?.forEach(property => {
for (const property of tileProperties) { if (property.value) {
if (property.value) { properties.set(property.name, property.value)
properties.set(property.name, property.value) } else if (properties.has(property.name)) {
} else if (properties.has(property.name)) { properties.delete(property.name)
properties.delete(property.name)
}
} }
} })
} }
} }