X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Froaches.py;h=08440ccda8333e1b3e7369585682038a12991100;hb=cda4116741c03cb69ee972a4285251126fa4de2e;hp=20220c4c6da52165651910e691ad354d62c83dde;hpb=1b461881652d85894fbe5c13e790ce3e46feb452;p=koperkapel.git

diff --git a/koperkapel/roaches.py b/koperkapel/roaches.py
index 20220c4..08440cc 100644
--- a/koperkapel/roaches.py
+++ b/koperkapel/roaches.py
@@ -5,13 +5,7 @@ from pgzero.clock import each_tick
 from pgzero.loaders import images
 from pygame.constants import BLEND_RGBA_MULT
 from .actors.surf import SurfActor
-
-ROACH_COLORS = {
-    "blue": (0, 0, 255, 255),
-    "green": (0, 255, 0, 255),
-    "purple": (255, 0, 255, 255),
-    "brown": (170, 68, 0, 255),
-}
+from .serums import roach_serum_color
 
 
 class RoachActor(SurfActor):
@@ -38,15 +32,6 @@ class RoachFactory:
         self.suffix = suffix
         self.frames = 4
 
-    def roach_color(self, roach):
-        if roach.smart:
-            return ROACH_COLORS["blue"]
-        elif roach.fast:
-            return ROACH_COLORS["green"]
-        elif roach.strong:
-            return ROACH_COLORS["purple"]
-        return ROACH_COLORS["brown"]
-
     def assemble_frame(self, i, color, roach_data):
         roach = images.load("roach%s/roach_%d" % (self.suffix, i + 1))
         eyes = images.load("roach%s/eyes_%d" % (self.suffix, i + 1))
@@ -56,7 +41,7 @@ class RoachFactory:
         return roach
 
     def assemble(self, roach_data):
-        color = self.roach_color(roach_data)
+        color = roach_serum_color(roach_data)
         frames = [
             self.assemble_frame(i, color, roach_data)
             for i in range(self.frames)]