X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=e4cc73384b9c433f61755cfd16fe73a35226770f;hb=48c809306d2aaf6ed2487aad4970138601d74a60;hp=803827665d534eb2627aef88dc47bb4d42a6d1a6;hpb=e26b9da6eb050eda3943d8451a71c32ae6aad3d8;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 8038276..e4cc733 100644
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -8,7 +8,7 @@ import pymunk
 from .base import BaseScene
 from ..battery import BatteryManager
 from ..lights import LightManager
-from ..infobar import InfoBar
+from ..infobar import InfoBar, CountDownBar
 from ..obstacles import ObstacleManager
 from ..enemies import Boyd
 from ..events import SceneChangeEvent
@@ -17,12 +17,14 @@ from ..loader import loader
 from ..transforms import Overlay
 from ..turnip import Turnip
 from ..widgets import ImageButton
-from ..constants import NIGHT_LENGTH, DEBUG, FONTS, SCREEN_SIZE, FPS
+from ..constants import (
+    NIGHT_LENGTH, NIGHT_LENGTH_HOURS, 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()
@@ -31,6 +33,7 @@ class NightScene(BaseScene):
         self._battery = BatteryManager(gamestate)
         self.check_battery()
         self._infobar = InfoBar("day", battery=self._battery, scene=self)
+        self._countdownbar = CountDownBar("h")
         self._mould = Boyd(gamestate, self._space)
         self._turnips = []
         for turnip_data in gamestate.turnips:
@@ -55,6 +58,11 @@ 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)
@@ -63,6 +71,10 @@ class NightScene(BaseScene):
     def power_usage(self):
         return int(self._lights.total_power_usage())
 
+    def remaining_hours(self):
+        return int(round(
+            (NIGHT_LENGTH - self._total_ticks) * self.HOURS_PER_TICK))
+
     @debug_timer("night.render")
     def render(self, surface, gamestate):
         surface.blit(self._soil, (0, 0))
@@ -82,6 +94,7 @@ class NightScene(BaseScene):
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)
         self._infobar.render(surface, gamestate)
+        self._countdownbar.render(surface, self.remaining_hours())
 
         for tool in self._tools:
             tool.render(surface)
@@ -116,6 +129,8 @@ class NightScene(BaseScene):
                         elif tool.name == 'exit':
                             from .menu import MenuScene
                             SceneChangeEvent.post(scene=MenuScene())
+                        elif tool.name == 'day':
+                            self._to_day()
 
     def toggle_pause(self):
         self._paused = not self._paused
@@ -167,6 +182,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]