X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fmenu.py;h=7f671026b193bae591ec75a3cddc59d9ba36dde4;hb=bf0cca2f391ed3e49b09933325b430c33cf59daf;hp=7a4366aedeb4a686e7c7060dbb4368124c7610ed;hpb=428f0c89073e5518f563a86c8bd42f6073af0007;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/menu.py b/tabakrolletjie/scenes/menu.py
index 7a4366a..7f67102 100644
--- a/tabakrolletjie/scenes/menu.py
+++ b/tabakrolletjie/scenes/menu.py
@@ -6,21 +6,23 @@ from .base import BaseScene
 from ..events import QuitEvent, SceneChangeEvent
 from ..loader import loader
 from ..constants import FONTS
-from ..widgets import TextButton
+from ..widgets import TextButton, SpacerButton
 
 
 class MenuScene(BaseScene):
     def enter(self, gamestate):
         if gamestate.station is None:
             print "Loading Station Alpha ..."
-            gamestate.load_station("station-alpha.json")
+            gamestate.set_station(loader.load_station("station-alpha.json"))
         font_title = loader.load_font(FONTS['bold'], size=32)
         self._title = font_title.render('A Game with a title', True,
                                         (255, 255, 255))
         self._menu = [
-            TextButton("Load Level", (255, 255, 255), name='load level'),
-            TextButton("Start Game (Day)", (255, 255, 255), name='start game'),
-            TextButton("Load Saved Game", (255, 255, 255), name='load game'),
+            TextButton("New Game", (255, 255, 255), name='new game'),
+            TextButton("Continue / Retry", (255, 255, 255), name='continue'),
+            TextButton("Help", (255, 255, 255), name='help'),
+            SpacerButton((50, 30)),
+            TextButton("Quit", (255, 255, 255), name='quit'),
         ]
 
     def render(self, surface, gamestate):
@@ -51,6 +53,10 @@ class MenuScene(BaseScene):
         from .load_level import LoadLevelScene
         SceneChangeEvent.post(scene=LoadLevelScene())
 
+    def _do_help(self):
+        from .help import HelpScene
+        SceneChangeEvent.post(scene=HelpScene())
+
     def event(self, ev, gamestate):
         if ev.type == pgl.KEYDOWN:
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
@@ -62,11 +68,17 @@ class MenuScene(BaseScene):
                 self._do_day()
             elif ev.key == pgl.K_l:
                 self._do_load_level()
+            elif ev.key == pgl.K_h:
+                self._do_help()
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             pressed = self._get_pressed(ev)
-            if pressed == 'load level':
+            if pressed == 'new game':
                 self._do_load_level()
-            elif pressed == 'start game':
+            elif pressed == 'continue':
                 self._do_day()
+            elif pressed == 'help':
+                self._do_help()
+            elif pressed == 'quit':
+                QuitEvent.post()
             elif pressed:
                 print 'Pressed', pressed