Changeset 253 for trunk/src/pyspacewar/ui.py

Timestamp:

01/07/07 02:05:49 (5 years ago)

Author:

mg

Message:

Add a sound_in_vacuum option. It defaults to True, which is a bit unrealistic,
but makes the gameplay more fun.

Change options menu titles.

Files:

• trunk/src/pyspacewar/ui.py (modified) (10 diffs)

trunk/src/pyspacewar/ui.py

@@ -1447 +1447 @@
         """Initialize the mode."""
         self.menu_items = [
-            ('Screen size: %dx%d' % self.ui.fullscreen_mode,
+            ('Screen size\t%dx%d' % self.ui.fullscreen_mode,
              self.ui.screen_resolution_menu),
-            (self.ui.fullscreen and 'Windowed mode'
-                                 or 'Full screen mode',
+            (self.ui.fullscreen and 'Full screen mode\ton'
+                                 or 'Full screen mode\toff',
              self.toggle_fullscreen),
-            (self.ui.show_missile_trails and 'Hide missile orbits'
-                                          or 'Show missile orbits',
+            (self.ui.show_missile_trails and 'Missile orbits\ton'
+                                          or 'Missile orbits\toff',
              self.toggle_missile_orbits),
+            (self.ui.sound_in_vacuum and 'Sound in vacuum\ton'
+                                      or 'Sound in vacuum\toff',
+             self.toggle_sound_in_vacuum),
             ('Controls', self.ui.controls_menu),
             ('Return to main menu', self.close_menu),
@@ -1481 +1484 @@
         """Toggle missile orbits and reflect the setting in the menu."""
         self.ui.toggle_missile_orbits()
+        self.reinit_menu()
+
+    def toggle_sound_in_vacuum(self):
+        """Toggle sound in vacuum and reflect the setting in the menu."""
+        self.ui.toggle_sound_in_vacuum()
         self.reinit_menu()
 
@@ -1784 +1792 @@
     fullscreen_mode = None          # Desired video mode (w, h)
     show_missile_trails = True      # Show missile trails by default
+    sound_in_vacuum = True          # Can you hear what happens to AI ships?
     show_debug_info = False         # Hide debug info by default
     desired_zoom_level = 1.0        # The desired zoom level
@@ -1833 +1842 @@
         self.show_missile_trails = config.getboolean('video',
                                                      'show_missile_trails')
+        self.sound_in_vacuum = config.getboolean('sound',
+                                                 'sound_in_vacuum')
         for action in self.controls:
             key = config.get('controls', action)
@@ -1863 +1874 @@
         config.set('video', 'show_missile_trails',
                    str(self.show_missile_trails))
+        config.add_section('sound')
+        config.set('sound', 'sound_in_vacuum', str(self.sound_in_vacuum))
         config.add_section('controls')
         for action, keys in self.controls.items():
@@ -2296 +2309 @@
         self.show_missile_trails = not self.show_missile_trails
 
+    def toggle_sound_in_vacuum(self):
+        """Toggle sound in vacuum."""
+        self.sound_in_vacuum = not self.sound_in_vacuum
+
     def toggle_ai(self, player_id):
         """Toggle AI control for player."""
@@ -2337 +2354 @@
         """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]:
+        if not self.ai_controlled[player_id] or self.sound_in_vacuum:
             self.fire_sound.play()
 
@@ -2343 +2360 @@
         """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()
+        if not ship.dead:
+            # It sounds weird to hear that sound when dead ships bounce
+            if not self.ai_controlled[player_id] or self.sound_in_vacuum:
+                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]:
+        if not self.ai_controlled[player_id] or self.sound_in_vacuum:
             self.hit_sound.play()
 
@@ -2355 +2374 @@
         """Play a sound effect when the player's ship explodes."""
         player_id = self.ships.index(ship)
-        if not self.ai_controlled[player_id]:
+        if not self.ai_controlled[player_id] or self.sound_in_vacuum:
             self.explode_sound.play()
 
@@ -2367 +2386 @@
         makes_noise = False
         for player_id, ship in enumerate(self.ships):
-            if not self.ai_controlled[player_id]:
+            if not self.ai_controlled[player_id] or self.sound_in_vacuum:
                 makes_noise = (ship.forward_thrust or ship.rear_thrust or
                                ship.left_thrust or ship.right_thrust or