Random vehicle swapping.

[koperkapel.git] / koperkapel / roaches.py

diff --git a/koperkapel/roaches.py b/koperkapel/roaches.py
index b39d189fe669c6571047973feb33f8b7b6e4eecc..c844b5277c404c41c4448239d58daa564fecb570 100644 (file)
--- a/koperkapel/roaches.py
+++ b/koperkapel/roaches.py
@@ -1,29 +1,16 @@
 """ Tools for creating roach actors. """
 
-import random
-from pgzero.clock import each_tick
 from pgzero.loaders import images
 from pygame.constants import BLEND_RGBA_MULT
-from .actors.orientatedsurf import OrientatedSurfActor
+from .actors.animsurf import AnimatedSurfActor
 from .serums import roach_serum_color
 
 
-class RoachActor(OrientatedSurfActor):
-    def __init__(self, frames):
-        self._frames = frames
-        self._frame = random.randint(0, len(frames) - 1)
-        self._dt = 0
-        self._cycle_dt = 0.2
-        each_tick(self.update)
-        super().__init__(surf=frames[self._frame], angle=0)
-
-    def update(self, dt):
-        self._dt += dt
-        while self._dt > self._cycle_dt:
-            self._dt -= self._cycle_dt
-            self._frame += 1
-            self._frame %= len(self._frames)
-        self.surf = self._frames[self._frame]
+def roach_by_name(world, roach_name):
+    roaches = [r for r in world.roaches if r.name == roach_name]
+    if not roaches:
+        return None
+    return roaches[0]
 
 
 class WorldRoach(object):
@@ -54,7 +41,7 @@ class RoachFactory:
         frames = [
             self.assemble_frame(i, color, roach_data)
             for i in range(self.frames)]
-        return RoachActor(frames)
+        return AnimatedSurfActor(frames)
 
 
 default_roaches = RoachFactory("")