2 files changed, 17 insertions, 14 deletions
diff --git a/client/src/akkamon/render/engine/GridPhysics.ts b/client/src/akkamon/render/engine/GridPhysics.ts
index 04ff865..7c266bf 100644
--- a/client/src/akkamon/render/engine/GridPhysics.ts
+++ b/client/src/akkamon/render/engine/GridPhysics.ts
@@ -1,6 +1,6 @@
 import Phaser from 'phaser';
 
-import { AkkamonWorldScene } from '../../scenes/AkkamonWorldScene';
+import { TILE_SIZE } from '../../scenes/WorldScene';
 
 import { AkkamonEngine } from './AkkamonEngine';
 
@@ -12,7 +12,7 @@ import {
     StartMovingEvent,
     StopMovingEvent,
     NewTilePosEvent
-} from '../../client/Events';
+} from '../../client/OutgoingEvents';
 
 export class GridPhysics extends AkkamonEngine {
 
@@ -26,7 +26,7 @@ export class GridPhysics extends AkkamonEngine {
     }
 
     private movementDirection: Direction = Direction.NONE;
-    private readonly speedPixelsPerSecond: number = AkkamonWorldScene.TILE_SIZE * 4;
+    private readonly speedPixelsPerSecond: number = TILE_SIZE * 4;
 
     private tileSizePixelsWalked: number = 0;
 
@@ -90,7 +90,7 @@ export class GridPhysics extends AkkamonEngine {
             this.spriteMovement(pixelsToWalkThisUpdate);
             this.updatePlayerSpriteTilePosition();
         } else {
-            this.spriteMovement(AkkamonWorldScene.TILE_SIZE - this.tileSizePixelsWalked);
+            this.spriteMovement(TILE_SIZE - this.tileSizePixelsWalked);
             this.stopMoving();
         }
     }
@@ -120,7 +120,7 @@ export class GridPhysics extends AkkamonEngine {
     private spriteMovement(pixelsToMove: number) {
 
         this.tileSizePixelsWalked += pixelsToMove;
-        this.tileSizePixelsWalked %= AkkamonWorldScene.TILE_SIZE;
+        this.tileSizePixelsWalked %= TILE_SIZE;
 
 
         const directionVec = GridPhysics.movementDirectionVectors[
@@ -139,7 +139,7 @@ export class GridPhysics extends AkkamonEngine {
         pixelsToWalkThisUpdate: number
     ): boolean {
         return (
-            this.tileSizePixelsWalked + pixelsToWalkThisUpdate >= AkkamonWorldScene.TILE_SIZE
+            this.tileSizePixelsWalked + pixelsToWalkThisUpdate >= TILE_SIZE
         );
     }
 
diff --git a/client/src/akkamon/render/engine/RemotePlayerEngine.ts b/client/src/akkamon/render/engine/RemotePlayerEngine.ts
index 65d54bf..7ce5fa9 100644
--- a/client/src/akkamon/render/engine/RemotePlayerEngine.ts
+++ b/client/src/akkamon/render/engine/RemotePlayerEngine.ts
@@ -1,6 +1,6 @@
 import Phaser from 'phaser';
 
-import type { AkkamonWorldScene } from '../../scenes/AkkamonWorldScene';
+import type { WorldScene } from '../../scenes/WorldScene';
 import { AkkamonEngine } from '../engine/AkkamonEngine';
 
 import type { Direction } from '../Direction';
@@ -10,20 +10,23 @@ import {
 } from '../model/RemotePlayerSprite';
 
 import {
-    Queue
+    Queue,
+    baseQueue,
+    queueFromArray
 } from '../../DataWrappers';
 
-import type {
-    RemoteMovementQueues
-} from '../../client/Events';
+
+type RemoteMovementQueues = {
+    [key: string]: {value: Direction[]}
+}
 
 export class RemotePlayerEngine extends AkkamonEngine {
 
-    private scene: AkkamonWorldScene;
+    private scene: WorldScene;
 
     private trainerIdToRemotePlayerSprite: Map<string, RemotePlayerSprite> = new Map();
 
-    constructor(scene: AkkamonWorldScene) {
+    constructor(scene: WorldScene) {
         super();
         this.scene = scene;
     }
@@ -69,7 +72,7 @@ export class RemotePlayerEngine extends AkkamonEngine {
                                                               tilePos: new Phaser.Math.Vector2(this.scene.spawnPointTilePos!),
                                                               texture: this.scene.textures.get("atlas"),
                                                               frame: "misa-front",
-                                                              moveQueue: new Queue(moveQueue)
+                                                              moveQueue: queueFromArray(moveQueue)
                                                               }
                                                           ));
                 } else {