From 099d5732967074da0d46ae6c8533dc0b870dd811 Mon Sep 17 00:00:00 2001
From: Hanusiak Piotr <piotr@ltmp.co>
Date: Thu, 27 Jan 2022 16:50:25 +0100
Subject: [PATCH] cleanup

---
 front/src/Components/ActionsMenu/ActionsMenu.svelte |  8 +++++---
 front/src/Phaser/Entity/RemotePlayer.ts             | 12 ------------
 front/src/Phaser/Game/ActivatablesManager.ts        |  2 +-
 front/src/Phaser/Game/GameScene.ts                  |  3 ++-
 front/src/Phaser/Game/OutlineableInterface.ts       |  2 +-
 front/src/Stores/ActionsMenuStore.ts                |  2 +-
 front/src/Utils/CustomTypeGuards.ts                 |  4 ++--
 7 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/front/src/Components/ActionsMenu/ActionsMenu.svelte b/front/src/Components/ActionsMenu/ActionsMenu.svelte
index 632401e7..d4772c4f 100644
--- a/front/src/Components/ActionsMenu/ActionsMenu.svelte
+++ b/front/src/Components/ActionsMenu/ActionsMenu.svelte
@@ -1,9 +1,10 @@
 <script lang="typescript">
     import { fly } from "svelte/transition";
-    import { ActionsMenuData, actionsMenuStore } from '../../Stores/ActionsMenuStore';
+    import { actionsMenuStore } from '../../Stores/ActionsMenuStore';
     import { onDestroy } from "svelte";
 
     import type { Unsubscriber } from "svelte/store";
+    import type { ActionsMenuData } from '../../Stores/ActionsMenuStore';
 
     let actionsMenuData: ActionsMenuData | undefined;
 
@@ -57,7 +58,8 @@
         left: 50%;
         transform: translate(-50%, 0);
         width: 260px !important;
-        max-height: 300px;
+        height: max-content !important;
+        max-height: 40vh;
         margin-top: 200px;
 
         pointer-events: auto;
@@ -66,7 +68,7 @@
         color: whitesmoke;
 
         .actions {
-            max-height: 200px;
+            max-height: calc(100% - 50px);
             width: 100%;
             display:block;
             overflow-x:hidden;
diff --git a/front/src/Phaser/Entity/RemotePlayer.ts b/front/src/Phaser/Entity/RemotePlayer.ts
index 22d1b2bf..7a7716ec 100644
--- a/front/src/Phaser/Entity/RemotePlayer.ts
+++ b/front/src/Phaser/Entity/RemotePlayer.ts
@@ -107,18 +107,6 @@ export class RemotePlayer extends Character implements ActivatableInterface {
                     console.log('HELLO');
                 }
             },
-            {
-                actionName: "Log Goodbye",
-                callback: () => {
-                    console.log('GOODBYE');
-                }
-            },
-            {
-                actionName: "Clear Goodbye Action",
-                callback: () => {
-                    actionsMenuStore.removeAction("Log Goodbye");
-                }
-            },
         ];
     }
 
diff --git a/front/src/Phaser/Game/ActivatablesManager.ts b/front/src/Phaser/Game/ActivatablesManager.ts
index 2ea45959..e8f2c831 100644
--- a/front/src/Phaser/Game/ActivatablesManager.ts
+++ b/front/src/Phaser/Game/ActivatablesManager.ts
@@ -91,4 +91,4 @@ export class ActivatablesManager {
             MathUtils.distanceBetween(this.currentPlayer.getPosition(), object.getPosition()),
         );
     }
-}
\ No newline at end of file
+}
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 2e6e1a0d..619d85d3 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -1802,7 +1802,7 @@ ${escapedMessage}
                 case "RemovePlayerEvent":
                     this.doRemovePlayer(event.userId);
                     break;
-                case "UserMovedEvent":
+                case "UserMovedEvent": {
                     this.doUpdatePlayerPosition(event.event);
                     const remotePlayer = this.MapPlayersByKey.get(event.event.userId);
                     if (remotePlayer) {
@@ -1810,6 +1810,7 @@ ${escapedMessage}
                         this.activatablesManager.deduceSelectedActivatableObjectByDistance();
                     }
                     break;
+                }
                 case "GroupCreatedUpdatedEvent":
                     this.doShareGroupPosition(event.event);
                     break;
diff --git a/front/src/Phaser/Game/OutlineableInterface.ts b/front/src/Phaser/Game/OutlineableInterface.ts
index f2657d61..b73b2413 100644
--- a/front/src/Phaser/Game/OutlineableInterface.ts
+++ b/front/src/Phaser/Game/OutlineableInterface.ts
@@ -8,4 +8,4 @@ export interface OutlineableInterface {
     pointerOutOutline(): void
     characterCloseByOutline(): void
     characterFarAwayOutline(): void
-}
\ No newline at end of file
+}
diff --git a/front/src/Stores/ActionsMenuStore.ts b/front/src/Stores/ActionsMenuStore.ts
index 0ba483a3..e72a6baf 100644
--- a/front/src/Stores/ActionsMenuStore.ts
+++ b/front/src/Stores/ActionsMenuStore.ts
@@ -42,4 +42,4 @@ function createActionsMenuStore() {
     };
 }
 
-export const actionsMenuStore = createActionsMenuStore();
\ No newline at end of file
+export const actionsMenuStore = createActionsMenuStore();
diff --git a/front/src/Utils/CustomTypeGuards.ts b/front/src/Utils/CustomTypeGuards.ts
index 4db719cb..7c2c9f21 100644
--- a/front/src/Utils/CustomTypeGuards.ts
+++ b/front/src/Utils/CustomTypeGuards.ts
@@ -1,5 +1,5 @@
 import type { OutlineableInterface } from '../Phaser/Game/OutlineableInterface';
 
 export function isOutlineable(object: unknown): object is OutlineableInterface {
-    return (object as unknown as OutlineableInterface)?.getObjectToOutline() !== undefined;
-}
\ No newline at end of file
+    return (object as OutlineableInterface)?.pointerOverOutline !== undefined;
+}