diff --git a/default_bus_layout.tres b/default_bus_layout.tres index c2e241c..803ff69 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -14,3 +14,9 @@ bus/2/mute = false bus/2/bypass_fx = false bus/2/volume_db = 0.0 bus/2/send = &"Master" +bus/3/name = &"Ambient" +bus/3/solo = false +bus/3/mute = false +bus/3/bypass_fx = false +bus/3/volume_db = 0.0 +bus/3/send = &"SFX" diff --git a/levels/ghost_ship/ghost_ship.tscn b/levels/ghost_ship/ghost_ship.tscn index 8ecc39d..1c8c9c5 100644 --- a/levels/ghost_ship/ghost_ship.tscn +++ b/levels/ghost_ship/ghost_ship.tscn @@ -74,7 +74,7 @@ unique_name_in_owner = true stream = ExtResource("5_ejh2c") volume_db = -80.0 autoplay = true -bus = &"Music" +bus = &"Ambient" script = ExtResource("5_jiowi") [node name="AmbientSFX" type="Node3D" parent="."] @@ -83,6 +83,7 @@ script = ExtResource("5_jiowi") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21, 1, -38) stream = SubResource("AudioStreamRandomizer_d8fas") unit_size = 2.0 +bus = &"Ambient" interval_mean = 120.0 interval_st_dev = 30.0 @@ -90,6 +91,7 @@ interval_st_dev = 30.0 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 1, -54) stream = SubResource("AudioStreamRandomizer_d8fas") unit_size = 2.0 +bus = &"Ambient" interval_mean = 120.0 interval_st_dev = 30.0 @@ -97,6 +99,7 @@ interval_st_dev = 30.0 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27, 1, -54) stream = SubResource("AudioStreamRandomizer_d8fas") unit_size = 2.0 +bus = &"Ambient" interval_mean = 120.0 interval_st_dev = 30.0 @@ -104,6 +107,7 @@ interval_st_dev = 30.0 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, -77) stream = SubResource("AudioStreamRandomizer_d8fas") unit_size = 2.0 +bus = &"Ambient" interval_mean = 120.0 interval_st_dev = 30.0 @@ -111,6 +115,7 @@ interval_st_dev = 30.0 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 2, -38) stream = SubResource("AudioStreamRandomizer_d8fas") unit_size = 2.0 +bus = &"Ambient" interval_mean = 120.0 interval_st_dev = 30.0 diff --git a/src/equipment/mp3_player/mp3_player.gd b/src/equipment/mp3_player/mp3_player.gd index e9ca0c9..07b6c7a 100644 --- a/src/equipment/mp3_player/mp3_player.gd +++ b/src/equipment/mp3_player/mp3_player.gd @@ -5,6 +5,8 @@ const BIG_RUMBLE = 0.006 const SMALL_RUMBLE = 0.0009 const RUMBLE_DROPOFF = 0.8 +const AMBIENT_BUS_IDX = 3 + @onready var mp3_controller: MP3Controller = %MP3Controller @onready var audio_stream_player: AudioStreamPlayer = %AudioStreamPlayer @onready var rumbler: Rumbler3D = %Rumbler @@ -47,12 +49,15 @@ func _on_mp3_collected(_track: MP3Track) -> void: func pause_playback() -> void: audio_stream_player.stream_paused = true + AudioServer.set_bus_mute(AMBIENT_BUS_IDX, false) func resume_playback() -> void: audio_stream_player.stream_paused = false + AudioServer.set_bus_mute(AMBIENT_BUS_IDX, true) func select_track(idx: int) -> void: audio_stream_player.stream = World.instance.manager.mp3_collection[idx].track audio_stream_player.play() + AudioServer.set_bus_mute(AMBIENT_BUS_IDX, true)