Merge branch 'master' of ctpug.org.za:tabakrolletjie

diff --git a/data/stations/station-alpha.json b/data/stations/station-alpha.json
index f0e27e509bcd2af4aba2b09cd775887047d6862b..07f23e98b7cf1b134c6c6148341be9efb5a2fa97 100644 (file)
--- a/data/stations/station-alpha.json
+++ b/data/stations/station-alpha.json
@@ -2,6 +2,7 @@
   "config": {
     "name": "Station Alpha",
     "power": 100,
+    "spawn positions": [[275, 300]],
     "seeds": 10
   },
   "obstacles": [

diff --git a/data/stations/station-beta.json b/data/stations/station-beta.json
index ae16cff5d3eb359e372783af932de1dd17e3a97b..8273a5c3b9c66954db1d3326cc28f4f0f2172c69 100644 (file)
--- a/data/stations/station-beta.json
+++ b/data/stations/station-beta.json
@@ -2,6 +2,7 @@
   "config": {
     "name": "Station Beta",
     "power": 100,
+    "spawn positions": [[25, 400], [1000, 410]],
     "seeds": 100
   },
   "obstacles": [

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index eef2596e5300455ea7437d29642b27b9bdaabe02..b8d016dc689d8857ac074e7e49fa978a9c407b94 100644 (file)
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -20,6 +20,15 @@ MOULD_FILTER = pymunk.ShapeFilter(
 EAT_TURNIP_FILTER = pymunk.ShapeFilter(mask=TURNIP_CATEGORY)
 
 
+# Boyd parameters
+SPAWN_RATE = 10
+MAX_AGE = 60
+MAX_ELEMENTS = 500
+MAX_HEALTH = 100
+
+MOULD_STAGES = [10, 20]
+
+
 class Mould(pymunk.Body):
     """A segment of Boyd"""
 
@@ -47,7 +56,7 @@ class Mould(pymunk.Body):
         if not self._img:
             name = random.choice(
                 ('mouldA.png', 'mouldB.png', 'mouldC.png'))
-            size = "16" if self._age < 10 else "32" if self._age < 20 else "64"
+            size = "16" if self._age < MOULD_STAGES[0] else "32" if self._age < MOULD_STAGES[1] else "64"
             self._img = loader.load_image(size, name)
         return self._img
 
@@ -64,15 +73,15 @@ class Mould(pymunk.Body):
         self._age += 1
 
         # we regain a health every tick, so we heal in the dark
-        if self._health < 100:
+        if self._health < MAX_HEALTH:
             self._health += 1
 
         refresh = False
 
-        if (self._age % 15) == 0 and len(moulds) < 1000:
+        if (self._age % SPAWN_RATE) == 0 and len(moulds) < MAX_ELEMENTS:
             # Spawn a new child, if we can
             spawn = True
-            choice = random.randint(0, 4)
+            choice = random.randint(0, 3)
             if choice == 0:
                 pos = self.position + (0, 24)
             elif choice == 1:
@@ -102,16 +111,16 @@ class Mould(pymunk.Body):
                 if random.randint(0, 10) < 2:
                     sound.play_sound("mouth_pop_2a.ogg")
 
-        if self._age in (10, 20):
+        if self._age in MOULD_STAGES:
             # We grow in size
             refresh = True
             self._img = None  # invalidate cached image
 
-        if self._age > 20 and random.randint(0, 500) < 1:
+        if self._age > MOULD_STAGES[1] and random.randint(0, 500) < 1:
             # Maybe we grow an eyeball
             self.has_eyeball = True
 
-        if self._age > 120:
+        if self._age > MAX_AGE:
             # We die of old age
             space.remove(self, self._shape)
             moulds.remove(self)
@@ -127,7 +136,7 @@ class Mould(pymunk.Body):
     def damage(self, light, space, moulds):
         """Take damage for light, adjusted for resistances."""
         self._health -= light.base_damage()
-        if self._health <= 0 and self._age <= 120:
+        if self._health <= 0 and self._age <= MAX_AGE:
             # We die of damage
             space.remove(self, self._shape)
             moulds.remove(self)
@@ -138,8 +147,10 @@ class Mould(pymunk.Body):
 class Boyd(object):
 
     def __init__(self, gamestate, space):
-        seed = Mould(gamestate, space, (275, 300))
-        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 = self._image.convert_alpha(pygame.display.get_surface())
         self._draw_moulds()

diff --git a/tabakrolletjie/gamestate.py b/tabakrolletjie/gamestate.py
index 091b7093d419ac3024c4c52c35c6e984444fe47f..c678befb968eb83d6520531698ee78a82c4fabcb 100644 (file)
--- a/tabakrolletjie/gamestate.py
+++ b/tabakrolletjie/gamestate.py
@@ -40,3 +40,6 @@ class GameState(object):
 
     def load_station(self, station):
         self._state["station"] = loader.load_station(station)
+
+    def get_spawn_positions(self):
+        return self._state["station"]["config"]["spawn positions"]