Mercurial > nagslang

changeset 591:8dcf5176ffd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Door sound.
author Jeremy Thurgood <firxen@gmail.com>
date Sat, 07 Sep 2013 23:28:20 +0200
parents d1c4cf7dfeca
children db8b87caa402
files data/levels/level1 nagslang/game_object.py nagslang/sound.py
diffstat 3 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/level1	Sat Sep 07 23:21:19 2013 +0200
+++ b/data/levels/level1	Sat Sep 07 23:28:20 2013 +0200
@@ -62,11 +62,6 @@
   - door_switch
   classname: PuzzleDoor
   name: switch_door
-- args:
-  - [600, 600]
-  - 100
-  - 1000
-  classname: GravityWell
 lines:
 - - [750, 680]
   - [800, 680]
--- a/nagslang/game_object.py	Sat Sep 07 23:21:19 2013 +0200
+++ b/nagslang/game_object.py	Sat Sep 07 23:28:20 2013 +0200
@@ -14,6 +14,7 @@
     ZORDER_HIGH)
 from nagslang.resources import resources
 from nagslang.events import DoorEvent
+from nagslang.sound import sound
 
 
 class Result(object):
@@ -404,7 +405,7 @@
         DoorEvent.post(self.destination, self.dest_pos)
 
     def door_opened(self):
-        pass
+        sound.play_sound('robotstep2.ogg')
 
 
 class Door(BaseDoor):
@@ -468,6 +469,7 @@
 
     def door_opened(self):
         self._stored_state['is_open'] = True
+        super(PuzzleDoor, self).door_opened()
 
     def set_stored_state_dict(self, stored_state):
         self._stored_state = stored_state
--- a/nagslang/sound.py	Sat Sep 07 23:21:19 2013 +0200
+++ b/nagslang/sound.py	Sat Sep 07 23:28:20 2013 +0200
@@ -63,7 +63,7 @@
         mixer.music.unpause()
 
     def stop(self):
-        mixer.stop()
+        mixer.fadeout(1000)
         mixer.music.stop()