Move turnip growth and related updates to the end of the night

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

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 16e2249e5c6fbb32b8007749dbd7cb08227a3934..2a1cc35a18c8c0a12f546d4067c6e7edac7676dc 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -17,6 +17,7 @@ from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
 from ..utils import debug_timer, shadowed_text, write_save_file
 from ..loader import loader
+from ..sound import sound
 from ..transforms import Overlay, Alpha, ColourWedges
 
 from ..constants import SCREEN_SIZE, FONTS, FPS, NIGHT_HOURS_PER_TICK, DEBUG
@@ -39,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)
@@ -88,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 = []
 
@@ -131,14 +123,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())
@@ -202,8 +194,7 @@ class DayScene(BaseScene):
                 self._turnips.append(turnip)
                 gamestate.seeds -= 1
             except TurnipInvalidPosition:
-                # TODO: Add error sound or something
-                pass
+                sound.play_sound("beep_kind.ogg")
 
     def _update_light_angle(self, pos, gamestate):
         # Update the angle of the given light
@@ -228,6 +219,7 @@ class DayScene(BaseScene):
                 ev.pos, pygame.display.get_surface())
             # Bail if we're too close to an existing light, obstacle or turnip
             if check_space_for_light(self._space, pos, max_distance=25):
+                sound.play_sound("beep_kind.ogg")
                 return
             gamestate.seeds -= cost
             cfg["position"] = pos