Mercurial > skaapsteker

changeset 532:eec2cf912e03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add tearing rice sound. Only smash breakables once.
author Simon Cross <hodgestar@gmail.com>
date Sun, 10 Apr 2011 00:19:20 +0200
parents 5f1058593462
children 89f7ea0f4b0e
files skaapsteker/sprites/items.py
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/sprites/items.py	Sun Apr 10 00:18:36 2011 +0200
+++ b/skaapsteker/sprites/items.py	Sun Apr 10 00:19:20 2011 +0200
@@ -12,7 +12,7 @@
 class BreakableItem(Item):
     whole_image_file = None
     broken_image_file = None
-    breaking_sound = (None, None)
+    breaking_sound = None, None
 
     collides_with = set([PC_LAYER, PROJECTILE_LAYER])
 
@@ -29,11 +29,12 @@
 
 
     def smash(self):
-        self._me.broken = True
-        self.broken = True
-        self.setup_image_data(self._starting_tile_pos)
-        if self.breaking_sound[0] is not None:
-            sound.play_sound(self.breaking_sound[0])
+        if not self._me.broken:
+            self._me.broken = True
+            self.broken = True
+            self.setup_image_data(self._starting_tile_pos)
+            if self.breaking_sound[0] is not None:
+                sound.play_sound(self.breaking_sound[0])
 
     def damage(self, damage):
         self.smash()
@@ -220,7 +221,7 @@
 class Vase(BreakableItem):
     whole_image_file = 'props/vase-whole.png'
     broken_image_file = 'props/vase-broken.png'
-    breaking_sound = ('sounds/vase breaking.ogg', 0.1)
+    breaking_sound = 'sounds/vase breaking.ogg', 0.1
 
 
 class Salmon(Item):
@@ -249,6 +250,7 @@
 class Rice(BreakableItem):
     whole_image_file = 'props/rice-whole.png'
     broken_image_file = 'props/rice-broken.png'
+    breaking_sound = 'sounds/tearing-rice bag.ogg', 0.2
 
 
 class Documents(Item):