From: David Sharpe <decoydavid@gmail.com>
Date: Sat, 17 May 2014 12:51:20 +0000 (+0200)
Subject: Merge branch 'master' of git://ctpug.org.za/naja
X-Git-Tag: 0.1~95
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=d8ba5bc439430a1a009b776c4f08673d45253815;hp=33c14b6ac08f42a34a56ca3309b64b616a4fa650;p=naja.git

Merge branch 'master' of git://ctpug.org.za/naja
---

diff --git a/data/music/A_ninja.ogg b/data/music/A_ninja.ogg
new file mode 100644
index 0000000..096fc83
Binary files /dev/null and b/data/music/A_ninja.ogg differ
diff --git a/data/music/SOURCES.txt b/data/music/SOURCES.txt
index 45732a9..e56f304 100644
--- a/data/music/SOURCES.txt
+++ b/data/music/SOURCES.txt
@@ -47,3 +47,11 @@ Music files by Rolemusic:
       Converted to ogg via:
           mpg123 -w test.wav another_beek_beep_beer_please.mp3
           sox test.wav another_beek.ogg vol 0.25 amplitude
+
+   A_ninja.ogg
+      A ninja among culturachippers
+      Downloaded from: http://freemusicarchive.org/music/Rolemusic/gigs_n_contest/rolemusic_-_gigs_n_contest_-_01_A_ninja_among_culturachippers
+      License: Creative Commons Attribution (CC-BY) (http://creativecommons.org/licenses/by/4.0/)
+      Converted to ogg via:
+          mpg123 -w test.wav A_ninja.mp3
+          sox test.wav A_ninja.ogg vol 0.25 amplitude channels 1
diff --git a/naja/scenes/lose.py b/naja/scenes/lose.py
index 6fe9b4f..ccd0acc 100644
--- a/naja/scenes/lose.py
+++ b/naja/scenes/lose.py
@@ -8,7 +8,7 @@ from naja.constants import KEYS, PALETTE
 from naja.scenes.scene import Scene
 from naja.widgets.image_box import ImageBox
 from naja.widgets.text import TextWidget, TextBoxWidget
-from naja.events import QuitGameEvent
+from naja.events import SceneChangeEvent, LoadGameEvent
 
 
 class LoseScene(Scene):
@@ -35,12 +35,17 @@ class LoseScene(Scene):
             (50, 300), '\n\n'.join([
                 "Something went terribly wrong.",
                 "You should re-evaluate your life choices.",
+                "",
+                "Press ESC to return to the menu",
             ]), fontsize=32,
             colour='white', padding=1, border=1,
             bg_colour='black', border_colour='black',
             box_width=300))
 
     def handle_scene_event(self, ev):
+        from naja.scenes.menu import MenuScene
         if ev.type == pgl.KEYDOWN and ev.key in KEYS.QUIT:
-            QuitGameEvent.post()
+            # drop current state
+            LoadGameEvent.post(None)
+            SceneChangeEvent.post(MenuScene)
             return
diff --git a/naja/scenes/win.py b/naja/scenes/win.py
index 77df66f..59efdb9 100644
--- a/naja/scenes/win.py
+++ b/naja/scenes/win.py
@@ -5,7 +5,8 @@ Win scene.
 import pygame.locals as pgl
 
 from naja.constants import KEYS, PALETTE
-from naja.events import QuitGameEvent
+from naja.events import SceneChangeEvent, LoadGameEvent
+from naja.sound import sound
 from naja.scenes.scene import Scene
 from naja.widgets.image_box import ImageBox
 from naja.widgets.text import TextWidget, TextBoxWidget
@@ -31,12 +32,19 @@ class WinScene(Scene):
                 "You're great.",
                 "You did well.",
                 "You should be proud of yourself.",
+                "",
+                "Press ESC to return to the menu",
             ]),
             colour=PALETTE.WHITE, padding=1, border=1,
             bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLACK,
             box_width=300))
+        sound.play_music('A_ninja.ogg')
 
     def handle_scene_event(self, ev):
+        from naja.scenes.menu import MenuScene
         if ev.type == pgl.KEYDOWN and ev.key in KEYS.QUIT:
-            QuitGameEvent.post()
+            sound.stop()
+            # drop current state
+            LoadGameEvent.post(None)
+            SceneChangeEvent.post(MenuScene)
             return