Lights can be added to the world

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index e546b292851510f5b3452d68b1a1d63b7f7c9608..077cec033e1a61d9d22b41b6395507091eadf68c 100644 (file)
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -38,6 +38,11 @@ class LightManager(object):
         for light in self._lights:
             light.add(self._space)
 
+    def add_light(self, cfg):
+        light = BaseLight.load(cfg)
+        self._lights.append(light)
+        light.add(self._space)
+
     def toggle_nearest(self, *args, **kw):
         light = self.nearest(*args, **kw)
         if light:

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 4af1d8fe9f52b85b1580fe363a62c1cde2750e2b..7860c87b44e4db2d09c7c11549215648a0ab0acb 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -1,5 +1,6 @@
 """ Be prepared. """
 
+import pygame.display
 import pygame.locals as pgl
 
 import pymunk
@@ -80,6 +81,41 @@ class DayScene(BaseScene):
             tool.render(surface)
         self._draw_cursor(surface)
 
+    def _place_seed(self, gamestate, ev):
+        if self._seeds > 0:
+            # plant seed
+            # We don't want top-left to equal the mouse position,
+            # 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)
+            try:
+                turnip = Turnip(age=0, pos=pos, space=self._space)
+                self._turnips.append(turnip)
+                self._seeds -= 1
+                self._update_toolbar(gamestate)
+            except TurnipInvalidPosition as e:
+                # TODO: Add error sound or something
+                pass
+
+    def _place_spotlight(self, gamestate, colour, ev):
+        if self._seeds > 5:
+            self._seeds -= 5
+            self._update_toolbar(gamestate)
+            pos = pymunk.pygame_util.from_pygame(ev.pos,
+                                                 pygame.display.get_surface())
+            cfg = {
+                "type": "spotlight",
+                "colour": colour,
+                "position": pos,
+                "direction": 45,
+                "angle_limits": [0, 90],
+                "intensity": 0.5,
+                "radius_limits": [0, 100],
+            }
+            gamestate.station["lights"].append(cfg)
+            self._lights.add_light(cfg)
+
     def event(self, ev, gamestate):
         if ev.type == pgl.KEYDOWN:
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
@@ -114,21 +150,11 @@ class DayScene(BaseScene):
                                         colour=(0, 0, 255, 172)))
                         return
                 if self._tool == "seed":
-                    if self._seeds > 0:
-                        # plant seed
-                        # We don't want top-left to equal the mouse position,
-                        # 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)
-                        try:
-                            turnip = Turnip(age=0, pos=pos, space=self._space)
-                            self._turnips.append(turnip)
-                            self._seeds -= 1
-                            self._update_toolbar(gamestate)
-                        except TurnipInvalidPosition as e:
-                            # TODO: Add error sound or something
-                            pass
+                    self._place_seed(gamestate, ev)
+                elif self._tool == 'red_spotlight':
+                    self._place_spotlight(gamestate, 'red', ev)
+                elif self._tool == 'blue_spotlight':
+                    self._place_spotlight(gamestate, 'blue', ev)
                 else:
                     # Not tool, so check lights
                     self._lights.toggle_nearest(ev.pos, surfpos=True)