# HG changeset patch
# User David Sharpe <decoydavid@gmail.com>
# Date 1378589433 -7200
# Node ID 21bb9dfa7f9fa1fb4a19a82682727afacd639098
# Parent  0279d573ef7e1063f764158216097dca0e3bb31e# Parent  db8b87caa4022432165812148e79fd05c05f651b
Merge

diff -r 0279d573ef7e -r 21bb9dfa7f9f data/levels/crew
--- a/data/levels/crew	Sat Sep 07 23:29:49 2013 +0200
+++ b/data/levels/crew	Sat Sep 07 23:30:33 2013 +0200
@@ -115,6 +115,16 @@
   - 300
   classname: ChargingAlien
   name: store_alien_1
+- args:
+  - [684, 612]
+  - 300
+  classname: ChargingAlien
+  name: room_one_alien
+- args:
+  - [1304, 760]
+  - 300
+  classname: ChargingAlien
+  name: room_two_alien
 game_objects:
 - args:
   - [730, 936]
@@ -423,6 +433,18 @@
   - [1304, 1024]
   classname: ToggleSwitch
   name: room_two_switch
+- args:
+  - [2668, 1428]
+  classname: SokoBox
+  name: lift_box_1
+- args:
+  - [2792, 1436]
+  classname: SokoBox
+  name: store_box_2
+- args:
+  - [2732, 1316]
+  classname: SokoBox
+  name: lift_box_3
 lines: []
 music: POL-cyber-factory-short.ogg
 polygons:
diff -r 0279d573ef7e -r 21bb9dfa7f9f data/levels/finale
--- a/data/levels/finale	Sat Sep 07 23:29:49 2013 +0200
+++ b/data/levels/finale	Sat Sep 07 23:30:33 2013 +0200
@@ -42,7 +42,7 @@
   classname: AcidFloor
   name: acid_4
 lines: []
-music: POL-cyber-factory-short.ogg
+music: moonlight-sonata.ogg
 polygons:
   1:
   - [1000, 2400]
diff -r 0279d573ef7e -r 21bb9dfa7f9f data/levels/hangar
--- a/data/levels/hangar	Sat Sep 07 23:29:49 2013 +0200
+++ b/data/levels/hangar	Sat Sep 07 23:30:33 2013 +0200
@@ -196,7 +196,7 @@
   name: moonhint
 - args:
   - [2595, 1100]
-  - Agricultural Research Laboratory: Authorised research staff only.
+  - 'Agricultural Research Laboratory: Authorised research staff only.'
   classname: Note
   name: note_sheep
 - args:
diff -r 0279d573ef7e -r 21bb9dfa7f9f data/levels/level1
--- a/data/levels/level1	Sat Sep 07 23:29:49 2013 +0200
+++ b/data/levels/level1	Sat Sep 07 23:30:33 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]
diff -r 0279d573ef7e -r 21bb9dfa7f9f data/sounds/SOURCES.txt
--- a/data/sounds/SOURCES.txt	Sat Sep 07 23:29:49 2013 +0200
+++ b/data/sounds/SOURCES.txt	Sat Sep 07 23:30:33 2013 +0200
@@ -8,3 +8,16 @@
     Generated 2 secs of silence - dd if=/dev/zero of=silence.pcm bs=176400 count=2 ; oggenc -r silence.pcm
     Generated by Neil Muller, Aug 2010
     Not copyrightable.
+
+
+robotstep2.ogg
+--------------
+
+URL:
+    http://archive.org/download/Berklee44Barkovich/Berklee44Barkovich.zip
+Source:
+    http://archive.org/details/Berklee44Barkovich
+License:
+    http://creativecommons.org/licenses/by/3.0
+Notes:
+    Ogg generated using 'oggenc robotstep2.wav'
diff -r 0279d573ef7e -r 21bb9dfa7f9f data/sounds/robotstep2.ogg
Binary file data/sounds/robotstep2.ogg has changed
diff -r 0279d573ef7e -r 21bb9dfa7f9f nagslang/game_object.py
--- a/nagslang/game_object.py	Sat Sep 07 23:29:49 2013 +0200
+++ b/nagslang/game_object.py	Sat Sep 07 23:30:33 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
diff -r 0279d573ef7e -r 21bb9dfa7f9f nagslang/screens/area.py
--- a/nagslang/screens/area.py	Sat Sep 07 23:29:49 2013 +0200
+++ b/nagslang/screens/area.py	Sat Sep 07 23:30:33 2013 +0200
@@ -94,7 +94,7 @@
         self.add_protagonist()
         self.add_game_objects()
         self.save_progress()
-        sound.play_music("POL-cyber-factory-short.ogg")
+        sound.play_music(self._level.music)
         self._background = None
         self._surface = None
 
diff -r 0279d573ef7e -r 21bb9dfa7f9f nagslang/sound.py
--- a/nagslang/sound.py	Sat Sep 07 23:29:49 2013 +0200
+++ b/nagslang/sound.py	Sat Sep 07 23:30:33 2013 +0200
@@ -63,7 +63,7 @@
         mixer.music.unpause()
 
     def stop(self):
-        mixer.stop()
+        mixer.fadeout(1000)
         mixer.music.stop()