X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=6b42f6bf878dafad72ef01fc63077230c71cc8b4;hb=11ec553b801969b1508405bfe2300243b1741c52;hp=ffc2ee95f9c345ab96256e2489b743acdb1f433b;hpb=d16507c49b10bdcfc70aa6f813182ec26a4be2da;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index ffc2ee9..6b42f6b 100644
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -1,7 +1,6 @@
 """ In the night, the mould attacks. """
 
 import pygame.locals as pgl
-import pygame.surface
 
 import pymunk
 
@@ -12,10 +11,15 @@ from ..enemies import Boyd
 from ..events import SceneChangeEvent
 from ..utils import debug_timer
 from ..loader import loader
+from ..transforms import Overlay
 from ..turnip import Turnip
+from ..constants import NIGHT_LENGTH, DEBUG
 
 
 class NightScene(BaseScene):
+
+    DARKNESS = Overlay(colour=(0, 0, 0, 150))
+
     def enter(self, gamestate):
         self._space = pymunk.Space()
         self._obstacles = ObstacleManager(self._space, gamestate)
@@ -25,14 +29,13 @@ class NightScene(BaseScene):
         for turnip_data in gamestate.turnips:
             turnip = Turnip(space=self._space, **turnip_data)
             self._turnips.append(turnip)
+        self._soil = loader.load_image(
+            "textures", "soil.png", transform=self.DARKNESS)
+        self._total_ticks = 0
 
     @debug_timer("night.render")
     def render(self, surface, gamestate):
-        surface.blit(loader.load_image("textures", "soil.png"), (0, 0))
-        darkness = pygame.surface.Surface(surface.get_size())
-        darkness = darkness.convert_alpha()
-        darkness.fill((0, 0, 0, 150))
-        surface.blit(darkness, (0, 0))
+        surface.blit(self._soil, (0, 0))
 
         self._mould.render(surface)
 
@@ -43,6 +46,7 @@ class NightScene(BaseScene):
                 gamestate.eaten += 1
             else:
                 turnip.render(surface)
+
         self._lights.render_light(surface)
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)
@@ -52,18 +56,28 @@ class NightScene(BaseScene):
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
-            if ev.key == pgl.K_e:
-                from .day import DayScene
-                SceneChangeEvent.post(scene=DayScene())
+            if ev.key == pgl.K_e and DEBUG:
+                self._to_day()
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if ev.button == 1:
                 self._lights.toggle_nearest(ev.pos, surfpos=True)
                 print self._lights.lit_by(ev.pos, surfpos=True)
 
+    def _to_day(self):
+        # End the night
+        from .day import DayScene
+        SceneChangeEvent.post(scene=DayScene())
+
     @debug_timer("night.tick")
     def tick(self, gamestate):
-        self._mould.tick(gamestate, self._space, self._lights)
-        self._lights.tick()
+        if self._total_ticks < NIGHT_LENGTH:
+            self._mould.tick(gamestate, self._space, self._lights)
+            self._lights.tick()
+            print "Power usage: ", self._lights.total_power_usage()
+        else:
+            self._to_day()
+        if not self._mould.alive():
+            self._to_day()
 
     def exit(self, gamestate):
         turnip_data = [turnip.serialize() for turnip in self._turnips]