X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml%2Fparser.py;h=b2e078b739a5153596f91fbb0af1c59ffd4aad3b;hp=e9b0488c5aa75f570a5867a42b48d036e38ec8b8;hb=bc6dd530488535b2edeff9afbbdde896aed73046;hpb=0153a3d87b036f4afaf78e3815a2ad981def4993

diff --git a/bulletml/parser.py b/bulletml/parser.py
index e9b0488..b2e078b 100644
--- a/bulletml/parser.py
+++ b/bulletml/parser.py
@@ -25,7 +25,7 @@ from bulletml.errors import Error
 from bulletml.expr import NumberDef, INumberDef
 
 
-__all_ = ["ParseError", "BulletML"]
+__all__ = ["ParseError", "BulletML"]
 
 class ParseError(Error):
     """Raised when an error occurs parsing the XML structure."""
@@ -358,10 +358,11 @@ class BulletDef(object):
     direction = None
     speed = None
 
-    def __init__(self, actions=[], direction=None, speed=None):
+    def __init__(self, actions=(), direction=None, speed=None, tags=()):
         self.direction = direction
         self.speed = speed
         self.actions = list(actions)
+        self.tags = set(tags)
 
     def __getstate__(self):
         state = []
@@ -371,6 +372,8 @@ class BulletDef(object):
             state.append(("speed", self.speed))
         if self.actions:
             state.append(("actions", self.actions))
+        if self.tags:
+            state.append(("tags", list(self.tags)))
         return state
 
     def __setstate__(self, state):
@@ -383,6 +386,7 @@ class BulletDef(object):
         actions = []
         speed = None
         direction = None
+        tags = set()
         for subelem in element.getchildren():
             tag = realtag(subelem)
             if tag == "direction":
@@ -393,7 +397,9 @@ class BulletDef(object):
                 actions.append(ActionDef.FromXML(doc, subelem))
             elif tag == "actionRef":
                 actions.append(ActionRef.FromXML(doc, subelem))
-        dfn = cls(actions, direction, speed)
+            elif tag == "tag":
+                tags.add(subelem.text)
+        dfn = cls(actions, direction, speed, tags)
         doc._bullets[element.get("label")] = dfn
         return dfn
 
@@ -402,6 +408,7 @@ class BulletDef(object):
         return (
             self.direction and self.direction(params, rank),
             self.speed and self.speed(params, rank),
+            self.tags,
             actions)
 
     def __repr__(self):
@@ -567,11 +574,13 @@ class Offset(object):
 class FireDef(object):
     """Fire definition (creates a bullet)."""
 
-    def __init__(self, bullet, direction=None, speed=None, offset=None):
+    def __init__(
+        self, bullet, direction=None, speed=None, offset=None, tags=()):
         self.bullet = bullet
         self.direction = direction
         self.speed = speed
         self.offset = offset
+        self.tags = set(tags)
 
     def __getstate__(self):
         state = []
@@ -581,6 +590,8 @@ class FireDef(object):
             state.append(("speed", self.speed))
         if self.offset:
             state.append(("offset", self.offset))
+        if self.tags:
+            state.append(("tags", list(self.tags)))
         try:
             params = self.bullet.params
         except AttributeError:
@@ -603,6 +614,7 @@ class FireDef(object):
         direction = None
         speed = None
         offset = None
+        tags = set()
 
         for subelem in element.getchildren():
             tag = realtag(subelem)
@@ -616,8 +628,10 @@ class FireDef(object):
                 bullet = BulletRef.FromXML(doc, subelem)
             elif tag == "offset":
                 offset = Offset.FromXML(doc, subelem)
+            elif tag == "tag":
+                tags.add(subelem.text)
         try:
-            fire = cls(bullet, direction, speed, offset)
+            fire = cls(bullet, direction, speed, offset, tags)
         except UnboundLocalError as exc:
             raise ParseError(str(exc))
         else:
@@ -625,12 +639,13 @@ class FireDef(object):
             return fire
 
     def __call__(self, params, rank):
-        direction, speed, actions = self.bullet(params, rank)
+        direction, speed, tags, actions = self.bullet(params, rank)
         if self.direction:
             direction = self.direction(params, rank)
         if self.speed:
             speed = self.speed(params, rank)
-        return direction, speed, actions, self.offset
+        tags = tags.union(self.tags)
+        return direction, speed, self.offset, tags, actions
 
     def __repr__(self):
         return "%s(direction=%r, speed=%r, bullet=%r)" % (