Mercurial > skaapsteker
changeset 624:83569a6b3ad8
Fix StartingDoorway and velocity clamping.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Sat, 07 May 2011 14:40:04 +0200 |
| parents | 65881746dc20 |
| children | 65882990b9cf |
| files | skaapsteker/physics.py skaapsteker/sprites/base.py |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/skaapsteker/physics.py Sat May 07 13:59:00 2011 +0200 +++ b/skaapsteker/physics.py Sat May 07 14:40:04 2011 +0200 @@ -54,11 +54,10 @@ def deltav(self, dv): - velocity = cadd(self.velocity, dv) - self.velocity = cclamp(velocity, self.terminal_velocity) - + self.velocity = cadd(self.velocity, dv) def deltap(self, dt): + self.velocity = cclamp(self.velocity, self.terminal_velocity) old_pos = self.rect.center self._float_pos = cadd(self._float_pos, cmul(self.velocity, dt)) self.rect.center = cint(self._float_pos)
--- a/skaapsteker/sprites/base.py Sat May 07 13:59:00 2011 +0200 +++ b/skaapsteker/sprites/base.py Sat May 07 14:40:04 2011 +0200 @@ -437,6 +437,9 @@ image_file = 'torii.png' + def __init__(self, pos, **opts): + super(Doorway, self).__init__(pos, **opts) + self.tile_pos = pos def setup_image_data(self, pos, **opts): super(Doorway, self).setup_image_data(pos, **opts) @@ -444,16 +447,17 @@ self.rect = self.image.get_rect(midbottom=self.rect.midbottom) self.collide_rect = self.rect - def setup(self, facing, leadsto): self.facing = facing self.leadsto = leadsto - def player_action(self, player): from .. import engine, levelscene engine.ChangeScene.post((levelscene.LevelScene, self.leadsto)) + def get_tile_pos(self): + return self.tile_pos + class CelestialDoorway(Doorway): @@ -476,7 +480,10 @@ def setup(self, facing): - Doorway.setup(self, facing, None) + super(StartingDoorway, self).setup(facing, None) + + def player_action(self, player): + pass class Skeleton(GameSprite):