diff --git a/assets/sfx/ui/ui_accept_v2.wav b/assets/sfx/ui/ui_accept_v2.wav new file mode 100644 index 0000000..4a78244 --- /dev/null +++ b/assets/sfx/ui/ui_accept_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f8723e5646523d467e87b9988b1f4cfc594fcc7c9aa168cdd7ef138d7450ea3 +size 81282 diff --git a/assets/sfx/ui/ui_accept_v2.wav.import b/assets/sfx/ui/ui_accept_v2.wav.import new file mode 100644 index 0000000..90c377b --- /dev/null +++ b/assets/sfx/ui/ui_accept_v2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cfv0eiax5miyy" +path="res://.godot/imported/ui_accept_v2.wav-5ceb50218ced5d0417d4dab35500f6e5.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_accept_v2.wav" +dest_files=["res://.godot/imported/ui_accept_v2.wav-5ceb50218ced5d0417d4dab35500f6e5.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_accept_v3.wav b/assets/sfx/ui/ui_accept_v3.wav new file mode 100644 index 0000000..c892207 --- /dev/null +++ b/assets/sfx/ui/ui_accept_v3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0406228b36d17a7c68e642b2ec9c9bdec8a5f74535b1a757c20d08dbffae340b +size 66366 diff --git a/assets/sfx/ui/ui_accept_v3.wav.import b/assets/sfx/ui/ui_accept_v3.wav.import new file mode 100644 index 0000000..8f06915 --- /dev/null +++ b/assets/sfx/ui/ui_accept_v3.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://h3fo48pslb04" +path="res://.godot/imported/ui_accept_v3.wav-0443a5c43d277f9b6116532ca735cdc1.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_accept_v3.wav" +dest_files=["res://.godot/imported/ui_accept_v3.wav-0443a5c43d277f9b6116532ca735cdc1.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_accept_v4.wav b/assets/sfx/ui/ui_accept_v4.wav new file mode 100644 index 0000000..e2603b4 --- /dev/null +++ b/assets/sfx/ui/ui_accept_v4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdf80839fcd6c96efc00f22978204d8b15e11a69105095abb1cab0216535f38f +size 49134 diff --git a/assets/sfx/ui/ui_accept_v4.wav.import b/assets/sfx/ui/ui_accept_v4.wav.import new file mode 100644 index 0000000..c60ed06 --- /dev/null +++ b/assets/sfx/ui/ui_accept_v4.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cvdn1s11isp0q" +path="res://.godot/imported/ui_accept_v4.wav-545f853de36ba762616f18db6adbe93b.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_accept_v4.wav" +dest_files=["res://.godot/imported/ui_accept_v4.wav-545f853de36ba762616f18db6adbe93b.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_accept_v5.wav b/assets/sfx/ui/ui_accept_v5.wav new file mode 100644 index 0000000..91fc2ab --- /dev/null +++ b/assets/sfx/ui/ui_accept_v5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4269f1a92e1e84ae486fcd6401929026caf5445600039ed2b1592054d865221 +size 48078 diff --git a/assets/sfx/ui/ui_accept_v5.wav.import b/assets/sfx/ui/ui_accept_v5.wav.import new file mode 100644 index 0000000..b86708b --- /dev/null +++ b/assets/sfx/ui/ui_accept_v5.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bxorrvuexipfs" +path="res://.godot/imported/ui_accept_v5.wav-9d68201f280dc9489643abceb296fa96.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_accept_v5.wav" +dest_files=["res://.godot/imported/ui_accept_v5.wav-9d68201f280dc9489643abceb296fa96.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_cancel_v2.wav b/assets/sfx/ui/ui_cancel_v2.wav new file mode 100644 index 0000000..5fa9f11 --- /dev/null +++ b/assets/sfx/ui/ui_cancel_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f4c423536bc9abdf7894360696e79e590bf6f65dd9ecf24129efcc620e7817b +size 65160 diff --git a/assets/sfx/ui/ui_cancel_v2.wav.import b/assets/sfx/ui/ui_cancel_v2.wav.import new file mode 100644 index 0000000..8d4f820 --- /dev/null +++ b/assets/sfx/ui/ui_cancel_v2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://llla6lqmwawd" +path="res://.godot/imported/ui_cancel_v2.wav-a57fe55362eeca93732a134a280d8d33.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_cancel_v2.wav" +dest_files=["res://.godot/imported/ui_cancel_v2.wav-a57fe55362eeca93732a134a280d8d33.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_cancel_v3.wav b/assets/sfx/ui/ui_cancel_v3.wav new file mode 100644 index 0000000..9bb2f47 --- /dev/null +++ b/assets/sfx/ui/ui_cancel_v3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8a3c01f7dcc277e63a296637849e3675313f30e560b04be47fb69fdc620627a +size 64638 diff --git a/assets/sfx/ui/ui_cancel_v3.wav.import b/assets/sfx/ui/ui_cancel_v3.wav.import new file mode 100644 index 0000000..5594683 --- /dev/null +++ b/assets/sfx/ui/ui_cancel_v3.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c363igt5iqkiw" +path="res://.godot/imported/ui_cancel_v3.wav-19b43fcc6981c4bd398247fee7ad2d1a.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_cancel_v3.wav" +dest_files=["res://.godot/imported/ui_cancel_v3.wav-19b43fcc6981c4bd398247fee7ad2d1a.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_cancel_v4.wav b/assets/sfx/ui/ui_cancel_v4.wav new file mode 100644 index 0000000..3b5dba2 --- /dev/null +++ b/assets/sfx/ui/ui_cancel_v4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a65a09d4e3b1a31ce144aa9a32bd4011a1c536cbabb30ac294895a1de3c7ced7 +size 48504 diff --git a/assets/sfx/ui/ui_cancel_v4.wav.import b/assets/sfx/ui/ui_cancel_v4.wav.import new file mode 100644 index 0000000..c385b90 --- /dev/null +++ b/assets/sfx/ui/ui_cancel_v4.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c27dwn4wx68cj" +path="res://.godot/imported/ui_cancel_v4.wav-9076576f7834c1b239e45cce08c3d639.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_cancel_v4.wav" +dest_files=["res://.godot/imported/ui_cancel_v4.wav-9076576f7834c1b239e45cce08c3d639.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/ui/ui_extra_accept_v0.wav b/assets/sfx/ui/ui_extra_accept_v0.wav new file mode 100644 index 0000000..d2b2640 --- /dev/null +++ b/assets/sfx/ui/ui_extra_accept_v0.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae0eeab34c4677e334dcbb93c1a433200b1399dfc94299441da7cc64f40a56af +size 90654 diff --git a/assets/sfx/ui/ui_extra_accept_v0.wav.import b/assets/sfx/ui/ui_extra_accept_v0.wav.import new file mode 100644 index 0000000..d987e14 --- /dev/null +++ b/assets/sfx/ui/ui_extra_accept_v0.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://i47j5mxtgwro" +path="res://.godot/imported/ui_extra_accept_v0.wav-55d31457ca167bc3acf643baf2591cdb.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_extra_accept_v0.wav" +dest_files=["res://.godot/imported/ui_extra_accept_v0.wav-55d31457ca167bc3acf643baf2591cdb.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/src/game/global_sfx_manager/global_sfx_manager.gd b/src/game/global_sfx_manager/global_sfx_manager.gd index efa6a64..011eb63 100644 --- a/src/game/global_sfx_manager/global_sfx_manager.gd +++ b/src/game/global_sfx_manager/global_sfx_manager.gd @@ -2,5 +2,7 @@ class_name GlobalSFXManagerType extends Node ## Global autoloaded singleton controller for global UI non-diegetic sounds @onready var confirm: AudioStreamPlayer = %Confirm -@onready var cancel: AudioStreamPlayer = %Cancel +@onready var accept: AudioStreamPlayer = %Accept +@onready var forward: AudioStreamPlayer = %Forward +@onready var back: AudioStreamPlayer = %Back @onready var bonk: AudioStreamPlayer = %Bonk diff --git a/src/game/global_sfx_manager/global_sfx_manager.tscn b/src/game/global_sfx_manager/global_sfx_manager.tscn index c5bf3fb..27c3ac5 100644 --- a/src/game/global_sfx_manager/global_sfx_manager.tscn +++ b/src/game/global_sfx_manager/global_sfx_manager.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://dt27sg6y8luhe"] +[gd_scene load_steps=6 format=3 uid="uid://dt27sg6y8luhe"] -[ext_resource type="AudioStream" uid="uid://cfj1o2mt8pc8e" path="res://assets/sfx/ui/ui_confirm_v0.wav" id="1_wh46b"] [ext_resource type="Script" uid="uid://bpaid8cfddrtp" path="res://src/game/global_sfx_manager/global_sfx_manager.gd" id="1_xjjma"] -[ext_resource type="AudioStream" uid="uid://qua4yq6ceeax" path="res://assets/sfx/ui/ui_cancel_v0.wav" id="2_xjjma"] +[ext_resource type="AudioStream" uid="uid://i47j5mxtgwro" path="res://assets/sfx/ui/ui_extra_accept_v0.wav" id="2_xjjma"] +[ext_resource type="AudioStream" uid="uid://c27dwn4wx68cj" path="res://assets/sfx/ui/ui_cancel_v4.wav" id="3_xjjma"] +[ext_resource type="AudioStream" uid="uid://bxorrvuexipfs" path="res://assets/sfx/ui/ui_accept_v5.wav" id="3_xl3ms"] [ext_resource type="AudioStream" uid="uid://ddggq8bnksrv6" path="res://assets/sfx/ui/ui_bonk_v1.wav" id="4_ywyuo"] [node name="GlobalSFXManager" type="Node"] @@ -10,14 +11,27 @@ script = ExtResource("1_xjjma") [node name="Confirm" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -stream = ExtResource("1_wh46b") -volume_db = -16.0 +stream = ExtResource("2_xjjma") +volume_db = -20.0 bus = &"SFX" -[node name="Cancel" type="AudioStreamPlayer" parent="."] +[node name="Accept" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true -stream = ExtResource("2_xjjma") -volume_db = -16.0 +stream = ExtResource("3_xl3ms") +volume_db = -20.0 +bus = &"SFX" + +[node name="Forward" type="AudioStreamPlayer" parent="."] +unique_name_in_owner = true +stream = ExtResource("3_xjjma") +volume_db = -20.0 +pitch_scale = 0.7 +bus = &"SFX" + +[node name="Back" type="AudioStreamPlayer" parent="."] +unique_name_in_owner = true +stream = ExtResource("3_xjjma") +volume_db = -20.0 bus = &"SFX" [node name="Bonk" type="AudioStreamPlayer" parent="."] diff --git a/src/ui/menus/pause_menu/pause_menu.gd b/src/ui/menus/pause_menu/pause_menu.gd index 21151f9..5ad2e79 100644 --- a/src/ui/menus/pause_menu/pause_menu.gd +++ b/src/ui/menus/pause_menu/pause_menu.gd @@ -39,13 +39,13 @@ func _hide() -> void: func resume() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.back.play() Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) queue_free() func settings() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.forward.play() var instance: Control = settings_scene.instantiate() settings_container.add_child(instance) instance.tree_exited.connect(_unhide) @@ -53,27 +53,27 @@ func settings() -> void: func quit() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.forward.play() quit_confirm.show() func cancel_quit() -> void: - GlobalSFXManager.cancel.play() + GlobalSFXManager.back.play() quit_confirm.hide() func confirm_quit() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.accept.play() get_tree().root.propagate_notification(NOTIFICATION_WM_CLOSE_REQUEST) func end_game() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.forward.play() end_game_confirm.show() func cancel_end_game() -> void: - GlobalSFXManager.cancel.play() + GlobalSFXManager.back.play() end_game_confirm.hide() diff --git a/src/ui/menus/settings_menu/settings_menu.gd b/src/ui/menus/settings_menu/settings_menu.gd index 6072ef4..634da2c 100644 --- a/src/ui/menus/settings_menu/settings_menu.gd +++ b/src/ui/menus/settings_menu/settings_menu.gd @@ -52,7 +52,7 @@ func populate_volume_mixers() -> void: ## Close menu without applying settings. func cancel() -> void: - GlobalSFXManager.cancel.play() + GlobalSFXManager.back.play() queue_free() @@ -73,7 +73,7 @@ func save_settings() -> void: ## Apply settings and close menu. func accept() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.accept.play() apply() save_settings() queue_free() diff --git a/src/ui/menus/title_screen/title_screen.gd b/src/ui/menus/title_screen/title_screen.gd index b29793e..18107fe 100644 --- a/src/ui/menus/title_screen/title_screen.gd +++ b/src/ui/menus/title_screen/title_screen.gd @@ -46,13 +46,13 @@ func new_game() -> void: func show_settings() -> void: - GlobalSFXManager.confirm.play() + GlobalSFXManager.forward.play() var instance: Control = settings_scene.instantiate() settings_container.add_child(instance) func quit() -> void: - GlobalSFXManager.cancel.play() + GlobalSFXManager.back.play() get_tree().root.propagate_notification(NOTIFICATION_WM_CLOSE_REQUEST) diff --git a/src/world/world.gd b/src/world/world.gd index f75cff5..a2a7836 100644 --- a/src/world/world.gd +++ b/src/world/world.gd @@ -63,7 +63,7 @@ func pause() -> void: AudioServer.add_bus_effect(MUSIC_BUS_IDX, pause_music_effect, 0) get_tree().paused = true - GlobalSFXManager.cancel.play() + GlobalSFXManager.forward.play() var pause_menu: Control = pause_scene.instantiate() ui_root.add_child(pause_menu)