X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=blobdiff_plain;f=naja%2Fscenes%2Fmenu.py;h=2431e07cf2cc9f4be35c1e9419f59f17376c4405;hp=84911c3eb1987b13e00e8758d258b102d63ad49f;hb=51be7c66a7b60369a7165f3130f13951c21e53fa;hpb=a2e00020315065e5730f9fcdd50bf9200d575195 diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py index 84911c3..2431e07 100644 --- a/naja/scenes/menu.py +++ b/naja/scenes/menu.py @@ -10,7 +10,7 @@ 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 @@ -33,6 +33,13 @@ class MenuScene(Scene): 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, @@ -41,6 +48,11 @@ 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 Random Game', colour=PALETTE.WHITE, @@ -70,13 +82,6 @@ class MenuScene(Scene): 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,