Merge branch 'develop' of github.com:thecodingmachine/workadventure into main

front/src/Phaser/Entity/Character.ts

@@ -41,6 +41,7 @@ export abstract class Character extends Container {
                 direction: PlayerAnimationDirections,
                 moving: boolean,
                 frame: string | number,
+                isClickable: boolean,
                 companion: string|null,
                 companionTexturePromise?: Promise<string>
     ) {
@@ -60,7 +61,7 @@ export abstract class Character extends Container {
         this.playerName.setOrigin(0.5).setDepth(DEPTH_INGAME_TEXT_INDEX);
         this.add(this.playerName);
 
-        if (this.isClickable()) {
+        if (isClickable) {
             this.setInteractive({
                 hitArea: new Phaser.Geom.Circle(0, 0, interactiveRadius),
                 hitAreaCallback: Phaser.Geom.Circle.Contains, //eslint-disable-line @typescript-eslint/unbound-method
@@ -79,7 +80,7 @@ export abstract class Character extends Container {
         this.setDepth(-1);
 
         this.playAnimation(direction, moving);
-        
+
         if (typeof companion === 'string') {
             this.addCompanion(companion, companionTexturePromise);
         }
@@ -90,12 +91,10 @@ export abstract class Character extends Container {
             this.companion = new Companion(this.scene, this.x, this.y, name, texturePromise);
         }
     }
-    
-    public abstract isClickable(): boolean;
 
     public addTextures(textures: string[], frame?: string | number): void {
         for (const texture of textures) {
-            if(!this.scene.textures.exists(texture)){
+            if(this.scene && !this.scene.textures.exists(texture)){
                 throw new TextureError('texture not found');
             }
             const sprite = new Sprite(this.scene, 0, 0, texture, frame);
@@ -240,23 +239,23 @@ export abstract class Character extends Container {
                 this.scene.sys.updateList.remove(sprite);
             }
         }
-        this.list.forEach(objectContaining => objectContaining.destroy()) 
+        this.list.forEach(objectContaining => objectContaining.destroy())
         super.destroy();
     }
-    
+
     playEmote(emoteKey: string) {
         this.cancelPreviousEmote();
 
         const scalingFactor = waScaleManager.uiScalingFactor * 0.05;
         const emoteY = -30 - scalingFactor * 10;
-        
+
         this.playerName.setVisible(false);
         this.emote = new Sprite(this.scene, 0,  0, emoteKey);
         this.emote.setAlpha(0);
         this.emote.setScale(0.1 * scalingFactor);
         this.add(this.emote);
         this.scene.sys.updateList.add(this.emote);
-        
+
         this.createStartTransition(scalingFactor, emoteY);
     }
 

front/src/Phaser/Entity/CustomizedCharacter.ts

@@ -0,0 +1,20 @@
+import Container = Phaser.GameObjects.Container;
+import type {Scene} from "phaser";
+import Sprite = Phaser.GameObjects.Sprite;
+
+/**
+ * A sprite of a customized character (used in the Customize Scene only)
+ */
+export class CustomizedCharacter extends Container {
+    public constructor(scene: Scene, x: number, y: number, layers: string[]) {
+        super(scene, x, y);
+        this.updateSprites(layers);
+    }
+
+    public updateSprites(layers: string[]): void {
+        this.removeAll(true);
+        for (const layer of layers) {
+            this.add(new Sprite(this.scene, 0, 0, layer));
+        }
+    }
+}

front/src/Phaser/Entity/RemotePlayer.ts

@@ -2,15 +2,15 @@ import type {GameScene} from "../Game/GameScene";
 import type {PointInterface} from "../../Connexion/ConnexionModels";
 import {Character} from "../Entity/Character";
 import type {PlayerAnimationDirections} from "../Player/Animation";
-import {DISABLE_VISIT_CARD_FEATURE} from "../../Enum/EnvironmentVariable";
+import {requestVisitCardsStore} from "../../Stores/GameStore";
 
-export const playerClickedEvent = 'playerClickedEvent';
 
 /**
  * Class representing the sprite of a remote player (a player that plays on another computer)
  */
 export class RemotePlayer extends Character {
     userId: number;
+    private visitCardUrl: string|null;
 
     constructor(
         userId: number,
@@ -21,16 +21,18 @@ export class RemotePlayer extends Character {
         texturesPromise: Promise<string[]>,
         direction: PlayerAnimationDirections,
         moving: boolean,
+        visitCardUrl: string|null,
         companion: string|null,
         companionTexturePromise?: Promise<string>
     ) {
-        super(Scene, x, y, texturesPromise, name, direction, moving, 1, companion, companionTexturePromise);
+        super(Scene, x, y, texturesPromise, name, direction, moving, 1, !!visitCardUrl, companion, companionTexturePromise);
         
         //set data
         this.userId = userId;
+        this.visitCardUrl = visitCardUrl;
         
         this.on('pointerdown', () => {
-            this.emit(playerClickedEvent, this.userId);
+            requestVisitCardsStore.set(this.visitCardUrl);
         })
     }
 
@@ -45,8 +47,4 @@ export class RemotePlayer extends Character {
             this.companion.setTarget(position.x, position.y, position.direction as PlayerAnimationDirections);
         }
     }
-
-    isClickable(): boolean {
-        return !DISABLE_VISIT_CARD_FEATURE; //todo: make remote players clickable if they are logged in.
-    }
 }