Changeset 239

Timestamp:

01/05/07 02:43:51 (5 years ago)

Author:

mg

Message:

More sound effects.

Location:

trunk

Files:

• NEWS.txt (modified) (1 diff)
• src/pyspacewar/sounds/Grenade2.au (added)
• src/pyspacewar/sounds/Grenade2.wav (added)
• src/pyspacewar/sounds/README.txt (modified) (1 diff)
• src/pyspacewar/sounds/bomb.wav (added)
• src/pyspacewar/ui.py (modified) (3 diffs)
• src/pyspacewar/world.py (modified) (3 diffs)

trunk/NEWS.txt

@@ -8 +8 @@
     a better video mode; if not, give a better first impression by avoiding
     sluggishness.
-  - Sound effects!  Well, one sound effect.
+  - Sound effects!
 
 December 25, 2006: Released version 0.9.3: the Christmas release.

trunk/src/pyspacewar/sounds/README.txt

@@ -1 +1 @@
 These are public domain sounds, downloaded from
 http://www.partnersinrhyme.com/pir/PIRsfx.shtml
+
+Grenade2.wav was produced from Grenade2.pcm with
+mplayer Grenade2.au -ao pcm:file=Grenade2.wav

trunk/src/pyspacewar/ui.py

@@ -1974 +1974 @@
         self.bounce_sound = pygame.mixer.Sound(find('sounds',
                                                     'electricshock.wav'))
+        self.hit_sound = pygame.mixer.Sound(find('sounds', 'Grenade2.wav'))
+        self.explode_sound = pygame.mixer.Sound(find('sounds', 'bomb.wav'))
 
     def _init_fonts(self):
@@ -2003 +2005 @@
         for ship in self.ships:
             ship.bounce_effect = self.bounce_effect_Ship
+            ship.hit_effect = self.hit_effect_Ship
+            ship.explode_effect = self.explode_effect_Ship
         self.ai = map(AIController, self.ships)
         self.ai_controlled = [False] * len(self.ships)
@@ -2260 +2264 @@
         """Play a sound effect when the player's ship bounces off something."""
         player_id = self.ships.index(ship)
+        if not self.ai_controlled[player_id] and not ship.dead:
+            self.bounce_sound.play()
+
+    def hit_effect_Ship(self, ship, missile):
+        """Play a sound effect when the player's ship is hit."""
+        player_id = self.ships.index(ship)
         if not self.ai_controlled[player_id]:
-            self.bounce_sound.play()
+            self.hit_sound.play()
+
+    def explode_effect_Ship(self, ship, killer):
+        """Play a sound effect when the player's ship explodes."""
+        player_id = self.ships.index(ship)
+        if not self.ai_controlled[player_id]:
+            self.explode_sound.play()
 
     def draw(self):

trunk/src/pyspacewar/world.py

@@ -556 +556 @@
         self.dead = False
         self.spawn_time = 0 # the value of world.time when last respawned
+        self.hit_effect = None
+        self.explode_effect = None
 
     def _set_direction(self, direction):
@@ -640 +642 @@
             killed_by = other.launched_by
             self.velocity += other.velocity * self.missile_recoil
+            if self.hit_effect:
+                self.hit_effect(self, other)
         else:
             self.health -= self.collision_damage
@@ -659 +663 @@
         self.add_debris(time=50, maxdistance=self.size * 0.5,
                         howmany=self.world.rng.randrange(9, 21))
+        if self.explode_effect:
+            self.explode_effect(self, killed_by)
 
     def respawn(self):