Mercurial > touhou

diff pytouhou/game/effect.py @ 193:9f58e2a6e950

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix particles, fix "random" item popping, change update order to match the original game's more closely.
author Thibaut Girka <thib@sitedethib.com>
date Fri, 28 Oct 2011 12:38:26 +0200
parents dbe6b7b2d3fc
children f3099ebf4f61
line wrap: on
line diff
--- a/pytouhou/game/effect.py
+++ b/pytouhou/game/effect.py
@@ -40,7 +40,7 @@ class Effect(object):
 
 
 class Particle(object):
-    def __init__(self, start_pos, index, anm_wrapper, size, amp, delay, game):
+    def __init__(self, start_pos, index, anm_wrapper, size, amp, game):
         self._sprite = Sprite()
         self._sprite.anm, self._sprite.texcoords = anm_wrapper.get_sprite(index)
         self._game = game
@@ -56,7 +56,6 @@ class Particle(object):
         self.scale_interpolator = None
         self.rotations_interpolator = None
 
-        self.delay = delay
         self.amp = amp
 
 
@@ -73,7 +72,7 @@ class Particle(object):
 
 
     def update(self):
-        if (self.frame == 0 and not self.delay) or (self.frame == 1 and self.delay):
+        if self.frame == 0:
             self.set_end_pos(self.amp)
 
         if self.pos_interpolator: