X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fimpl.py;h=4785ef2c8c17094076b38e49ceef4486fb9910b7;hp=836fb410c4efbaaafec9a1c60c7d90b2b7bf50e9;hb=75cf6c9dd1fa5aef18f11e08bcc3728c1175b1c4;hpb=67aa3f0b15d5f8122a8f99f5903ec2e2029937c4

diff --git a/bulletml/impl.py b/bulletml/impl.py
index 836fb41..4785ef2 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.parser import ActionDef, ActionRef
-
 __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:
@@ -80,8 +74,8 @@ class Action(object):
             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:
@@ -120,13 +114,7 @@ class Action(object):
                     self.pc = 0
                     action = self.actions[self.pc]
 
-            if isinstance(action, (ActionDef, 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):
@@ -143,9 +131,10 @@ 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
 
     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,9 +142,11 @@ class Bullet(object):
     """
 
     def __init__(self, x=0, y=0, direction=0, speed=0, target=None,
-                 actions=(), rank=0.5, tags=(), appearance=None):
+                 actions=(), rank=0.5, tags=(), appearance=None,
+                 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
@@ -171,16 +162,14 @@ class Bullet(object):
     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 = [action(params, rank) for action in doc.actions]
-        # New bullets reset the parent hierarchy.
-        actions = [Action(None, action, params, rank)
-                   for action, params in 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)
 
     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)