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

front/src/Stores/LayoutManagerStore.ts

@@ -1,4 +1,5 @@
 import { derived, writable } from "svelte/store";
+import type { ActivatablesManager } from "../Phaser/Game/ActivatablesManager";
 import type { UserInputManager } from "../Phaser/UserInput/UserInputManager";
 
 export interface LayoutManagerAction {

front/src/Stores/OutlineColorStore.ts

@@ -5,38 +5,33 @@ export function createColorStore() {
 
     let followColor: number | undefined = undefined;
     let apiColor: number | undefined = undefined;
-
-    let pointedByPointer: boolean = false;
-    let pointedByCharacter: boolean = false;
+    let pointedByPointer: number | undefined = undefined;
+    let pointedByCharacter: number | undefined = undefined;
 
     const updateColor = () => {
-        if (pointedByPointer || pointedByCharacter) {
-            set(0xffff00);
-        } else {
-            set(followColor ?? apiColor);
-        }
+        set(pointedByPointer ?? pointedByCharacter ?? followColor ?? apiColor);
     };
 
     return {
         subscribe,
 
-        pointerOver() {
-            pointedByPointer = true;
+        pointerOver(color: number) {
+            pointedByPointer = color;
             updateColor();
         },
 
         pointerOut() {
-            pointedByPointer = false;
+            pointedByPointer = undefined;
             updateColor();
         },
 
-        characterCloseBy() {
-            pointedByCharacter = true;
+        characterCloseBy(color: number) {
+            pointedByCharacter = color;
             updateColor();
         },
 
         characterFarAway() {
-            pointedByCharacter = false;
+            pointedByCharacter = undefined;
             updateColor();
         },