changeset 230:ec2682b373e7

Add chopping sound. Tweak mess descriptions
author Neil Muller <neil@dip.sun.ac.za>
date Thu, 26 Aug 2010 23:23:10 +0200
parents 1e970e759ac0
children 84ea1f73bde0
files Resources/sounds/chopping.ogg Resources/sounds/sources.txt gamelib/scenes/mess.py
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
Binary file Resources/sounds/chopping.ogg has changed
--- a/Resources/sounds/sources.txt	Thu Aug 26 23:18:47 2010 +0200
+++ b/Resources/sounds/sources.txt	Thu Aug 26 23:23:10 2010 +0200
@@ -33,11 +33,13 @@
 Not copyrightable.
 
 [can_hit.ogg]
+[chopping.ogg]
 URL: http://www.archive.org/download/Berklee44v12/Berklee44v12.zip
 Source: http://www.archive.org/details/Berklee44v12
 License: http://creativecommons.org/licenses/by/3.0/
 Credit: Sound samples from Berklee recorded for Richard Boulanger for use in the One Laptop per Child music library. See http://wiki.laptop.org/go/Sound_samples for details.
 can_hit.ogg wavfile: Trashcan_hit2.wav
+chopping.ogg wavfile: chopping4.wav
 
 [grinder.ogg]
 URL: http://www.archive.org/download/Berklee44v7/Berklee44v7.zip
--- a/gamelib/scenes/mess.py	Thu Aug 26 23:18:47 2010 +0200
+++ b/gamelib/scenes/mess.py	Thu Aug 26 23:23:10 2010 +0200
@@ -146,7 +146,12 @@
         }
 
     def get_description(self):
-        return "The brocolli seems to have become entangled with something"
+        if self.get_data('status') == "blocked":
+            return "The brocolli seems to have become entangled with something"
+        elif self.get_data("status") == "broken":
+            return "These broken pipes look important."
+        else:
+            return "Your fix looks like it's holding up well."
 
     def interact_with_machete(self, item):
         if self.get_data("status") == "blocked":
@@ -154,7 +159,8 @@
             self.set_interact("broken")
             return Result("With a flurry of disgusting mutant vegetable chunks,"
                           " you clear the overgrown broccoli away from the access"
-                          " panel and reveal some broken tubes. They look important.")
+                          " panel and reveal some broken tubes. They look important.",
+                          soundfile='chopping.ogg')
         elif self.get_data("status") == "broken":
             return Result("It looks broken enough already.")
         else: