andrew/moonlight-skulk
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI Sprite's path_tween speed should match their movement state for that tween

Browse Source
This commit is contained in:
Andrew Kesterson
2014-06-26 07:39:52 -07:00
parent 76b4cfd1bd
commit 4e5ec4b0ae
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
moonlight/src/AISprite.js
View File

@@ -261,34 +261,37 @@ var AISprite = function(game, x, y, key, frame) {
this.path_tween_start = function(movingstate) this.path_tween_start = function(movingstate)
{ {
movingState = (typeof movementState == undefined ? movementState : (STATE_MOVING | STATE_RUNNING)); var movingstate = (typeof movingstate == 'undefined' ? (STATE_MOVING | STATE_RUNNING) : movingstate);
this.path_tweens = []; this.path_tweens = [];
prevpos = [this.x, this.y] prevpos = [this.x, this.y]
for ( var i = 0; for ( var i = 0;
i < this.path.length ; i < this.path.length ;
i++ ) { i++ ) {
pl = this.path[i]; pl = this.path[i];
movingstate = STATE_MOVING | STATE_RUNNING; var stepstate = movingstate;
if ( pl.end.x < prevpos[0]) { if ( pl.end.x < prevpos[0]) {
movingstate = movingstate | STATE_FACE_LEFT; stepstate = stepstate | STATE_FACE_LEFT;
} else if ( pl.end.x > prevpos[0] ) { } else if ( pl.end.x > prevpos[0] ) {
movingstate = movingstate | STATE_FACE_RIGHT; stepstate = stepstate | STATE_FACE_RIGHT;
} }
if ( pl.end.y < prevpos[1] ) { if ( pl.end.y < prevpos[1] ) {
movingstate = movingstate | STATE_FACE_UP; stepstate = stepstate | STATE_FACE_UP;
} else if ( pl.end.y > prevpos[1] ) { } else if ( pl.end.y > prevpos[1] ) {
movingstate = movingstate | STATE_FACE_DOWN; stepstate = stepstate | STATE_FACE_DOWN;
} }
prevpos = [pl.end.x, pl.end.y]; prevpos = [pl.end.x, pl.end.y];
tween = game.add.tween(this); tween = game.add.tween(this);
tween.movingstate = movingstate; tween.stepstate = stepstate;
this.path_tweens.push(tween); this.path_tweens.push(tween);
var tweenspeed = TWEEN_DURATION_PERPIXEL_WALKING;
if ( (stepstate & STATE_RUNNING) == STATE_RUNNING )
tweenspeed = TWEEN_DURATION_PERPIXEL_RUNNING;
tween.to( tween.to(
{x: (pl.end.x), y: (pl.end.y)}, {x: (pl.end.x), y: (pl.end.y)},
(TWEEN_DURATION_PERPIXEL_RUNNING * pl.length), (tweenspeed * pl.length),
null); null);
tween.onStart.add(function() { tween.onStart.add(function() {
setMovingState(this._object, this.movingstate); setMovingState(this._object, this.stepstate);
this._object.animations.play(getMovingAnimationName(this._object)); this._object.animations.play(getMovingAnimationName(this._object));
}, tween); }, tween);
tween.onComplete.add(function() { tween.onComplete.add(function() {