projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use new GenericBits in chess puzzle.
[naja.git]
/
naja
/
scenes
/
menu.py
diff --git
a/naja/scenes/menu.py
b/naja/scenes/menu.py
index a409b2a8735ac4ebd8441e8307a9eb44a85b42c0..3c7ffb5d8d464c31691b59adcfcf842e8b2db11a 100644
(file)
--- a/
naja/scenes/menu.py
+++ b/
naja/scenes/menu.py
@@
-13,9
+13,11
@@
from naja.scenes.game import GameScene
from naja.scenes.howto import HowtoScene
from naja.scenes.load_save import LoadGameScene, SaveGameScene
from naja.scenes.new_game import NewGameScene
from naja.scenes.howto import HowtoScene
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.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):
class MenuScene(Scene):
@@
-28,7
+30,7
@@
class MenuScene(Scene):
selector = SelectorWidget()
self.add(selector)
selector = SelectorWidget()
self.add(selector)
- y_offset, y_diff = 270,
40
+ y_offset, y_diff = 270,
36
x_offset = 400
y_offset += y_diff
x_offset = 400
y_offset += y_diff
@@
-41,14
+43,21
@@
class MenuScene(Scene):
y_offset += y_diff
new = TextWidget(
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)
centre=True)
new.add_callback('click', self.scene_callback(NewGameScene))
selector.add(new)
+ y_offset += y_diff
+ 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', colour=PALETTE.WHITE,
y_offset += y_diff
load = TextWidget((x_offset, y_offset), 'Load', colour=PALETTE.WHITE,
-
centre=True)
+ centre=True)
load.add_callback('click', self.scene_callback(LoadGameScene))
selector.add(load)
load.add_callback('click', self.scene_callback(LoadGameScene))
selector.add(load)
@@
-76,11
+85,13
@@
class MenuScene(Scene):
y_offset += y_diff
quit = TextWidget((x_offset, y_offset), 'Quit', colour=PALETTE.WHITE,
y_offset += y_diff
quit = TextWidget((x_offset, y_offset), 'Quit', colour=PALETTE.WHITE,
-
centre=True)
+ centre=True)
quit.add_callback('click', lambda event: QuitGameEvent.post())
selector.add(quit)
self.konami = []
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)
def scene_callback(self, scene_class):
return lambda event: SceneChangeEvent.post(scene_class)