Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into webrtc

Browse source 
# Conflicts:
#	front/src/Phaser/Player/Player.ts
This commit is contained in:
gparant 2020-05-02 20:51:49 +02:00
commit 0d6ce5e6e9
3 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,11 @@
import {getPlayerAnimations, playAnimation, PlayerAnimationNames} from "./Animation";
import {GameSceneInterface, Textures} from "../Game/GameScene";
import {ConnexionInstance} from "../Game/GameManager";
import {MessageUserPositionInterface} from "../../Connexion";
import {ActiveEventList, UserInputEvent, UserInputManager} from "../UserInput/UserInputManager";
import {PlayableCaracter} from "../Entity/PlayableCaracter";
export const hasMovedEventName = "hasMoved";
export interface CurrentGamerInterface extends PlayableCaracter{
userId : string;
PlayerValue : string;
@ -89,18 +90,11 @@ export class Player extends PlayableCaracter implements CurrentGamerInterface, G
direction = PlayerAnimationNames.None;
this.stop();
}
if(this.previousMove !== PlayerAnimationNames.None || direction !== PlayerAnimationNames.None){
this.sharePosition(direction);
}
this.previousMove = direction;
}
private sharePosition(direction: string) {
if (ConnexionInstance) {
ConnexionInstance.sharePosition(this.x, this.y, direction);
}
this.emit(hasMovedEventName, {direction, x: this.x, y: this.y});
}
//todo: put this method into the NonPlayer class instead
updatePosition(MessageUserPosition: MessageUserPositionInterface) {
playAnimation(this, MessageUserPosition.position.direction);
this.setX(MessageUserPosition.position.x);