Tweak mould rendering logic to have sane realtionship between image position and...

[tabakrolletjie.git] / tabakrolletjie / enemies.py

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 830ef731bfd102fecaf82443f81cd6f3001750a0..f668f1afe0f50fbf19a6655fd7a2bf3754af6816 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,6 +11,7 @@ import pygame.display
 import pygame.locals as pgl
 
 from .constants import SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY
+from .loader import loader
 
 MOULD_FILTER = pymunk.ShapeFilter(
     mask=MOULD_CATEGORY | OBSTACLE_CATEGORY,
@@ -28,13 +31,18 @@ class Mould(pymunk.Body):
         self._age = 0
         self._img = None
 
+    def pygame_pos(self, surface):
+        """Convert to pygame coordinates and offset position so
+           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)
+
     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 +54,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)
@@ -88,11 +95,13 @@ class Mould(pymunk.Body):
 class Boyd(object):
 
     def __init__(self, gamestate, space):
-        seed = Mould(gamestate, space, (400, 400))
+        seed = Mould(gamestate, space, (350, 350))
         self._moulds = [seed]
         self._image = pygame.surface.Surface(SCREEN_SIZE)
         self._image.convert_alpha(pygame.display.get_surface())
         self._image.fill((0, 0, 0, 0))
+        self._image.blit(seed.get_image(),
+            seed.pygame_pos(self._image), None, pgl.BLEND_RGBA_ADD)
 
     def tick(self, gamestate, space):
         redraw = False
@@ -102,9 +111,8 @@ class Boyd(object):
         if redraw:
             self._image.fill((0, 0, 0, 0))
             for mould in self._moulds:
-                pos = pymunk.pygame_util.to_pygame(mould.position, self._image)
-                self._image.blit(mould.get_image(), pos, None,
-                                 pgl.BLEND_RGBA_ADD)
+                self._image.blit(mould.get_image(),
+                    mould.pygame_pos(self._image), None, pgl.BLEND_RGBA_ADD)
 
     def render(self, surface):
         """Draw ourselves"""