Add days to gamestate and day screen display

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

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 468c4ca995b416ef320a5c662c5661a161444213..e54e2f1664a6c5ecc916127e1b5bf0b37d2f5e9e 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -174,10 +174,10 @@ class DayScene(BaseScene):
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
-            if ev.key == pgl.K_e:
+            elif ev.key == pgl.K_e:
                 from .night import NightScene
                 SceneChangeEvent.post(scene=NightScene())
-            if ev.key == pgl.K_SPACE:
+            elif ev.key == pgl.K_SPACE:
                 self._paused = not self._paused
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if ev.button == 1:
@@ -244,8 +244,8 @@ class DayScene(BaseScene):
             self._lights.tick()
 
     def _update_toolbar(self, gamestate):
-        text = ("Turnip Stocks: Seeds: %d. Planted: %d. "
+        text = ("Day: %d: Turnip Stocks: Seeds: %d. Planted: %d. "
                 "Harvested: %d. Destroyed: %d" %
-                (self._seeds, len(self._turnips),
+                (gamestate.days, self._seeds, len(self._turnips),
                  self._harvested, gamestate.eaten))
         self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))