X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Froaches.py;h=b708a88b9b0219f65bee7656b924362113cca6a8;hp=da362a306361b6b28006b641ffb5ac3ff4401523;hb=94041e07b1111324d2666a1f3aa2ea5cdbdbb805;hpb=96dd67b1005fa0123f96409cecb62ae1a2342152

diff --git a/koperkapel/roaches.py b/koperkapel/roaches.py
index da362a3..b708a88 100644
--- a/koperkapel/roaches.py
+++ b/koperkapel/roaches.py
@@ -74,18 +74,25 @@ class RoachFactory:
         self.suffix = suffix
         self.frames = 4
 
-    def assemble_frame(self, i, color, roach_data):
+    def assemble_frame(self, i, color, roach_data, weapon=None):
         roach = images.load("roach%s/roach_%d" % (self.suffix, i + 1))
         eyes = images.load("roach%s/eyes_%d" % (self.suffix, i + 1))
-        frame = roach.copy()
-        frame.fill(color, None, BLEND_RGBA_MULT)
+        if weapon is None:
+            frame = roach.copy()
+            frame.fill(color, None, BLEND_RGBA_MULT)
+        else:
+            frame = weapon.surf.copy()
+            roach = roach.copy()
+            roach.fill(color, None, BLEND_RGBA_MULT)
+            frame.blit(roach, (0, 0))
         frame.blit(eyes, (0, 0))
         return frame
 
-    def assemble(self, roach_data):
+    def assemble(self, roach_data, weapon=None):
         color = roach_serum_color(roach_data)
+        frames = []
         frames = [
-            self.assemble_frame(i, color, roach_data)
+            self.assemble_frame(i, color, roach_data, weapon)
             for i in range(self.frames)]
         return AnimatedSurfActor(frames)