X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=fcb3aab34ea99da4e76f2c6fdee77b1fd7ded9ce;hp=9df26c62a865f555458c8e0a1acfb6e16ee2bddc;hb=c1021a77feb2c7b29572f77d83f81840dd339d91;hpb=2d1ad947cd9ebb183d63b062132fa4df11e8bc61

diff --git a/bulletml/impl.py b/bulletml/impl.py
index 9df26c6..fcb3aab 100644
--- a/bulletml/impl.py
+++ b/bulletml/impl.py
@@ -17,19 +17,16 @@ PI_2 = math.pi * 2
 class Action(object):
     """Running action implementation."""
 
-    def __init__(self, owner, parent, actions, params, rank):
+    def __init__(self, owner, parent, actions, params, rank, repeat=1):
         self.actions = actions
         self.parent = parent
-        self.repeat = 1
+        self.repeat = repeat
         self.wait_frames = 0
         self.speed = 0
         self.speed_frames = 0
-        self.aim_direction = 0
         self.direction = 0
         self.direction_frames = 0
         self.aiming = False
-        self.aim_mx = 0
-        self.aim_my = 0
         self.mx = 0
         self.my = 0
         self.owner = owner
@@ -76,10 +73,13 @@ class Action(object):
             self.owner.speed += self.speed
 
         if self.direction_frames > 0:
+            # The Noiz implementation was a little weird here, I think
+            # there was a bug in it that prevented it from working if
+            # the frame count was 1. I'm still not sure what the aim
+            # check is supposed to do, exactly.
             self.direction_frames -= 1
-            if self.direction_frames <= 0:
-                if self.aiming:
-                    self.owner.direction += self.owner.aim
+            if self.aiming and self.direction_frames <= 0:
+                self.owner.direction += self.owner.aim
             else:
                 self.owner.direction += self.direction
 
@@ -98,7 +98,9 @@ class Action(object):
         while True:
             self.pc += 1
 
-            if self.pc >= len(self.actions):
+            try:
+                action = self.actions[self.pc]
+            except IndexError:
                 self.repeat -= 1
                 if self.repeat <= 0:
                     self.pc = None
@@ -109,13 +111,12 @@ class Action(object):
                     break
                 else:
                     self.pc = 0
-
-            action = self.actions[self.pc]
+                    action = self.actions[self.pc]
 
             if isinstance(action, parser.Repeat):
                 repeat, (actions, params) = action(self.params, self.rank)
-                child = Action(self.owner, self, actions, params, self.rank)
-                child.repeat = repeat
+                child = Action(
+                    self.owner, self, actions, params, self.rank, repeat)
                 self.owner.replace(self, child)
                 created.extend(child.step())
                 break
@@ -141,7 +142,6 @@ class Action(object):
                     direction = self.owner.aim
                 self.previous_fire_direction = direction
 
-
                 if speed:
                     speed, type = speed
                     if type == "sequence":
@@ -176,15 +176,12 @@ class Action(object):
                 self.direction_frames = frames
                 self.aiming = False
                 if type == "sequence":
-                    self.aiming = False
                     self.direction = direction
                 else:
                     if type == "absolute":
-                        self.aiming = False
                         self.direction = (
                             direction - self.owner.direction) % PI_2
                     elif type == "relative":
-                        self.aiming = False
                         self.direction = direction
                     else:
                         self.aiming = True
@@ -193,9 +190,9 @@ class Action(object):
                             + self.owner.aim
                             - self.owner.direction) % PI_2
 
-                    while self.direction > math.pi:
+                    if self.direction > math.pi:
                         self.direction -= PI_2
-                    while self.direction < -math.pi:
+                    if self.direction < -math.pi:
                         self.direction += PI_2
                     self.direction /= self.direction_frames
 
@@ -242,18 +239,17 @@ class Bullet(object):
         self.speed = speed
         self.vanished = False
         self.target = target
-        self.actions = []
         if rank is None:
             rank = parent.rank if parent else 0.5
         # New bullets reset the parent hierarchy.
-        self.actions = [Action(self, None, action, params, rank)
-                        for action, params in actions]
+        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, "
                 "actions=%r, target=%r, vanished=%r)") % (
             type(self).__name__, self.x, self.y, (self.mx, self.my),
-            self.direction, self.speed, self.actions, self.target,
+            self.direction, self.speed, self._actions, self.target,
             self.vanished)
 
     @property
@@ -266,10 +262,15 @@ class Bullet(object):
 
     @property
     def finished(self):
-        """Check if this bullet is finished running."""
+        """Check if this bullet is finished running.
+
+        If this is true, the bullet should be removed from the screen.
+        (You will probably want to cull it under other circumstances
+        as well).
+        """
         if not self.vanished:
             return False
-        for action in self.actions:
+        for action in self._actions:
             if not action.finished:
                 return False
         return True
@@ -277,24 +278,28 @@ class Bullet(object):
     def vanish(self):
         """Vanish this bullet and stop all actions."""
         self.vanished = True
-        for action in self.actions:
+        for action in self._actions:
             action.vanish()
-        self.actions = []
+        self._actions = []
 
     def replace(self, old, new):
         """Replace an active action with another."""
         try:
-            idx = self.actions.index(old)
+            idx = self._actions.index(old)
         except ValueError:
             pass
         else:
-            self.actions[idx] = new
+            self._actions[idx] = new
 
     def step(self):
-        """Advance by one frame."""
+        """Advance by one frame.
+
+        This updates the direction, speed, x, y, px, and py members,
+        and may set the vanished flag.
+        """
         created = []
 
-        for action in self.actions:
+        for action in self._actions:
             created.extend(action.step())
 
         self.px = self.x
@@ -310,4 +315,3 @@ class Bullet(object):
         """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)
-