Merge pull request #174 from thecodingmachine/fixstartpos

Fixing start position on disconnect

front/src/Phaser/Entity/Character.ts

@@ -117,6 +117,10 @@ export abstract class Character extends Phaser.Physics.Arcade.Sprite {
     }
 
     protected playAnimation(direction : string, moving: boolean): void {
+        if (!this.anims) {
+            console.error('ANIMS IS NOT DEFINED!!!');
+            return;
+        }
         if (moving && (!this.anims.currentAnim || this.anims.currentAnim.key !== direction)) {
             this.play(this.PlayerTexture+'-'+direction, true);
         } else if (!moving) {

front/src/Phaser/Game/GameManager.ts

@@ -11,7 +11,9 @@ import {
 } from "../../Connection";
 import {SimplePeer} from "../../WebRtc/SimplePeer";
 import {AddPlayerInterface} from "./AddPlayerInterface";
-import {ReconnectingSceneName} from "../Reconnecting/ReconnectingScene";
+import {ReconnectingScene, ReconnectingSceneName} from "../Reconnecting/ReconnectingScene";
+import ScenePlugin = Phaser.Scenes.ScenePlugin;
+import {Scene} from "phaser";
 
 /*export enum StatusGameManagerEnum {
     IN_PROGRESS = 1,
@@ -33,7 +35,7 @@ export interface MapObject {
 export class GameManager {
     //status: number;
     private ConnectionInstance: Connection;
-    private currentGameScene: GameScene;
+    private currentGameScene: GameScene|null;
     private playerName: string;
     SimplePeer : SimplePeer;
     private characterUserSelected: string;
@@ -87,15 +89,15 @@ export class GameManager {
             name: message.name,
             position: message.position
         }
-        this.currentGameScene.addPlayer(userMessage);
+        this.getCurrentGameScene().addPlayer(userMessage);
     }
 
     onUserMoved(message: MessageUserMovedInterface): void {
-        this.currentGameScene.updatePlayerPosition(message);
+        this.getCurrentGameScene().updatePlayerPosition(message);
     }
 
     onUserLeft(userId: string): void {
-        this.currentGameScene.removePlayer(userId);
+        this.getCurrentGameScene().removePlayer(userId);
     }
 
     initUsersPosition(usersPosition: MessageUserPositionInterface[]): void {
@@ -104,7 +106,7 @@ export class GameManager {
             return;
         }*/
         try {
-            this.currentGameScene.initUsersPosition(usersPosition)
+            this.getCurrentGameScene().initUsersPosition(usersPosition)
         } catch (e) {
             console.error(e);
         }
@@ -118,7 +120,7 @@ export class GameManager {
             return;
         }*/
         try {
-            this.currentGameScene.shareGroupPosition(groupPositionMessage)
+            this.getCurrentGameScene().shareGroupPosition(groupPositionMessage)
         } catch (e) {
             console.error(e);
         }
@@ -129,7 +131,7 @@ export class GameManager {
             return;
         }*/
         try {
-            this.currentGameScene.deleteGroup(groupId)
+            this.getCurrentGameScene().deleteGroup(groupId)
         } catch (e) {
             console.error(e);
         }
@@ -163,13 +165,36 @@ export class GameManager {
     }
 
     private oldSceneKey : string;
+    private oldMapUrlFile : string;
+    private oldInstance : string;
+    private scenePlugin: ScenePlugin;
+    private reconnectScene: Scene;
     switchToDisconnectedScene(): void {
+        if (this.currentGameScene === null) {
+            return;
+        }
+        console.log('Switching to disconnected scene');
         this.oldSceneKey = this.currentGameScene.scene.key;
+        this.oldMapUrlFile = this.currentGameScene.MapUrlFile;
+        this.oldInstance = this.currentGameScene.instance;
         this.currentGameScene.scene.start(ReconnectingSceneName);
+        this.reconnectScene = this.currentGameScene.scene.get(ReconnectingSceneName);
+        // Let's completely delete an purge the disconnected scene. We will start again from 0.
+        this.currentGameScene.scene.remove(this.oldSceneKey);
+        this.scenePlugin = this.currentGameScene.scene;
+        this.currentGameScene = null;
     }
 
     reconnectToGameScene(lastPositionShared: PointInterface) {
-        this.currentGameScene.scene.start(this.oldSceneKey, { initPosition: lastPositionShared });
+        const game : Phaser.Scene = GameScene.createFromUrl(this.oldMapUrlFile, this.oldInstance);
+        this.reconnectScene.scene.add(this.oldSceneKey, game, true, { initPosition: lastPositionShared });
+    }
+
+    private getCurrentGameScene(): GameScene {
+        if (this.currentGameScene === null) {
+            throw new Error('No current game scene enabled');
+        }
+        return this.currentGameScene;
     }
 }
 

front/src/Phaser/Game/GameScene.ts

@@ -160,6 +160,11 @@ export class GameScene extends Phaser.Scene {
             throw new Error('Your map MUST contain a layer of type "objectgroup" whose name is "floorLayer" that represents the layer characters are drawn at.');
         }
 
+        // If there is an init position passed
+        if (this.initPosition !== null) {
+            this.startX = this.initPosition.x;
+            this.startY = this.initPosition.y;
+        } else {
             // Now, let's find the start layer
             if (this.startLayerName) {
                 for (let layer of this.mapFile.layers) {
@@ -180,6 +185,7 @@ export class GameScene extends Phaser.Scene {
                     }
                 }
             }
+        }
         // Still no start position? Something is wrong with the map, we need a "start" layer.
         if (this.startX === undefined) {
             console.warn('This map is missing a layer named "start" that contains the available default start positions.');
@@ -304,15 +310,6 @@ export class GameScene extends Phaser.Scene {
      * @param layer
      */
     private startUser(layer: ITiledMapLayer): PositionInterface {
-        if (this.initPosition !== null) {
-            this.startX = this.initPosition.x;
-            this.startY = this.initPosition.y;
-            return {
-                x: this.initPosition.x,
-                y: this.initPosition.y
-            };
-        }
-
         let tiles : any = layer.data;
         let possibleStartPositions : PositionInterface[]  = [];
         tiles.forEach((objectKey : number, key: number) => {