From 0edf520a21ddd5b2a4a9d5d8a068ac263c363f12 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sat, 16 Aug 2025 19:28:07 -0600 Subject: [PATCH] Rebalanced audio --- asset_dev/sfx/beam_loop.aup3 | Bin 7016448 -> 7016448 bytes asset_dev/sfx/spray.aup3 | Bin 3874816 -> 3878912 bytes assets/sfx/grunk/alarm_screech.wav | 2 +- assets/sfx/grunk/alarm_screech.wav.import | 2 +- assets/sfx/tools/beam_loop.wav | 2 +- assets/sfx/tools/spray.wav | 2 +- levels/ghost_ship/ghost_ship.tscn | 3 +++ .../level/corridor_1/corridor_1.tscn | 14 +++++++------- .../ghost_ship/player_ship/player_ship.tscn | 7 +++---- src/effects/grunk_splatter/grunk_splatter.gd | 3 +-- .../grunk_splatter/grunk_splatter.tscn | 2 +- src/game/game_settings.gd | 10 ++++++++++ .../global_sfx_manager.tscn | 12 ++++++------ src/player/player.tscn | 13 ++++++++----- src/props/bulkhead/bulkhead.tscn | 3 +-- src/props/wall_switch/wall_switch.tscn | 2 +- src/ui/hud/player_hud.tscn | 9 ++++----- .../volume_slider/volume_slider.tscn | 2 +- src/ui/menus/title_screen/title_screen.tscn | 6 +++--- src/world/gunk_node/grunk_nodule.tscn | 2 +- src/world/mechanics/alarm/gunk_alarm.tscn | 2 +- src/world/mechanics/heart/gunk_heart.tscn | 2 +- 22 files changed, 56 insertions(+), 44 deletions(-) diff --git a/asset_dev/sfx/beam_loop.aup3 b/asset_dev/sfx/beam_loop.aup3 index e7c1f2062f151b4a488042a1d1adbc69dd53582f..dcea343890970105a483715616be5277a445adcb 100644 GIT binary patch delta 541 zcmY+ANpFpD6o=p2-WHdttL9!EjHQ$sOItdjhN5PrJZAnIE0XSN@$75kO{`d17)nIm ztu(Essq2f7sBhp+L&W0Q{Lb?`Cpp6}-joifj8tcGPYd0d+!G`tB~mI`DU))UBXeb* z3?p>O}Qnv<&NBydvaeMd?LIa ztr(4>^7knpQr>;c*ZrtWvY*4FlKAC#cpf*7hsVjUvCxr;-;RZzcxWs%#jO*eB^PCD zqGwSQmDR@i=};AqOoaOQdok3-$z*6tD!zoyOeTt(r_$u%WN0X3u)oj|&lE#-k{UyQ rhQ0stzGQkTH2+u1rUz!?pT$s^-5R%l3$K#iuVLVCdsawNA>Z{I+?CAa delta 531 zcmY+AIZsq!07d7)fDSk!;)Wm$uDGGNqM!`of(Y&l?#ErfMjHz{EKZ^wHonBl&O##+ zV_s{-kq{g^m=~dv0?_p1mv|DKXj*Wga*7MwtglBxO=AX{nG(nISVJ zBUMr@vm`6CrAFpRt<04=nJ4pQfh?3oQZI|8K^kR=G)c4Mq(zp>GFdJwWTmWeg>vBVG$}PDqcis|S zjAdV?QkAbujF%XDQ=9u%lce8;`(<&q5ZdC251~JKG!gPqTt5-+#l!Ez)3~z`I;x^{ zQ|d`7m8xitYo|k9JX#1X>HOE{pW^Su&=@C^p)1LL3_Vd4#qCoe7vG%>trhv9flNOB qQ49@9$r%1q_WjETlj*6@{@*AbFNB9laXNhYtN%`NN%iOOv*#CxjLK{P diff --git a/asset_dev/sfx/spray.aup3 b/asset_dev/sfx/spray.aup3 index 8931b5149ba58b3251e3c9254cf317fc4023f85d..6b9184402ad8735ed5dd02331afdf627b435dfdc 100644 GIT binary patch delta 275 zcmXBGyDo!a0D$5CZBd6R>e#=kl&bT&#g`Z*b{Fu@Sh#{3-o2gv+mJNUN#ZJuVwG?Y zgyBh^_Ul*F{`iVIaXyzyWqSWoQMb{Ga*s$PX~{@d24ql%Bqzf%BBL@Uc^Q|2Ovt26 zNl~U{MrLJB=4C-j5=&VYr6NmGm1S9xnykv2)MZ^7vLTzYCEKziyRs+yav+CtB*$_h zO=-!goXPn!;cX$giNj^G9fynLy%esKhf=spnx)W8p5pM5P1SBc`}gHgPyaRfZMomC OgsZ4mtbP}|o#GFYWLqBq delta 267 zcmXZOIZgs$0D#dMK*0q!+?YY!5%(R?zc;b>0N)j~(+W+#UaPr=F)<`2CLY1c+5>P1 zjqz2l``wSbAN}|-Ef=FG{}TOsYPRFzJrYY!@=}li8I+=wWJrc(L`J17V=^uiGAUD1 zk!hKcS(%f0sY)WL)MP>GvM5WkEGx1qYqBm4*^s7e%9d=)j_k^w?8|{1%8?w)iJVGH z+R~9TIe#U5RkOP^w6anfZnC!|TxAbQ=wz)VTx8E_crSEsE1$jVT4?0{n*Fxc>(#?$ F`~w void: # Scale amount of dust grunk_dust.amount_ratio = 0.5 * effect_scale - print_debug("Splatter dust ratio: ", grunk_dust.amount_ratio) func _scale_particles(emitter: GPUParticles3D) -> void: diff --git a/src/effects/grunk_splatter/grunk_splatter.tscn b/src/effects/grunk_splatter/grunk_splatter.tscn index 2e598c8..00d09ba 100644 --- a/src/effects/grunk_splatter/grunk_splatter.tscn +++ b/src/effects/grunk_splatter/grunk_splatter.tscn @@ -194,7 +194,7 @@ autostart = true [node name="SplatterSFX" type="AudioStreamPlayer3D" parent="."] unique_name_in_owner = true stream = SubResource("AudioStreamRandomizer_6adkd") -volume_db = -12.0 +volume_db = -3.0 unit_size = 6.0 autoplay = true bus = &"SFX" diff --git a/src/game/game_settings.gd b/src/game/game_settings.gd index 10a2c2a..51707d4 100644 --- a/src/game/game_settings.gd +++ b/src/game/game_settings.gd @@ -64,4 +64,14 @@ func write() -> void: print_debug("Writing settings to ", settings_file) ProjectSettings.save_custom(settings_file) print_debug("Writing audio bus levels to ", audio_bus_file) + # Write a bus layout with all effects removed + var base_layout := AudioServer.generate_bus_layout() + _strip_bus_effects() ResourceSaver.save(AudioServer.generate_bus_layout(), audio_bus_file) + AudioServer.set_bus_layout(base_layout) + + +func _strip_bus_effects() -> void: + for bus_idx: int in AudioServer.bus_count: + for fx_idx: int in AudioServer.get_bus_effect_count(bus_idx): + AudioServer.remove_bus_effect(bus_idx, fx_idx) diff --git a/src/game/global_sfx_manager/global_sfx_manager.tscn b/src/game/global_sfx_manager/global_sfx_manager.tscn index a6c4791..dd60cdc 100644 --- a/src/game/global_sfx_manager/global_sfx_manager.tscn +++ b/src/game/global_sfx_manager/global_sfx_manager.tscn @@ -13,37 +13,37 @@ script = ExtResource("1_xjjma") [node name="Confirm" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("2_xjjma") -volume_db = -10.0 +volume_db = -2.0 bus = &"SFX" [node name="Accept" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("3_xl3ms") -volume_db = -10.0 +volume_db = -2.0 bus = &"SFX" [node name="Forward" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("3_xjjma") -volume_db = -10.0 +volume_db = -2.0 pitch_scale = 0.7 bus = &"SFX" [node name="Back" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("3_xjjma") -volume_db = -10.0 +volume_db = -2.0 bus = &"SFX" [node name="Bonk" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("4_ywyuo") -volume_db = -8.0 +volume_db = -5.0 pitch_scale = 1.1 bus = &"SFX" [node name="Bloop" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("6_ywyuo") -volume_db = -10.0 +volume_db = -4.0 bus = &"SFX" diff --git a/src/player/player.tscn b/src/player/player.tscn index 7c0598c..f586dac 100644 --- a/src/player/player.tscn +++ b/src/player/player.tscn @@ -728,16 +728,18 @@ script = ExtResource("9_l271a") [node name="Metal" type="AudioStreamPlayer3D" parent="FootstepController/LeftFoot"] stream = SubResource("AudioStreamRandomizer_8ydov") -volume_db = -42.0 +volume_db = -30.0 +unit_size = 18.0 bus = &"SFX" [node name="Grunk" type="AudioStreamPlayer3D" parent="FootstepController/LeftFoot"] stream = SubResource("AudioStreamRandomizer_wcxbk") +unit_size = 24.0 bus = &"SFX" [node name="Plastic" type="AudioStreamPlayer3D" parent="FootstepController/LeftFoot"] stream = SubResource("AudioStreamRandomizer_o04tx") -volume_db = -24.0 +unit_size = 16.0 bus = &"SFX" [node name="RightFoot" type="Node3D" parent="FootstepController"] @@ -747,17 +749,19 @@ script = ExtResource("9_l271a") [node name="Metal" type="AudioStreamPlayer3D" parent="FootstepController/RightFoot"] stream = SubResource("AudioStreamRandomizer_ylhto") -volume_db = -42.0 +volume_db = -30.0 +unit_size = 18.0 bus = &"SFX" [node name="Grunk" type="AudioStreamPlayer3D" parent="FootstepController/RightFoot"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.8, 0, 0) stream = SubResource("AudioStreamRandomizer_p6grl") +unit_size = 24.0 bus = &"SFX" [node name="Plastic" type="AudioStreamPlayer3D" parent="FootstepController/RightFoot"] stream = SubResource("AudioStreamRandomizer_e7e1q") -volume_db = -24.0 +unit_size = 16.0 bus = &"SFX" [node name="FootCast" type="RayCast3D" parent="FootstepController"] @@ -829,5 +833,4 @@ tutorial_key = &"game/tutorial/progress/move" [node name="ToolSwitchSFX" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("39_gsylq") -volume_db = -12.0 pitch_scale = 1.8 diff --git a/src/props/bulkhead/bulkhead.tscn b/src/props/bulkhead/bulkhead.tscn index b2c9cda..e8004ea 100644 --- a/src/props/bulkhead/bulkhead.tscn +++ b/src/props/bulkhead/bulkhead.tscn @@ -317,7 +317,6 @@ shape = SubResource("ConcavePolygonShape3D_w7oba") unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.9, 0) stream = ExtResource("5_4jho1") -volume_db = -10.0 [node name="Ramp" type="StaticBody3D" parent="." index="4" groups=["MetalMaterial"]] @@ -364,7 +363,7 @@ libraries = { [node name="DustSFX" type="AudioStreamPlayer3D" parent="Dust" index="5"] stream = ExtResource("7_4jho1") -volume_db = -24.0 +volume_db = -14.0 [node name="NavLink" type="NavigationLink3D" parent="." index="6"] unique_name_in_owner = true diff --git a/src/props/wall_switch/wall_switch.tscn b/src/props/wall_switch/wall_switch.tscn index 484cf83..044f0bb 100644 --- a/src/props/wall_switch/wall_switch.tscn +++ b/src/props/wall_switch/wall_switch.tscn @@ -228,7 +228,7 @@ mesh = SubResource("BoxMesh_a6hjm") [node name="SuccessSFX" type="AudioStreamPlayer3D" parent="Lights/SuccessLight" index="0"] stream = ExtResource("11_7shuc") -volume_db = -16.0 +volume_db = -9.0 unit_size = 4.0 bus = &"SFX" diff --git a/src/ui/hud/player_hud.tscn b/src/ui/hud/player_hud.tscn index d868e74..c31e316 100644 --- a/src/ui/hud/player_hud.tscn +++ b/src/ui/hud/player_hud.tscn @@ -410,7 +410,6 @@ libraries = { [node name="TankAlertBonkSFX" type="AudioStreamPlayer" parent="AlertHUD/TankAlert"] stream = ExtResource("7_bu2tv") -volume_db = -8.0 bus = &"SFX" [node name="GrunkAlert" type="Control" parent="AlertHUD"] @@ -459,10 +458,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -19.0295 -offset_top = -20.3157 -offset_right = -19.0295 -offset_bottom = -20.3157 +offset_left = -20.2593 +offset_top = -19.6536 +offset_right = -20.2593 +offset_bottom = -19.6536 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("4_ud8na") diff --git a/src/ui/menus/settings_menu/volume_slider/volume_slider.tscn b/src/ui/menus/settings_menu/volume_slider/volume_slider.tscn index c18ee25..01f8ec8 100644 --- a/src/ui/menus/settings_menu/volume_slider/volume_slider.tscn +++ b/src/ui/menus/settings_menu/volume_slider/volume_slider.tscn @@ -50,7 +50,7 @@ suffix = "%" [node name="AudioDemo" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("3_y4yh3") -volume_db = -10.0 +volume_db = -2.0 [connection signal="drag_ended" from="Slider" to="." method="_on_slider_drag_ended"] [connection signal="value_changed" from="Slider" to="." method="_on_component_value_changed"] diff --git a/src/ui/menus/title_screen/title_screen.tscn b/src/ui/menus/title_screen/title_screen.tscn index 4f14047..a464daf 100644 --- a/src/ui/menus/title_screen/title_screen.tscn +++ b/src/ui/menus/title_screen/title_screen.tscn @@ -607,7 +607,7 @@ tracks/22/keys = { "times": PackedFloat32Array(6.15, 10), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [-40.0, -10.0] +"values": [-40.0, 0.0] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_3qdtd"] @@ -841,14 +841,14 @@ autoplay = "display" [node name="TitleSFX" type="AudioStreamPlayer" parent="TitleScreenContent"] unique_name_in_owner = true -volume_db = -20.0 +volume_db = -10.0 bus = &"SFX" [node name="TitleDrone" type="AudioStreamPlayer" parent="TitleScreenContent"] unique_name_in_owner = true stream = ExtResource("11_gdkv4") volume_db = -40.0 -bus = &"Music" +bus = &"Ambient" [node name="SettingsContainer" type="Control" parent="."] unique_name_in_owner = true diff --git a/src/world/gunk_node/grunk_nodule.tscn b/src/world/gunk_node/grunk_nodule.tscn index 9ae37b1..67f159a 100644 --- a/src/world/gunk_node/grunk_nodule.tscn +++ b/src/world/gunk_node/grunk_nodule.tscn @@ -37,7 +37,7 @@ shape = SubResource("ConcavePolygonShape3D_530fq") [node name="ChitterSFX" type="AudioStreamPlayer3D" parent="."] unique_name_in_owner = true stream = SubResource("AudioStreamRandomizer_yg8lg") -volume_db = -14.0 +volume_db = -8.0 unit_size = 1.5 panning_strength = 3.0 bus = &"SFX" diff --git a/src/world/mechanics/alarm/gunk_alarm.tscn b/src/world/mechanics/alarm/gunk_alarm.tscn index 7101dab..d1276e6 100644 --- a/src/world/mechanics/alarm/gunk_alarm.tscn +++ b/src/world/mechanics/alarm/gunk_alarm.tscn @@ -6,7 +6,7 @@ [ext_resource type="Material" uid="uid://bmab6i16v748m" path="res://assets/materials/grunk_jittery.material" id="3_g4yos"] [ext_resource type="Script" uid="uid://b274q7uvn0cvp" path="res://src/ui/rumbler_3d.gd" id="3_vokcn"] [ext_resource type="Material" uid="uid://cdpvcruywnp4x" path="res://assets/grunk/alarm/alarm_core.material" id="5_6vdvf"] -[ext_resource type="AudioStream" uid="uid://ypk1d4adrcs" path="res://assets/sfx/grunk/alarm_screech.wav" id="6_6vdvf"] +[ext_resource type="AudioStream" uid="uid://6yo1n0l1jgok" path="res://assets/sfx/grunk/alarm_screech.wav" id="6_6vdvf"] [sub_resource type="SphereMesh" id="SphereMesh_b6er8"] radius = 0.285 diff --git a/src/world/mechanics/heart/gunk_heart.tscn b/src/world/mechanics/heart/gunk_heart.tscn index 2777a33..a6ea67b 100644 --- a/src/world/mechanics/heart/gunk_heart.tscn +++ b/src/world/mechanics/heart/gunk_heart.tscn @@ -132,7 +132,7 @@ speed_scale = 4.0 [node name="HeartbeatSFX" type="AudioStreamPlayer3D" parent="."] stream = ExtResource("3_eu6st") -unit_size = 0.4 +unit_size = 1.0 bus = &"SFX" [connection signal="timeout" from="PulseTimer" to="." method="pulse"]