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

diff --combined tabakrolletjie/scenes/day.py
index aff92a61507cf45dec0191c6ca14bc635fc50b0a,17690e254da011e93429cf9c213291a3f83bdf3b..017675432ce71828a012c7e015cd1f10c6125978
--- 1/tabakrolletjie/scenes/day.py
--- 2/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@@ -10,7 -10,6 +10,7 @@@ import pymun
  import pymunk.pygame_util
  
  from .base import BaseScene
 +from ..battery import BatteryManager
  from ..lights import LightManager, light_fitting_by_type
  from ..obstacles import ObstacleManager
  from ..events import SceneChangeEvent
@@@ -18,7 -17,7 +18,7 @@@ from ..utils import debug_timer, shadow
  from ..loader import loader
  from ..transforms import Overlay, Alpha, ColourWedges
  
--from ..constants import SCREEN_SIZE, FONTS
++from ..constants import SCREEN_SIZE, FONTS, DEBUG
  from ..widgets import ImageButton
  from ..turnip import Turnip, TurnipInvalidPosition
  
@@@ -32,7 -31,6 +32,7 @@@ class DayScene(BaseScene)
          self._toolbar_font = loader.load_font(FONTS['sans'], size=20)
          self._obstacles = ObstacleManager(self._space, gamestate)
          self._lights = LightManager(self._space, gamestate)
 +        self._battery = BatteryManager(gamestate)
          self._turnips = []
          self._seeds = gamestate.seeds
          self._harvested = gamestate.harvested
@@@ -81,11 -79,9 +81,9 @@@
  
      def create_tools(self, gamestate):
          tools = []
-         x, y, step = 0, SCREEN_SIZE[1] - 40, 50
  
-         tools.append(ImageButton(
-             '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
-         x += step
+         x, y, step = 50, SCREEN_SIZE[1] - 40, 50
 -        
++
          tools.append(ImageButton('32', 'seed.png', name='seed', pos=(x, y)))
          x += step
  
@@@ -97,9 -93,11 +95,12 @@@
              tools.append(tool)
              x += step
  
+         tools.append(ImageButton(
+             '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
+ 
          tools.append(ImageButton(
 -            '32', 'night.png', name='start night', pos=(SCREEN_SIZE[0] - 100, y)))
 +            '32', 'night.png', name='start night',
 +            pos=(SCREEN_SIZE[0] - 100, y)))
          tools.append(ImageButton(
              '32', 'exit.png', name='exit', pos=(SCREEN_SIZE[0] - 50, y)))
          return tools
@@@ -111,11 -109,6 +112,11 @@@
          turnip_data = [turnip.serialize() for turnip in self._turnips]
          gamestate.turnips = turnip_data
  
 +    def end_day(self, gamestate):
 +        self._battery.apply_recharge()
 +        from .night import NightScene
 +        SceneChangeEvent.post(scene=NightScene())
 +
      @debug_timer("day.render")
      def render(self, surface, gamestate):
          surface.blit(self._soil, (0, 0))
@@@ -210,8 -203,9 +211,8 @@@
                  from .menu import MenuScene
                  SceneChangeEvent.post(scene=MenuScene())
              elif ev.key == pgl.K_e:
 -                from .night import NightScene
 -                SceneChangeEvent.post(scene=NightScene())
 +                self.end_day(gamestate)
-             elif ev.key == pgl.K_SPACE:
+             elif ev.key == pgl.K_SPACE and DEBUG:
                  self._paused = not self._paused
          elif ev.type == pgl.MOUSEBUTTONDOWN:
              if ev.button == 1:
@@@ -224,7 -218,8 +225,7 @@@
                              self._tool = None
                              self._clear_light_toolbar()
                          elif tool.name == 'start night':
 -                            from .night import NightScene
 -                            SceneChangeEvent.post(scene=NightScene())
 +                            self.end_day(gamestate)
                          elif tool.name == 'exit':
                              from .menu import MenuScene
                              SceneChangeEvent.post(scene=MenuScene())