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

Close #46 : AI no longer gets 'stuck' on paths with visible state change

Browse Source
This commit is contained in:
Andrew Kesterson
2014-07-07 21:34:56 -07:00
parent 870c00d537
commit b294db5943
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
moonlight/src/AISprite.js
View File

@@ -342,8 +342,9 @@ var AISprite = function(game, x, y, key, frame) {
this._object.animations.play(getMovingAnimationName(this._object)); this._object.animations.play(getMovingAnimationName(this._object));
}, tween); }, tween);
tween.onComplete.add(function() { tween.onComplete.add(function() {
if ( this._object.resetPathOnCollision() == true ) if ( this._object.resetPathOnCollision() == true ) {
return; return;
}
this._object.path_index += 1; this._object.path_index += 1;
setMovingState(this._object, getFaceState(this._object)); setMovingState(this._object, getFaceState(this._object));
this._object.animations.play(getMovingAnimationName(this._object)); this._object.animations.play(getMovingAnimationName(this._object));
@@ -367,6 +368,7 @@ var AISprite = function(game, x, y, key, frame) {
if ( game.physics.arcade.overlap(spr, this) ) { if ( game.physics.arcade.overlap(spr, this) ) {
var last = this.path[this.path.length - 1]; var last = this.path[this.path.length - 1];
this.path_tween_stop(); this.path_tween_stop();
this.path_purge();
hasBeenReset = true; hasBeenReset = true;
} }
}, this); }, this);
@@ -379,6 +381,7 @@ var AISprite = function(game, x, y, key, frame) {
x.stop(); x.stop();
game.tweens.remove(x); game.tweens.remove(x);
}, this); }, this);
this.path_tweens = [];
} }
this.turnRandomDirection = function() { this.turnRandomDirection = function() {
@@ -461,7 +464,7 @@ var AISprite = function(game, x, y, key, frame) {
STATE_MOVING | STATE_RUNNING, STATE_MOVING | STATE_RUNNING,
false, false,
1000, 1000,
false); true);
} else { } else {
this.chasetarget(player, this.chasetarget(player,
STATE_ALERTED, STATE_ALERTED,
@@ -683,7 +686,7 @@ var AISprite = function(game, x, y, key, frame) {
} else { } else {
this.action_reportplayer(); this.action_reportplayer();
} }
} else if ( hasAnyState(this, [STATE_CONCERNED, STATE_LOSTHIM]) ) { } else if ( hasState(this, [STATE_CONCERNED]) ) {
this.action_huntplayer(); this.action_huntplayer();
} else { } else {
this.action_wander(); this.action_wander();