transmit companion to remote players

front/src/Phaser/Companion/Companion.ts

@@ -22,11 +22,7 @@ export class Companion extends Container {
     private direction: PlayerAnimationDirections;
     private animationType: PlayerAnimationTypes;
 
-    constructor(
-        scene: Phaser.Scene,
-        x: number,
-        y: number
-        ) {
+    constructor(scene: Phaser.Scene, x: number, y: number, name: string) {
         super(scene, x + 8, y + 8);
             
         this.sprites = new Map<string, Sprite>();
@@ -38,11 +34,7 @@ export class Companion extends Container {
         this.direction = PlayerAnimationDirections.Down;
         this.animationType = PlayerAnimationTypes.Idle;
 
-        // select random animal
-        const animal = ["dog1", "dog2", "dog3", "cat1", "cat2", "cat3"];
-        const random = Math.floor(Math.random() * animal.length);
-
-        this.companionName = animal[random];
+        this.companionName = name;
 
         lazyLoadResource(this.scene.load, this.companionName).then(resource => {
             this.addResource(resource);
@@ -59,14 +51,16 @@ export class Companion extends Container {
 
         this.setDepth(-1);
 
-        scene.add.existing(this);
+        this.scene.events.addListener('update', this.step, this);
+
+        this.scene.add.existing(this);
     }
 
     public setTarget(x: number, y: number, direction: PlayerAnimationDirections) {
         this.target = { x, y, direction };
     }
 
-    public step(delta: number) {
+    public step(time: number, delta: number) {
         if (typeof this.target === 'undefined') return;
 
         this.delta += delta;
@@ -216,6 +210,8 @@ export class Companion extends Container {
             }
         }
 
+        this.scene.events.removeListener('update', this.step, this);
+
         super.destroy();
     }
 }

front/src/Phaser/Entity/Character.ts

@@ -71,8 +71,8 @@ export abstract class Character extends Container {
         this.playAnimation(direction, moving);
     }
 
-    public addCompanion(): void {
-        this.companion = new Companion(this.scene, this.x, this.y);
+    public addCompanion(name: string): void {
+        this.companion = new Companion(this.scene, this.x, this.y, name);
     }
 
     public addTextures(textures: string[], frame?: string | number): void {

front/src/Phaser/Entity/RemotePlayer.ts

@@ -17,12 +17,17 @@ export class RemotePlayer extends Character {
         name: string,
         texturesPromise: Promise<string[]>,
         direction: PlayerAnimationDirections,
-        moving: boolean
+        moving: boolean,
+        companion: string|null
     ) {
         super(Scene, x, y, texturesPromise, name, direction, moving, 1);
-
+        
         //set data
         this.userId = userId;
+
+        if (typeof companion === 'string') {
+            this.addCompanion(companion);
+        }
     }
 
     updatePosition(position: PointInterface): void {

front/src/Phaser/Game/AddPlayerInterface.ts

@@ -6,4 +6,5 @@ export interface AddPlayerInterface {
     name: string;
     characterLayers: BodyResourceDescriptionInterface[];
     position: PointInterface;
+    companion: string|null;
 }

front/src/Phaser/Game/GameManager.ts

@@ -21,12 +21,14 @@ export interface HasMovedEvent {
 export class GameManager {
     private playerName: string|null;
     private characterLayers: string[]|null;
+    private companion: string|null;
     private startRoom!:Room;
     currentGameSceneName: string|null = null;
     
     constructor() {
         this.playerName = localUserStore.getName();
         this.characterLayers = localUserStore.getCharacterLayers();
+        this.companion = localUserStore.getCompanion();
     }
 
     public async init(scenePlugin: Phaser.Scenes.ScenePlugin): Promise<string> {
@@ -63,6 +65,9 @@ export class GameManager {
         return this.characterLayers;
     }
 
+    getCompanion(): string|null {
+        return this.companion;
+    }
 
     public async loadMap(room: Room, scenePlugin: Phaser.Scenes.ScenePlugin): Promise<void> {
         const roomID = room.id;

front/src/Phaser/Game/GameScene.ts

@@ -159,6 +159,7 @@ export class GameScene extends ResizableScene implements CenterListener {
     private openChatIcon!: OpenChatIcon;
     private playerName!: string;
     private characterLayers!: string[];
+    private companion!: string|null;
     private messageSubscription: Subscription|null = null;
     private popUpElements : Map<number, DOMElement> = new Map<number, Phaser.GameObjects.DOMElement>();
 
@@ -335,7 +336,7 @@ export class GameScene extends ResizableScene implements CenterListener {
         }
         this.playerName = playerName;
         this.characterLayers = gameManager.getCharacterLayers();
-
+        this.companion = gameManager.getCompanion();
 
         //initalise map
         this.Map = this.add.tilemap(this.MapUrlFile);
@@ -459,7 +460,9 @@ export class GameScene extends ResizableScene implements CenterListener {
                 top: camera.scrollY,
                 right: camera.scrollX + camera.width,
                 bottom: camera.scrollY + camera.height,
-            }).then((onConnect: OnConnectInterface) => {
+            },
+            this.companion
+            ).then((onConnect: OnConnectInterface) => {
             this.connection = onConnect.connection;
 
             this.connection.onUserJoins((message: MessageUserJoined) => {
@@ -467,7 +470,8 @@ export class GameScene extends ResizableScene implements CenterListener {
                     userId: message.userId,
                     characterLayers: message.characterLayers,
                     name: message.name,
-                    position: message.position
+                    position: message.position,
+                    companion: message.companion
                 }
                 this.addPlayer(userMessage);
             });
@@ -1019,7 +1023,8 @@ ${escapedMessage}
                 texturesPromise,
                 PlayerAnimationDirections.Down,
                 false,
-                this.userInputManager
+                this.userInputManager,
+                this.companion
             );
         }catch (err){
             if(err instanceof TextureError) {
@@ -1211,7 +1216,8 @@ ${escapedMessage}
             addPlayerData.name,
             texturesPromise,
             addPlayerData.position.direction as PlayerAnimationDirections,
-            addPlayerData.position.moving
+            addPlayerData.position.moving,
+            addPlayerData.companion
         );
         this.MapPlayers.add(player);
         this.MapPlayersByKey.set(player.userId, player);

front/src/Phaser/Player/Player.ts

@@ -21,14 +21,17 @@ export class Player extends Character implements CurrentGamerInterface {
         texturesPromise: Promise<string[]>,
         direction: PlayerAnimationDirections,
         moving: boolean,
-        private userInputManager: UserInputManager
+        private userInputManager: UserInputManager,
+        companion: string|null
     ) {
         super(Scene, x, y, texturesPromise, name, direction, moving, 1);
 
         //the current player model should be push away by other players to prevent conflict
         this.getBody().setImmovable(false);
 
-        this.addCompanion();
+        if (typeof companion === 'string') {
+            this.addCompanion(companion);
+        }
     }
 
     moveUser(delta: number): void {
@@ -61,10 +64,6 @@ export class Player extends Character implements CurrentGamerInterface {
             moving = true;
         }
 
-        if (this.companion) {
-            this.companion.step(delta);
-        }
-
         if (x !== 0 || y !== 0) {
             this.move(x, y);
             this.emit(hasMovedEventName, {moving, direction, x: this.x, y: this.y});