tweaked eyeball; made eyeballs less frequent; fixed mould transparency and corrected...

[tabakrolletjie.git] / tabakrolletjie / enemies.py

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index fd7a6d4c0df6d71c0f51c25da72f4ba45a16b17d..2de784709b229e7bd7102bb5bcdc3a813b7d18fa 100644 (file)
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -12,6 +12,7 @@ import pygame.locals as pgl
 
 from .constants import SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY
 from .loader import loader
+from .sound import sound
 
 MOULD_FILTER = pymunk.ShapeFilter(
     mask=MOULD_CATEGORY | OBSTACLE_CATEGORY,
@@ -31,6 +32,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
@@ -43,11 +46,18 @@ class Mould(pymunk.Body):
         if not self._img:
             name = random.choice(
                 ('mouldA.png', 'mouldB.png', 'mouldC.png'))
-            self._img = loader.load_image("32", name)
+            size = "16" if self._age < 10 else "32" if self._age < 20 else "64"
+            self._img = loader.load_image(size, name)
         return self._img
 
+    def get_eyeball(self):
+        if not self._eyeball:
+            self._eyeball = loader.load_image("32", "eyeball.png")
+        return self._eyeball
+
     def tick(self, gamestate, space, moulds):
         """Grow and / or Die"""
+
         self._age += 1
 
         # we regain a health every tick, so we heal in the dark
@@ -86,6 +96,17 @@ class Mould(pymunk.Body):
                 child._health = self._health
                 moulds.append(child)
                 refresh = True
+                if random.randint(0, 10) < 2:
+                    sound.play_sound("mouth_pop_2a.ogg")
+
+        if self._age in (10, 20):
+            # We grow in size
+            refresh = True
+            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
@@ -111,10 +132,19 @@ class Boyd(object):
         seed = Mould(gamestate, space, (350, 370))
         self._moulds = [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):
         self._image.fill((0, 0, 0, 0))
-        self._image.blit(seed.get_image(),
-            seed.pygame_pos(self._image), None, pgl.BLEND_RGBA_ADD)
+        for m in self._moulds:
+            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
@@ -124,15 +154,15 @@ class Boyd(object):
             if mould.tick(gamestate, space, self._moulds):
                 redraw = True
             # Check for damage
-            if lights.lit_by(mould.position):
+            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):
                     redraw = True
+                    break  # we only die once
         if redraw:
-            self._image.fill((0, 0, 0, 0))
-            for mould in self._moulds:
-                self._image.blit(mould.get_image(),
-                    mould.pygame_pos(self._image), None, pgl.BLEND_RGBA_ADD)
+            self._draw_moulds()
 
     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)