X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fmenu.py;h=2431e07cf2cc9f4be35c1e9419f59f17376c4405;hb=83850d913f756713d0e82c768147a018e2dcc84d;hp=4dde093a9a12ecff4faf807cb10c4e967115a5ca;hpb=1be3c4bdb77da69df48d6c75dc0a6842e2fcf379;p=naja.git

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 4dde093..2431e07 100644
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -10,9 +10,10 @@ from naja.options import options
 from naja.scenes.scene import Scene
 from naja.scenes.credits import CreditsScene
 from naja.scenes.game import GameScene
-from naja.scenes.howto import HowtoScene
+from naja.scenes.introduction import IntroductionScene
 from naja.scenes.load_save import LoadGameScene, SaveGameScene
 from naja.scenes.new_game import NewGameScene
+from naja.scenes.puzzlelist import PuzzleListScene
 from naja.widgets.selector import SelectorWidget
 from naja.widgets.text import TextWidget
 from naja.widgets.image_box import ImageBox
@@ -29,9 +30,16 @@ class MenuScene(Scene):
 
         selector = SelectorWidget()
         self.add(selector)
-        y_offset, y_diff = 270, 40
+        y_offset, y_diff = 270, 36
         x_offset = 400
 
+        y_offset += y_diff
+        intro = TextWidget(
+            (x_offset, y_offset), 'Introduction', colour=PALETTE.WHITE,
+            centre=True)
+        intro.add_callback('click', self.scene_callback(IntroductionScene))
+        selector.add(intro)
+
         y_offset += y_diff
         resume = TextWidget(
             (x_offset, y_offset), 'Resume Game', colour=PALETTE.WHITE,
@@ -40,34 +48,40 @@ class MenuScene(Scene):
         resume.set_selectable_callback(lambda: state is not None)
         selector.add(resume)
 
+        if state is None:
+            selector.position = 2
+        else:
+            selector.position = 1
+
         y_offset += y_diff
         new = TextWidget(
-            (x_offset, y_offset), 'New Game', colour=PALETTE.WHITE,
+            (x_offset, y_offset), 'New Random Game', colour=PALETTE.WHITE,
             centre=True)
         new.add_callback('click', self.scene_callback(NewGameScene))
         selector.add(new)
 
         y_offset += y_diff
-        load = TextWidget((x_offset, y_offset), 'Load', colour=PALETTE.WHITE,
-                          centre=True)
+        new = TextWidget(
+            (x_offset, y_offset), 'New Puzzle', colour=PALETTE.WHITE,
+            centre=True)
+        new.add_callback('click', self.scene_callback(PuzzleListScene))
+        selector.add(new)
+
+        y_offset += y_diff
+        load = TextWidget(
+            (x_offset, y_offset), 'Load Game', colour=PALETTE.WHITE,
+            centre=True)
         load.add_callback('click', self.scene_callback(LoadGameScene))
         selector.add(load)
 
         y_offset += y_diff
         save = TextWidget(
-            (x_offset, y_offset), 'Save', colour=PALETTE.WHITE,
+            (x_offset, y_offset), 'Save Game', colour=PALETTE.WHITE,
             unselectable_colour=PALETTE.GREY, centre=True)
         save.add_callback('click', self.scene_callback(SaveGameScene))
         save.set_selectable_callback(lambda: state is not None)
         selector.add(save)
 
-        y_offset += y_diff
-        howto = TextWidget(
-            (x_offset, y_offset), 'How To Play', colour=PALETTE.WHITE,
-            centre=True)
-        howto.add_callback('click', self.scene_callback(HowtoScene))
-        selector.add(howto)
-
         y_offset += y_diff
         credits = TextWidget(
             (x_offset, y_offset), 'Credits', colour=PALETTE.WHITE,