Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptingApi

front/package.json

@@ -54,7 +54,8 @@
     "standardized-audio-context": "^25.2.4"
   },
   "scripts": {
-    "start": "run-p serve svelte-check-watch",
+    "start": "run-p templater serve svelte-check-watch",
+    "templater": "cross-env ./templater.sh",
     "serve": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" webpack serve --open",
     "build": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production webpack",
     "test": "TS_NODE_PROJECT=\"tsconfig-for-jasmine.json\" ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",

front/src/Phaser/Game/GameMap.ts

@@ -1,4 +1,4 @@
-import type { ITiledMap, ITiledMapLayer } from "../Map/ITiledMap";
+import type {ITiledMap, ITiledMapLayer, ITiledMapLayerProperty} from "../Map/ITiledMap";
 import { flattenGroupLayersMap } from "../Map/LayersFlattener";
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer;
 import { DEPTH_OVERLAY_INDEX } from "./DepthIndexes";
@@ -10,12 +10,16 @@ export type PropertyChangeCallback = (newValue: string | number | boolean | unde
  * It is used to handle layer properties.
  */
 export class GameMap {
-    private key: number|undefined;
-    private lastProperties = new Map<string, string|boolean|number>();
+    private key: number | undefined;
+    private lastProperties = new Map<string, string | boolean | number>();
     private callbacks = new Map<string, Array<PropertyChangeCallback>>();
+
+    private tileSetPropertyMap: { [tile_index: number]: Array<ITiledMapLayerProperty> } = {}
     public readonly flatLayers: ITiledMapLayer[];
     public readonly phaserLayers: TilemapLayer[] = [];
 
+    public exitUrls: Array<string> = []
+
     public constructor(private map: ITiledMap, phaserMap: Phaser.Tilemaps.Tilemap, terrains: Array<Phaser.Tilemaps.Tileset>) {
         this.flatLayers = flattenGroupLayersMap(map);
         let depth = -2;
@@ -27,8 +31,22 @@ export class GameMap {
                 depth = DEPTH_OVERLAY_INDEX;
             }
         }
+        for (const tileset of map.tilesets) {
+            tileset?.tiles?.forEach(tile => {
+                if (tile.properties) {
+                    this.tileSetPropertyMap[tileset.firstgid + tile.id] = tile.properties
+                    tile.properties.forEach(prop => {
+                        if (prop.name == "exitUrl" && typeof prop.value == "string") {
+                            this.exitUrls.push(prop.value);
+                        }
+                    })
+                }
+            })
+        }
     }
 
+
+
     /**
      * Sets the position of the current player (in pixels)
      * This will trigger events if properties are changing.
@@ -63,21 +81,27 @@ export class GameMap {
         }
     }
 
-    public getCurrentProperties(): Map<string, string|boolean|number> {
+    public getCurrentProperties(): Map<string, string | boolean | number> {
         return this.lastProperties;
     }
 
-    private getProperties(key: number): Map<string, string|boolean|number> {
-        const properties = new Map<string, string|boolean|number>();
+    private getProperties(key: number): Map<string, string | boolean | number> {
+        const properties = new Map<string, string | boolean | number>();
 
         for (const layer of this.flatLayers) {
             if (layer.type !== 'tilelayer') {
                 continue;
             }
-            const tiles = layer.data as number[];
-            if (tiles[key] == 0) {
-                continue;
+
+            let tileIndex: number | undefined = undefined;
+            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
             if (layer.properties !== undefined) {
                 for (const layerProperty of layer.properties) {
@@ -87,6 +111,16 @@ export class GameMap {
                     properties.set(layerProperty.name, layerProperty.value);
                 }
             }
+
+            if (tileIndex) {
+                this.tileSetPropertyMap[tileIndex]?.forEach(property => {
+                    if (property.value) {
+                        properties.set(property.name, property.value)
+                    } else if (properties.has(property.name)) {
+                        properties.delete(property.name)
+                    }
+                })
+            }
         }
 
         return properties;

front/src/Phaser/Game/GameScene.ts

@@ -441,6 +441,10 @@ export class GameScene extends DirtyScene implements CenterListener {
             }
         }
 
+        this.gameMap.exitUrls.forEach(exitUrl => {
+            this.loadNextGame(exitUrl)
+        })
+
         this.initStartXAndStartY();
 
         //add entities

front/src/Phaser/Map/ITiledMap.ts

@@ -170,7 +170,7 @@ export interface ITiledTileSet {
     tilewidth: number;
     transparentcolor: string;
     terrains: ITiledMapTerrain[];
-    tiles: {[key: string]: { terrain: number[] }};
+    tiles?: Array<ITile>;
 
     /**
      * Refers to external tileset file (should be JSON)
@@ -178,6 +178,13 @@ export interface ITiledTileSet {
     source: string;
 }
 
+export interface ITile {
+    id: number,
+    type?: string
+
+    properties?: Array<ITiledMapLayerProperty>
+}
+
 export interface ITiledMapTerrain {
     name: string;
     tile: number;