zombie player changes humans to zombies too

krzysu · Nov 29, 2013 · 5a3fb40 · 5a3fb40
1 parent d44b8e6
commit 5a3fb40
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/app/scripts/game.js b/app/scripts/game.js
diff --git a/app/scripts/game/sprites/characters/human.coffee b/app/scripts/game/sprites/characters/human.coffee
@@ -52,6 +52,10 @@ Q.Sprite.extend "Human",
  obj.play("attack", 10)
  @play("outro")
 
+ if obj.isA("ZombiePlayer")
+ @play("outro")
+ @p.zombiePlayerSensor = true
+
  die: ->
  @destroy()
 
@@ -61,4 +65,5 @@ Q.Sprite.extend "Human",
  y: @p.y
  startLeft: randomBool
 
- zombie.p.wasHuman = true
+ if !@p.zombiePlayerSensor
+ zombie.p.wasHuman = true
diff --git a/app/scripts/game/sprites/characters/zombie_player.coffee b/app/scripts/game/sprites/characters/zombie_player.coffee
@@ -24,7 +24,7 @@ Q.Sprite.extend "ZombiePlayer",
  sheet: "zombie_player"
  sprite: "zombiePlayer"
  type: Game.SPRITE_ZOMBIE_PLAYER
- collisionMask: Game.SPRITE_TILES | Game.SPRITE_PLAYER_COLLECTIBLE
+ collisionMask: Game.SPRITE_TILES | Game.SPRITE_HUMAN
 
  @add("2d, platformerControls, animation")