X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fmenu.py;h=2431e07cf2cc9f4be35c1e9419f59f17376c4405;hb=51be7c66a7b60369a7165f3130f13951c21e53fa;hp=da009a994acdcd1104bbeb23cb613338d5053d76;hpb=24b6b42799aec7465b6d064eaf3ed052a3355fb5;p=naja.git

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index da009a9..2431e07 100644
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -10,12 +10,14 @@ 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
+from naja.sound import sound
 
 
 class MenuScene(Scene):
@@ -28,54 +30,74 @@ class MenuScene(Scene):
 
         selector = SelectorWidget()
         self.add(selector)
-        y_offset, y_diff = 260, 40
-        x_offset = 320
+        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,
-            unselectable_colour=PALETTE.GREY)
+            unselectable_colour=PALETTE.GREY, centre=True)
         resume.add_callback('click', self.scene_callback(GameScene))
         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)
+        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,
-            unselectable_colour=PALETTE.GREY)
+            (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)
-        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)
+            (x_offset, y_offset), 'Credits', colour=PALETTE.WHITE,
+            centre=True)
         credits.add_callback('click', self.scene_callback(CreditsScene))
         selector.add(credits)
 
         y_offset += y_diff
-        quit = TextWidget((x_offset, y_offset), 'Quit', colour=PALETTE.WHITE)
+        quit = TextWidget((x_offset, y_offset), 'Quit', colour=PALETTE.WHITE,
+                          centre=True)
         quit.add_callback('click', lambda event: QuitGameEvent.post())
         selector.add(quit)
 
         self.konami = []
+        if not sound.playing_music:
+            sound.play_music('scape.ogg', 0.25)
 
     def scene_callback(self, scene_class):
         return lambda event: SceneChangeEvent.post(scene_class)