X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fenemies.py;h=a6b475719802e2c0f0f296fa978d1b14e42b93f6;hb=24ff8e4688188866651cbda74c559a1dba93b92d;hp=9524617ffeef3037cab592d9bdc02885e2091af6;hpb=300fabb070c5d13ba1c4a4600b4570ef208ec28d;p=tabakrolletjie.git

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 9524617..a6b4757 100644
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -12,7 +12,7 @@ from .constants import (SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY,
                         TURNIP_CATEGORY, COLOURS)
 from .loader import loader
 from .sound import sound
-from .transforms import Multiply
+from .transforms import Multiply, Overlay
 from .utils import debug_timer
 
 MOULD_FILTER = pymunk.ShapeFilter(
@@ -23,8 +23,8 @@ EAT_TURNIP_FILTER = pymunk.ShapeFilter(mask=TURNIP_CATEGORY)
 
 
 # Boyd parameters
-SPAWN_RATE = 10
-MAX_AGE = 60
+SPAWN_RATE = 5
+MAX_AGE = 30
 MAX_ELEMENTS = 400
 MAX_HEALTH = 100
 
@@ -33,7 +33,9 @@ DAY_HEALTH = 10
 
 HEAL_FACTOR = 1
 
-MOULD_STAGES = [15, 25]
+MOULD_STAGES = [7, 13]
+
+MOULD_RADIUS = 16
 
 
 def calc_colour_transform(resistances):
@@ -65,7 +67,7 @@ class Mould(pymunk.Body):
     def __init__(self, gamestate, space, pos, resistances, transform):
         super(Mould, self).__init__(0, 0, pymunk.Body.STATIC)
         self.position = pos
-        self._shape = pymunk.Circle(self, 16)
+        self._shape = pymunk.Circle(self, MOULD_RADIUS)
         space.add(self, self._shape)
         self._shape.filter = MOULD_FILTER
         self._age = 0
@@ -81,7 +83,8 @@ class Mould(pymunk.Body):
            our position is the centre of the image."""
         # The odd sign combination is because of the pymunk / pygame
         # transform, but we do it this way to exploit Vec2d math magic
-        return pymunk.pygame_util.to_pygame(self.position + (-16, 16), surface)
+        return pymunk.pygame_util.to_pygame(
+            self.position + (-MOULD_RADIUS, MOULD_RADIUS), surface)
 
     def get_image(self):
         if not self._img:
@@ -98,7 +101,10 @@ class Mould(pymunk.Body):
         if not self._eyeball:
             name = random.choice(
                 ('eyeballA.png', 'eyeballB.png', 'eyeballC.png'))
-            self._eyeball = loader.load_image("32", name)
+            self._eyeball = loader.load_image("32", name,
+                transform=Overlay(colour=self._transform.colour+(127,)))
+            eyelid = loader.load_image("32", "eyelid.png", transform=self._transform)
+            self._eyeball.blit(eyelid, (0, 0), None)
         return self._eyeball
 
     def set_health(self, new_health):
@@ -143,8 +149,8 @@ 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 random.randint(0, 100) < 1:
+                    sound.play_sound("rubber_toy_short%d.ogg" % random.randint(1, 5), volume=0.3)
 
         if self._age in MOULD_STAGES:
             # We grow in size
@@ -154,6 +160,7 @@ class Mould(pymunk.Body):
         if self._age > MOULD_STAGES[1] and random.randint(0, 500) < 1:
             # Maybe we grow an eyeball
             self.has_eyeball = True
+            sound.play_sound("mouth_pop_2a.ogg", volume=0.5)
 
         if self._age > MAX_AGE:
             # We die of old age
@@ -163,9 +170,11 @@ class Mould(pymunk.Body):
         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)
+            query = space.point_query(self.position, MOULD_RADIUS,
+                                      EAT_TURNIP_FILTER)
             if query:
                 query[0].shape.body.turnip.eaten = True
+                sound.play_sound("eating_chips_%d.ogg" % random.randint(1, 3), volume=0.8)
         return refresh
 
     def damage(self, light, space, moulds):
@@ -217,7 +226,7 @@ class Boyd(object):
             if mould.tick(gamestate, space, self._moulds):
                 redraw = True
             # Check for damage
-            lit_by = lights.light_query(mould._shape)
+            lit_by = lights.lit_by(mould.position, MOULD_RADIUS)
             for light in lit_by:
                 self._seen_colours.add(light.colour)
                 if mould.damage(light, space, self._moulds):