__init__.py

@@ -173,48 +173,42 @@ def cut_scene(sounds, soundName):
             pygame.mixer.stop()
         pygame.event.pump()
 
-
-def calculate_volume_and_pan(player_pos, obj_pos):
-    distance = abs(player_pos - obj_pos)
-    max_distance = 12  # Maximum audible distance
-    if distance > max_distance:
-        return 0, 0, 0  # No sound if out of range
-    # Calculate volume (non-linear scaling for more noticeable changes)
-    volume = ((max_distance - distance) / max_distance) ** 1.5
-    # Determine left/right based on relative position
-    if player_pos < obj_pos:
-        # Object is to the right
-        left = max(0, 1 - (obj_pos - player_pos) / max_distance)
-        right = 1
-    elif player_pos > obj_pos:
-        # Object is to the left
-        left = 1
-        right = max(0, 1 - (player_pos - obj_pos) / max_distance)
+def obj_play(sounds, sound_name, player_pos, obj_pos):
+    distance = player_pos - obj_pos
+    if abs(distance) > 9:
+        # The item is out of range, so play it at 0
+        left = 0
+        right = 0
     else:
-        # Player is on the object
-        left = right = 1
-    return volume, left, right
-
-def obj_play(sounds, soundName, player_pos, obj_pos):
-    volume, left, right = calculate_volume_and_pan(player_pos, obj_pos)
-    if volume == 0:
-        return None  # Don't play if out of range
+        # Calculate the panning based on the distance
+        left = max(0, 1 - (distance / 9))
+        right = max(0, 1 + (distance / 9))
+        left = min(1, left)
+        right = min(1, right)
     # Play the sound on a new channel
-    x = sounds[soundName].play(-1)
-    # Apply the volume and pan
-    x.set_volume(volume * left, volume * right)
-    return x
-def obj_update(x, player_pos, obj_pos):
-    if x is None:
-        return None
-    volume, left, right = calculate_volume_and_pan(player_pos, obj_pos)
-    if volume == 0:
-        x.stop()
-        return None
-    # Apply the volume and pan
-    x.set_volume(volume * left, volume * right)
-    return x
+    channel = sounds[sound_name].play(-1)
+    # Apply the position information to the channel
+    channel.set_volume(left, right)
+    # Return the channel so that it can be used in the update and stop functions.
+    return channel
 
+def obj_update(channel, player_pos, obj_pos):
+    distance = player_pos - obj_pos
+    if abs(distance) > 9:
+        left = 0
+        right = 0
+    else:
+        # Calculate the panning based on the distance
+        left = max(0, 1 - (distance / 9))
+        right = max(0, 1 + (distance / 9))
+        left = min(1, left)
+        right = min(1, right)
+    # Apply the position information to the channel
+    channel.set_volume(left, right)
+    # Return the channel
+    return channel
+
+soundData    
 def obj_stop(x):
     # Tries to stop a playing object channel
     try: