X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=1e65fe10794b0e3e05c2a97339df7672ecbcd702;hb=e26b9da6eb050eda3943d8451a71c32ae6aad3d8;hp=17506fd1f04e1e828667f7958e644f7b91c079e1;hpb=23617e4ca4cb091ad5f4bb55caee87c427993525;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 17506fd..1e65fe1 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -21,7 +21,7 @@ from ..transforms import Overlay, Alpha, ColourWedges
 
 from ..constants import SCREEN_SIZE, FONTS, DEBUG
 from ..widgets import ImageButton
-from ..turnip import Turnip, TurnipInvalidPosition
+from ..turnip import Turnip, TurnipInvalidPosition, check_turnips
 
 
 class DayScene(BaseScene):
@@ -44,7 +44,6 @@ class DayScene(BaseScene):
         # Tools
         self._light_toolbar = []
         self._tools = self.create_tools(gamestate)
-        self._infobar.update(gamestate)
         # Background
         self._soil = loader.load_image(
             "textures", "soil.png", transform=self.BRIGHTNESS)
@@ -150,7 +149,7 @@ class DayScene(BaseScene):
         self._lights.render_light(surface)
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)
-        self._infobar.render(surface)
+        self._infobar.render(surface, gamestate)
         for tool in self._tools:
             tool.render(surface)
         for light_tool in self._light_toolbar:
@@ -184,12 +183,11 @@ class DayScene(BaseScene):
             # since that looks weird, but we don't want to center
             # the turnip under the mouse either, since that
             # causes issues as well, so we compromise
-            pos = (ev.pos[0] - 8, ev.pos[1] - 8)
+            pos = (ev.pos[0] - 18, ev.pos[1] - 18)
             try:
                 turnip = Turnip(age=0, pos=pos, space=self._space)
                 self._turnips.append(turnip)
                 gamestate.seeds -= 1
-                self._infobar.update(gamestate)
             except TurnipInvalidPosition:
                 # TODO: Add error sound or something
                 pass
@@ -218,8 +216,10 @@ class DayScene(BaseScene):
             # Bail if we're too close to an existing light
             if self._lights.nearest(pos, max_distance=25):
                 return
+            # Also check turnips
+            if check_turnips(self._space, pos, max_distance=25):
+                return
             gamestate.seeds -= cost
-            self._infobar.update(gamestate)
             cfg["position"] = pos
             cfg["colours"] = colours
             gamestate.station["lights"].append(cfg)