Mercurial > nagslang
changeset 307:c2bbb1e70d6f
Rename animate to update and pass seconds, for future fun
| author | Neil Muller <drnlmuller@gmail.com> |
|---|---|
| date | Fri, 06 Sep 2013 00:32:38 +0200 |
| parents | 3118589aeb11 |
| children | 3dee86b6c216 |
| files | nagslang/enemies.py nagslang/game_object.py nagslang/render.py nagslang/screens/area.py nagslang/world.py |
| diffstat | 5 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/nagslang/enemies.py Fri Sep 06 00:20:54 2013 +0200 +++ b/nagslang/enemies.py Fri Sep 06 00:32:38 2013 +0200 @@ -110,7 +110,7 @@ self._body.apply_impulse( (dx * self.impulse_factor, dy * self.impulse_factor)) - def animate(self): + def update(self, seconds): # Calculate the step every frame if self._direction == 'away': target = self._end_pos @@ -133,7 +133,7 @@ if abs(x_step) < 1 and abs(y_step) < 1: self._switch_direction() self.set_direction(x_step, y_step) - super(PatrollingAlien, self).animate() + super(PatrollingAlien, self).update(seconds) def collide_with_protagonist(self, protagonist): protagonist.lose_health(15) @@ -193,7 +193,7 @@ self._body.apply_impulse( (dx * self.impulse_factor, dy * self.impulse_factor)) - def animate(self): + def update(self, seconds): # Calculate the step every frame # Distance to the protagonist pos = self._body.position @@ -218,7 +218,7 @@ if abs(y_step) < 0.5: y_step = 0 self.set_direction(x_step, y_step) - super(ChargingAlien, self).animate() + super(ChargingAlien, self).update(seconds) def collide_with_protagonist(self, protagonist): protagonist.lose_health(20)
--- a/nagslang/game_object.py Fri Sep 06 00:20:54 2013 +0200 +++ b/nagslang/game_object.py Fri Sep 06 00:32:38 2013 +0200 @@ -145,8 +145,8 @@ def render(self, surface): return self.renderer.render(surface) - def animate(self): - self.renderer.animate() + def update(self, seconds): + self.renderer.update(seconds) def hit(self, weapon): '''Was hit with a weapon (such as a bullet)''' @@ -357,8 +357,8 @@ ) self.physicser.apply_impulse(impulse) - def animate(self): - super(Bullet, self).animate() + def update(self, seconds): + super(Bullet, self).update(seconds) position = (self.physicser.position.x, self.physicser.position.y) r = self.get_space().segment_query(self.last_position, position) self.last_position = position
--- a/nagslang/render.py Fri Sep 06 00:20:54 2013 +0200 +++ b/nagslang/render.py Fri Sep 06 00:32:38 2013 +0200 @@ -33,7 +33,7 @@ if options.debug: self._render_shape(surface) - def animate(self): + def update(self, seconds): # Used by time animatations to advance the clock pass @@ -99,12 +99,12 @@ def get_image(self): return self._images[self._frame] - def animate(self): + def update(self, seconds): self.advance_tick() class MovementAnimatedRenderer(TimedAnimatedRenderer): - def animate(self): + def update(self, seconds): if self.game_object.is_moving: self.advance_tick() else: @@ -127,8 +127,8 @@ def render(self, surface): return self.renderer.render(surface) - def animate(self): - return self.renderer.animate() + def update(self, seconds): + return self.renderer.update(seconds) def select_renderer(self): raise NotImplementedError()
--- a/nagslang/screens/area.py Fri Sep 06 00:20:54 2013 +0200 +++ b/nagslang/screens/area.py Fri Sep 06 00:32:38 2013 +0200 @@ -199,7 +199,7 @@ super(AreaScreen, self).tick(seconds) self.tick_protagonist() for drawable in self._drawables: - drawable.animate() + drawable.update(seconds) if drawable.remove: self._drawables.remove(drawable)