Bug 738999: Prevent dying mobs from reappearing

mozilla · Mar 24, 2012 · e41fa31 · e41fa31
1 parent 4c23f09
commit e41fa31
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 38 deletions.
diff --git a/client/js/camera.js b/client/js/camera.js
@@ -57,8 +57,12 @@ define(function() {
         },
 
         isVisible: function(entity) {
-            if(entity.gridY >= this.gridY && entity.gridY < this.gridY + this.gridH
-            && entity.gridX >= this.gridX && entity.gridX < this.gridX + this.gridW) {
+            return this.isVisiblePosition(entity.gridX, entity.gridY);
+        },
+
+        isVisiblePosition: function(x, y) {
+            if(y >= this.gridY && y < this.gridY + this.gridH
+            && x >= this.gridX && x < this.gridX + this.gridW) {
                 return true;
             } else {
                 return false;

diff --git a/client/js/character.js b/client/js/character.js
@@ -67,16 +67,18 @@ define(['entity', 'transition', 'timer'], function(Entity, Transition, Timer) {
     	animate: function(animation, speed, count, onEndCount) {
     	    var oriented = ['atk', 'walk', 'idle'];
     	        o = this.orientation;
-
-        	this.flipSpriteX = false;
-    	    this.flipSpriteY = false;
+
+            if(!(this.currentAnimation && this.currentAnimation.name === "death")) { // don't change animation if the character is dying
+            	this.flipSpriteX = false;
+        	    this.flipSpriteY = false;
 
-    	    if(_.indexOf(oriented, animation) >= 0) {
-    	        animation += "_" + (o === Types.Orientations.LEFT ? "right" : Types.getOrientationAsString(o));
-    	        this.flipSpriteX = (this.orientation === Types.Orientations.LEFT) ? true : false;
-    	    }
+        	    if(_.indexOf(oriented, animation) >= 0) {
+        	        animation += "_" + (o === Types.Orientations.LEFT ? "right" : Types.getOrientationAsString(o));
+        	        this.flipSpriteX = (this.orientation === Types.Orientations.LEFT) ? true : false;
+        	    }
 
-    		this.setAnimation(animation, speed, count, onEndCount);
+        		this.setAnimation(animation, speed, count, onEndCount);
+        	}
     	},
 
         turnTo: function(orientation) {

diff --git a/client/js/game.js b/client/js/game.js
@@ -1109,40 +1109,44 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
                                     });
 
                                     entity.onStep(function() {
-                                        self.registerEntityDualPosition(entity);
-
-                                        entity.forEachAttacker(function(attacker) {
-                                            if(attacker.isAdjacent(attacker.target)) {
-                                                attacker.lookAtTarget();
-                                            } else {
-                                                attacker.follow(entity);
-                                            }
-                                        });
+                                        if(!entity.isDying) {
+                                            self.registerEntityDualPosition(entity);
+
+                                            entity.forEachAttacker(function(attacker) {
+                                                if(attacker.isAdjacent(attacker.target)) {
+                                                    attacker.lookAtTarget();
+                                                } else {
+                                                    attacker.follow(entity);
+                                                }
+                                            });
+                                        }
                                     });
 
                                     entity.onStopPathing(function(x, y) {
-                                        if(entity.hasTarget() && entity.isAdjacent(entity.target)) {
-                                            entity.lookAtTarget();
-                                        }
+                                        if(!entity.isDying) {
+                                            if(entity.hasTarget() && entity.isAdjacent(entity.target)) {
+                                                entity.lookAtTarget();
+                                            }
 
-                                        if(entity instanceof Player) {
-                                            var gridX = entity.destination.gridX,
-                                                gridY = entity.destination.gridY;
-
-                                            if(self.map.isDoor(gridX, gridY)) {
-                                                var dest = self.map.getDoorDestination(gridX, gridY);
-                                                entity.setGridPosition(dest.x, dest.y);
+                                            if(entity instanceof Player) {
+                                                var gridX = entity.destination.gridX,
+                                                    gridY = entity.destination.gridY;
+
+                                                if(self.map.isDoor(gridX, gridY)) {
+                                                    var dest = self.map.getDoorDestination(gridX, gridY);
+                                                    entity.setGridPosition(dest.x, dest.y);
+                                                }
                                             }
-                                        }
 
-                                        entity.forEachAttacker(function(attacker) {
-                                            if(!attacker.isAdjacentNonDiagonal(entity) && attacker.id !== self.playerId) {
-                                                attacker.follow(entity);
-                                            }
-                                        });
+                                            entity.forEachAttacker(function(attacker) {
+                                                if(!attacker.isAdjacentNonDiagonal(entity) && attacker.id !== self.playerId) {
+                                                    attacker.follow(entity);
+                                                }
+                                            });
 
-                                        self.unregisterEntityPosition(entity);
-                                        self.registerEntityPosition(entity);
+                                            self.unregisterEntityPosition(entity);
+                                            self.registerEntityPosition(entity);
+                                        }
                                     });
 
                                     entity.onRequestPath(function(x, y) {
@@ -1169,6 +1173,7 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
                                             self.deathpositions[entity.id] = {x: entity.gridX, y: entity.gridY};
                                         }
 
+                                        entity.isDying = true;
                                         entity.setSprite(self.sprites[entity instanceof Mobs.Rat ? "rat" : "death"]);
                                         entity.animate("death", 120, 1, function() {
                                             log.info(entity.id + " was removed");

diff --git a/client/js/renderer.js b/client/js/renderer.js
@@ -214,7 +214,7 @@ function(Camera, Item, Character, Player, Timer) {
             if(grid && this.game.debugPathing) {
                 for(var y=0; y < grid.length; y += 1) {
                     for(var x=0; x < grid[y].length; x += 1) {
-                        if(grid[y][x] === 1) {
+                        if(grid[y][x] === 1 && this.game.camera.isVisiblePosition(x, y)) {
                             this.drawCellHighlight(x, y, "rgba(50, 50, 255, 0.5)");
                         }
                     }