projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mor deth wit speling
[naja.git]
/
naja
/
scenes
/
menu.py
diff --git
a/naja/scenes/menu.py
b/naja/scenes/menu.py
index 3c7ffb5d8d464c31691b59adcfcf842e8b2db11a..2431e07cf2cc9f4be35c1e9419f59f17376c4405 100644
(file)
--- 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.scene import Scene
from naja.scenes.credits import CreditsScene
from naja.scenes.game import GameScene
-from naja.scenes.
howto import Howto
Scene
+from naja.scenes.
introduction import Introduction
Scene
from naja.scenes.load_save import LoadGameScene, SaveGameScene
from naja.scenes.new_game import NewGameScene
from naja.scenes.puzzlelist import PuzzleListScene
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 = 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,
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)
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,
y_offset += y_diff
new = TextWidget(
(x_offset, y_offset), 'New Random Game', colour=PALETTE.WHITE,
@@
-56,26
+68,20
@@
class MenuScene(Scene):
selector.add(new)
y_offset += y_diff
selector.add(new)
y_offset += y_diff
- load = TextWidget((x_offset, y_offset), 'Load', colour=PALETTE.WHITE,
- centre=True)
+ 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(
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)
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,
y_offset += y_diff
credits = TextWidget(
(x_offset, y_offset), 'Credits', colour=PALETTE.WHITE,