X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml-runner;h=d2d9ce00ed3e410a766d4e798ba897ea79dfe423;hp=7c262b02ba3d0ce9bf01e9d4bea0be7507a67213;hb=3639cbf64fb5d54061d20b9b072bfcee8a26436d;hpb=7b73a60799150ec3df407a8a1620a613aad5f59c

diff --git a/bulletml-runner b/bulletml-runner
index 7c262b0..d2d9ce0 100755
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -16,7 +16,7 @@ except ImportError:
     yaml = None
 
 try:
-    import psycox
+    import psyco
 except ImportError:
     pass
 else:
@@ -28,11 +28,17 @@ def main(argv):
 
     pygame.display.init()
     screen = pygame.display.set_mode([600, 600], pygame.DOUBLEBUF)
-    bullet = pygame.Surface([3, 3])
-    bullet.fill([255, 0, 0])
+    red = pygame.Surface([3, 3])
+    red.fill([255, 0, 0])
+    green = pygame.Surface([3, 3])
+    green.fill([0, 255, 0])
+    blue = pygame.Surface([3, 3])
+    blue.fill([0, 0, 255])
     clock = pygame.time.Clock()
     target = bulletml.Bullet()
 
+    bullets = dict(red=red, green=green, blue=blue)
+
     file_idx = 0
 
     while True:
@@ -44,7 +50,7 @@ def main(argv):
         active = set([source])
         source.vanished = True
         print filename
-        print "  Loaded %d top-level actions." % len(source._actions)
+        print "  Loaded %d top-level actions." % len(source.actions)
         frames = 0
         total = 0
         paused = False
@@ -72,15 +78,14 @@ def main(argv):
                     elif event.key == pygame.K_RETURN:
                         newfile = True
                     elif event.key == pygame.K_s:
-                        actions = [act([], 0.5) for act in doc.actions]
-                        source = bulletml.Bullet(
-                            x=150, y=150, target=target,
-                            actions=actions, rank=0.5)
+                        source = bulletml.Bullet.FromDocument(
+                            doc, x=150, y=150, target=target, rank=0.5)
                         source.vanished = True
                         active.add(source)
             target.x, target.y = pygame.mouse.get_pos()
             target.x /= 2
             target.y /= 2
+            target.y = 300 - target.y
 
             if not paused or go:
                 lactive = list(active)
@@ -120,7 +125,8 @@ def main(argv):
                         y *= 2
                         x -= 1
                         y -= 1
-                        screen.blit(bullet, [x, y])
+                        bullet = bullets.get(obj.appearance, red)
+                        screen.blit(bullet, [x, 600 - y])
             clock.tick(60)
             pygame.display.flip()