Move turnip growth and related updates to the end of the night

[tabakrolletjie.git] / tabakrolletjie / scenes / night.py

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 7813e32baab0ce118682dd04133a2d977d879adf..9f86745a052aa142acb72654a6519b3a44bf9cc9 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -14,6 +14,7 @@ from ..enemies import Boyd
 from ..events import SceneChangeEvent
 from ..utils import debug_timer, shadowed_text
 from ..loader import loader
+from ..sound import sound
 from ..transforms import Overlay
 from ..turnip import Turnip
 from ..widgets import ImageButton
@@ -31,6 +32,7 @@ class NightScene(BaseScene):
         self._obstacles = ObstacleManager(self._space, gamestate)
         self._lights = LightManager(self._space, gamestate)
         self._battery = BatteryManager(gamestate)
+        self._battery_dead = False
         self.check_battery()
         self._infobar = InfoBar("day", battery=self._battery, scene=self)
         self._countdownbar = CountDownBar("h")
@@ -151,6 +153,12 @@ class NightScene(BaseScene):
         if self._ending:
             return
         gamestate.update_lights(self._lights)
+        # Turnip
+        self.grow_turnips(gamestate)
+        turnip_data = [turnip.serialize() for turnip in self._turnips]
+        gamestate.turnips = turnip_data
+        gamestate.days += 1
+        self._mould.update_resistances(gamestate)
         self._ending = True
         from .day import DayScene
         SceneChangeEvent.post(scene=DayScene())
@@ -175,7 +183,9 @@ class NightScene(BaseScene):
              (350, 240)))
 
     def check_battery(self):
-        if self._battery.current == 0:
+        if self._battery.current == 0 and not self._battery_dead:
+            self._battery_dead = True
+            sound.play_sound("battery_dying.ogg")
             self._lights.battery_dead()
 
     @debug_timer("night.tick")
@@ -198,9 +208,13 @@ class NightScene(BaseScene):
             if not self.turnip_count and not self._battery.current:
                 self._end_night()
 
-    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)
+    def grow_turnips(self, gamestate):
+        """ Turnips grow at the end of the night """
+        for turnip in self._turnips[:]:
+            # Turnips grow at dawn
+            seeds = turnip.grow()
+            if seeds:
+                gamestate.seeds += seeds
+                gamestate.harvested += 1
+                self._turnips.remove(turnip)
+                # We ignore the body cleanup, since the space is going away