X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=4af1d8fe9f52b85b1580fe363a62c1cde2750e2b;hb=9f211541df540369cb876b511b00107dd48bccc2;hp=c28070203c20d6dd7b872af17807988844e1d716;hpb=7c934665afcc5ddffccddf8784b02424e267d6b0;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index c280702..4af1d8f 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -1,7 +1,6 @@
 """ Be prepared. """
 
 import pygame.locals as pgl
-import pygame.surface
 
 import pymunk
 import pymunk.pygame_util
@@ -12,6 +11,7 @@ from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
 from ..loader import loader
+from ..transforms import Overlay, Multiply, Alpha
 
 from ..constants import SCREEN_SIZE, FONTS
 from ..widgets import ImageButton
@@ -19,6 +19,9 @@ from ..turnip import Turnip, TurnipInvalidPosition
 
 
 class DayScene(BaseScene):
+
+    BRIGHTNESS = Overlay(colour=(255, 255, 255, 50))
+
     def enter(self, gamestate):
         self._space = pymunk.Space()
         self._toolbar_font = loader.load_font(FONTS['sans'], size=20)
@@ -42,10 +45,19 @@ class DayScene(BaseScene):
         self._tools = [
             ImageButton('32', 'seed.png', name='seed',
                         pos=(50, SCREEN_SIZE[1] - 40)),
+            ImageButton('32', 'spotlight.png', name='blue_spotlight',
+                        pos=(100, SCREEN_SIZE[1] - 40),
+                        transform=Multiply(colour=(0, 0, 255, 255))),
+            ImageButton('32', 'spotlight.png', name='red_spotlight',
+                        pos=(150, SCREEN_SIZE[1] - 40),
+                        transform=Multiply(colour=(255, 0, 0, 255))),
             ImageButton('32', 'default_cursor.png', name='reset tool',
                         pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
         ]
         self._update_toolbar(gamestate)
+        # Background
+        self._soil = loader.load_image(
+            "textures", "soil.png", transform=self.BRIGHTNESS)
 
     def exit(self, gamestate):
         self._unset_cursor()
@@ -56,12 +68,8 @@ class DayScene(BaseScene):
 
     @debug_timer("day.render")
     def render(self, surface, gamestate):
-        surface.blit(loader.load_image("textures", "soil.png"), (0, 0))
-        brightness = pygame.surface.Surface(surface.get_size())
-        brightness = brightness.convert_alpha()
-        brightness.fill((255, 255, 255, 50))
-        surface.blit(brightness, (0, 0))
-        
+        surface.blit(self._soil, (0, 0))
+
         for turnip in self._turnips:
             turnip.render(surface)
         self._lights.render_light(surface)
@@ -92,7 +100,18 @@ class DayScene(BaseScene):
                             self._tool = None
                         else:
                             self._tool = tool.name
-                            self._set_cursor(tool.name)
+                            if self._tool == 'seed':
+                                self._set_cursor('seed', transform=Alpha(alpha=172))
+                            elif self._tool == 'red_spotlight':
+                                self._set_cursor(
+                                    'spotlight',
+                                    transform=Multiply(
+                                        colour=(255, 0, 0, 172)))
+                            elif self._tool == 'blue_spotlight':
+                                self._set_cursor(
+                                    'spotlight',
+                                    transform=Multiply(
+                                        colour=(0, 0, 255, 172)))
                         return
                 if self._tool == "seed":
                     if self._seeds > 0:
@@ -114,6 +133,9 @@ class DayScene(BaseScene):
                     # Not tool, so check lights
                     self._lights.toggle_nearest(ev.pos, surfpos=True)
                     print self._lights.lit_by(ev.pos, surfpos=True)
+            elif ev.button == 3 and self._tool:
+                self._tool = None
+                self._unset_cursor()
 
     @debug_timer("day.tick")
     def tick(self, gamestate):
@@ -122,7 +144,7 @@ class DayScene(BaseScene):
 
     def _update_toolbar(self, gamestate):
         text = ("Turnip Stocks: Seeds: %d. Planted: %d. "
-                "Harvested: %d. Destroyed: %d" % 
+                "Harvested: %d. Destroyed: %d" %
                 (self._seeds, len(self._turnips),
                  self._harvested, gamestate.eaten))
         self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))