X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fenemies.py;h=422b1032b8b9f73b8ceccf4eeaee48df4a6673fb;hb=7fe679f0d81d81b6bc3b8dc20d4b0a62840144f3;hp=0fe1619fc175f63b970deb882e8d1ed5a15e6e6a;hpb=e9598e08943dd68a66f0a0f2f5eb2a8757051a50;p=tabakrolletjie.git

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 0fe1619..422b103 100644
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -8,9 +8,8 @@ import pygame.draw
 import pygame.surface
 import pygame.display
 
-import pygame.locals as pgl
-
-from .constants import SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY
+from .constants import (SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY,
+                        TURNIP_CATEGORY)
 from .loader import loader
 from .sound import sound
 
@@ -18,6 +17,8 @@ MOULD_FILTER = pymunk.ShapeFilter(
     mask=MOULD_CATEGORY | OBSTACLE_CATEGORY,
     categories=MOULD_CATEGORY)
 
+EAT_TURNIP_FILTER = pymunk.ShapeFilter(mask=TURNIP_CATEGORY)
+
 
 class Mould(pymunk.Body):
     """A segment of Boyd"""
@@ -32,6 +33,8 @@ class Mould(pymunk.Body):
         self._age = 0
         self._img = None
         self._health = 500
+        self.has_eyeball = False
+        self._eyeball = None
 
     def pygame_pos(self, surface):
         """Convert to pygame coordinates and offset position so
@@ -48,6 +51,13 @@ class Mould(pymunk.Body):
             self._img = loader.load_image(size, name)
         return self._img
 
+    def get_eyeball(self):
+        if not self._eyeball:
+            name = random.choice(
+                ('eyeballA.png', 'eyeballB.png', 'eyeballC.png'))
+            self._eyeball = loader.load_image("32", name)
+        return self._eyeball
+
     def tick(self, gamestate, space, moulds):
         """Grow and / or Die"""
 
@@ -93,20 +103,30 @@ class Mould(pymunk.Body):
                     sound.play_sound("mouth_pop_2a.ogg")
 
         if self._age in (10, 20):
-            # Segment grows in size
+            # We grow in size
             refresh = True
-            self._img = None # invalidate cached image
+            self._img = None  # invalidate cached image
+
+        if self._age > 20 and random.randint(0, 500) < 1:
+            # Maybe we grow an eyeball
+            self.has_eyeball = True
 
         if self._age > 120:
             # We die of old age
             space.remove(self, self._shape)
             moulds.remove(self)
             refresh = True
+        else:
+            # Check for turnips we can eat
+            # Note that we can only eat a tick after we spawn
+            query = space.point_query(self.position, 16, EAT_TURNIP_FILTER)
+            if query:
+                query[0].shape.body.turnip.eaten = True
         return refresh
 
-    def damage(self, light_color, intensity, space, moulds):
+    def damage(self, light, space, moulds):
         """Take damage for light, adjusted for resistances."""
-        self._health -= 3
+        self._health -= light.base_damage()
         if self._health <= 0 and self._age <= 120:
             # We die of damage
             space.remove(self, self._shape)
@@ -118,10 +138,12 @@ class Mould(pymunk.Body):
 class Boyd(object):
 
     def __init__(self, gamestate, space):
-        seed = Mould(gamestate, space, (350, 370))
-        self._moulds = [seed]
+        self._moulds = []
+        for position in gamestate.get_spawn_positions():
+            seed = Mould(gamestate, space, position)
+            self._moulds.append(seed)
         self._image = pygame.surface.Surface(SCREEN_SIZE)
-        self._image.convert_alpha(pygame.display.get_surface())
+        self._image = self._image.convert_alpha(pygame.display.get_surface())
         self._draw_moulds()
 
     def _draw_moulds(self):
@@ -130,6 +152,10 @@ class Boyd(object):
             self._image.blit(m.get_image(),
                              m.pygame_pos(self._image), None,
                              0)
+        for m in self._moulds:
+            if m.has_eyeball:
+                self._image.blit(m.get_eyeball(), m.pygame_pos(self._image),
+                                 None, 0)
 
     def tick(self, gamestate, space, lights):
         redraw = False
@@ -142,7 +168,7 @@ class Boyd(object):
             lit_by = lights.light_query(mould._shape)
             for light in lit_by:
                 # Todo: extract colour and intensity from light
-                if mould.damage(None, None, space, self._moulds):
+                if mould.damage(light, space, self._moulds):
                     redraw = True
                     break  # we only die once
         if redraw:
@@ -150,4 +176,4 @@ class Boyd(object):
 
     def render(self, surface):
         """Draw ourselves"""
-        surface.blit(self._image, (0, 0), None, pgl.BLEND_RGBA_ADD)
+        surface.blit(self._image, (0, 0), None, 0)