Bug 738395: Characters should never get stuck if diagonally adjacent …

…to their target
kamaliang · Mar 24, 2012 · c8d5679 · c8d5679
1 parent 3f97029
commit c8d5679
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/client/js/entity.js b/client/js/entity.js
@@ -211,6 +211,10 @@ define(function() {
             return result;
         },
 
+        isDiagonallyAdjacent: function(entity) {
+            return this.isAdjacent(entity) && !this.isAdjacentNonDiagonal(entity);
+        },
+
         forEachAdjacentNonDiagonalPosition: function(callback) {
             callback(this.gridX - 1, this.gridY, Types.Orientations.LEFT);
             callback(this.gridX, this.gridY - 1, Types.Orientations.UP);

diff --git a/client/js/game.js b/client/js/game.js
@@ -2032,7 +2032,12 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
 
                 if(character.canAttack(time)) {
                     if(!isMoving) { // don't hit target if moving to a different tile.
+                        if(character.hasTarget() && character.getOrientationTo(character.target) !== character.orientation) {
+                            character.lookAtTarget();
+                        }
+
                         character.hit();
+
                         if(character.id === this.playerId) {
                             this.client.sendHit(character.target);
                         }
@@ -2045,6 +2050,13 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
                             this.client.sendHurt(character);
                         }
                     }
+                } else {
+                    if(character.hasTarget()
+                    && character.isDiagonallyAdjacent(character.target)
+                    && character.target instanceof Player
+                    && !character.target.isMoving()) {
+                        character.follow(character.target);
+                    }
                 }
             }
         },