X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=cbe0460c4717a86fb15181a1a9f040e0d49457a2;hb=bf599c6a9c40524185436ff616d420a64bbdb47a;hp=8c42b06eebbf02a11f6c5ba2790a647269c447db;hpb=7062402aa29c06de2d4ae7340f5e3c1f210f87a7;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 8c42b06..cbe0460 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -40,8 +40,10 @@ class DayScene(BaseScene):
         self._tool = None
         self._light_colors = None
         self._dragging = None
-        # Turnip
-        self.grow_turnips(gamestate)
+        # Create Turnips
+        for turnip_data in gamestate.turnips:
+            turnip = Turnip(space=self._space, **turnip_data)
+            self._turnips.append(turnip)
         # Tools
         self._light_toolbar = []
         self._tools = self.create_tools(gamestate)
@@ -89,17 +91,6 @@ class DayScene(BaseScene):
             (shadowed_text("Press a key to return to the menu",
                            FONTS["sans"], 24), (350, 400)))
 
-    def grow_turnips(self, gamestate):
-        for turnip_data in gamestate.turnips:
-            turnip = Turnip(space=self._space, **turnip_data)
-            # Turnips grow at dawn
-            seeds = turnip.grow()
-            if seeds:
-                gamestate.seeds += seeds
-                gamestate.harvested += 1
-            else:
-                self._turnips.append(turnip)
-
     def create_tools(self, gamestate):
         tools = []
 
@@ -112,6 +103,9 @@ class DayScene(BaseScene):
             tool = ImageButton(
                 '32', '%s.png' % light_config["type"], name='light',
                 pos=(x, y))
+            font = loader.load_font(FONTS["sans"], size=12)
+            tool_cost = font.render("%d" % light_config["cost"], True, (0, 0, 0))
+            tool._img.blit(tool_cost, (16, 12), None)
             tool.light_config = light_config
             tools.append(tool)
             x += step
@@ -132,14 +126,14 @@ class DayScene(BaseScene):
 
     def exit(self, gamestate):
         self._unset_cursor()
-        turnip_data = [turnip.serialize() for turnip in self._turnips]
-        gamestate.turnips = turnip_data
 
     def end_day(self, gamestate):
         if self._ending:
             return
         self._battery.apply_recharge()
         gamestate.update_lights(self._lights)
+        turnip_data = [turnip.serialize() for turnip in self._turnips]
+        gamestate.turnips = turnip_data
         self._ending = True
         from .night import NightScene
         SceneChangeEvent.post(scene=NightScene())