Merge branch 'refactor_wokas' into new_custom_woka_scene

front/src/Phaser/Game/GameMap.ts

@@ -126,19 +126,7 @@ export class GameMap {
         for (let y = 0; y < this.map.height; y += 1) {
             const row: number[] = [];
             for (let x = 0; x < this.map.width; x += 1) {
-                row.push(this.isCollidingAt(x, y) ? 1 : 0);
-            }
-            grid.push(row);
-        }
-        return grid;
-    }
-
-    public getWalkingCostGrid(): number[][] {
-        const grid: number[][] = [];
-        for (let y = 0; y < this.map.height; y += 1) {
-            const row: number[] = [];
-            for (let x = 0; x < this.map.width; x += 1) {
-                row.push(this.getWalkingCostAt(x, y));
+                row.push(this.isCollidingAt(x, y) ? 1 : this.isExitTile(x, y) ? 2 : 0);
             }
             grid.push(row);
         }
@@ -355,8 +343,7 @@ export class GameMap {
         return false;
     }
 
-    private getWalkingCostAt(x: number, y: number): number {
-        const bigCost = 100;
+    private isExitTile(x: number, y: number): boolean {
         for (const layer of this.phaserLayers) {
             if (!layer.visible) {
                 continue;
@@ -369,16 +356,16 @@ export class GameMap {
                 tile &&
                 (tile.properties[GameMapProperties.EXIT_URL] || tile.properties[GameMapProperties.EXIT_SCENE_URL])
             ) {
-                return bigCost;
+                return true;
             }
             for (const property of layer.layer.properties) {
                 //@ts-ignore
                 if (property.name && property.name === "exitUrl") {
-                    return bigCost;
+                    return true;
                 }
             }
         }
-        return 0;
+        return false;
     }
 
     private triggerAllProperties(): void {

front/src/Phaser/Game/GameScene.ts

@@ -566,7 +566,6 @@ export class GameScene extends DirtyScene {
         this.pathfindingManager = new PathfindingManager(
             this,
             this.gameMap.getCollisionGrid(),
-            this.gameMap.getWalkingCostGrid(),
             this.gameMap.getTileDimensions()
         );
 
@@ -1453,7 +1452,7 @@ ${escapedMessage}
                 phaserLayers[i].setCollisionByProperty({ collides: true }, visible);
             }
         }
-        this.pathfindingManager.setCollisionGrid(this.gameMap.getCollisionGrid(), this.gameMap.getWalkingCostGrid());
+        this.pathfindingManager.setCollisionGrid(this.gameMap.getCollisionGrid());
         this.markDirty();
     }
 
@@ -1601,6 +1600,8 @@ ${escapedMessage}
                         }
                     })
                     .catch((reason) => console.warn(reason));
+
+                urlManager.clearHashParameter();
             } catch (err) {
                 console.warn(`Cannot proceed with moveTo command:\n\t-> ${err}`);
             }