Add basic support resistances

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 02491aa5138fabd40c12e89dda350e98822e45ef..46da6100c48513d382980b5e652c2d4510305c59 100644 (file)
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -37,18 +37,18 @@ MOULD_STAGES = [15, 25]
 class Mould(pymunk.Body):
     """A segment of Boyd"""
 
-    def __init__(self, gamestate, space, pos):
+    def __init__(self, gamestate, space, pos, resistances):
         super(Mould, self).__init__(0, 0, pymunk.Body.STATIC)
         self.position = pos
         self._shape = pymunk.Circle(self, 16)
         space.add(self, self._shape)
         self._shape.filter = MOULD_FILTER
-        self._resistances = {}
         self._age = 0
         self._img = None
         self._health = 500
         self.has_eyeball = False
         self._eyeball = None
+        self._resistances = resistances
 
     def pygame_pos(self, surface):
         """Convert to pygame coordinates and offset position so
@@ -112,7 +112,7 @@ class Mould(pymunk.Body):
                 #         print x.shape, x.shape.body
                 spawn = False
             if spawn:
-                child = Mould(gamestate, space, pos)
+                child = Mould(gamestate, space, pos, self._resistances)
                 child._health = self._health
                 moulds.append(child)
                 refresh = True
@@ -143,7 +143,10 @@ class Mould(pymunk.Body):
 
     def damage(self, light, space, moulds):
         """Take damage for light, adjusted for resistances."""
-        self._health -= light.base_damage()
+        damage = light.base_damage()
+        colour = light.colour
+        damage = int(damage * (3 - self._resistances.get(colour, 0)) / 3.0)
+        self._health -= damage
         if self._health <= 0 and self._age <= MAX_AGE:
             # We die of damage
             space.remove(self, self._shape)
@@ -156,8 +159,10 @@ class Boyd(object):
 
     def __init__(self, gamestate, space):
         self._moulds = []
+        self._seen_colours = set()
         for position in gamestate.get_spawn_positions():
-            seed = Mould(gamestate, space, position)
+            seed = Mould(gamestate, space, position,
+                         gamestate.resistances)
             seed.set_health(MAX_HEALTH + gamestate.days * DAY_HEALTH)
             self._moulds.append(seed)
         self._image = pygame.surface.Surface(SCREEN_SIZE)
@@ -185,7 +190,7 @@ class Boyd(object):
             # Check for damage
             lit_by = lights.light_query(mould._shape)
             for light in lit_by:
-                # Todo: extract colour and intensity from light
+                self._seen_colours.add(light.colour)
                 if mould.damage(light, space, self._moulds):
                     redraw = True
                     break  # we only die once
@@ -198,3 +203,14 @@ class Boyd(object):
 
     def alive(self):
         return len(self._moulds) > 0
+
+    def update_resistances(self, gamestate):
+        for colour in self._seen_colours:
+            cur_reistance = gamestate.resistances.get(colour, 0)
+            gamestate.resistances[colour] = cur_reistance + 2
+        for colour in gamestate.resistances:
+            gamestate.resistances[colour] -= 1
+            if gamestate.resistances[colour] > 3:
+                gamestate.resistances[colour] = 3
+            if gamestate.resistances[colour] < 0:
+                gamestate.resistances[colour] = 0

diff --git a/tabakrolletjie/gamestate.py b/tabakrolletjie/gamestate.py
index 27762a6d7e086c3dae50bff4226cfe4ee085708a..219edfb3f5c87c0a21411c3c1023f04a1c12b2f9 100644 (file)
--- a/tabakrolletjie/gamestate.py
+++ b/tabakrolletjie/gamestate.py
@@ -11,6 +11,7 @@ class GameState(object):
         self.harvested = 0
         self.eaten = 0
         self.days = 0
+        self.resistances = {}
 
     @property
     def station(self):
@@ -42,6 +43,7 @@ class GameState(object):
         self._state["station"] = station
         self._state["turnips"] = []
         self._state["seeds"] = None
+        self.resistances = {}
 
     def get_spawn_positions(self):
         return self._state["station"]["config"]["spawn positions"]

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 3f58d921e64ad450d7339390dfefc1c74247c9e0..7d028d58f1688ac984a512e190cdd7b8e71ce2b3 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -141,6 +141,7 @@ class NightScene(BaseScene):
                 self._mould.tick(gamestate, self._space, self._lights)
                 self._lights.tick()
                 print "Power usage: ", self._lights.total_power_usage()
+                self._total_ticks += 1
             else:
                 self._end_night()
             if not self._mould.alive():
@@ -149,4 +150,6 @@ class NightScene(BaseScene):
     def exit(self, gamestate):
         turnip_data = [turnip.serialize() for turnip in self._turnips]
         gamestate.turnips = turnip_data
+        # TODO: Move this into the end_night function
         gamestate.days += 1
+        self._mould.update_resistances(gamestate)