X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=65d234a699f267754d3ece0253bfda4185ff1878;hp=a0ef92ccdd0952087b9e79f7b665dbd352e23616;hb=5733428dbb7033a5827013cd1f55894a99708bab;hpb=97141cbfbbae18076db7a1185ea46f23c412b620

diff --git a/bulletml/impl.py b/bulletml/impl.py
index a0ef92c..65d234a 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.
@@ -18,7 +18,7 @@ class Action(object):
     def __init__(self, owner, parent, actions, params, rank):
         self.actions = actions
         self.parent = parent
-        self.repeat = 0
+        self.repeat = 1
         self.wait_frames = 0
         self.speed = 0
         self.speed_frames = 0
@@ -37,16 +37,23 @@ class Action(object):
         self.params = params
         self.rank = rank
         self.pc = -1
+        self.finished = False
         if parent:
             self.copy_state(parent)
 
+    def __repr__(self):
+        return "%s(pc=%r, actions=%r)" % (
+            type(self).__name__, self.pc, self.actions)
+
     def vanish(self):
+        """End this action and its parents."""
         if self.parent:
             self.parent.vanish()
-        self.repeat = 0
         self.pc = None
+        self.finished = True
 
     def copy_state(self, other):
+        """Copy fire/movement state from other to self."""
         self.direction_frames = other.direction_frames
         self.direction = other.direction
         self.aiming = other.aiming
@@ -59,11 +66,13 @@ class Action(object):
         self.previous_fire_speed = other.previous_fire_speed
 
     def step(self):
+        """Advance by one frame."""
         created = []
 
         if self.speed_frames > 0:
             self.speed_frames -= 1
             self.owner.speed += self.speed
+
         if self.direction_frames > 0:
             self.direction_frames -= 1
             if self.direction_frames <= 0:
@@ -71,6 +80,7 @@ class Action(object):
                     self.owner.direction += self.owner.aim
             else:
                 self.owner.direction += self.direction
+
         if self.accel_frames > 0:
             self.accel_frames -= 1
             self.owner.mx += self.mx
@@ -85,13 +95,15 @@ class Action(object):
 
         while True:
             self.pc += 1
+
             if self.pc >= len(self.actions):
                 self.repeat -= 1
                 if self.repeat <= 0:
                     self.pc = None
+                    self.finished = True
                     if self.parent is not None:
                         self.parent.copy_state(self)
-                    self.owner.replace(self, self.parent)
+                        self.owner.replace(self, self.parent)
                     break
                 else:
                     self.pc = 0
@@ -228,9 +240,9 @@ class Bullet(object):
         self.actions = []
         if rank is None:
             rank = parent.rank if parent else 0.5
-        for action, params in actions:
-            self.actions.append(
-                Action(self, parent, 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, "
@@ -246,11 +258,15 @@ class Bullet(object):
             return self.direction
         else:
             return math.degrees(
-                math.atan2(self.target.x - self.x, self.target.y - self.y))
+                math.atan2(self.target.x - self.x, self.y - self.target.y))
 
     @property
     def finished(self):
-        return self.vanished and not self.actions
+        """Check if this bullet is finished running."""
+        for action in self.actions:
+            if not action.finished:
+                return False
+        return self.vanished
 
     def vanish(self):
         """Vanish this bullet and stop all actions."""
@@ -260,6 +276,7 @@ class Bullet(object):
         self.actions = []
 
     def replace(self, old, new):
+        """Replace an active action with another."""
         try:
             idx = self.actions.index(old)
         except ValueError:
@@ -268,22 +285,24 @@ class Bullet(object):
             self.actions[idx] = new
 
     def step(self):
+        """Advance by one frame."""
         created = []
 
-        self.actions = filter(None, self.actions)
-
         for action in self.actions:
             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
+        self.y += self.my - math.cos(direction) * self.speed
 
         return created
 
     @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)