_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'github.com/master' into webrtc

Browse Source 
# Conflicts:
#	back/src/Model/Group.ts
#	back/src/Model/World.ts
This commit is contained in:
gparant
2020-05-02 00:36:04 +02:00
parent c7f8f92e85 d2f94e9406
commit aff77fe074
9 changed files with 258 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/Phaser/Player/Player.ts
+13 -15
View File
@@ -67,27 +67,25 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
let speedMultiplier = activeEvents.get(UserInputEvent.SpeedUp) ? 25 : 9;
let moveAmount = speedMultiplier * delta;
let x = 0;
let y = 0;
if (activeEvents.get(UserInputEvent.MoveUp)) {
this.move(0, -moveAmount);
haveMove = true;
y = - moveAmount;
direction = PlayerAnimationNames.WalkUp;
}
if (activeEvents.get(UserInputEvent.MoveLeft)) {
this.move(-moveAmount, 0);
haveMove = true;
direction = PlayerAnimationNames.WalkLeft;
}
if (activeEvents.get(UserInputEvent.MoveDown)) {
this.move(0, moveAmount);
haveMove = true;
} else if (activeEvents.get(UserInputEvent.MoveDown)) {
y = moveAmount;
direction = PlayerAnimationNames.WalkDown;
}
if (activeEvents.get(UserInputEvent.MoveRight)) {
this.move(moveAmount, 0);
haveMove = true;
if (activeEvents.get(UserInputEvent.MoveLeft)) {
x = -moveAmount;
direction = PlayerAnimationNames.WalkLeft;
} else if (activeEvents.get(UserInputEvent.MoveRight)) {
x = moveAmount;
direction = PlayerAnimationNames.WalkRight;
}
if (!haveMove) {
if (x !== 0 || y !== 0) {
this.move(x, y);
} else {
direction = PlayerAnimationNames.None;
this.stop();
}