From 0d811db66818188c3297354f4f26a05d663e9a21 Mon Sep 17 00:00:00 2001 From: _Bastler <_Bastler@bstly.de> Date: Fri, 5 Nov 2021 18:44:33 +0100 Subject: [PATCH] latest dev --- .../character_accessories/wheelchair.png | Bin 0 -> 8067 bytes .../LayoutManager/LayoutManager.svelte | 2 +- front/src/Phaser/Entity/PlayerTextures.ts | 9 ++++++++- front/src/Phaser/Game/GameScene.ts | 8 +++++--- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 front/dist/resources/customisation/character_accessories/wheelchair.png diff --git a/front/dist/resources/customisation/character_accessories/wheelchair.png b/front/dist/resources/customisation/character_accessories/wheelchair.png new file mode 100644 index 0000000000000000000000000000000000000000..47fe9a8acb6f5596265a3b05627031288c1e0574 GIT binary patch literal 8067 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 az7@(VSbNPD+Vf$LAB3)nPU-23m;VP?B9r(4 literal 0 HcmV?d00001 diff --git a/front/src/Components/LayoutManager/LayoutManager.svelte b/front/src/Components/LayoutManager/LayoutManager.svelte index 0d5c4d2c..0c26ca98 100644 --- a/front/src/Components/LayoutManager/LayoutManager.svelte +++ b/front/src/Components/LayoutManager/LayoutManager.svelte @@ -6,7 +6,7 @@ callback(); } - function sanitize(html : string) { + function sanitize(html) { return HtmlUtils.sanitize(html); } diff --git a/front/src/Phaser/Entity/PlayerTextures.ts b/front/src/Phaser/Entity/PlayerTextures.ts index b144438c..7857b513 100644 --- a/front/src/Phaser/Entity/PlayerTextures.ts +++ b/front/src/Phaser/Entity/PlayerTextures.ts @@ -434,7 +434,14 @@ export const ACCESSORIES_RESOURCES: BodyResourceDescriptionListInterface = { name: "accessory_mate_bottle", img: "resources/customisation/character_accessories/mate_bottle1.png", }, - accessory_mask: { name: "accessory_mask", img: "resources/customisation/character_accessories/mask.png" }, + accessory_mask: { + name: "accessory_mask", + img: "resources/customisation/character_accessories/mask.png", + }, + wheelchair: { + name: "accessory_wheelchair", + img: "resources/customisation/character_accessories/wheelchair.png", + }, }; export const LAYERS: BodyResourceDescriptionListInterface[] = [ diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index 4a2691b5..e34c2033 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -232,6 +232,8 @@ export class GameScene extends DirtyScene { //initialize frame event of scripting API this.listenToIframeEvents(); + layoutManagerActionStore.clearActions(); + const localUser = localUserStore.getLocalUser(); const textures = localUser?.textures; if (textures) { @@ -1920,10 +1922,10 @@ export class GameScene extends DirtyScene { layoutManagerActionStore.removeAction("jitsi"); } else { const openJitsiRoomFunction = () => { - const roomName = jitsiFactory.getRoomName(allProps.get("jitsiRoom") as string, this.instance); - const jitsiUrl = allProps.get("jitsiUrl") as string | undefined; + const roomName = jitsiFactory.getRoomName(allProps.get(GameMapProperties.JITSI_ROOM) as string, this.instance); + const jitsiUrl = allProps.get(GameMapProperties.JITSI_URL) as string | undefined; if (JITSI_PRIVATE_MODE && !jitsiUrl) { - const adminTag = allProps.get("jitsiRoomAdminTag") as string | undefined; + const adminTag = allProps.get(GameMapProperties.JITSI_ADMIN_ROOM_TAG) as string | undefined; this.connection && this.connection.emitQueryJitsiJwtMessage(roomName, adminTag); } else {