From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 10 Sep 2016 19:06:46 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:tabakrolletjie
X-Git-Tag: tabakrolletjie-v1.0.0~53
X-Git-Url: https://git.ctpug.org.za/?p=tabakrolletjie.git;a=commitdiff_plain;h=48c809306d2aaf6ed2487aad4970138601d74a60;hp=-c

Merge branch 'master' of ctpug.org.za:tabakrolletjie
---

48c809306d2aaf6ed2487aad4970138601d74a60
diff --combined tabakrolletjie/scenes/night.py
index e78ba81,674d074..e4cc733
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@@ -8,7 -8,7 +8,7 @@@ import pymun
  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,14 -17,12 +17,14 @@@ from ..loader import loade
  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()
@@@ -33,7 -31,6 +33,7 @@@
          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:
@@@ -58,6 -55,11 +58,11 @@@
              '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)
@@@ -66,10 -68,6 +71,10 @@@
      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))
@@@ -89,7 -87,6 +94,7 @@@
          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)
@@@ -124,6 -121,8 +129,8 @@@
                          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
@@@ -175,6 -174,10 +182,10 @@@
                  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]