X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=9459c0ed68668d6edb358879ca93917ab9c75a76;hb=0244fa47c747ff7c68bba61328aea7a6ac9d82c8;hp=e78ba815c3294219efb0a4a421e0850969a725c9;hpb=0f420d66fa52bfdbd95683e44819c79c94211d7c;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index e78ba81..9459c0e 100644
--- 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()
@@ -58,17 +58,24 @@ class NightScene(BaseScene):
             '32', 'exit.png', name='exit', pos=(SCREEN_SIZE[0] - 50, y)))
         return tools
 
+    def add_day_button(self):
+        y = SCREEN_SIZE[1] - 40
+        self._tools.append(ImageButton(
+            '32', 'day.png', name='day', pos=(SCREEN_SIZE[0] - 200, y)))
+
     @property
     def turnip_count(self):
         return len(self._turnips)
 
     @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):
@@ -101,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())
@@ -112,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)
 
@@ -124,6 +131,8 @@ class NightScene(BaseScene):
                         elif tool.name == 'exit':
                             from .menu import MenuScene
                             SceneChangeEvent.post(scene=MenuScene())
+                        elif tool.name == 'day':
+                            self._to_day(gamestate)
 
     def toggle_pause(self):
         self._paused = not self._paused
@@ -132,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())
 
@@ -175,6 +185,10 @@ class NightScene(BaseScene):
                 self._end_night()
             if not self._mould.alive():
                 self._end_night()
+            if not self.turnip_count:
+                self.add_day_button()
+            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]