X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=0c40f1ebd2596752ab10861f9042cdb6c82cfd31;hp=ea4893f42dacfaf91cc1b7bcc0693400d2d27d8e;hb=HEAD;hpb=66792ffbd26da7a4093707c58ca352dea52f643c

diff --git a/bulletml/impl.py b/bulletml/impl.py
index ea4893f..0c40f1e 100644
--- a/bulletml/impl.py
+++ b/bulletml/impl.py
@@ -4,8 +4,6 @@ from __future__ import division
 
 from math import atan2, sin, cos
 
-from bulletml import parser
-
 __all__ = ["Action", "Bullet"]
 
 class Action(object):
@@ -48,10 +46,6 @@ class Action(object):
         return "%s(pc=%r, actions=%r)" % (
             type(self).__name__, self.pc, self.actions)
 
-    def Child(self, action, params, rank, repeat=1):
-        actions, params = action(params, rank)
-        return type(self)(self, actions, params, rank, repeat)
-
     def vanish(self):
         """End this action and its parents."""
         if self.parent:
@@ -74,16 +68,14 @@ class Action(object):
 
     def step(self, owner, created):
         """Advance by one frame."""
-        s_params = self.params
-        rank = owner.rank
 
         if self.speed_frames > 0:
             self.speed_frames -= 1
             owner.speed += self.speed
 
         if self.direction_frames > 0:
-            # I'm still not sure what the aim check is supposed to do.
             self.direction_frames -= 1
+            # I'm still not sure what the aim check is supposed to do.
             if self.aiming and self.direction_frames <= 0:
                 owner.direction += owner.aim
             else:
@@ -101,6 +93,9 @@ class Action(object):
             self.wait_frames -= 1
             return
 
+        s_params = self.params
+        rank = owner.rank
+
         while True:
             self.pc += 1
 
@@ -119,13 +114,7 @@ class Action(object):
                     self.pc = 0
                     action = self.actions[self.pc]
 
-            if isinstance(action, (parser.ActionDef, parser.ActionRef)):
-                child = self.Child(action, s_params, rank)
-                owner.replace(self, child)
-                child.step(owner, created)
-                break
-
-            elif action(owner, self, s_params, rank, created):
+            if action(owner, self, s_params, rank, created):
                 break
 
 class Bullet(object):
@@ -142,9 +131,11 @@ class Bullet(object):
     rank - game difficulty, 0 to 1, default 0.5
     tags - string tags set by the running actions
     appearance - string used to set bullet appearance
+    radius - radius for collision
+    finished - true if all actions are finished and the bullet vanished
 
     Contructor Arguments:
-    x, y, direction, speed, target, rank, tags, appearance
+    x, y, direction, speed, target, rank, tags, appearance, radius
         - same as the above attributes
     actions - internal action list
     Action - custom Action constructor
@@ -153,33 +144,34 @@ class Bullet(object):
 
     def __init__(self, x=0, y=0, direction=0, speed=0, target=None,
                  actions=(), rank=0.5, tags=(), appearance=None,
-                 Action=Action):
+                 radius=0.5):
         self.x = self.px = x
         self.y = self.py = y
+        self.radius = radius
         self.mx = 0
         self.my = 0
         self.direction = direction
         self.speed = speed
         self.vanished = False
+        self.finished = False
         self.target = target
         self.rank = rank
         self.tags = set(tags)
         self.appearance = appearance
-        # New bullets reset the parent hierarchy.
-        self.actions = [Action(None, action, params, rank)
-                         for action, params in actions]
+        self.actions = list(actions)
 
     @classmethod
     def FromDocument(cls, doc, x=0, y=0, direction=0, speed=0, target=None,
                      params=(), rank=0.5, Action=Action):
         """Construct a new Bullet from a loaded BulletML document."""
-        actions = [a(params, rank) for a in doc.actions]
+        actions = [action(None, Action, params, rank)
+                   for action in doc.actions]
         return cls(x=x, y=y, direction=direction, speed=speed,
-                   target=target, actions=actions, rank=rank, Action=Action)
+                   target=target, actions=actions, rank=rank)
 
     def __repr__(self):
         return ("%s(%r, %r, accel=%r, direction=%r, speed=%r, "
-                "actions=%r, target=%r, appearance=vanished=%r)") % (
+                "actions=%r, target=%r, appearance=%r, vanished=%r)") % (
             type(self).__name__, self.x, self.y, (self.mx, self.my),
             self.direction, self.speed, self.actions, self.target,
             self.appearance, self.vanished)
@@ -198,24 +190,6 @@ class Bullet(object):
         else:
             return atan2(target_x - self.x, target_y - self.y)
 
-    @property
-    def finished(self):
-        """Check if this bullet is finished running.
-
-        A bullet is finished when it has vanished, and all its
-        actions have finished.
-
-        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:
-            if not action.finished:
-                return False
-        return True
-
     def vanish(self):
         """Vanish this bullet and stop all actions."""
         self.vanished = True
@@ -245,12 +219,20 @@ class Bullet(object):
         """
         created = []
 
+        finished = self.vanished
         for action in self.actions:
             action.step(self, created)
-
+            finished = finished and action.finished
+        if finished:
+            for action in self.actions:
+                finished = finished and action.finished
+        self.finished = finished
+
+        speed = self.speed
+        direction = self.direction
         self.px = self.x
         self.py = self.y
-        self.x += self.mx + sin(self.direction) * self.speed
-        self.y += -self.my + cos(self.direction) * self.speed
+        self.x += self.mx + sin(direction) * speed
+        self.y += -self.my + cos(direction) * speed
 
         return created