lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge branch 'refactoring_messages' into feature/login-page

Browse source 
# Conflicts:
#	front/src/Phaser/Player/Player.ts
This commit is contained in:
gparant 2020-05-06 01:58:04 +02:00
parent 5a6415607d 86abdfe30b
commit 4e04357b71
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
front/src/Phaser/Entity/PlayableCaracter.ts
View file

@ -77,7 +77,7 @@ export class PlayableCaracter extends Phaser.Physics.Arcade.Sprite {
stop(){
this.setVelocity(0, 0);
this.play(PlayerAnimationNames.None, true);
this.anims.stop();
}
say(text: string) {

14
front/src/Phaser/Player/Player.ts
View file

@ -59,7 +59,6 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
moveUser(delta: number): void {
//if user client on shift, camera and player speed
let haveMove = false;
let direction = null;
let activeEvents = this.userInputManager.getEventListForGameTick();
@ -84,11 +83,18 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
}
if (x !== 0 || y !== 0) {
this.move(x, y);
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y});
} else {
direction = PlayerAnimationNames.None;
this.stop();
if (this.previousMove !== PlayerAnimationNames.None) {
direction = PlayerAnimationNames.None;
this.stop();
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y});
}
}
if (direction !== null) {
this.previousMove = direction;
}
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y, frame: this.PlayerTexture});
}
//todo: put this method into the NonPlayer class instead