From 69314f223534fc76fe55e0a0b9929c9bd6675b9b Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sat, 16 Aug 2025 15:29:34 -0600 Subject: [PATCH] Added bloops --- assets/sfx/ui/ui_bloop_v1.wav | 3 + assets/sfx/ui/ui_bloop_v1.wav.import | 24 +++++ .../global_sfx_manager/global_sfx_manager.gd | 1 + .../global_sfx_manager.tscn | 9 +- src/ui/menus/pause_menu/pause_menu.gd | 4 + src/ui/menus/pause_menu/pause_menu.tscn | 96 ++++++++++++++++++- .../control_binding/control_binding.gd | 6 +- .../control_binding/control_binding.tscn | 15 ++- .../checkbox_setting/checkbox_setting.tscn | 11 ++- .../dropdown_setting/dropdown_setting.tscn | 14 ++- .../numeric_setting/numeric_setting.tscn | 8 +- src/ui/menus/settings_menu/settings_menu.gd | 8 ++ src/ui/menus/settings_menu/settings_menu.tscn | 36 ++++++- .../volume_slider/volume_slider.tscn | 4 +- src/ui/menus/title_screen/title_screen.tscn | 35 ++++++- src/util/bloop_component.gd | 7 ++ src/util/bloop_component.gd.uid | 1 + 17 files changed, 267 insertions(+), 15 deletions(-) create mode 100644 assets/sfx/ui/ui_bloop_v1.wav create mode 100644 assets/sfx/ui/ui_bloop_v1.wav.import create mode 100644 src/util/bloop_component.gd create mode 100644 src/util/bloop_component.gd.uid diff --git a/assets/sfx/ui/ui_bloop_v1.wav b/assets/sfx/ui/ui_bloop_v1.wav new file mode 100644 index 0000000..64e129d --- /dev/null +++ b/assets/sfx/ui/ui_bloop_v1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc2365f7420c6e8d362315503ff8c1bdfaa9071022fcca779f2579439dd7f078 +size 95996 diff --git a/assets/sfx/ui/ui_bloop_v1.wav.import b/assets/sfx/ui/ui_bloop_v1.wav.import new file mode 100644 index 0000000..3eb8e39 --- /dev/null +++ b/assets/sfx/ui/ui_bloop_v1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://duobdakanodbd" +path="res://.godot/imported/ui_bloop_v1.wav-02382f5069b97c9d0093fa2df8d67522.sample" + +[deps] + +source_file="res://assets/sfx/ui/ui_bloop_v1.wav" +dest_files=["res://.godot/imported/ui_bloop_v1.wav-02382f5069b97c9d0093fa2df8d67522.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 011eb63..9e8586e 100644 --- a/src/game/global_sfx_manager/global_sfx_manager.gd +++ b/src/game/global_sfx_manager/global_sfx_manager.gd @@ -6,3 +6,4 @@ class_name GlobalSFXManagerType extends Node @onready var forward: AudioStreamPlayer = %Forward @onready var back: AudioStreamPlayer = %Back @onready var bonk: AudioStreamPlayer = %Bonk +@onready var bloop: AudioStreamPlayer = %Bloop diff --git a/src/game/global_sfx_manager/global_sfx_manager.tscn b/src/game/global_sfx_manager/global_sfx_manager.tscn index 27c3ac5..701c51e 100644 --- a/src/game/global_sfx_manager/global_sfx_manager.tscn +++ b/src/game/global_sfx_manager/global_sfx_manager.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=6 format=3 uid="uid://dt27sg6y8luhe"] +[gd_scene load_steps=7 format=3 uid="uid://dt27sg6y8luhe"] [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://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"] +[ext_resource type="AudioStream" uid="uid://duobdakanodbd" path="res://assets/sfx/ui/ui_bloop_v1.wav" id="6_ywyuo"] [node name="GlobalSFXManager" type="Node"] script = ExtResource("1_xjjma") @@ -40,3 +41,9 @@ stream = ExtResource("4_ywyuo") volume_db = -16.0 pitch_scale = 1.1 bus = &"SFX" + +[node name="Bloop" type="AudioStreamPlayer" parent="."] +unique_name_in_owner = true +stream = ExtResource("6_ywyuo") +volume_db = -20.0 +bus = &"SFX" diff --git a/src/ui/menus/pause_menu/pause_menu.gd b/src/ui/menus/pause_menu/pause_menu.gd index 5ad2e79..9a2ea65 100644 --- a/src/ui/menus/pause_menu/pause_menu.gd +++ b/src/ui/menus/pause_menu/pause_menu.gd @@ -38,6 +38,10 @@ func _hide() -> void: menu_list.hide() +func hover() -> void: + GlobalSFXManager.bloop.play() + + func resume() -> void: GlobalSFXManager.back.play() Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) diff --git a/src/ui/menus/pause_menu/pause_menu.tscn b/src/ui/menus/pause_menu/pause_menu.tscn index 2ef039a..2b58e46 100644 --- a/src/ui/menus/pause_menu/pause_menu.tscn +++ b/src/ui/menus/pause_menu/pause_menu.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://byvjsvavbg5xe"] +[gd_scene load_steps=6 format=3 uid="uid://byvjsvavbg5xe"] [ext_resource type="Theme" uid="uid://doq7ay6f7dgfo" path="res://src/ui/menus/menu.theme" id="1_b4t8b"] [ext_resource type="Script" uid="uid://cllx5glqld8wn" path="res://src/ui/menus/pause_menu/pause_menu.gd" id="1_rd0j2"] [ext_resource type="PackedScene" uid="uid://d3eaqw2rdurct" path="res://src/ui/menus/settings_menu/settings_menu.tscn" id="3_dowgp"] [ext_resource type="PackedScene" uid="uid://dofr2ebmvnwxf" path="res://src/ui/menus/debug_menu/debug_menu.tscn" id="4_1bm4j"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="5_ls6ft"] [node name="PauseMenu" type="Control"] process_mode = 3 @@ -72,22 +73,73 @@ alignment = 1 [node name="ResumeButton" type="Button" parent="MenuList/VBoxContainer"] layout_mode = 2 +focus_neighbor_bottom = NodePath("../SettingsButton") +focus_next = NodePath("../SettingsButton") text = "PAUSE_RESUME" +[node name="BloopComponent" type="Control" parent="MenuList/VBoxContainer/ResumeButton"] +anchors_preset = 0 +offset_left = -878.0 +offset_top = -551.0 +offset_right = -838.0 +offset_bottom = -511.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="SettingsButton" type="Button" parent="MenuList/VBoxContainer"] layout_mode = 2 +focus_neighbor_top = NodePath("../ResumeButton") +focus_neighbor_bottom = NodePath("../EndGameButton") +focus_next = NodePath("../EndGameButton") +focus_previous = NodePath("../ResumeButton") text = "PAUSE_SETTINGS" +[node name="BloopComponent" type="Control" parent="MenuList/VBoxContainer/SettingsButton"] +layout_mode = 3 +anchors_preset = 0 +offset_left = -878.0 +offset_top = -551.0 +offset_right = -838.0 +offset_bottom = -511.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="EndGameButton" type="Button" parent="MenuList/VBoxContainer"] layout_mode = 2 +focus_neighbor_top = NodePath("../SettingsButton") +focus_neighbor_bottom = NodePath("../QuitButton") +focus_next = NodePath("../QuitButton") +focus_previous = NodePath("../SettingsButton") theme_type_variation = &"DangerButton" text = "PAUSE_END" +[node name="BloopComponent" type="Control" parent="MenuList/VBoxContainer/EndGameButton"] +layout_mode = 3 +anchors_preset = 0 +offset_left = -878.0 +offset_top = -551.0 +offset_right = -838.0 +offset_bottom = -511.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="QuitButton" type="Button" parent="MenuList/VBoxContainer"] layout_mode = 2 +focus_neighbor_top = NodePath("../EndGameButton") +focus_previous = NodePath("../EndGameButton") theme_type_variation = &"DangerButton" text = "PAUSE_QUIT" +[node name="BloopComponent" type="Control" parent="MenuList/VBoxContainer/QuitButton"] +layout_mode = 3 +anchors_preset = 0 +offset_left = -878.0 +offset_top = -551.0 +offset_right = -838.0 +offset_bottom = -511.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="DebugButton" type="Button" parent="MenuList/VBoxContainer"] unique_name_in_owner = true visible = false @@ -95,6 +147,16 @@ layout_mode = 2 theme_override_colors/font_color = Color(0.14, 1, 0.355, 1) text = "PAUSE_DEBUG" +[node name="BloopComponent" type="Control" parent="MenuList/VBoxContainer/DebugButton"] +layout_mode = 3 +anchors_preset = 0 +offset_left = -878.0 +offset_top = -551.0 +offset_right = -838.0 +offset_bottom = -511.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="SettingsContainer" type="MarginContainer" parent="."] unique_name_in_owner = true custom_minimum_size = Vector2(1000, 600) @@ -168,12 +230,28 @@ layout_mode = 2 size_flags_horizontal = 3 text = "UI_CANCEL" +[node name="BloopComponent" type="Control" parent="QuitConfirm/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/CancelButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="ConfirmQuitButton" type="Button" parent="QuitConfirm/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 theme_type_variation = &"DangerButton" text = "UI_QUIT" +[node name="BloopComponent" type="Control" parent="QuitConfirm/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/ConfirmQuitButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="EndGameConfirm" type="CenterContainer" parent="."] unique_name_in_owner = true visible = false @@ -213,12 +291,28 @@ layout_mode = 2 size_flags_horizontal = 3 text = "UI_CANCEL" +[node name="BloopComponent" type="Control" parent="EndGameConfirm/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/CancelButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="ConfirmEndGameButton" type="Button" parent="EndGameConfirm/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 size_flags_horizontal = 3 theme_type_variation = &"DangerButton" text = "UI_QUIT" +[node name="BloopComponent" type="Control" parent="EndGameConfirm/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer/ConfirmEndGameButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("5_ls6ft") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [connection signal="pressed" from="MenuList/VBoxContainer/ResumeButton" to="." method="resume"] [connection signal="pressed" from="MenuList/VBoxContainer/SettingsButton" to="." method="settings"] [connection signal="pressed" from="MenuList/VBoxContainer/EndGameButton" to="." method="end_game"] diff --git a/src/ui/menus/settings_menu/control_binding/control_binding.gd b/src/ui/menus/settings_menu/control_binding/control_binding.gd index 4d73f2f..a6fb26c 100644 --- a/src/ui/menus/settings_menu/control_binding/control_binding.gd +++ b/src/ui/menus/settings_menu/control_binding/control_binding.gd @@ -30,8 +30,7 @@ func _ready() -> void: # Set action label text var loc_action := tr(ACTION_KEY_FMT.format([key])) # Fall back to just the key if no localization exists - @warning_ignore("incompatible_ternary") - action.text = loc_action if loc_action else key + @warning_ignore("incompatible_ternary") action.text = loc_action if loc_action else key # Set the binding label _set_label_from_binding() @@ -83,11 +82,13 @@ func _input(event: InputEvent) -> void: func start_listening() -> void: + GlobalSFXManager.forward.play() button.text = LISTENING_TEXT listening = true func cancel_rebinding() -> void: + GlobalSFXManager.back.play() _set_label_from_binding() listening = false @@ -100,6 +101,7 @@ func rebind(event: InputEvent) -> void: # Update label _set_label_from_binding() + GlobalSFXManager.accept.play() listening = false diff --git a/src/ui/menus/settings_menu/control_binding/control_binding.tscn b/src/ui/menus/settings_menu/control_binding/control_binding.tscn index 1b2aee8..a0db1c7 100644 --- a/src/ui/menus/settings_menu/control_binding/control_binding.tscn +++ b/src/ui/menus/settings_menu/control_binding/control_binding.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://dwvpddd7id1h"] +[gd_scene load_steps=4 format=3 uid="uid://dwvpddd7id1h"] [ext_resource type="Script" uid="uid://y0kwpyt3w5bt" path="res://src/ui/menus/settings_menu/control_binding/control_binding.gd" id="1_7mwhu"] [ext_resource type="Theme" uid="uid://doq7ay6f7dgfo" path="res://src/ui/menus/menu.theme" id="1_82ajm"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="3_pt7f5"] [node name="ControlBinding" type="PanelContainer" groups=["ControlBindings"]] theme = ExtResource("1_82ajm") -theme_type_variation = &"CheckerContainerOdd" +theme_type_variation = &"CheckerContainerEven" script = ExtResource("1_7mwhu") [node name="MarginContainer" type="MarginContainer" parent="."] @@ -24,7 +25,7 @@ alignment = 2 unique_name_in_owner = true layout_mode = 2 theme_type_variation = &"SettingsInputLabel" -text = "Action" +text = "ACTION_" [node name="Button" type="Button" parent="MarginContainer/HBoxContainer"] unique_name_in_owner = true @@ -33,4 +34,12 @@ layout_mode = 2 theme_type_variation = &"InputBindButton" text = "UI_UNSET" +[node name="BloopComponent" type="Control" parent="MarginContainer/HBoxContainer/Button"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("3_pt7f5") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [connection signal="pressed" from="MarginContainer/HBoxContainer/Button" to="." method="start_listening"] diff --git a/src/ui/menus/settings_menu/settings/checkbox_setting/checkbox_setting.tscn b/src/ui/menus/settings_menu/settings/checkbox_setting/checkbox_setting.tscn index bbdc1da..e0b66fd 100644 --- a/src/ui/menus/settings_menu/settings/checkbox_setting/checkbox_setting.tscn +++ b/src/ui/menus/settings_menu/settings/checkbox_setting/checkbox_setting.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://bpmpj4n6xp17l"] +[gd_scene load_steps=5 format=3 uid="uid://bpmpj4n6xp17l"] [ext_resource type="PackedScene" uid="uid://dcah6r3ku60g6" path="res://src/ui/menus/settings_menu/settings/setting/setting.tscn" id="1_5t42f"] [ext_resource type="Script" uid="uid://dv8n1d4g4awyc" path="res://src/ui/menus/settings_menu/settings/checkbox_setting/checkbox_setting.gd" id="2_mwq55"] [ext_resource type="PackedScene" uid="uid://b7ce38k7rx466" path="res://src/ui/elements/text_checkbox/text_checkbox.tscn" id="3_fosy2"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="4_0iluu"] [node name="CheckboxSetting" instance=ExtResource("1_5t42f")] script = ExtResource("2_mwq55") @@ -10,3 +11,11 @@ script = ExtResource("2_mwq55") [node name="TextCheckbox" parent="PanelContainer/MarginContainer" index="0" instance=ExtResource("3_fosy2")] unique_name_in_owner = true layout_mode = 2 + +[node name="BloopComponent" type="Control" parent="PanelContainer/MarginContainer/TextCheckbox" index="0"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("4_0iluu") +metadata/_custom_type_script = "uid://bxkawcupln4fp" diff --git a/src/ui/menus/settings_menu/settings/dropdown_setting/dropdown_setting.tscn b/src/ui/menus/settings_menu/settings/dropdown_setting/dropdown_setting.tscn index 81700ed..81b2367 100644 --- a/src/ui/menus/settings_menu/settings/dropdown_setting/dropdown_setting.tscn +++ b/src/ui/menus/settings_menu/settings/dropdown_setting/dropdown_setting.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://dpry41u0ctikn"] +[gd_scene load_steps=4 format=3 uid="uid://dpry41u0ctikn"] [ext_resource type="PackedScene" uid="uid://dcah6r3ku60g6" path="res://src/ui/menus/settings_menu/settings/setting/setting.tscn" id="1_km84n"] -[ext_resource type="Script" path="res://src/ui/menus/settings_menu/settings/dropdown_setting/dropdown_setting.gd" id="2_ubo13"] +[ext_resource type="Script" uid="uid://cfsf8k44t38g7" path="res://src/ui/menus/settings_menu/settings/dropdown_setting/dropdown_setting.gd" id="2_ubo13"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="3_n5wkc"] [node name="DropdownSetting" instance=ExtResource("1_km84n")] script = ExtResource("2_ubo13") @@ -11,3 +12,12 @@ unique_name_in_owner = true layout_mode = 2 selected = 0 item_count = 1 +popup/item_0/id = 0 + +[node name="BloopComponent" type="Control" parent="PanelContainer/MarginContainer/Dropdown" index="1"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("3_n5wkc") +metadata/_custom_type_script = "uid://bxkawcupln4fp" diff --git a/src/ui/menus/settings_menu/settings/numeric_setting/numeric_setting.tscn b/src/ui/menus/settings_menu/settings/numeric_setting/numeric_setting.tscn index 1982db6..3b7d21e 100644 --- a/src/ui/menus/settings_menu/settings/numeric_setting/numeric_setting.tscn +++ b/src/ui/menus/settings_menu/settings/numeric_setting/numeric_setting.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://dut1lj8ju37sq"] +[gd_scene load_steps=5 format=3 uid="uid://dut1lj8ju37sq"] [ext_resource type="PackedScene" uid="uid://dcah6r3ku60g6" path="res://src/ui/menus/settings_menu/settings/setting/setting.tscn" id="1_t2sut"] [ext_resource type="Script" uid="uid://dpxpgs6iw7b7x" path="res://src/ui/menus/settings_menu/settings/numeric_setting/numeric_setting.gd" id="2_3nkup"] [ext_resource type="PackedScene" uid="uid://dqqcyi26d3bpg" path="res://src/ui/elements/numeric_slider/numeric_slider.tscn" id="2_piwkl"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="4_gyy1p"] [node name="NumericSetting" instance=ExtResource("1_t2sut")] script = ExtResource("2_3nkup") @@ -10,3 +11,8 @@ script = ExtResource("2_3nkup") [node name="NumericSlider" parent="PanelContainer/MarginContainer" index="0" instance=ExtResource("2_piwkl")] unique_name_in_owner = true layout_mode = 2 + +[node name="BloopComponent" type="Control" parent="PanelContainer/MarginContainer/NumericSlider" index="2"] +layout_mode = 2 +script = ExtResource("4_gyy1p") +metadata/_custom_type_script = "uid://bxkawcupln4fp" diff --git a/src/ui/menus/settings_menu/settings_menu.gd b/src/ui/menus/settings_menu/settings_menu.gd index 634da2c..82fefee 100644 --- a/src/ui/menus/settings_menu/settings_menu.gd +++ b/src/ui/menus/settings_menu/settings_menu.gd @@ -17,6 +17,14 @@ func _ready() -> void: populate_control_bindings() +func _tab_change() -> void: + GlobalSFXManager.forward.play() + + +func _tab_hover() -> void: + GlobalSFXManager.bloop.play() + + func _get_settings_elements() -> Array[Setting]: var elements: Array[Setting] = [] elements.assign(get_tree().get_nodes_in_group(SETTINGS_GROUP)) diff --git a/src/ui/menus/settings_menu/settings_menu.tscn b/src/ui/menus/settings_menu/settings_menu.tscn index e0ad2fb..385deda 100644 --- a/src/ui/menus/settings_menu/settings_menu.tscn +++ b/src/ui/menus/settings_menu/settings_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://d3eaqw2rdurct"] +[gd_scene load_steps=11 format=3 uid="uid://d3eaqw2rdurct"] [ext_resource type="Script" uid="uid://dyb8cwai3cyw2" path="res://src/ui/menus/settings_menu/settings_menu.gd" id="1_lbcn7"] [ext_resource type="Theme" uid="uid://doq7ay6f7dgfo" path="res://src/ui/menus/menu.theme" id="1_vuur6"] @@ -9,6 +9,7 @@ [ext_resource type="Script" uid="uid://wlo8hxahp1x7" path="res://src/ui/menus/settings_menu/settings/checkbox_setting/fullscreen_setting.gd" id="4_ug1id"] [ext_resource type="Script" uid="uid://cchqp66wig3wa" path="res://src/ui/menus/settings_menu/reset_tutorial_button.gd" id="7_ftg2j"] [ext_resource type="Script" uid="uid://c3a127y0x8qod" path="res://src/ui/menus/settings_menu/disable_tutorial_button.gd" id="8_stv84"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="10_nxapy"] [node name="SettingsMenu" type="MarginContainer"] anchors_preset = 15 @@ -208,6 +209,14 @@ layout_mode = 2 text = "SETTINGS_TUTORIAL_RESET" script = ExtResource("7_ftg2j") +[node name="BloopComponent" type="Control" parent="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList/ResetTutorial/ResetTutorialButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_nxapy") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="DisableTutorial" type="HBoxContainer" parent="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList"] layout_mode = 2 @@ -220,6 +229,14 @@ layout_mode = 2 text = "SETTINGS_TUTORIAL_DISABLE" script = ExtResource("8_stv84") +[node name="BloopComponent" type="Control" parent="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList/DisableTutorial/DisableTutorialButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_nxapy") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="SETTINGS_GRAPHICS" type="MarginContainer" parent="TabContainer"] visible = false layout_mode = 2 @@ -390,11 +407,28 @@ layout_mode = 2 theme_type_variation = &"CancelButton" text = "UI_CANCEL" +[node name="BloopComponent" type="Control" parent="SouthEast/HBoxContainer/CancelButton"] +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_nxapy") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="AcceptButton" type="Button" parent="SouthEast/HBoxContainer"] layout_mode = 2 theme_type_variation = &"AlertButton" text = "UI_ACCEPT" +[node name="BloopComponent" type="Control" parent="SouthEast/HBoxContainer/AcceptButton"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_nxapy") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + +[connection signal="tab_changed" from="TabContainer" to="." method="_tab_change" unbinds=1] +[connection signal="tab_hovered" from="TabContainer" to="." method="_tab_hover" unbinds=1] [connection signal="pressed" from="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList/ResetTutorial/ResetTutorialButton" to="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList/ResetTutorial/ResetTutorialButton" method="_on_pressed"] [connection signal="pressed" from="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList/DisableTutorial/DisableTutorialButton" to="TabContainer/SETTINGS_GAME/VBoxContainer/ScrollContainer/MarginContainer/SettingsList/DisableTutorial/DisableTutorialButton" method="_on_pressed"] [connection signal="pressed" from="SouthEast/HBoxContainer/CancelButton" to="." method="cancel"] 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 7057e8f..9592c43 100644 --- a/src/ui/menus/settings_menu/volume_slider/volume_slider.tscn +++ b/src/ui/menus/settings_menu/volume_slider/volume_slider.tscn @@ -2,7 +2,7 @@ [ext_resource type="Theme" uid="uid://doq7ay6f7dgfo" path="res://src/ui/menus/menu.theme" id="1_k7hk0"] [ext_resource type="Script" uid="uid://bt3oajqvevj4k" path="res://src/ui/menus/settings_menu/volume_slider/volume_slider.gd" id="1_rfe0k"] -[ext_resource type="AudioStream" uid="uid://cfj1o2mt8pc8e" path="res://assets/sfx/ui/ui_confirm_v0.wav" id="3_y4yh3"] +[ext_resource type="AudioStream" uid="uid://bxorrvuexipfs" path="res://assets/sfx/ui/ui_accept_v5.wav" id="3_y4yh3"] [node name="VolumeSlider" type="VBoxContainer" groups=["VolumeSliders"]] custom_minimum_size = Vector2(300, 0) @@ -48,7 +48,7 @@ suffix = "%" [node name="AudioDemo" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true stream = ExtResource("3_y4yh3") -volume_db = -16.0 +volume_db = -20.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 f89ae7c..4f14047 100644 --- a/src/ui/menus/title_screen/title_screen.tscn +++ b/src/ui/menus/title_screen/title_screen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://bctwol681jdk0"] +[gd_scene load_steps=22 format=3 uid="uid://bctwol681jdk0"] [ext_resource type="Theme" uid="uid://dj2ij1b2yjicr" path="res://src/ui/menus/title_screen/title_screen.theme" id="1_3lcvc"] [ext_resource type="PackedScene" uid="uid://b6dx0ovy15g5o" path="res://src/effects/grunk_2d/grunk_2d.tscn" id="2_7vchy"] @@ -9,6 +9,7 @@ [ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="4_cgiy0"] [ext_resource type="Texture2D" uid="uid://dixpjnlaj86x2" path="res://assets/ui/corpo_logo/corpo_logo_128.png" id="5_yrys0"] [ext_resource type="FontFile" uid="uid://cj5luctpn3bfm" path="res://assets/fonts/Sixtyfour/Sixtyfour-Regular-VariableFont_BLED,SCAN.ttf" id="8_x67pi"] +[ext_resource type="Script" uid="uid://bxkawcupln4fp" path="res://src/util/bloop_component.gd" id="10_gdkv4"] [ext_resource type="AudioStream" uid="uid://c838ofbu4bqrn" path="res://assets/sfx/computer_noise.wav" id="10_x67pi"] [ext_resource type="AudioStream" uid="uid://dx4d8a3mgpws" path="res://assets/sfx/ambient/drone_loop.wav" id="11_gdkv4"] @@ -784,22 +785,54 @@ layout_mode = 2 disabled = true text = "TITLE_CONTINUE" +[node name="BloopComponent" type="Control" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons/Continue"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_gdkv4") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="NewGame" type="Button" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons"] visible = false layout_mode = 2 text = "TITLE_NEW_GAME" +[node name="BloopComponent" type="Control" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons/NewGame"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_gdkv4") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="Settings" type="Button" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons"] visible = false layout_mode = 2 text = "PAUSE_SETTINGS" +[node name="BloopComponent" type="Control" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons/Settings"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_gdkv4") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="Quit" type="Button" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons"] visible = false layout_mode = 2 theme_type_variation = &"DangerButton" text = "UI_QUIT" +[node name="BloopComponent" type="Control" parent="TitleScreenContent/VBoxContainer/MarginContainer/MenuButtons/Quit"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("10_gdkv4") +metadata/_custom_type_script = "uid://bxkawcupln4fp" + [node name="AnimationPlayer" type="AnimationPlayer" parent="TitleScreenContent"] libraries = { &"": SubResource("AnimationLibrary_3qdtd") diff --git a/src/util/bloop_component.gd b/src/util/bloop_component.gd new file mode 100644 index 0000000..b4362b8 --- /dev/null +++ b/src/util/bloop_component.gd @@ -0,0 +1,7 @@ +class_name BloopComponent extends Control +## Makes the parent control bloop when focused + + +func _ready() -> void: + get_parent_control().mouse_entered.connect(GlobalSFXManager.bloop.play) + queue_free() diff --git a/src/util/bloop_component.gd.uid b/src/util/bloop_component.gd.uid new file mode 100644 index 0000000..1ee2468 --- /dev/null +++ b/src/util/bloop_component.gd.uid @@ -0,0 +1 @@ +uid://bxkawcupln4fp