Night shift managers.

[tabakrolletjie.git] / tabakrolletjie / enemies.py

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 3f9210b35c89e83e493a217c8a9bc1be8a64aed9..7b26fed214ebb600a5366aa4d40c85b1eb6edcee 100644 (file)
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -1,5 +1,7 @@
 # Boyd, the friendly, misunderstood turnip loving, light hating space mould
 
+import random
+
 import pymunk
 import pymunk.pygame_util
 import pygame.draw
@@ -9,8 +11,9 @@ import pygame.display
 import pygame.locals as pgl
 
 from .constants import SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY
+from .loader import loader
 
-MOULD_FILTER = LIGHT_FILTER = pymunk.ShapeFilter(
+MOULD_FILTER = pymunk.ShapeFilter(
     mask=MOULD_CATEGORY | OBSTACLE_CATEGORY,
     categories=MOULD_CATEGORY)
 
@@ -30,11 +33,9 @@ class Mould(pymunk.Body):
 
     def get_image(self):
         if not self._img:
-            img = pygame.surface.Surface((32, 32))
-            img.convert_alpha(pygame.display.get_surface())
-            img.fill((0, 0, 0, 0))
-            pygame.draw.circle(img, (255, 255, 255, 255), (16, 16), 16)
-            self._img = img
+            name = random.choice(
+                ('mouldA.png', 'mouldB.png', 'mouldC.png'))
+            self._img = loader.load_image("32", name)
         return self._img
 
     def tick(self, gamestate, space, moulds):
@@ -46,7 +47,6 @@ class Mould(pymunk.Body):
         if (self._age % 15) == 0 and len(moulds) < 1000:
             # Spawn a new child, if we can
             spawn = True
-            import random
             choice = random.randint(0, 4)
             if choice == 0:
                 pos = self.position + (0, 24)