Changeset 237

Timestamp:

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

Author:

mg

Message:

Another sound effect: bouncing off something.

Add sound effects to the set of distributed files in setup.py

Location:

trunk

Files:

• setup.py (modified) (1 diff)
• src/pyspacewar/sounds/README.txt (modified) (1 diff)
• src/pyspacewar/sounds/electricshock.wav (added)
• src/pyspacewar/ui.py (modified) (4 diffs)
• src/pyspacewar/world.py (modified) (2 diffs)

trunk/setup.py

@@ -50 +50 @@
       packages=['pyspacewar'],
       package_dir={'pyspacewar': 'src/pyspacewar'},
-      package_data={'pyspacewar': ['images/*']},
+      package_data={'pyspacewar': ['images/*', 'sounds/*']},
      )

trunk/src/pyspacewar/sounds/README.txt

@@ -1 +1 @@
 These are public domain sounds, downloaded from
-http://www.partnersinrhyme.com/soundfx/warsounds.shtml
+http://www.partnersinrhyme.com/pir/PIRsfx.shtml

trunk/src/pyspacewar/ui.py

@@ -1972 +1972 @@
         self.fire_sound = pygame.mixer.Sound(find('sounds',
                                                   'Gun_Silencer.wav'))
+        self.bounce_sound = pygame.mixer.Sound(find('sounds',
+                                                    'electricshock.wav'))
 
     def _init_fonts(self):
@@ -1999 +2001 @@
                              rng=self.rng)
         self.ships = self.game.ships
+        for ship in self.ships:
+            ship.bounce_effect = self.bounce_effect_Ship
         self.ai = map(AIController, self.ships)
         self.ai_controlled = [False] * len(self.ships)
@@ -2253 +2257 @@
             self.fire_sound.play()
 
+    def bounce_effect_Ship(self, ship, obstacle):
+        """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]:
+            self.bounce_sound.play()
+
     def draw(self):
         """Draw the state of the game"""
@@ -2445 +2455 @@
             self.update_missile_trails()
             self.framedrop_needed = not self.game.wait_for_tick()
-

trunk/src/pyspacewar/world.py

@@ -346 +346 @@
         self.appearance = appearance
         self.world = None
+        self.bounce_effect = None
 
     def distanceTo(self, other):
@@ -463 +464 @@
         collision_distance = other.radius + self.radius
         self.position = other.position + normal.scaled(collision_distance)
+        if self.bounce_effect:
+            self.bounce_effect(self, other)
 
     def add_debris(self, howmany=None, maxdistance=1.0, time=5.0):