X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=9f86745a052aa142acb72654a6519b3a44bf9cc9;hb=12fcf96fbede458905d0f0c3a94429e4c5970dd2;hp=580d140a6941475cfeefc1f295e2b51ec82312b7;hpb=923e068edb27b9b6d35359e496668038a1db6fa4;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 580d140..9f86745 100644
--- 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")
@@ -47,6 +49,7 @@ class NightScene(BaseScene):
         self._paused = False
         self._eaten_tonight = 0
         self._night_over_text = []
+        self._ending = False
 
     def create_tools(self, gamestate):
         tools = []
@@ -105,11 +108,14 @@ class NightScene(BaseScene):
             surface.blit(text, text_pos, None)
 
     def event(self, ev, gamestate):
+        if self._ending:
+            return
         if ev.type == pgl.KEYDOWN:
             if not self._do_ticks:
                 # Any keypress exits
-                self._to_day()
+                self._to_day(gamestate)
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
+                self._ending = True
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
             elif ev.key == pgl.K_e and DEBUG:
@@ -119,7 +125,7 @@ class NightScene(BaseScene):
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if not self._do_ticks:
                 # Any mouse press exits
-                self._to_day()
+                self._to_day(gamestate)
             if ev.button == 1:
                 self._lights.toggle_nearest(ev.pos, surfpos=True)
 
@@ -129,10 +135,11 @@ class NightScene(BaseScene):
                         if tool.name == 'pause play':
                             self.toggle_pause()
                         elif tool.name == 'exit':
+                            self._ending = True
                             from .menu import MenuScene
                             SceneChangeEvent.post(scene=MenuScene())
                         elif tool.name == 'day':
-                            self._to_day()
+                            self._to_day(gamestate)
 
     def toggle_pause(self):
         self._paused = not self._paused
@@ -141,8 +148,18 @@ class NightScene(BaseScene):
             if tool.name == 'pause play':
                 tool.update_image("32", pause_img)
 
-    def _to_day(self):
+    def _to_day(self, gamestate):
         # End the night
+        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())
 
@@ -166,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")
@@ -189,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