Clean up follow implementation; stop following when leader leaves the scene

front/src/Phaser/Entity/Character.ts

@@ -32,7 +32,7 @@ export abstract class Character extends Container {
     private readonly playerName: Text;
     public PlayerValue: string;
     public sprites: Map<string, Sprite>;
-    private lastDirection: PlayerAnimationDirections = PlayerAnimationDirections.Down;
+    protected lastDirection: PlayerAnimationDirections = PlayerAnimationDirections.Down;
     //private teleportation: Sprite;
     private invisible: boolean;
     public companion?: Companion;
@@ -266,24 +266,20 @@ export abstract class Character extends Container {
 
         body.setVelocity(x, y);
 
-        // up or down animations are prioritized over left and right
+        if (Math.abs(body.velocity.x) > Math.abs(body.velocity.y)) {
-        if (body.velocity.y < 0) {
+            if (body.velocity.x < 0) {
-            //moving up
-            this.lastDirection = PlayerAnimationDirections.Up;
-            this.playAnimation(PlayerAnimationDirections.Up, true);
-        } else if (body.velocity.y > 0) {
-            //moving down
-            this.lastDirection = PlayerAnimationDirections.Down;
-            this.playAnimation(PlayerAnimationDirections.Down, true);
-        } else if (body.velocity.x > 0) {
-            //moving right
-            this.lastDirection = PlayerAnimationDirections.Right;
-            this.playAnimation(PlayerAnimationDirections.Right, true);
-        } else if (body.velocity.x < 0) {
-            //moving left
                 this.lastDirection = PlayerAnimationDirections.Left;
-            this.playAnimation(PlayerAnimationDirections.Left, true);
+            } else if (body.velocity.x > 0) {
+                this.lastDirection = PlayerAnimationDirections.Right;
             }
+        } else {
+            if (body.velocity.y < 0) {
+                this.lastDirection = PlayerAnimationDirections.Up;
+            } else if (body.velocity.y > 0) {
+                this.lastDirection = PlayerAnimationDirections.Down;
+            }
+        }
+        this.playAnimation(this.lastDirection, true);
 
         this.setDepth(this.y);
 

front/src/Phaser/Game/GameScene.ts

@@ -1715,6 +1715,10 @@ ${escapedMessage}
         });
     }
 
+    public findPlayer(testFunction: (player: RemotePlayer) => boolean): RemotePlayer | undefined {
+        return Array.from(this.MapPlayersByKey.values()).find(testFunction);
+    }
+
     /**
      * Called by the connexion when a new player arrives on a map
      */

front/src/Phaser/Player/Player.ts

@@ -18,11 +18,6 @@ export const hasMovedEventName = "hasMoved";
 export const requestEmoteEventName = "requestEmote";
 
 export class Player extends Character {
-    private previousDirection: PlayerAnimationDirections = PlayerAnimationDirections.Down;
-    private wasMoving: boolean = false;
-    private timeCounter: number = 0;
-    private follow: { followPlayer: RemotePlayer; direction: PlayerAnimationDirections } | null = null;
-
     constructor(
         Scene: GameScene,
         x: number,
@@ -41,9 +36,9 @@ export class Player extends Character {
         this.getBody().setImmovable(false);
     }
 
-    private inputStep(activeEvents: ActiveEventList, delta: number) {
+    private inputStep(activeEvents: ActiveEventList) {
         //if user client on shift, camera and player speed
-        let direction = null;
+        let direction = this.lastDirection;
         let moving = false;
 
         const speedMultiplier = activeEvents.get(UserInputEvent.SpeedUp) ? 25 : 9;
@@ -77,22 +72,22 @@ export class Player extends Character {
         if (x !== 0 || y !== 0) {
             this.move(x, y);
             this.emit(hasMovedEventName, { moving, direction, x: this.x, y: this.y, oldX: x, oldY: y });
-        } else if (this.wasMoving && moving) {
+        } else if (get(userMovingStore) && moving) {
             // slow joystick movement
             this.move(0, 0);
             this.emit(hasMovedEventName, {
                 moving,
-                direction: this.previousDirection,
+                direction: direction,
                 x: this.x,
                 y: this.y,
                 oldX: x,
                 oldY: y,
             });
-        } else if (this.wasMoving && !moving) {
+        } else if (get(userMovingStore) && !moving) {
             this.stop();
             this.emit(hasMovedEventName, {
                 moving,
-                direction: this.previousDirection,
+                direction: direction,
                 x: this.x,
                 y: this.y,
                 oldX: x,
@@ -100,35 +95,27 @@ export class Player extends Character {
             });
         }
 
-        if (direction !== null) {
-            this.previousDirection = direction;
-        }
-
-        this.wasMoving = moving;
         userMovingStore.set(moving);
     }
 
-    private followStep(activeEvents: ActiveEventList, delta: number) {
+    private followStep(delta: number) {
-        let moving = false;
+        const player = this.scene.findPlayer((p) => p.PlayerValue === get(followUsersStore)[0]);
-
+        if (!player) {
-        if (this.follow === null) {
+            this.scene.connection?.emitFollowAbort(get(followUsersStore)[0], this.PlayerValue);
+            followStateStore.set(followStates.off);
             return;
         }
 
-        this.timeCounter += delta;
+        const xDist = player.x - this.x;
-        if (this.timeCounter < 128) {
+        const yDist = player.y - this.y;
-            return;
-        }
-        this.timeCounter = 0;
-
-        const xDist = this.follow.followPlayer.x - this.x;
-        const yDist = this.follow.followPlayer.y - this.y;
-
         const distance = Math.pow(xDist, 2) + Math.pow(yDist, 2);
 
+        let moving = false;
+        let direction = this.lastDirection;
         if (distance < 2000) {
             this.stop();
         } else {
+            moving = true;
             const moveAmount = 9 * 20;
             const xDir = xDist / Math.sqrt(distance);
             const yDir = yDist / Math.sqrt(distance);
@@ -136,46 +123,24 @@ export class Player extends Character {
             this.move(xDir * moveAmount, yDir * moveAmount);
 
             if (Math.abs(xDist) > Math.abs(yDist)) {
-                if (xDist < 0) {
+                direction = xDist < 0 ? PlayerAnimationDirections.Left : PlayerAnimationDirections.Right;
-                    this.follow.direction = PlayerAnimationDirections.Left;
             } else {
-                    this.follow.direction = PlayerAnimationDirections.Right;
+                direction = yDist < 0 ? PlayerAnimationDirections.Up : PlayerAnimationDirections.Down;
             }
-            } else {
-                if (yDist < 0) {
-                    this.follow.direction = PlayerAnimationDirections.Up;
-                } else {
-                    this.follow.direction = PlayerAnimationDirections.Down;
-                }
-            }
-
-            moving = true;
         }
 
         this.emit(hasMovedEventName, {
             moving: moving,
-            direction: this.follow.direction,
+            direction: direction,
             x: this.x,
             y: this.y,
         });
 
-        this.previousDirection = this.follow.direction;
-
-        this.wasMoving = moving;
         userMovingStore.set(moving);
     }
 
     public enableFollowing() {
-        Array.from(this.scene.MapPlayersByKey.values()).forEach((player) => {
-            if (player.PlayerValue !== get(followUsersStore)[0]) {
-                return;
-            }
-            this.follow = {
-                followPlayer: player,
-                direction: this.previousDirection,
-            };
         followStateStore.set(followStates.active);
-        });
     }
 
     public moveUser(delta: number): void {
@@ -193,13 +158,9 @@ export class Player extends Character {
         }
 
         if ((state !== followStates.active && state !== followStates.ending) || role !== followRoles.follower) {
-            this.inputStep(activeEvents, delta);
+            this.inputStep(activeEvents);
         } else {
-            this.followStep(activeEvents, delta);
+            this.followStep(delta);
         }
     }
-
-    public isMoving(): boolean {
-        return this.wasMoving;
-    }
 }