X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=aadff681400cd67a38794eba040dbe71a800d977;hb=ee4a089ad17cc17ff85d2d86d5412eab3fd9038c;hp=f9935d32d761b7f1e9df8d9165b2db121b86cd77;hpb=28c8033fc20fc71e8a5e39fde868ac3f0ccac374;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index f9935d3..aadff68 100644
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -13,7 +13,7 @@ from ..utils import debug_timer
 from ..loader import loader
 from ..transforms import Overlay
 from ..turnip import Turnip
-from ..constants import NIGHT_LENGTH
+from ..constants import NIGHT_LENGTH, DEBUG
 
 
 class NightScene(BaseScene):
@@ -56,22 +56,30 @@ 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):
         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()
-        self._total_ticks += 1
+        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]
         gamestate.turnips = turnip_data
+        gamestate.days += 1