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

front/src/Phaser/Game/EmoteManager.ts

@@ -1,6 +1,6 @@
-import {emoteEventStream} from "../../Connexion/EmoteEventStream";
-import type {GameScene} from "./GameScene";
-import type {Subscription} from "rxjs";
+import { emoteEventStream } from "../../Connexion/EmoteEventStream";
+import type { GameScene } from "./GameScene";
+import type { Subscription } from "rxjs";
 
 export class EmoteManager {
     private subscription: Subscription;
@@ -8,7 +8,7 @@ export class EmoteManager {
     constructor(private scene: GameScene) {
         this.subscription = emoteEventStream.stream.subscribe((event) => {
             const actor = this.scene.MapPlayersByKey.get(event.userId);
-            if(actor) {
+            if (actor) {
                 actor.playEmote(event.emote);
             }
         });

front/src/Phaser/Game/GameManager.ts

@@ -36,11 +36,11 @@ export class GameManager {
         this.startRoom = await connectionManager.initGameConnexion();
         this.loadMap(this.startRoom);
 
-        if(!this.playerName) {
+        if (!this.playerName) {
             const res = await Axios.get("/");
-            this.playerName = res.headers['bstlyusername'];
+            this.playerName = res.headers[ 'bstlyusername' ];
         }
-        
+
         //If player name was not set show login scene with player name
         //If Room si not public and Auth was not set, show login scene to authenticate user (OpenID - SSO - Anonymous)
         if (!this.playerName || (this.startRoom.authenticationMandatory && !localUserStore.getAuthToken())) {

front/src/Phaser/Game/SoundManager.ts

@@ -4,35 +4,39 @@ import BaseSound = Phaser.Sound.BaseSound;
 import SoundConfig = Phaser.Types.Sound.SoundConfig;
 
 class SoundManager {
-    private soundPromises : Map<string,Promise<BaseSound>> = new Map<string, Promise<Phaser.Sound.BaseSound>>();
-    public  loadSound (loadPlugin: LoaderPlugin, soundManager : BaseSoundManager, soundUrl: string) : Promise<BaseSound> {
-        let soundPromise =  this.soundPromises.get(soundUrl);
+    private soundPromises: Map<string, Promise<BaseSound>> = new Map<string, Promise<Phaser.Sound.BaseSound>>();
+    public loadSound(loadPlugin: LoaderPlugin, soundManager: BaseSoundManager, soundUrl: string): Promise<BaseSound> {
+        let soundPromise = this.soundPromises.get(soundUrl);
         if (soundPromise !== undefined) {
             return soundPromise;
         }
-        soundPromise =  new Promise<BaseSound>((res) => {
-
+        soundPromise = new Promise<BaseSound>((res) => {
             const sound = soundManager.get(soundUrl);
             if (sound !== null) {
                 return res(sound);
             }
             loadPlugin.audio(soundUrl, soundUrl);
-            loadPlugin.once('filecomplete-audio-' + soundUrl, () => {
+            loadPlugin.once("filecomplete-audio-" + soundUrl, () => {
                 res(soundManager.add(soundUrl));
             });
             loadPlugin.start();
         });
-        this.soundPromises.set(soundUrl,soundPromise);
+        this.soundPromises.set(soundUrl, soundPromise);
         return soundPromise;
     }
 
-    public async playSound(loadPlugin: LoaderPlugin, soundManager : BaseSoundManager, soundUrl: string, config: SoundConfig|undefined) : Promise<void> {
-        const sound = await this.loadSound(loadPlugin,soundManager,soundUrl);
+    public async playSound(
+        loadPlugin: LoaderPlugin,
+        soundManager: BaseSoundManager,
+        soundUrl: string,
+        config: SoundConfig | undefined
+    ): Promise<void> {
+        const sound = await this.loadSound(loadPlugin, soundManager, soundUrl);
         if (config === undefined) sound.play();
         else sound.play(config);
     }
 
-    public stopSound(soundManager : BaseSoundManager,soundUrl : string){
+    public stopSound(soundManager: BaseSoundManager, soundUrl: string) {
         soundManager.get(soundUrl).stop();
     }
 }