X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=92982db02afd4d128f8b475b7f42937b0baabd42;hp=6fe1641c2134fe1f231c09bba9654e8711027dae;hb=ef50d69288ee60ac2a8fae2ffe5860e80299fd72;hpb=2e2790231b49d4a2ed9299825ac0cf8121a655e2 diff --git a/bulletml/impl.py b/bulletml/impl.py index 6fe1641..92982db 100644 --- a/bulletml/impl.py +++ b/bulletml/impl.py @@ -7,7 +7,7 @@ from __future__ import division import math -from bulletml import parser, errors +from bulletml import parser # TODO(jfw): This is very non-Pythonic, it's pretty much just the # BulletML reference ActionImpl translated to Python. @@ -238,9 +238,9 @@ class Bullet(object): self.actions = [] if rank is None: rank = parent.rank if parent else 0.5 - for action, params in actions: - # New bullets reset the parent hierarchy. - self.actions.append(Action(self, None, action, params, rank)) + # New bullets reset the parent hierarchy. + self.actions = [Action(self, None, action, params, rank) + for action, params in actions] def __repr__(self): return ("%s(%r, %r, accel=%r, direction=%r, speed=%r, " @@ -287,6 +287,8 @@ class Bullet(object): created.extend(action.step()) direction = math.radians(self.direction) + self.px = self.x + self.py = self.y self.x += self.mx + math.sin(direction) * self.speed self.y += self.my - math.cos(direction) * self.speed @@ -295,6 +297,7 @@ class Bullet(object): @classmethod def FromDoc(cls, doc, params=(), x=0, y=0, speed=0, direction=0, target=None, rank=0.5): + """Construct a bullet from top-level actions in a document.""" actions = [act(params, rank) for act in doc.top] return cls(x, y, direction, speed, target, actions, rank=rank)