diff --git a/assets/first_party/sounds/ui/Hover.wav b/assets/first_party/sounds/ui/Hover.wav new file mode 100644 index 000000000..64bc07242 --- /dev/null +++ b/assets/first_party/sounds/ui/Hover.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05462e71635d86be37307232a9a34a083a4f098bc8509ff534d5ea7925cc2c26 +size 2470 diff --git a/assets/first_party/sounds/ui/Hover.wav.import b/assets/first_party/sounds/ui/Hover.wav.import new file mode 100644 index 000000000..ca8950142 --- /dev/null +++ b/assets/first_party/sounds/ui/Hover.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://b11jqkfbthwec" +path="res://.godot/imported/Hover.wav-d00dcf75edf30b73b4333a46a1b42156.sample" + +[deps] + +source_file="res://assets/first_party/sounds/ui/Hover.wav" +dest_files=["res://.godot/imported/Hover.wav-d00dcf75edf30b73b4333a46a1b42156.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/project.godot b/project.godot index 9a04d73b9..45b0ae9b0 100644 --- a/project.godot +++ b/project.godot @@ -71,7 +71,7 @@ window/size/mode.web=0 [editor] -movie_writer/movie_file="user://recording.ogv" +movie_writer/movie_file="user://recording.mp4" [editor_plugins] diff --git a/scenes/globals/uisfx_player/menu_ui_player.gd b/scenes/globals/uisfx_player/menu_ui_player.gd index 273eff1de..e625c4602 100644 --- a/scenes/globals/uisfx_player/menu_ui_player.gd +++ b/scenes/globals/uisfx_player/menu_ui_player.gd @@ -13,6 +13,7 @@ extends Node @onready var button_sfx_player: AudioStreamPlayer = %ButtonSFXPlayer @onready var toggle_on_sfx_player: AudioStreamPlayer = %ToggleOnSFXPlayer @onready var toggle_off_sfx_player: AudioStreamPlayer = %ToggleOffSFXPlayer +@onready var hover_sfx_player: AudioStreamPlayer = %HoverSFXPlayer func _enter_tree() -> void: @@ -20,6 +21,10 @@ func _enter_tree() -> void: func _on_node_added(node: Node) -> void: + if node is BaseButton: + _connect_once(node.mouse_entered, _on_button_hovered) + _connect_once(node.focus_entered, _on_button_hovered) + if node is CheckButton: _connect_once(node.toggled, _on_toggle_pressed) elif node is Button: @@ -35,11 +40,8 @@ func _connect_once(sig: Signal, callable: Callable) -> void: sig.connect(callable) -func _on_toggle_pressed(toggled_on: bool) -> void: - if toggled_on: - toggle_on_sfx_player.play() - else: - toggle_off_sfx_player.play() +func _on_button_hovered() -> void: + hover_sfx_player.play() func _on_button_pressed() -> void: @@ -52,3 +54,10 @@ func _on_slider_value_changed(_value: float) -> void: func _on_tab_clicked(_tab: int) -> void: button_sfx_player.play() + + +func _on_toggle_pressed(toggled_on: bool) -> void: + if toggled_on: + toggle_on_sfx_player.play() + else: + toggle_off_sfx_player.play() diff --git a/scenes/globals/uisfx_player/menu_ui_player.tscn b/scenes/globals/uisfx_player/menu_ui_player.tscn index 437088768..4b772b243 100644 --- a/scenes/globals/uisfx_player/menu_ui_player.tscn +++ b/scenes/globals/uisfx_player/menu_ui_player.tscn @@ -3,6 +3,7 @@ [ext_resource type="Script" uid="uid://bpti2tbv1ufco" path="res://scenes/globals/uisfx_player/menu_ui_player.gd" id="1_08877"] [ext_resource type="AudioStream" uid="uid://pk4mvg05n0uo" path="res://assets/first_party/sounds/ui/Click_single.wav" id="2_a0vny"] [ext_resource type="AudioStream" uid="uid://cba2ckeb3gxu1" path="res://assets/first_party/sounds/ui/Click.wav" id="3_73s60"] +[ext_resource type="AudioStream" uid="uid://b11jqkfbthwec" path="res://assets/first_party/sounds/ui/Hover.wav" id="4_empwr"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_7me2p"] random_pitch = 1.122462 @@ -27,6 +28,13 @@ unique_name_in_owner = true stream = SubResource("AudioStreamRandomizer_a0vny") bus = &"SFX" +[node name="HoverSFXPlayer" type="AudioStreamPlayer" parent="." unique_id=335986934] +unique_name_in_owner = true +stream = ExtResource("4_empwr") +volume_db = -9.42 +max_polyphony = 8 +bus = &"SFX" + [node name="ToggleOnSFXPlayer" type="AudioStreamPlayer" parent="." unique_id=1221647971] unique_name_in_owner = true stream = ExtResource("3_73s60")