Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure

front/src/Phaser/Entity/Character.ts

@@ -97,7 +97,7 @@ export abstract class Character extends Container implements OutlineableInterfac
             fontFamily: '"Press Start 2P"',
             fontSize: "8px",
             strokeThickness: 2,
-            stroke: "gray",
+            stroke: "#14304C",
             metrics: {
                 ascent: 20,
                 descent: 10,

front/src/Phaser/Game/ActivatablesManager.ts

@@ -13,7 +13,7 @@ export class ActivatablesManager {
 
     private canSelectByDistance: boolean = true;
 
-    private readonly outlineColor = 0xffff00;
+    private readonly outlineColor = 0xf9e81e;
     private readonly directionalActivationPositionShift = 50;
 
     constructor(currentPlayer: Player) {

front/src/Phaser/Game/GameMap.ts

@@ -361,7 +361,7 @@ export class GameMap {
             if (!layer.visible) {
                 continue;
             }
-            if (layer.getTileAt(x, y)?.properties[GameMapProperties.COLLIDES]) {
+            if (layer.getTileAt(x, y)?.properties?.[GameMapProperties.COLLIDES]) {
                 return true;
             }
         }

front/src/Phaser/Game/GameScene.ts

@@ -346,7 +346,6 @@ export class GameScene extends DirtyScene {
         (this.load as any).rexWebFont({
             custom: {
                 families: ["Press Start 2P"],
-                urls: ["/resources/fonts/fonts.css"],
                 testString: "abcdefg",
             },
         });
@@ -1253,6 +1252,8 @@ export class GameScene extends DirtyScene {
                 openCoWebsite.hint
             );
 
+            coWebsiteManager.addCoWebsiteToStore(coWebsite, openCoWebsite.position);
+
             if (openCoWebsite.lazy === undefined || !openCoWebsite.lazy) {
                 await coWebsiteManager.loadCoWebsite(coWebsite);
             }
@@ -1322,15 +1323,6 @@ export class GameScene extends DirtyScene {
                 this.markDirty();
             })
         );
-
-        this.iframeSubscriptionList.push(
-            iframeListener.setTilesStream.subscribe((eventTiles) => {
-                for (const eventTile of eventTiles) {
-                    this.gameMap.putTile(eventTile.tile, eventTile.x, eventTile.y, eventTile.layer);
-                }
-            })
-        );
-
         iframeListener.registerAnswerer("loadTileset", (eventTileset) => {
             return this.connectionAnswerPromise.then(() => {
                 const jsonTilesetDir = eventTileset.url.substr(0, eventTileset.url.lastIndexOf("/"));
@@ -1643,6 +1635,8 @@ export class GameScene extends DirtyScene {
                         }
                     })
                     .catch((reason) => console.warn(reason));
+
+                urlManager.clearHashParameter();
             } catch (err) {
                 console.warn(`Cannot proceed with moveTo command:\n\t-> ${err}`);
             }
@@ -1762,7 +1756,7 @@ export class GameScene extends DirtyScene {
                 }
             });
             this.CurrentPlayer.on(Phaser.Input.Events.POINTER_OVER, (pointer: Phaser.Input.Pointer) => {
-                this.CurrentPlayer.pointerOverOutline(0x00ffff);
+                this.CurrentPlayer.pointerOverOutline(0x365dff);
             });
             this.CurrentPlayer.on(Phaser.Input.Events.POINTER_OUT, (pointer: Phaser.Input.Pointer) => {
                 this.CurrentPlayer.pointerOutOutline();

front/src/Phaser/Items/ActionableItem.ts

@@ -56,7 +56,7 @@ export class ActionableItem implements ActivatableInterface {
 
         this.getOutlinePlugin()?.add(this.sprite, {
             thickness: 2,
-            outlineColor: 0xffff00,
+            outlineColor: 0xf9e81e,
         });
     }
 

front/src/Phaser/Items/Computer/computer.ts

@@ -61,7 +61,6 @@ export default {
             state = initState;
         }
 
-        // Idée: ESSAYER WebPack? https://paultavares.wordpress.com/2018/07/02/webpack-how-to-generate-an-es-module-bundle/
         const computer = new Sprite(scene, object.x, object.y, "computer");
         scene.add.existing(computer);
         if (state.status === "on") {