Mercurial > skaapsteker
comparison skaapsteker/sprites/npcs.py @ 583:194f71cc0689
don't remove kaneda from the geisha room too early (looks weird, but fixes crash)
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Sun, 10 Apr 2011 15:59:59 +0200 |
| parents | 1ccb90397c4a |
| children | 79a9b61e12ff |
comparison
equal
deleted
inserted
replaced
| 582:213f46e787c4 | 583:194f71cc0689 |
|---|---|
| 71 if not self._me.present: | 71 if not self._me.present: |
| 72 return | 72 return |
| 73 super(Kaneda, self).player_action(player) | 73 super(Kaneda, self).player_action(player) |
| 74 | 74 |
| 75 def update(self): | 75 def update(self): |
| 76 if not self._me.present and self.alive: | 76 super(Kaneda, self).update() |
| 77 if not self._me.present and self.alive and self._me.level == "tea_house": | |
| 77 self.remove() | 78 self.remove() |
| 78 if self.world.missions.kumiko_disgraced and self.alive: | 79 elif self.world.missions.kumiko_disgraced and self.alive and self._me.level == 'geisha_room': |
| 79 self.remove() | 80 self.remove() |
| 80 super(Kaneda, self).update() | |
| 81 | 81 |
| 82 | 82 |
| 83 class Tetsuo(NPC): | 83 class Tetsuo(NPC): |
| 84 image_dir = 'sprites/tetsuo' | 84 image_dir = 'sprites/tetsuo' |
| 85 | 85 |