Render turnips in same order for day and night

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

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 453ccf1001bb92fdbff2a14e04b11ba28da2d5e5..a3e43475d72e63d36edde6cf4997a109cd0b1bcf 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -10,8 +10,9 @@ from ..lights import LightManager
 from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
+from ..loader import loader
 
-from ..constants import SCREEN_SIZE
+from ..constants import SCREEN_SIZE, FONTS
 from ..widgets import ImageButton
 from ..turnip import Turnip, TurnipInvalidPosition
 
@@ -19,11 +20,13 @@ from ..turnip import Turnip, TurnipInvalidPosition
 class DayScene(BaseScene):
     def enter(self, gamestate):
         self._space = pymunk.Space()
+        self._toolbar_font = loader.load_font(FONTS['sans'], size=20)
         self._obstacles = ObstacleManager(self._space, gamestate)
         self._lights = LightManager(self._space, gamestate)
         self._turnips = []
         self._seeds = gamestate.seeds
         self._harvested = gamestate.harvested
+        self._paused = False
         self._tool = None
         for turnip_data in gamestate.turnips:
             turnip = Turnip(space=self._space, **turnip_data)
@@ -34,14 +37,14 @@ class DayScene(BaseScene):
                 self._harvested += 1
             else:
                 self._turnips.append(turnip)
-        print 'Seeds', self._seeds
-        # Toolbar
+        # Tools
         self._tools = [
             ImageButton('32', 'seed.png', name='seed',
                         pos=(50, SCREEN_SIZE[1] - 40)),
             ImageButton('32', 'default_cursor.png', name='reset tool',
                         pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
         ]
+        self._update_toolbar()
 
     def exit(self, gamestate):
         self._unset_cursor()
@@ -53,11 +56,12 @@ class DayScene(BaseScene):
     @debug_timer("day.render")
     def render(self, surface, gamestate):
         surface.fill((0, 0, 155))
+        for turnip in self._turnips:
+            turnip.render(surface)
         self._lights.render_light(surface)
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)
-        for turnip in self._turnips:
-            turnip.render(surface)
+        surface.blit(self._toolbar, (120, 10), None)
         for tool in self._tools:
             tool.render(surface)
         self._draw_cursor(surface)
@@ -70,6 +74,8 @@ class DayScene(BaseScene):
             if ev.key == pgl.K_e:
                 from .night import NightScene
                 SceneChangeEvent.post(scene=NightScene())
+            if ev.key == pgl.K_SPACE:
+                self._paused = not self._paused
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if ev.button == 1:
                 # Check tools
@@ -105,7 +111,10 @@ class DayScene(BaseScene):
 
     @debug_timer("day.tick")
     def tick(self, gamestate):
-        self._lights.tick()
+        if not self._paused:
+            self._lights.tick()
 
     def _update_toolbar(self):
-        pass
+        text = "Turnip Stocks: Seeds: %d. Planted: %d. Harvested: %d" % (
+            self._seeds, len(self._turnips), self._harvested)
+        self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))