Mercurial > skaapsteker
changeset 438:8ee16cec0f9f
Add check for whether we're still flying or invisible to recharge meters.
| author | Simon Cross <hodgestar@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 19:24:40 +0200 |
| parents | 8fc3f8894d0f |
| children | 400d68993977 |
| files | skaapsteker/sprites/player.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/skaapsteker/sprites/player.py Sat Apr 09 19:20:14 2011 +0200 +++ b/skaapsteker/sprites/player.py Sat Apr 09 19:24:40 2011 +0200 @@ -398,10 +398,10 @@ return min((time.time() - self._recharge_timers[attack][0]) / recharge_time, 1) def discharge_level(self, tail): - if tail == 'invisibility' and hasattr(self, '_invisibility_start_time'): + if tail == 'invisibility' and hasattr(self, '_invisibility_start_time') and self.invisible: start_time = self._invisibility_start_time max_time = self._max_invisibility_time - elif tail == 'flight' and hasattr(self, '_flight_start_time'): + elif tail == 'flight' and hasattr(self, '_flight_start_time') and self.flying: start_time = self._flight_start_time max_time = self._max_flight_time else: