From 29e44d30236680a2f61f5168beaa135413d4c03f Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 09:34:06 +0100
Subject: [PATCH 01/12] Player move API wip

---
 front/src/Api/Events/IframeEvent.ts           |   5 +
 front/src/Api/Events/WalkPlayerToEvent.ts     |  11 +
 front/src/Api/iframe/player.ts                |   7 +
 front/src/Phaser/Game/GameScene.ts            |   9 +
 .../MovePlayer/move_player_api_test.json      | 207 ++++++++++++++++++
 maps/tests/MovePlayer/script.php              |  50 +++++
 maps/tests/index.html                         |   8 +
 7 files changed, 297 insertions(+)
 create mode 100644 front/src/Api/Events/WalkPlayerToEvent.ts
 create mode 100644 maps/tests/MovePlayer/move_player_api_test.json
 create mode 100644 maps/tests/MovePlayer/script.php

diff --git a/front/src/Api/Events/IframeEvent.ts b/front/src/Api/Events/IframeEvent.ts
index 93d0735c..e499f80a 100644
--- a/front/src/Api/Events/IframeEvent.ts
+++ b/front/src/Api/Events/IframeEvent.ts
@@ -34,6 +34,7 @@ import type { ChangeZoneEvent } from "./ChangeZoneEvent";
 import type { CameraSetEvent } from "./CameraSetEvent";
 import type { CameraFollowPlayerEvent } from "./CameraFollowPlayerEvent";
 import { isColorEvent } from "./ColorEvent";
+import { isWalkPlayerToEventConfig } from "./WalkPlayerToEvent";
 
 export interface TypedMessageEvent<T> extends MessageEvent {
     data: T;
@@ -173,6 +174,10 @@ export const iframeQueryMapTypeGuards = {
         query: tg.isUndefined,
         answer: isPlayerPosition,
     },
+    walkPlayerTo: {
+        query: isWalkPlayerToEventConfig,
+        answer: isPlayerPosition,
+    },
 };
 
 type GuardedType<T> = T extends (x: unknown) => x is infer T ? T : never;
diff --git a/front/src/Api/Events/WalkPlayerToEvent.ts b/front/src/Api/Events/WalkPlayerToEvent.ts
new file mode 100644
index 00000000..82abcd03
--- /dev/null
+++ b/front/src/Api/Events/WalkPlayerToEvent.ts
@@ -0,0 +1,11 @@
+import * as tg from "generic-type-guard";
+
+export const isWalkPlayerToEventConfig = new tg.IsInterface()
+    .withProperties({
+        x: tg.isNumber,
+        y: tg.isNumber,
+        speed: tg.isNumber,
+    })
+    .get();
+
+export type WalkPlayerToEvent = tg.GuardedType<typeof isWalkPlayerToEventConfig>;
diff --git a/front/src/Api/iframe/player.ts b/front/src/Api/iframe/player.ts
index 0c71ae33..dbc689d3 100644
--- a/front/src/Api/iframe/player.ts
+++ b/front/src/Api/iframe/player.ts
@@ -84,6 +84,13 @@ export class WorkadventurePlayerCommands extends IframeApiContribution<Workadven
         });
     }
 
+    public async walkTo(x: number, y: number, speed: number): Promise<{ x: number; y: number }> {
+        return await queryWorkadventure({
+            type: "walkPlayerTo",
+            data: { x, y, speed },
+        });
+    }
+
     get userRoomToken(): string | undefined {
         if (userRoomToken === undefined) {
             throw new Error(
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 26e4004a..ea967cf3 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -1456,6 +1456,15 @@ ${escapedMessage}
                 y: this.CurrentPlayer.y,
             };
         });
+
+        iframeListener.registerAnswerer("walkPlayerTo", () => {
+            // TODO: walk player to position, wait for promise to resolve
+            console.log("WALK PLAYER TO ACTION CALLED");
+            return {
+                x: this.CurrentPlayer.x,
+                y: this.CurrentPlayer.y,
+            };
+        });
     }
 
     private setPropertyLayer(
diff --git a/maps/tests/MovePlayer/move_player_api_test.json b/maps/tests/MovePlayer/move_player_api_test.json
new file mode 100644
index 00000000..965428e7
--- /dev/null
+++ b/maps/tests/MovePlayer/move_player_api_test.json
@@ -0,0 +1,207 @@
+{ "compressionlevel":-1,
+ "height":30,
+ "infinite":false,
+ "layers":[
+        {
+         "data":[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, 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, 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, 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, 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, 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, 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, 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 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, 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, 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, 1],
+         "height":30,
+         "id":1,
+         "name":"floor",
+         "opacity":1,
+         "properties":[
+                {
+                 "name":"openWebsite",
+                 "type":"string",
+                 "value":"script.php"
+                }, 
+                {
+                 "name":"openWebsiteAllowApi",
+                 "type":"bool",
+                 "value":true
+                }],
+         "type":"tilelayer",
+         "visible":true,
+         "width":30,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 0, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":30,
+         "id":6,
+         "name":"furnitures",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":30,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":30,
+         "id":2,
+         "name":"start",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":30,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "draworder":"topdown",
+         "id":3,
+         "name":"floorLayer",
+         "objects":[
+                {
+                 "height":159.371714951095,
+                 "id":4,
+                 "name":"",
+                 "rotation":0,
+                 "text":
+                    {
+                     "fontfamily":"MS Shell Dlg 2",
+                     "pixelsize":21,
+                     "text":"Set position of where you want the player character to move to. On movement's end or interruption, player's current position will be logged into the console",
+                     "wrap":true
+                    },
+                 "type":"",
+                 "visible":true,
+                 "width":315.438,
+                 "x":64.7309301350722,
+                 "y":95.2559217512811
+                }, 
+                {
+                 "height":30.8202477876106,
+                 "id":8,
+                 "name":"",
+                 "rotation":0,
+                 "text":
+                    {
+                     "fontfamily":"MS Shell Dlg 2",
+                     "pixelsize":21,
+                     "text":"x: 16 y: 16",
+                     "wrap":true
+                    },
+                 "type":"",
+                 "visible":true,
+                 "width":111.991330228225,
+                 "x":39.0206367023754,
+                 "y":2.47529762459247
+                }, 
+                {
+                 "height":30.8202,
+                 "id":9,
+                 "name":"",
+                 "rotation":0,
+                 "text":
+                    {
+                     "fontfamily":"MS Shell Dlg 2",
+                     "pixelsize":21,
+                     "text":"x: 464 y: 432",
+                     "wrap":true
+                    },
+                 "type":"",
+                 "visible":true,
+                 "width":149.997520726595,
+                 "x":483.920662086633,
+                 "y":417.193532976246
+                }, 
+                {
+                 "height":113.333333333333,
+                 "id":10,
+                 "name":"",
+                 "rotation":0,
+                 "text":
+                    {
+                     "fontfamily":"MS Shell Dlg 2",
+                     "pixelsize":21,
+                     "text":"Top: 256\/512 Center: 496\/655 Width: 480 Height: 286",
+                     "wrap":true
+                    },
+                 "type":"",
+                 "visible":true,
+                 "width":172,
+                 "x":256,
+                 "y":512
+                }],
+         "opacity":1,
+         "type":"objectgroup",
+         "visible":true,
+         "x":0,
+         "y":0
+        }],
+ "nextlayerid":7,
+ "nextobjectid":11,
+ "orientation":"orthogonal",
+ "properties":[
+        {
+         "name":"openWebsite",
+         "type":"string",
+         "value":"script.php"
+        }, 
+        {
+         "name":"openWebsiteAllowApi",
+         "type":"bool",
+         "value":true
+        }],
+ "renderorder":"right-down",
+ "tiledversion":"1.7.2",
+ "tileheight":32,
+ "tilesets":[
+        {
+         "columns":11,
+         "firstgid":1,
+         "image":"..\/tileset1.png",
+         "imageheight":352,
+         "imagewidth":352,
+         "margin":0,
+         "name":"tileset1",
+         "spacing":0,
+         "tilecount":121,
+         "tileheight":32,
+         "tiles":[
+                {
+                 "id":16,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":17,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":27,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":28,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }],
+         "tilewidth":32
+        }],
+ "tilewidth":32,
+ "type":"map",
+ "version":"1.6",
+ "width":30
+}
\ No newline at end of file
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
new file mode 100644
index 00000000..24f7fff4
--- /dev/null
+++ b/maps/tests/MovePlayer/script.php
@@ -0,0 +1,50 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <script src="<?php echo $_SERVER["FRONT_URL"] ?>/iframe_api.js"></script>
+    <script>
+        window.addEventListener('load', () => {
+            //@ts-ignore
+            WA.camera.onCameraUpdate((worldView) => console.log(worldView));
+            WA.onInit().then(() => {
+                console.log('After WA init');
+                const setCameraButton = document.getElementById('setCameraButton');
+                const followPlayerButton = document.getElementById('followPlayerButton');
+                const xField = document.getElementById('x');
+                const yField = document.getElementById('y');
+                const widthField = document.getElementById('width');
+                const heightField = document.getElementById('height');
+                const smoothField = document.getElementById('smooth');
+                const lockField = document.getElementById('lock');
+
+                setCameraButton.addEventListener('click', () => {
+                    WA.camera.set(
+                        parseInt(xField.value),
+                        parseInt(yField.value),
+                        widthField.value ? parseInt(widthField.value) : undefined,
+                        heightField.value ? parseInt(heightField.value) : undefined,
+                        lockField.checked,
+                        smoothField.checked,
+                    );
+                });
+
+                followPlayerButton.addEventListener('click', () => {
+                    WA.camera.followPlayer(smoothField.checked);
+                });
+            });
+        })
+    </script>
+</head>
+<body>
+X: <input type="text" id="x" value="496" /><br/>
+Y: <input type="text" id="y" value="655" /><br/>
+width: <input type="text" id="width" value="480" /><br/>
+height: <input type="text" id="height" value="286" /><br/>
+Smooth: <input type="checkbox" id="smooth" value=1 /><br/>
+Lock: <input type="checkbox" id="lock" value=1 /><br/>
+
+<button id="setCameraButton">Set Camera</button>
+<button id="followPlayerButton">Follow Player</button>
+
+</body>
+</html>
diff --git a/maps/tests/index.html b/maps/tests/index.html
index 4a80634c..4af51be5 100644
--- a/maps/tests/index.html
+++ b/maps/tests/index.html
@@ -227,6 +227,14 @@
                         <a href="#" class="testLink" data-testmap="CameraApi/camera_api_test.json" target="_blank">Test camera API</a>
                     </td>
                 </tr>
+                <tr>
+                    <td>
+                        <input type="radio" name="test-set-tiles"> Success <input type="radio" name="test-set-tiles"> Failure <input type="radio" name="test-set-tiles" checked> Pending
+                    </td>
+                    <td>
+                        <a href="#" class="testLink" data-testmap="MovePlayer/move_player_api_test.json" target="_blank">Test Player Movement API</a>
+                    </td>
+                </tr>
                 <tr>
                     <td>
                         <input type="radio" name="test-variables"> Success <input type="radio" name="test-variables"> Failure <input type="radio" name="test-variables" checked> Pending

From f78392ceabb04ff4315009fae73255bdea717187 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 12:30:08 +0100
Subject: [PATCH 02/12] Pathfinding manager will now return path steps in pixel
 units by default

---
 front/src/Api/Events/IframeEvent.ts           |  6 ++--
 ...kPlayerToEvent.ts => MovePlayerToEvent.ts} |  4 +--
 front/src/Api/iframe/player.ts                |  4 +--
 front/src/Phaser/Game/GameScene.ts            | 21 +++++++++++--
 .../UserInput/GameSceneUserInputHandler.ts    | 13 ++------
 front/src/Utils/PathfindingManager.ts         | 16 ++++++++--
 maps/tests/MovePlayer/script.php              | 31 +++++--------------
 7 files changed, 50 insertions(+), 45 deletions(-)
 rename front/src/Api/Events/{WalkPlayerToEvent.ts => MovePlayerToEvent.ts} (58%)

diff --git a/front/src/Api/Events/IframeEvent.ts b/front/src/Api/Events/IframeEvent.ts
index e499f80a..12a9854e 100644
--- a/front/src/Api/Events/IframeEvent.ts
+++ b/front/src/Api/Events/IframeEvent.ts
@@ -34,7 +34,7 @@ import type { ChangeZoneEvent } from "./ChangeZoneEvent";
 import type { CameraSetEvent } from "./CameraSetEvent";
 import type { CameraFollowPlayerEvent } from "./CameraFollowPlayerEvent";
 import { isColorEvent } from "./ColorEvent";
-import { isWalkPlayerToEventConfig } from "./WalkPlayerToEvent";
+import { isMovePlayerToEventConfig } from "./MovePlayerToEvent";
 
 export interface TypedMessageEvent<T> extends MessageEvent {
     data: T;
@@ -174,8 +174,8 @@ export const iframeQueryMapTypeGuards = {
         query: tg.isUndefined,
         answer: isPlayerPosition,
     },
-    walkPlayerTo: {
-        query: isWalkPlayerToEventConfig,
+    movePlayerTo: {
+        query: isMovePlayerToEventConfig,
         answer: isPlayerPosition,
     },
 };
diff --git a/front/src/Api/Events/WalkPlayerToEvent.ts b/front/src/Api/Events/MovePlayerToEvent.ts
similarity index 58%
rename from front/src/Api/Events/WalkPlayerToEvent.ts
rename to front/src/Api/Events/MovePlayerToEvent.ts
index 82abcd03..cdb0830c 100644
--- a/front/src/Api/Events/WalkPlayerToEvent.ts
+++ b/front/src/Api/Events/MovePlayerToEvent.ts
@@ -1,6 +1,6 @@
 import * as tg from "generic-type-guard";
 
-export const isWalkPlayerToEventConfig = new tg.IsInterface()
+export const isMovePlayerToEventConfig = new tg.IsInterface()
     .withProperties({
         x: tg.isNumber,
         y: tg.isNumber,
@@ -8,4 +8,4 @@ export const isWalkPlayerToEventConfig = new tg.IsInterface()
     })
     .get();
 
-export type WalkPlayerToEvent = tg.GuardedType<typeof isWalkPlayerToEventConfig>;
+export type MovePlayerToEvent = tg.GuardedType<typeof isMovePlayerToEventConfig>;
diff --git a/front/src/Api/iframe/player.ts b/front/src/Api/iframe/player.ts
index dbc689d3..59687a5e 100644
--- a/front/src/Api/iframe/player.ts
+++ b/front/src/Api/iframe/player.ts
@@ -84,9 +84,9 @@ export class WorkadventurePlayerCommands extends IframeApiContribution<Workadven
         });
     }
 
-    public async walkTo(x: number, y: number, speed: number): Promise<{ x: number; y: number }> {
+    public async moveTo(x: number, y: number, speed: number): Promise<{ x: number; y: number }> {
         return await queryWorkadventure({
-            type: "walkPlayerTo",
+            type: "movePlayerTo",
             data: { x, y, speed },
         });
     }
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index ea967cf3..fc41c074 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -569,7 +569,11 @@ export class GameScene extends DirtyScene {
             waScaleManager
         );
 
-        this.pathfindingManager = new PathfindingManager(this, this.gameMap.getCollisionsGrid());
+        this.pathfindingManager = new PathfindingManager(
+            this,
+            this.gameMap.getCollisionsGrid(),
+            this.gameMap.getTileDimensions()
+        );
         biggestAvailableAreaStore.recompute();
         this.cameraManager.startFollowPlayer(this.CurrentPlayer);
 
@@ -1457,9 +1461,20 @@ ${escapedMessage}
             };
         });
 
-        iframeListener.registerAnswerer("walkPlayerTo", () => {
+        iframeListener.registerAnswerer("movePlayerTo", (message) => {
             // TODO: walk player to position, wait for promise to resolve
-            console.log("WALK PLAYER TO ACTION CALLED");
+            const index = this.getGameMap().getTileIndexAt(message.x, message.y);
+            const startTile = this.getGameMap().getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y);
+            this.getPathfindingManager()
+                .findPath(startTile, index, true, true)
+                .then((path) => {
+                    // Remove first step as it is for the tile we are currently standing on
+                    path.shift();
+                    this.CurrentPlayer.setPathToFollow(path);
+                })
+                .catch((reason) => {
+                    console.warn(reason);
+                });
             return {
                 x: this.CurrentPlayer.x,
                 y: this.CurrentPlayer.y,
diff --git a/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts b/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
index 2915901d..9874794c 100644
--- a/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
+++ b/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
@@ -31,18 +31,11 @@ export class GameSceneUserInputHandler implements UserInputHandlerInterface {
             .getTileIndexAt(this.gameScene.CurrentPlayer.x, this.gameScene.CurrentPlayer.y);
         this.gameScene
             .getPathfindingManager()
-            .findPath(startTile, index, true)
+            .findPath(startTile, index, true, true)
             .then((path) => {
-                const tileDimensions = this.gameScene.getGameMap().getTileDimensions();
-                const pixelPath = path.map((step) => {
-                    return {
-                        x: step.x * tileDimensions.width + tileDimensions.width * 0.5,
-                        y: step.y * tileDimensions.height + tileDimensions.height * 0.5,
-                    };
-                });
                 // Remove first step as it is for the tile we are currently standing on
-                pixelPath.shift();
-                this.gameScene.CurrentPlayer.setPathToFollow(pixelPath);
+                path.shift();
+                this.gameScene.CurrentPlayer.setPathToFollow(path);
             })
             .catch((reason) => {
                 console.warn(reason);
diff --git a/front/src/Utils/PathfindingManager.ts b/front/src/Utils/PathfindingManager.ts
index 2d0cae27..71205070 100644
--- a/front/src/Utils/PathfindingManager.ts
+++ b/front/src/Utils/PathfindingManager.ts
@@ -6,20 +6,23 @@ export class PathfindingManager {
 
     private easyStar;
     private grid: number[][];
+    private tileDimensions: { width: number; height: number };
 
-    constructor(scene: Phaser.Scene, collisionsGrid: number[][]) {
+    constructor(scene: Phaser.Scene, collisionsGrid: number[][], tileDimensions: { width: number; height: number }) {
         this.scene = scene;
 
         this.easyStar = new EasyStar.js();
         this.easyStar.enableDiagonals();
 
         this.grid = collisionsGrid;
+        this.tileDimensions = tileDimensions;
         this.setEasyStarGrid(collisionsGrid);
     }
 
     public async findPath(
         start: { x: number; y: number },
         end: { x: number; y: number },
+        measuredInPixels: boolean = true,
         tryFindingNearestAvailable: boolean = false
     ): Promise<{ x: number; y: number }[]> {
         let endPoints: { x: number; y: number }[] = [end];
@@ -48,12 +51,21 @@ export class PathfindingManager {
             // rejected Promise will return undefined for path
             path = await this.getPath(start, endPoint).catch();
             if (path && path.length > 0) {
-                return path;
+                return measuredInPixels ? this.mapTileUnitsToPixels(path) : path;
             }
         }
         return [];
     }
 
+    private mapTileUnitsToPixels(path: { x: number; y: number }[]): { x: number; y: number }[] {
+        return path.map((step) => {
+            return {
+                x: step.x * this.tileDimensions.width + this.tileDimensions.width * 0.5,
+                y: step.y * this.tileDimensions.height + this.tileDimensions.height * 0.5,
+            };
+        });
+    }
+
     private getNeighbouringTiles(tile: { x: number; y: number }): { x: number; y: number }[] {
         const xOffsets = [-1, 0, 1, 1, 1, 0, -1, -1];
         const yOffsets = [-1, -1, -1, 0, 1, 1, 1, 0];
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
index 24f7fff4..9d68065f 100644
--- a/maps/tests/MovePlayer/script.php
+++ b/maps/tests/MovePlayer/script.php
@@ -5,31 +5,20 @@
     <script>
         window.addEventListener('load', () => {
             //@ts-ignore
-            WA.camera.onCameraUpdate((worldView) => console.log(worldView));
             WA.onInit().then(() => {
                 console.log('After WA init');
-                const setCameraButton = document.getElementById('setCameraButton');
-                const followPlayerButton = document.getElementById('followPlayerButton');
+                const movePlayerButton = document.getElementById('movePlayerButton');
                 const xField = document.getElementById('x');
                 const yField = document.getElementById('y');
-                const widthField = document.getElementById('width');
-                const heightField = document.getElementById('height');
-                const smoothField = document.getElementById('smooth');
-                const lockField = document.getElementById('lock');
+                const speedField = document.getElementById('speed');
 
-                setCameraButton.addEventListener('click', () => {
-                    WA.camera.set(
+                movePlayerButton.addEventListener('click', async () => {
+                    const position = await WA.player.moveTo(
                         parseInt(xField.value),
                         parseInt(yField.value),
-                        widthField.value ? parseInt(widthField.value) : undefined,
-                        heightField.value ? parseInt(heightField.value) : undefined,
-                        lockField.checked,
-                        smoothField.checked,
+                        parseInt(speedField.value),
                     );
-                });
-
-                followPlayerButton.addEventListener('click', () => {
-                    WA.camera.followPlayer(smoothField.checked);
+                    console.log(position);
                 });
             });
         })
@@ -38,13 +27,9 @@
 <body>
 X: <input type="text" id="x" value="496" /><br/>
 Y: <input type="text" id="y" value="655" /><br/>
-width: <input type="text" id="width" value="480" /><br/>
-height: <input type="text" id="height" value="286" /><br/>
-Smooth: <input type="checkbox" id="smooth" value=1 /><br/>
-Lock: <input type="checkbox" id="lock" value=1 /><br/>
+Speed: <input type="text" id="speed" value="20" /><br/>
 
-<button id="setCameraButton">Set Camera</button>
-<button id="followPlayerButton">Follow Player</button>
+<button id="movePlayerButton">Move Player</button>
 
 </body>
 </html>

From 9b94705177cb456fb914b567a5e30b542a3509e8 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 13:09:17 +0100
Subject: [PATCH 03/12] manually resolve promise on certain events for player
 path following

---
 front/src/Phaser/Game/GameScene.ts            | 20 +++++--------------
 front/src/Phaser/Player/Player.ts             |  9 ++++++++-
 .../UserInput/GameSceneUserInputHandler.ts    |  4 +++-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index fc41c074..5b61ebc5 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -1461,24 +1461,14 @@ ${escapedMessage}
             };
         });
 
-        iframeListener.registerAnswerer("movePlayerTo", (message) => {
+        iframeListener.registerAnswerer("movePlayerTo", async (message) => {
             // TODO: walk player to position, wait for promise to resolve
             const index = this.getGameMap().getTileIndexAt(message.x, message.y);
             const startTile = this.getGameMap().getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y);
-            this.getPathfindingManager()
-                .findPath(startTile, index, true, true)
-                .then((path) => {
-                    // Remove first step as it is for the tile we are currently standing on
-                    path.shift();
-                    this.CurrentPlayer.setPathToFollow(path);
-                })
-                .catch((reason) => {
-                    console.warn(reason);
-                });
-            return {
-                x: this.CurrentPlayer.x,
-                y: this.CurrentPlayer.y,
-            };
+            const path = await this.getPathfindingManager().findPath(startTile, index, true, true);
+            path.shift();
+            return this.CurrentPlayer.setPathToFollow(path);
+            // return position;
         });
     }
 
diff --git a/front/src/Phaser/Player/Player.ts b/front/src/Phaser/Player/Player.ts
index 451a057b..60e5cdcf 100644
--- a/front/src/Phaser/Player/Player.ts
+++ b/front/src/Phaser/Player/Player.ts
@@ -12,6 +12,7 @@ export const requestEmoteEventName = "requestEmote";
 
 export class Player extends Character {
     private pathToFollow?: { x: number; y: number }[];
+    private followingPathPromiseResolve?: (position: { x: number; y: number }) => void;
 
     constructor(
         Scene: GameScene,
@@ -44,6 +45,7 @@ export class Player extends Character {
 
         if (this.pathToFollow && activeUserInputEvents.anyExcept(UserInputEvent.SpeedUp)) {
             this.pathToFollow = undefined;
+            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
         }
 
         let x = 0;
@@ -68,9 +70,13 @@ export class Player extends Character {
         this.scene.connection?.emitFollowConfirmation();
     }
 
-    public setPathToFollow(path: { x: number; y: number }[]): void {
+    public async setPathToFollow(path: { x: number; y: number }[]): Promise<{ x: number; y: number }> {
         // take collider offset into consideraton
         this.pathToFollow = this.adjustPathToFollowToColliderBounds(path);
+        return new Promise((resolve) => {
+            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
+            this.followingPathPromiseResolve = resolve;
+        });
     }
 
     private adjustPathToFollowToColliderBounds(path: { x: number; y: number }[]): { x: number; y: number }[] {
@@ -150,6 +156,7 @@ export class Player extends Character {
     private computeFollowPathMovement(): number[] {
         if (this.pathToFollow?.length === 0) {
             this.pathToFollow = undefined;
+            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
         }
         if (!this.pathToFollow) {
             return [0, 0];
diff --git a/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts b/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
index 9874794c..9fdb0ce8 100644
--- a/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
+++ b/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
@@ -35,7 +35,9 @@ export class GameSceneUserInputHandler implements UserInputHandlerInterface {
             .then((path) => {
                 // Remove first step as it is for the tile we are currently standing on
                 path.shift();
-                this.gameScene.CurrentPlayer.setPathToFollow(path);
+                this.gameScene.CurrentPlayer.setPathToFollow(path).catch((reason) => {
+                    console.warn(reason);
+                });
             })
             .catch((reason) => {
                 console.warn(reason);

From c023c4f8fdb188014af0700241e7425897453775 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 13:53:06 +0100
Subject: [PATCH 04/12] optional following path movement speed

---
 front/src/Api/Events/MovePlayerToEvent.ts |  2 +-
 front/src/Api/iframe/player.ts            |  2 +-
 front/src/Phaser/Game/GameScene.ts        |  3 +--
 front/src/Phaser/Player/Player.ts         | 13 ++++++++++---
 maps/tests/MovePlayer/script.php          | 18 +++++++++++++++++-
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/front/src/Api/Events/MovePlayerToEvent.ts b/front/src/Api/Events/MovePlayerToEvent.ts
index cdb0830c..462e2f43 100644
--- a/front/src/Api/Events/MovePlayerToEvent.ts
+++ b/front/src/Api/Events/MovePlayerToEvent.ts
@@ -4,7 +4,7 @@ export const isMovePlayerToEventConfig = new tg.IsInterface()
     .withProperties({
         x: tg.isNumber,
         y: tg.isNumber,
-        speed: tg.isNumber,
+        speed: tg.isOptional(tg.isNumber),
     })
     .get();
 
diff --git a/front/src/Api/iframe/player.ts b/front/src/Api/iframe/player.ts
index 59687a5e..f2014f55 100644
--- a/front/src/Api/iframe/player.ts
+++ b/front/src/Api/iframe/player.ts
@@ -84,7 +84,7 @@ export class WorkadventurePlayerCommands extends IframeApiContribution<Workadven
         });
     }
 
-    public async moveTo(x: number, y: number, speed: number): Promise<{ x: number; y: number }> {
+    public async moveTo(x: number, y: number, speed?: number): Promise<{ x: number; y: number }> {
         return await queryWorkadventure({
             type: "movePlayerTo",
             data: { x, y, speed },
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 5b61ebc5..a92e65be 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -1467,8 +1467,7 @@ ${escapedMessage}
             const startTile = this.getGameMap().getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y);
             const path = await this.getPathfindingManager().findPath(startTile, index, true, true);
             path.shift();
-            return this.CurrentPlayer.setPathToFollow(path);
-            // return position;
+            return this.CurrentPlayer.setPathToFollow(path, message.speed);
         });
     }
 
diff --git a/front/src/Phaser/Player/Player.ts b/front/src/Phaser/Player/Player.ts
index 60e5cdcf..ae661e54 100644
--- a/front/src/Phaser/Player/Player.ts
+++ b/front/src/Phaser/Player/Player.ts
@@ -13,6 +13,7 @@ export const requestEmoteEventName = "requestEmote";
 export class Player extends Character {
     private pathToFollow?: { x: number; y: number }[];
     private followingPathPromiseResolve?: (position: { x: number; y: number }) => void;
+    private pathWalkingSpeed?: number;
 
     constructor(
         Scene: GameScene,
@@ -70,15 +71,20 @@ export class Player extends Character {
         this.scene.connection?.emitFollowConfirmation();
     }
 
-    public async setPathToFollow(path: { x: number; y: number }[]): Promise<{ x: number; y: number }> {
+    public async setPathToFollow(path: { x: number; y: number }[], speed?: number): Promise<{ x: number; y: number }> {
         // take collider offset into consideraton
         this.pathToFollow = this.adjustPathToFollowToColliderBounds(path);
+        this.pathWalkingSpeed = speed;
         return new Promise((resolve) => {
             this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
             this.followingPathPromiseResolve = resolve;
         });
     }
 
+    private deduceSpeed(speedUp: boolean, followMode: boolean): number {
+        return this.pathWalkingSpeed ? this.pathWalkingSpeed : speedUp && !followMode ? 25 : 9;
+    }
+
     private adjustPathToFollowToColliderBounds(path: { x: number; y: number }[]): { x: number; y: number }[] {
         return path.map((step) => {
             return { x: step.x, y: step.y - this.getBody().offset.y };
@@ -101,8 +107,8 @@ export class Player extends Character {
 
         // Compute movement deltas
         const followMode = get(followStateStore) !== "off";
-        const speedup = activeEvents.get(UserInputEvent.SpeedUp) && !followMode ? 25 : 9;
-        const moveAmount = speedup * 20;
+        const speed = this.deduceSpeed(activeEvents.get(UserInputEvent.SpeedUp), followMode);
+        const moveAmount = speed * 20;
         x = x * moveAmount;
         y = y * moveAmount;
 
@@ -156,6 +162,7 @@ export class Player extends Character {
     private computeFollowPathMovement(): number[] {
         if (this.pathToFollow?.length === 0) {
             this.pathToFollow = undefined;
+            this.pathWalkingSpeed = undefined;
             this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
         }
         if (!this.pathToFollow) {
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
index 9d68065f..30d250a0 100644
--- a/maps/tests/MovePlayer/script.php
+++ b/maps/tests/MovePlayer/script.php
@@ -8,11 +8,26 @@
             WA.onInit().then(() => {
                 console.log('After WA init');
                 const movePlayerButton = document.getElementById('movePlayerButton');
+                const randomChainedMovementButton = document.getElementById('randomChainedMovementButton');
                 const xField = document.getElementById('x');
                 const yField = document.getElementById('y');
                 const speedField = document.getElementById('speed');
 
-                movePlayerButton.addEventListener('click', async () => {
+                randomChainedMovementButton.addEventListener('click', async () => {
+                    let pos;
+                    pos = await WA.player.moveTo(100, 100, 10);
+                    console.log(pos);
+                    pos = await WA.player.moveTo(500, 100, 10);
+                    console.log(pos);
+                    pos = await WA.player.moveTo(500, 500, 10);
+                    console.log(pos);
+                    pos = await WA.player.moveTo(100, 500, 10);
+                    console.log(pos);
+                    pos = await WA.player.moveTo(100, 100, 10);
+                    console.log(pos);
+                });
+
+                movePlayerButton.addEventListener('click', async () => {                    
                     const position = await WA.player.moveTo(
                         parseInt(xField.value),
                         parseInt(yField.value),
@@ -30,6 +45,7 @@ Y: <input type="text" id="y" value="655" /><br/>
 Speed: <input type="text" id="speed" value="20" /><br/>
 
 <button id="movePlayerButton">Move Player</button>
+<button id="randomChainedMovementButton">Do random chained movement</button>
 
 </body>
 </html>

From 8f40e7a33cb54c5eeaecd54104fb37cbbad28881 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 14:16:05 +0100
Subject: [PATCH 05/12] reject path following path promise if interrupted

---
 front/src/Phaser/Player/Player.ts | 20 +++++++++++++-------
 maps/tests/MovePlayer/script.php  | 26 +++++++++++++++-----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/front/src/Phaser/Player/Player.ts b/front/src/Phaser/Player/Player.ts
index ae661e54..62576d16 100644
--- a/front/src/Phaser/Player/Player.ts
+++ b/front/src/Phaser/Player/Player.ts
@@ -13,6 +13,7 @@ export const requestEmoteEventName = "requestEmote";
 export class Player extends Character {
     private pathToFollow?: { x: number; y: number }[];
     private followingPathPromiseResolve?: (position: { x: number; y: number }) => void;
+    private followingPathPromiseReject?: (position: { x: number; y: number }) => void;
     private pathWalkingSpeed?: number;
 
     constructor(
@@ -45,8 +46,7 @@ export class Player extends Character {
         }
 
         if (this.pathToFollow && activeUserInputEvents.anyExcept(UserInputEvent.SpeedUp)) {
-            this.pathToFollow = undefined;
-            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
+            this.finishFollowingPath();
         }
 
         let x = 0;
@@ -75,9 +75,10 @@ export class Player extends Character {
         // take collider offset into consideraton
         this.pathToFollow = this.adjustPathToFollowToColliderBounds(path);
         this.pathWalkingSpeed = speed;
-        return new Promise((resolve) => {
-            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
+        return new Promise((resolve, reject) => {
+            this.followingPathPromiseReject?.call(this, { x: this.x, y: this.y });
             this.followingPathPromiseResolve = resolve;
+            this.followingPathPromiseReject = reject;
         });
     }
 
@@ -161,9 +162,7 @@ export class Player extends Character {
 
     private computeFollowPathMovement(): number[] {
         if (this.pathToFollow?.length === 0) {
-            this.pathToFollow = undefined;
-            this.pathWalkingSpeed = undefined;
-            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y });
+            this.finishFollowingPath();
         }
         if (!this.pathToFollow) {
             return [0, 0];
@@ -180,6 +179,13 @@ export class Player extends Character {
         return this.getMovementDirection(xDistance, yDistance, distance);
     }
 
+    private finishFollowingPath(cancelled: boolean = false): void {
+        this.pathToFollow = undefined;
+        this.pathWalkingSpeed = undefined;
+        const func = cancelled ? this.followingPathPromiseReject : this.followingPathPromiseResolve;
+        func?.call(this, { x: this.x, y: this.y });
+    }
+
     private getMovementDirection(xDistance: number, yDistance: number, distance: number): [number, number] {
         return [xDistance / Math.sqrt(distance), yDistance / Math.sqrt(distance)];
     }
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
index 30d250a0..c505b939 100644
--- a/maps/tests/MovePlayer/script.php
+++ b/maps/tests/MovePlayer/script.php
@@ -14,17 +14,21 @@
                 const speedField = document.getElementById('speed');
 
                 randomChainedMovementButton.addEventListener('click', async () => {
-                    let pos;
-                    pos = await WA.player.moveTo(100, 100, 10);
-                    console.log(pos);
-                    pos = await WA.player.moveTo(500, 100, 10);
-                    console.log(pos);
-                    pos = await WA.player.moveTo(500, 500, 10);
-                    console.log(pos);
-                    pos = await WA.player.moveTo(100, 500, 10);
-                    console.log(pos);
-                    pos = await WA.player.moveTo(100, 100, 10);
-                    console.log(pos);
+                    try {
+                        let pos;
+                        pos = await WA.player.moveTo(100, 100, 10);
+                        console.log(pos);
+                        pos = await WA.player.moveTo(500, 100, 10);
+                        console.log(pos);
+                        pos = await WA.player.moveTo(500, 500, 10);
+                        console.log(pos);
+                        pos = await WA.player.moveTo(100, 500, 10);
+                        console.log(pos);
+                        pos = await WA.player.moveTo(100, 100, 10);
+                        console.log(pos);
+                    } catch (err) {
+                        console.log('movement was stopped forcefully');
+                    }
                 });
 
                 movePlayerButton.addEventListener('click', async () => {                    

From e70289c61d53ba2150880c141650fdec83ea3afc Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 15:28:49 +0100
Subject: [PATCH 06/12] add WA.player.moveTo command to the readme

---
 docs/maps/api-player.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/maps/api-player.md b/docs/maps/api-player.md
index d9a89bd1..a8280a6c 100644
--- a/docs/maps/api-player.md
+++ b/docs/maps/api-player.md
@@ -173,6 +173,19 @@ Example:
 WA.player.state.toto //will retrieve the variable
 ```
 
+### Move player to position
+Player will try to find shortest path to the destination point and proceed to move there.
+```typescript
+// Let's move player to x: 250 y: 250 with speed of 10
+WA.player.moveTo(250, 250, 10);
+```
+You can also chain movement like this:
+```typescript
+// Player will move to the next point after reaching first one
+await WA.player.moveTo(250, 250, 10);
+await WA.player.moveTo(500, 0, 10);
+```
+
 ### Set the outline color of the player
 ```
 WA.player.setOutlineColor(red: number, green: number, blue: number): Promise<void>;

From ef02a06ad7dac5779300aacc52e9063064dfc5be Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 15:32:26 +0100
Subject: [PATCH 07/12] more details to the readme

---
 docs/maps/api-player.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/maps/api-player.md b/docs/maps/api-player.md
index a8280a6c..4dfb52c7 100644
--- a/docs/maps/api-player.md
+++ b/docs/maps/api-player.md
@@ -174,6 +174,9 @@ WA.player.state.toto //will retrieve the variable
 ```
 
 ### Move player to position
+```typescript
+WA.player.moveTo(x: number, y: number, speed?: number): Promise<{ x: number, y: number }>;
+```
 Player will try to find shortest path to the destination point and proceed to move there.
 ```typescript
 // Let's move player to x: 250 y: 250 with speed of 10
@@ -185,6 +188,11 @@ You can also chain movement like this:
 await WA.player.moveTo(250, 250, 10);
 await WA.player.moveTo(500, 0, 10);
 ```
+It is possible to get the information about current player's position on stop or when movement is interrupted
+```typescript
+// Position will store x and y of Player at the moment of movement's end
+const position = await WA.player.moveTo(250, 250, 10);
+```
 
 ### Set the outline color of the player
 ```

From 62b00f852ddd994f2a79075a74d9f5fe9f1d12e8 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Wed, 19 Jan 2022 17:22:28 +0100
Subject: [PATCH 08/12] throw an exception if no path found when using
 player.moveTo command. Cancelling path following no longer rejects the
 promise

---
 front/src/Api/iframe/player.ts                |  2 +-
 front/src/Phaser/Game/GameScene.ts            |  3 +++
 front/src/Phaser/Player/Player.ts             | 21 ++++++++++---------
 .../UserInput/GameSceneUserInputHandler.ts    |  4 +---
 .../MovePlayer/move_player_api_test.json      |  2 +-
 maps/tests/MovePlayer/script.php              | 20 ++++++++----------
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/front/src/Api/iframe/player.ts b/front/src/Api/iframe/player.ts
index f2014f55..cf10dfa5 100644
--- a/front/src/Api/iframe/player.ts
+++ b/front/src/Api/iframe/player.ts
@@ -84,7 +84,7 @@ export class WorkadventurePlayerCommands extends IframeApiContribution<Workadven
         });
     }
 
-    public async moveTo(x: number, y: number, speed?: number): Promise<{ x: number; y: number }> {
+    public async moveTo(x: number, y: number, speed?: number): Promise<{ x: number; y: number; cancelled: boolean }> {
         return await queryWorkadventure({
             type: "movePlayerTo",
             data: { x, y, speed },
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index a92e65be..739e195d 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -1467,6 +1467,9 @@ ${escapedMessage}
             const startTile = this.getGameMap().getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y);
             const path = await this.getPathfindingManager().findPath(startTile, index, true, true);
             path.shift();
+            if (path.length === 0) {
+                throw new Error("no path available");
+            }
             return this.CurrentPlayer.setPathToFollow(path, message.speed);
         });
     }
diff --git a/front/src/Phaser/Player/Player.ts b/front/src/Phaser/Player/Player.ts
index 62576d16..c5134f1c 100644
--- a/front/src/Phaser/Player/Player.ts
+++ b/front/src/Phaser/Player/Player.ts
@@ -12,8 +12,7 @@ export const requestEmoteEventName = "requestEmote";
 
 export class Player extends Character {
     private pathToFollow?: { x: number; y: number }[];
-    private followingPathPromiseResolve?: (position: { x: number; y: number }) => void;
-    private followingPathPromiseReject?: (position: { x: number; y: number }) => void;
+    private followingPathPromiseResolve?: (result: { x: number; y: number; cancelled: boolean }) => void;
     private pathWalkingSpeed?: number;
 
     constructor(
@@ -46,7 +45,7 @@ export class Player extends Character {
         }
 
         if (this.pathToFollow && activeUserInputEvents.anyExcept(UserInputEvent.SpeedUp)) {
-            this.finishFollowingPath();
+            this.finishFollowingPath(true);
         }
 
         let x = 0;
@@ -71,14 +70,17 @@ export class Player extends Character {
         this.scene.connection?.emitFollowConfirmation();
     }
 
-    public async setPathToFollow(path: { x: number; y: number }[], speed?: number): Promise<{ x: number; y: number }> {
+    public async setPathToFollow(
+        path: { x: number; y: number }[],
+        speed?: number
+    ): Promise<{ x: number; y: number; cancelled: boolean }> {
+        const isPreviousPathInProgress = this.pathToFollow !== undefined && this.pathToFollow.length > 0;
         // take collider offset into consideraton
         this.pathToFollow = this.adjustPathToFollowToColliderBounds(path);
         this.pathWalkingSpeed = speed;
-        return new Promise((resolve, reject) => {
-            this.followingPathPromiseReject?.call(this, { x: this.x, y: this.y });
+        return new Promise((resolve) => {
+            this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y, cancelled: isPreviousPathInProgress });
             this.followingPathPromiseResolve = resolve;
-            this.followingPathPromiseReject = reject;
         });
     }
 
@@ -161,7 +163,7 @@ export class Player extends Character {
     }
 
     private computeFollowPathMovement(): number[] {
-        if (this.pathToFollow?.length === 0) {
+        if (this.pathToFollow !== undefined && this.pathToFollow.length === 0) {
             this.finishFollowingPath();
         }
         if (!this.pathToFollow) {
@@ -182,8 +184,7 @@ export class Player extends Character {
     private finishFollowingPath(cancelled: boolean = false): void {
         this.pathToFollow = undefined;
         this.pathWalkingSpeed = undefined;
-        const func = cancelled ? this.followingPathPromiseReject : this.followingPathPromiseResolve;
-        func?.call(this, { x: this.x, y: this.y });
+        this.followingPathPromiseResolve?.call(this, { x: this.x, y: this.y, cancelled });
     }
 
     private getMovementDirection(xDistance: number, yDistance: number, distance: number): [number, number] {
diff --git a/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts b/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
index 9fdb0ce8..19bb02bb 100644
--- a/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
+++ b/front/src/Phaser/UserInput/GameSceneUserInputHandler.ts
@@ -35,9 +35,7 @@ export class GameSceneUserInputHandler implements UserInputHandlerInterface {
             .then((path) => {
                 // Remove first step as it is for the tile we are currently standing on
                 path.shift();
-                this.gameScene.CurrentPlayer.setPathToFollow(path).catch((reason) => {
-                    console.warn(reason);
-                });
+                this.gameScene.CurrentPlayer.setPathToFollow(path).catch((reason) => {});
             })
             .catch((reason) => {
                 console.warn(reason);
diff --git a/maps/tests/MovePlayer/move_player_api_test.json b/maps/tests/MovePlayer/move_player_api_test.json
index 965428e7..d9dc63c6 100644
--- a/maps/tests/MovePlayer/move_player_api_test.json
+++ b/maps/tests/MovePlayer/move_player_api_test.json
@@ -26,7 +26,7 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 0, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 6, 7, 6, 7, 0, 17, 18, 17, 18, 17, 18, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 17, 18, 17, 18, 0, 28, 29, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 29, 28, 29, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
          "height":30,
          "id":6,
          "name":"furnitures",
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
index c505b939..9676c914 100644
--- a/maps/tests/MovePlayer/script.php
+++ b/maps/tests/MovePlayer/script.php
@@ -15,17 +15,15 @@
 
                 randomChainedMovementButton.addEventListener('click', async () => {
                     try {
-                        let pos;
-                        pos = await WA.player.moveTo(100, 100, 10);
-                        console.log(pos);
-                        pos = await WA.player.moveTo(500, 100, 10);
-                        console.log(pos);
-                        pos = await WA.player.moveTo(500, 500, 10);
-                        console.log(pos);
-                        pos = await WA.player.moveTo(100, 500, 10);
-                        console.log(pos);
-                        pos = await WA.player.moveTo(100, 100, 10);
-                        console.log(pos);
+                        WA.player.moveTo(100, 100, 10).then((result) => {
+                            console.log(result);
+                            WA.player.moveTo(500, 100, 20).then((result) => {
+                                console.log(result);
+                                WA.player.moveTo(500, 500, 10).then((result) => {
+                                    console.log(result);
+                                });
+                            });
+                        });
                     } catch (err) {
                         console.log('movement was stopped forcefully');
                     }

From bf6b9a7c83fd08eecefbb214f1d6cd11dd47e2dc Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Thu, 20 Jan 2022 09:39:41 +0100
Subject: [PATCH 09/12] do not call joystick logic if not on mobile

---
 front/src/Phaser/UserInput/UserInputManager.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/front/src/Phaser/UserInput/UserInputManager.ts b/front/src/Phaser/UserInput/UserInputManager.ts
index ffaf7d1f..ffa67c3a 100644
--- a/front/src/Phaser/UserInput/UserInputManager.ts
+++ b/front/src/Phaser/UserInput/UserInputManager.ts
@@ -54,7 +54,7 @@ export class UserInputManager {
     private scene: Phaser.Scene;
     private isInputDisabled: boolean;
 
-    private joystick!: MobileJoystick;
+    private joystick?: MobileJoystick;
     private joystickEvents = new ActiveEventList();
     private joystickForceThreshold = 60;
     private joystickForceAccuX = 0;
@@ -81,9 +81,9 @@ export class UserInputManager {
     initVirtualJoystick() {
         this.joystick = new MobileJoystick(this.scene);
         this.joystick.on("update", () => {
-            this.joystickForceAccuX = this.joystick.forceX ? this.joystickForceAccuX : 0;
-            this.joystickForceAccuY = this.joystick.forceY ? this.joystickForceAccuY : 0;
-            const cursorKeys = this.joystick.createCursorKeys();
+            this.joystickForceAccuX = this.joystick?.forceX ? this.joystickForceAccuX : 0;
+            this.joystickForceAccuY = this.joystick?.forceY ? this.joystickForceAccuY : 0;
+            const cursorKeys = this.joystick?.createCursorKeys();
             for (const name in cursorKeys) {
                 const key = cursorKeys[name as Direction];
                 switch (name) {
@@ -192,7 +192,7 @@ export class UserInputManager {
             return eventsMap;
         }
         this.joystickEvents.forEach((value, key) => {
-            if (value) {
+            if (value && this.joystick) {
                 switch (key) {
                     case UserInputEvent.MoveUp:
                     case UserInputEvent.MoveDown:
@@ -253,7 +253,7 @@ export class UserInputManager {
         this.scene.input.on(
             Phaser.Input.Events.POINTER_UP,
             (pointer: Phaser.Input.Pointer, gameObjects: Phaser.GameObjects.GameObject[]) => {
-                this.joystick.hide();
+                this.joystick?.hide();
                 this.userInputHandler.handlePointerUpEvent(pointer, gameObjects);
             }
         );
@@ -267,9 +267,9 @@ export class UserInputManager {
                 this.userInputHandler.handlePointerDownEvent(pointer, gameObjects);
                 // Let's only display the joystick if there is one finger on the screen
                 if ((pointer.event as TouchEvent).touches.length === 1) {
-                    this.joystick.showAt(pointer.x, pointer.y);
+                    this.joystick?.showAt(pointer.x, pointer.y);
                 } else {
-                    this.joystick.hide();
+                    this.joystick?.hide();
                 }
             }
         );

From b088e63290f6e801b633c3427e2dbf6b49a35ca9 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Thu, 20 Jan 2022 10:04:19 +0100
Subject: [PATCH 10/12] little fixes for moveTo example and with event return
 data

---
 front/src/Api/Events/IframeEvent.ts             |  3 ++-
 front/src/Api/Events/MovePlayerToEventAnswer.ts | 11 +++++++++++
 maps/tests/MovePlayer/script.php                |  9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 front/src/Api/Events/MovePlayerToEventAnswer.ts

diff --git a/front/src/Api/Events/IframeEvent.ts b/front/src/Api/Events/IframeEvent.ts
index 12a9854e..e56699a7 100644
--- a/front/src/Api/Events/IframeEvent.ts
+++ b/front/src/Api/Events/IframeEvent.ts
@@ -35,6 +35,7 @@ import type { CameraSetEvent } from "./CameraSetEvent";
 import type { CameraFollowPlayerEvent } from "./CameraFollowPlayerEvent";
 import { isColorEvent } from "./ColorEvent";
 import { isMovePlayerToEventConfig } from "./MovePlayerToEvent";
+import { isMovePlayerToEventAnswer } from "./MovePlayerToEventAnswer";
 
 export interface TypedMessageEvent<T> extends MessageEvent {
     data: T;
@@ -176,7 +177,7 @@ export const iframeQueryMapTypeGuards = {
     },
     movePlayerTo: {
         query: isMovePlayerToEventConfig,
-        answer: isPlayerPosition,
+        answer: isMovePlayerToEventAnswer,
     },
 };
 
diff --git a/front/src/Api/Events/MovePlayerToEventAnswer.ts b/front/src/Api/Events/MovePlayerToEventAnswer.ts
new file mode 100644
index 00000000..67d2f9ae
--- /dev/null
+++ b/front/src/Api/Events/MovePlayerToEventAnswer.ts
@@ -0,0 +1,11 @@
+import * as tg from "generic-type-guard";
+
+export const isMovePlayerToEventAnswer = new tg.IsInterface()
+    .withProperties({
+        x: tg.isNumber,
+        y: tg.isNumber,
+        cancelled: tg.isBoolean,
+    })
+    .get();
+
+export type MovePlayerToEventAnswer = tg.GuardedType<typeof isMovePlayerToEventAnswer>;
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
index 9676c914..74a57dfe 100644
--- a/maps/tests/MovePlayer/script.php
+++ b/maps/tests/MovePlayer/script.php
@@ -16,10 +16,19 @@
                 randomChainedMovementButton.addEventListener('click', async () => {
                     try {
                         WA.player.moveTo(100, 100, 10).then((result) => {
+                            if (result.cancelled) {
+                                return;
+                            }
                             console.log(result);
                             WA.player.moveTo(500, 100, 20).then((result) => {
+                                if (result.cancelled) {
+                                    return;
+                                }
                                 console.log(result);
                                 WA.player.moveTo(500, 500, 10).then((result) => {
+                                    if (result.cancelled) {
+                                        return;
+                                    }
                                     console.log(result);
                                 });
                             });

From 72c7eae5595262d2e35383a43ce1dbc5742d5afe Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Thu, 20 Jan 2022 12:54:55 +0100
Subject: [PATCH 11/12] readme changes

---
 docs/maps/api-player.md          | 16 +++++++++++++---
 maps/tests/MovePlayer/script.php | 30 ++++++++----------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/docs/maps/api-player.md b/docs/maps/api-player.md
index 4dfb52c7..6480d60a 100644
--- a/docs/maps/api-player.md
+++ b/docs/maps/api-player.md
@@ -188,10 +188,20 @@ You can also chain movement like this:
 await WA.player.moveTo(250, 250, 10);
 await WA.player.moveTo(500, 0, 10);
 ```
-It is possible to get the information about current player's position on stop or when movement is interrupted
+Or like this:
 ```typescript
-// Position will store x and y of Player at the moment of movement's end
-const position = await WA.player.moveTo(250, 250, 10);
+// Player will move to the next point after reaching first one or stop if the movement was cancelled
+WA.player.moveTo(250, 250, 10).then((result) => {
+    if (!result.cancelled) {
+        WA.player.moveTo(500, 0, 10);
+    }
+});
+```
+It is possible to get the information about current player's position on stop and if the movement was interrupted
+```typescript
+// Result will store x and y of Player at the moment of movement's end and information if the movement was interrupted
+const result = await WA.player.moveTo(250, 250, 10);
+// result: { x: number, y: number, cancelled: boolean }
 ```
 
 ### Set the outline color of the player
diff --git a/maps/tests/MovePlayer/script.php b/maps/tests/MovePlayer/script.php
index 74a57dfe..1188277b 100644
--- a/maps/tests/MovePlayer/script.php
+++ b/maps/tests/MovePlayer/script.php
@@ -14,28 +14,14 @@
                 const speedField = document.getElementById('speed');
 
                 randomChainedMovementButton.addEventListener('click', async () => {
-                    try {
-                        WA.player.moveTo(100, 100, 10).then((result) => {
-                            if (result.cancelled) {
-                                return;
-                            }
-                            console.log(result);
-                            WA.player.moveTo(500, 100, 20).then((result) => {
-                                if (result.cancelled) {
-                                    return;
-                                }
-                                console.log(result);
-                                WA.player.moveTo(500, 500, 10).then((result) => {
-                                    if (result.cancelled) {
-                                        return;
-                                    }
-                                    console.log(result);
-                                });
-                            });
-                        });
-                    } catch (err) {
-                        console.log('movement was stopped forcefully');
-                    }
+                    WA.player.moveTo(500, 500, 10)
+                    const result = await WA.player.moveTo(100, 100, 10).then((result) => {
+                    if (result.completed)
+                        if (result.cancelled) {
+                            return;
+                        }
+                        WA.player.moveTo(500, 100, 20);
+                    });
                 });
 
                 movePlayerButton.addEventListener('click', async () => {                    

From d8327d1b72407548baa765e7ed22f549129e8b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Sat, 22 Jan 2022 22:20:41 +0100
Subject: [PATCH 12/12] Apply suggestions from code review

Fixing missing return attribute in doc
---
 docs/maps/api-player.md            | 2 +-
 front/src/Phaser/Game/GameScene.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/maps/api-player.md b/docs/maps/api-player.md
index 6480d60a..442661bf 100644
--- a/docs/maps/api-player.md
+++ b/docs/maps/api-player.md
@@ -175,7 +175,7 @@ WA.player.state.toto //will retrieve the variable
 
 ### Move player to position
 ```typescript
-WA.player.moveTo(x: number, y: number, speed?: number): Promise<{ x: number, y: number }>;
+WA.player.moveTo(x: number, y: number, speed?: number): Promise<{ x: number, y: number, cancelled: boolean }>;
 ```
 Player will try to find shortest path to the destination point and proceed to move there.
 ```typescript
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 739e195d..05c0483f 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -1462,7 +1462,6 @@ ${escapedMessage}
         });
 
         iframeListener.registerAnswerer("movePlayerTo", async (message) => {
-            // TODO: walk player to position, wait for promise to resolve
             const index = this.getGameMap().getTileIndexAt(message.x, message.y);
             const startTile = this.getGameMap().getTileIndexAt(this.CurrentPlayer.x, this.CurrentPlayer.y);
             const path = await this.getPathfindingManager().findPath(startTile, index, true, true);