X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=d19b0c6e526e68118be0fca16b005bd13b836f9b;hb=6d2f8b1b22e097df92c515dfcf3baa6074483b97;hp=be8642509d5a4418a74e53c550e3bfef09a12e7e;hpb=4b40709e4dcc9c9924a93f6c4b5cfd8217c4d2af;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index be86425..d19b0c6 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -15,7 +15,7 @@ from ..lights import LightManager, light_fitting_by_type, check_space_for_light
 from ..infobar import InfoBar
 from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
-from ..utils import debug_timer, shadowed_text
+from ..utils import debug_timer, shadowed_text, write_save_file
 from ..loader import loader
 from ..transforms import Overlay, Alpha, ColourWedges
 
@@ -53,6 +53,9 @@ class DayScene(BaseScene):
             self._draw_you_lose(gamestate)
         elif gamestate.harvested >= gamestate.turnip_target:
             self._draw_you_win(gamestate)
+        else:
+            write_save_file(gamestate.serialize())
+        self._ending = False
 
     def _draw_you_lose(self, gamestate):
         overlay = pygame.surface.Surface(
@@ -128,7 +131,11 @@ class DayScene(BaseScene):
         gamestate.turnips = turnip_data
 
     def end_day(self, gamestate):
+        if self._ending:
+            return
         self._battery.apply_recharge()
+        gamestate.update_lights(self._lights)
+        self._ending = True
         from .night import NightScene
         SceneChangeEvent.post(scene=NightScene())
 
@@ -225,12 +232,16 @@ class DayScene(BaseScene):
             self._lights.add_light(cfg)
 
     def event(self, ev, gamestate):
+        if self._ending:
+            return
         if self._game_over_text:
             if ev.type in (pgl.KEYDOWN, pgl.MOUSEBUTTONDOWN):
+                self._ending = True
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
         if ev.type == pgl.KEYDOWN:
             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:
@@ -250,6 +261,7 @@ class DayScene(BaseScene):
                         elif tool.name == 'start night':
                             self.end_day(gamestate)
                         elif tool.name == 'exit':
+                            self._ending = True
                             from .menu import MenuScene
                             SceneChangeEvent.post(scene=MenuScene())
                         else: