Mercurial > touhou

changeset 78:bcf965ede96c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix/rename/comment a few things
author Thibaut Girka <thib@sitedethib.com>
date Wed, 31 Aug 2011 13:51:42 +0200
parents 6fa6d74a049a
children ffe2c2b9912c
files pytouhou/formats/ecl.py pytouhou/vm/eclrunner.py
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/pytouhou/formats/ecl.py
+++ b/pytouhou/formats/ecl.py
@@ -76,12 +76,12 @@ class ECL(object):
                      71: ('hhiiffffi', 'set_bullet_attributes5'),
                      74: ('hhiiffffi', 'set_bullet_attributes6'),
                      75: ('hhiiffffi', 'set_bullet_attributes7'),
-                     76: ('i', 'stop_bullets'),
-                     77: ('i', 'set_bullet_interval'),
+                     76: ('i', 'set_bullet_interval'),
+                     77: ('i', 'set_bullet_interval_ex'),
                      78: ('', 'delay_attack'),
                      79: ('', 'no_delay_attack'),
                      81: ('fff', 'set_bullet_launch_offset'),
-                     82: ('iiiiffff', 'set_bullet_attributes_ex'),
+                     82: ('iiiiffff', 'set_extended_bullet_attributes'),
                      83: ('', None),
                      84: ('i', None),
                      85: ('hhffffffiiiiii', 'laser'),
--- a/pytouhou/vm/eclrunner.py
+++ b/pytouhou/vm/eclrunner.py
@@ -431,11 +431,17 @@ class ECLRunner(object):
                                            flags)
 
 
-    @instruction(77)
+    @instruction(76)
     def set_bullet_interval(self, value):
         self._enemy.bullet_launch_interval = value
 
 
+    @instruction(77)
+    def set_bullet_interval_ex(self, value):
+        self.set_bullet_interval(value)
+        #TODO: set counter to random() * bullet_launch_interval
+
+
     @instruction(78)
     def set_delay_attack(self):
         self._enemy.delay_attack = True