# HG changeset patch # User Emmanuel Gil Peyrot # Date 1379349711 -7200 # Node ID 98995d8ac7448a6efdade2eec3111174049d2f4f # Parent 58b47e788c599f6f0f757fa9b1846cd77156be08 Reset ANMRunner.sprite_index_offset after the first frame, fixes bullettype 7; also forbid glitch bullet types. diff --git a/pytouhou/games/eosd.py b/pytouhou/games/eosd.py --- a/pytouhou/games/eosd.py +++ b/pytouhou/games/eosd.py @@ -46,13 +46,13 @@ class EoSDCommon(object): launch_anim_offsets=(0, 1, 1, 2, 2, 3, 4, 0), type_id=6), BulletType(self.etama[0], 7, 13, 20, 20, 20, hitbox_size=5.5, - launch_anim_offsets=(1,)*28, + launch_anim_offsets=(1, 1, 1, 1), type_id=7), BulletType(self.etama[0], 8, 13, 20, 20, 20, hitbox_size=4.5, launch_anim_offsets=(0, 1, 1, 2, 2, 3, 4, 0), type_id=8), BulletType(self.etama[1], 0, 1, 2, 2, 2, hitbox_size=16, - launch_anim_offsets=(0, 1, 2, 3, 4, 5, 6, 7, 8), + launch_anim_offsets=(0, 1, 2, 3), type_id=9)] self.laser_types = [LaserType(self.etama[0], 9), diff --git a/pytouhou/vm/anmrunner.py b/pytouhou/vm/anmrunner.py --- a/pytouhou/vm/anmrunner.py +++ b/pytouhou/vm/anmrunner.py @@ -55,8 +55,8 @@ class ANMRunner(object): 0, 0, 0, 0] self.sprite_index_offset = sprite_index_offset - self.run_frame() + self.sprite_index_offset = 0 def interrupt(self, interrupt):