Merge branch 'master' of ctpug.org.za:tabakrolletjie

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index aff92a61507cf45dec0191c6ca14bc635fc50b0a..017675432ce71828a012c7e015cd1f10c6125978 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -18,7 +18,7 @@ from ..utils import debug_timer, shadowed_text
 from ..loader import loader
 from ..transforms import Overlay, Alpha, ColourWedges
 
-from ..constants import SCREEN_SIZE, FONTS
+from ..constants import SCREEN_SIZE, FONTS, DEBUG
 from ..widgets import ImageButton
 from ..turnip import Turnip, TurnipInvalidPosition
 
@@ -81,11 +81,9 @@ class DayScene(BaseScene):
 
     def create_tools(self, gamestate):
         tools = []
-        x, y, step = 0, SCREEN_SIZE[1] - 40, 50
 
-        tools.append(ImageButton(
-            '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
-        x += step
+        x, y, step = 50, SCREEN_SIZE[1] - 40, 50
+
         tools.append(ImageButton('32', 'seed.png', name='seed', pos=(x, y)))
         x += step
 
@@ -97,6 +95,9 @@ class DayScene(BaseScene):
             tools.append(tool)
             x += step
 
+        tools.append(ImageButton(
+            '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
+
         tools.append(ImageButton(
             '32', 'night.png', name='start night',
             pos=(SCREEN_SIZE[0] - 100, y)))
@@ -211,7 +212,7 @@ class DayScene(BaseScene):
                 SceneChangeEvent.post(scene=MenuScene())
             elif ev.key == pgl.K_e:
                 self.end_day(gamestate)
-            elif ev.key == pgl.K_SPACE:
+            elif ev.key == pgl.K_SPACE and DEBUG:
                 self._paused = not self._paused
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if ev.button == 1:

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 848bb54fa8362def38a6b01d16e7b13d86523a94..e3b51cb03d14eb34471fc17498028dd489b86673 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -14,6 +14,7 @@ from ..utils import debug_timer, shadowed_text
 from ..loader import loader
 from ..transforms import Overlay
 from ..turnip import Turnip
+from ..widgets import ImageButton
 from ..constants import NIGHT_LENGTH, DEBUG, FONTS, SCREEN_SIZE
 
 
@@ -32,11 +33,19 @@ class NightScene(BaseScene):
             self._turnips.append(turnip)
         self._soil = loader.load_image(
             "textures", "soil.png", transform=self.DARKNESS)
+        self._tools = self.create_tools(gamestate)
         self._total_ticks = 0
         self._do_ticks = True
+        self._paused = False
         self._eaten_tonight = 0
         self._night_over_text = []
 
+    def create_tools(self, gamestate):
+        tools = []
+        tools.append(ImageButton(
+            '32', 'pause.png', name='pause play', pos=(SCREEN_SIZE[0] - 150, SCREEN_SIZE[1] - 40)))
+        return tools
+
     @debug_timer("night.render")
     def render(self, surface, gamestate):
         surface.blit(self._soil, (0, 0))
@@ -56,6 +65,9 @@ class NightScene(BaseScene):
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)
 
+        for tool in self._tools:
+            tool.render(surface)
+
         for text, text_pos in self._night_over_text:
             surface.blit(text, text_pos, None)
 
@@ -67,8 +79,10 @@ 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 and DEBUG:
+            elif ev.key == pgl.K_e and DEBUG:
                 self._end_night()
+            elif ev.key == pgl.K_SPACE:
+                self.toggle_pause()
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             if not self._do_ticks:
                 # Any mouse press exits
@@ -77,6 +91,19 @@ class NightScene(BaseScene):
                 self._lights.toggle_nearest(ev.pos, surfpos=True)
                 print self._lights.lit_by(ev.pos, surfpos=True)
 
+                # Check tools
+                for tool in self._tools:
+                    if tool.pressed(ev):
+                        if tool.name == 'pause play':
+                            self.toggle_pause()
+
+    def toggle_pause(self):
+        self._paused = not self._paused
+        pause_img = "play.png" if self._paused else "pause.png"
+        for tool in self._tools:
+            if tool.name == 'pause play':
+                tool.update_image("32", pause_img)
+
     def _to_day(self):
         # End the night
         from .day import DayScene
@@ -103,7 +130,7 @@ class NightScene(BaseScene):
 
     @debug_timer("night.tick")
     def tick(self, gamestate):
-        if self._do_ticks:
+        if self._do_ticks and not self._paused:
             if self._total_ticks < NIGHT_LENGTH:
                 self._mould.tick(gamestate, self._space, self._lights)
                 self._lights.tick()

diff --git a/tabakrolletjie/widgets.py b/tabakrolletjie/widgets.py
index c1d71c3b2fb18885b4429fe88a6f7f279cdb5d1c..3d12a30840b20cf49c40390a6be5707b8801342b 100644 (file)
--- a/tabakrolletjie/widgets.py
+++ b/tabakrolletjie/widgets.py
@@ -76,7 +76,7 @@ class ImageButton(Button):
                                           pos, padding)
 
     def update_image(self, *imgparts, **kwargs):
-        transform=kwargs.pop("transform", NullTransform())
+        transform = kwargs.pop("transform", NullTransform())
         self._img = loader.load_image(*imgparts, transform=transform)
         
     def render(self, surface):