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

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index d19b0c6..8c42b06 100644
--- 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
@@ -115,6 +116,10 @@ class DayScene(BaseScene):
             tools.append(tool)
             x += step
 
+        tools.append(ImageButton(
+            '32', 'remove.png', name='remove light', pos=(x, y)))
+        x += step
+
         tools.append(ImageButton(
             '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
 
@@ -198,8 +203,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
@@ -224,6 +228,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
@@ -231,6 +236,11 @@ class DayScene(BaseScene):
             gamestate.station["lights"].append(cfg)
             self._lights.add_light(cfg)
 
+    def _remove_light(self, ev):
+        light = self._lights.nearest(ev.pos, surfpos=True, max_distance=25.0)
+        if light:
+            self._lights.remove_light(light)
+
     def event(self, ev, gamestate):
         if self._ending:
             return
@@ -270,6 +280,10 @@ class DayScene(BaseScene):
                                 self._set_cursor(
                                     'seed', transform=Alpha(alpha=172))
                                 self._clear_light_toolbar()
+                            elif self._tool.name == 'remove light':
+                                self._set_cursor(
+                                    'remove', transform=Alpha(alpha=172))
+                                self._clear_light_toolbar()
                             elif self._tool.name == 'light':
                                 self._unset_cursor()
                                 self._draw_light_toolbar(
@@ -289,6 +303,8 @@ class DayScene(BaseScene):
                 if self._tool:
                     if self._tool.name == "seed":
                         self._place_seed(gamestate, ev)
+                    elif self._tool.name == "remove light":
+                        self._remove_light(ev)
                     elif self._tool.name == "light" and self._light_colors:
                         self._place_light(
                             gamestate, self._tool.light_config,