From b391ee271ac515aa9e4d585b0e13b20edbc5aade Mon Sep 17 00:00:00 2001
From: gparant <g.parant@thecodingmachine.com>
Date: Mon, 13 Apr 2020 15:41:11 +0200
Subject: [PATCH] Fix move & stop player

---
 front/src/Phaser/Entity/PlayableCaracter.ts | 14 +++++++++++---
 front/src/Phaser/Player/Player.ts           |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/front/src/Phaser/Entity/PlayableCaracter.ts b/front/src/Phaser/Entity/PlayableCaracter.ts
index d2a72b14..66ddd579 100644
--- a/front/src/Phaser/Entity/PlayableCaracter.ts
+++ b/front/src/Phaser/Entity/PlayableCaracter.ts
@@ -24,11 +24,14 @@ export class PlayableCaracter extends Phaser.Physics.Arcade.Sprite {
         //todo improve animations to better account for diagonal movement
         if (this.body.velocity.x > 0) { //moving right
             this.play(PlayerAnimationNames.WalkRight, true);
-        } else if (this.body.velocity.x < 0) { //moving left
+        }
+        if (this.body.velocity.x < 0) { //moving left
             this.anims.playReverse(PlayerAnimationNames.WalkLeft, true);
-        } else if (this.body.velocity.y < 0) { //moving up
+        }
+        if (this.body.velocity.y < 0) { //moving up
             this.play(PlayerAnimationNames.WalkUp, true);
-        } else if (this.body.velocity.y > 0) { //moving down
+        }
+        if (this.body.velocity.y > 0) { //moving down
             this.play(PlayerAnimationNames.WalkDown, true);
         }
 
@@ -36,6 +39,11 @@ export class PlayableCaracter extends Phaser.Physics.Arcade.Sprite {
             this.bubble.moveBubble(this.x, this.y);
         }
     }
+
+    stop(){
+        this.setVelocity(0, 0);
+        this.play(PlayerAnimationNames.None, true);
+    }
     
     say(text: string) {
         if (this.bubble) return;
diff --git a/front/src/Phaser/Player/Player.ts b/front/src/Phaser/Player/Player.ts
index d426b3d2..d0169297 100644
--- a/front/src/Phaser/Player/Player.ts
+++ b/front/src/Phaser/Player/Player.ts
@@ -95,7 +95,7 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
         }
         if (!haveMove) {
             direction = PlayerAnimationNames.None;
-            this.move(0, 0)
+            this.stop();
         }
         this.sharePosition(direction);
         this.CameraManager.moveCamera(this);