Serialize light state across day and night transitions

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

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index e4cc73384b9c433f61755cfd16fe73a35226770f..9459c0ed68668d6edb358879ca93917ab9c75a76 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -18,13 +18,13 @@ from ..transforms import Overlay
 from ..turnip import Turnip
 from ..widgets import ImageButton
 from ..constants import (
-    NIGHT_LENGTH, NIGHT_LENGTH_HOURS, DEBUG, FONTS, SCREEN_SIZE, FPS)
+    NIGHT_LENGTH, NIGHT_HOURS_PER_TICK, DEBUG, FONTS,
+    SCREEN_SIZE, FPS)
 
 
 class NightScene(BaseScene):
 
     DARKNESS = Overlay(colour=(0, 0, 0, 150))
-    HOURS_PER_TICK = float(NIGHT_LENGTH_HOURS) / NIGHT_LENGTH
 
     def enter(self, gamestate):
         self._space = pymunk.Space()
@@ -69,11 +69,13 @@ class NightScene(BaseScene):
 
     @property
     def power_usage(self):
-        return int(self._lights.total_power_usage())
+        power = self._lights.total_power_usage()
+        power = power / (FPS * NIGHT_HOURS_PER_TICK)
+        return int(round(power))
 
     def remaining_hours(self):
         return int(round(
-            (NIGHT_LENGTH - self._total_ticks) * self.HOURS_PER_TICK))
+            (NIGHT_LENGTH - self._total_ticks) * NIGHT_HOURS_PER_TICK))
 
     @debug_timer("night.render")
     def render(self, surface, gamestate):
@@ -106,7 +108,7 @@ class NightScene(BaseScene):
         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):
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
@@ -117,7 +119,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)
 
@@ -130,7 +132,7 @@ class NightScene(BaseScene):
                             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
@@ -139,8 +141,9 @@ 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
+        gamestate.update_lights(self._lights)
         from .day import DayScene
         SceneChangeEvent.post(scene=DayScene())