# HG changeset patch # User Emmanuel Gil Peyrot # Date 1321991495 -3600 # Node ID f5be441d2c42dd13fb775a082f580a4446895f0c # Parent 005ea47e11e05961c708366e5eb508408a65854b Implement collidable boolean of enemy. diff --git a/pytouhou/game/enemy.py b/pytouhou/game/enemy.py --- a/pytouhou/game/enemy.py +++ b/pytouhou/game/enemy.py @@ -39,6 +39,7 @@ class Enemy(object): self.life = 1 if life < 0 else life self.max_life = life self.touchable = True + self.collidable = True self.damageable = True self.death_flags = 0 self.boss = False @@ -250,7 +251,7 @@ class Enemy(object): self.drop_particles(1, 1) # Check for enemy-player collisions - if self.touchable: + if self.collidable: for player in self._game.players: if not player.state.touchable: continue