From f3fdcba16ab8fa1910f635530245b3607f7e60d2 Mon Sep 17 00:00:00 2001
From: kharhamel <oognic@gmail.com>
Date: Sun, 19 Apr 2020 16:48:47 +0200
Subject: [PATCH] removed the rock

---
 front/dist/resources/objects/rockSprite.png | Bin 3659 -> 0 bytes
 front/src/Phaser/Game/GameManager.ts        |   2 --
 front/src/Phaser/Game/GameScene.ts          |   6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 front/dist/resources/objects/rockSprite.png

diff --git a/front/dist/resources/objects/rockSprite.png b/front/dist/resources/objects/rockSprite.png
deleted file mode 100644
index 40820abd0ee4564498e779462128d879c48dae1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3659
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
YM$joE+UD)Q$@RdIgSOVi2i$4@0|kzR_y7O^

diff --git a/front/src/Phaser/Game/GameManager.ts b/front/src/Phaser/Game/GameManager.ts
index d03a3152..1859208c 100644
--- a/front/src/Phaser/Game/GameManager.ts
+++ b/front/src/Phaser/Game/GameManager.ts
@@ -46,8 +46,6 @@ export class GameManager implements GameManagerInterface {
 
     /**
      * Permit to create player in started room
-     * @param RoomId
-     * @param UserId
      */
     createCurrentPlayer(): void {
         //Get started room send by the backend
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index a08c8fd2..bb6e79de 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -55,7 +55,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
             })
         });
         this.load.tilemapTiledJSON(Textures.Map, mapUrl);
-        this.load.image(Textures.Rock, 'resources/objects/rockSprite.png');
         this.load.spritesheet(Textures.Player,
             'resources/characters/pipoya/Male 01-1.png',
             { frameWidth: 32, frameHeight: 32 }
@@ -251,8 +250,9 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
         player.updatePosition(MessageUserPosition);
 
         //init colision
-        this.physics.add.collider(this.CurrentPlayer, player, (CurrentPlayer: CurrentGamerInterface, MapPlayer: GamerInterface) => {
-            CurrentPlayer.say("Hello, how are you ? ");
+        this.physics.add.overlap(this.CurrentPlayer, player, (CurrentPlayer: CurrentGamerInterface, MapPlayer: GamerInterface) => {
+            CurrentPlayer.say("Salut ça va?");
+            MapPlayer.say("Oui et toi?");
         });
     }
 }