Add audio settings management and integrate into UI; refactor input settings handling

autoloads/config_file_handler.gd

@@ -6,8 +6,6 @@ const SETTINGS_PATH := "user://settings.ini"
 
 func _ready() -> void:
 	if !FileAccess.file_exists(SETTINGS_PATH):
-		settings_config.set_value("keybinding", "left", "A")
-
 		settings_config.save(SETTINGS_PATH)
 	else:
 		settings_config.load(SETTINGS_PATH)

objects/audio_controller.tscn

@@ -6,5 +6,6 @@
 
 [node name="Background Music" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("1_fuc3i")
+autoplay = true
 bus = &"music"
 parameters/looping = true

objects/level/ui_layer.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://6foggu31cu14"]
+[gd_scene load_steps=11 format=3 uid="uid://6foggu31cu14"]
 
 [ext_resource type="PackedScene" uid="uid://byxf45ukq82pe" path="res://objects/ui/hud.tscn" id="1_tgtfe"]
 [ext_resource type="PackedScene" uid="uid://dulkm3ah4tm0u" path="res://objects/ui/death_screen.tscn" id="2_ln68j"]
@@ -8,10 +8,12 @@
 [ext_resource type="PackedScene" uid="uid://i6mnjbjcoqe5" path="res://objects/ui/pause_menu.tscn" id="6_1q4vn"]
 [ext_resource type="PackedScene" uid="uid://y0ae6e7t70fj" path="res://objects/ui/settings_menu.tscn" id="7_hkjav"]
 [ext_resource type="PackedScene" uid="uid://cvfsbiy5ggrpg" path="res://objects/ui/input_settings.tscn" id="8_6pnu3"]
+[ext_resource type="PackedScene" uid="uid://b5fx1vdfky307" path="res://objects/ui/audio_settings.tscn" id="9_ln68j"]
 
 [sub_resource type="Resource" id="Resource_75pfo"]
 script = ExtResource("3_5kt5k")
 level_name = "Village - 1"
+scene_path = ""
 metadata/_custom_type_script = "uid://cp68km8bykymb"
 
 [node name="UI Layer" type="CanvasLayer"]
@@ -36,9 +38,13 @@ components_to_disable = [null]
 visible = false
 settings_menu = NodePath("../Settings menu")
 
-[node name="Settings menu" parent="." node_paths=PackedStringArray("input_settings") instance=ExtResource("7_hkjav")]
+[node name="Settings menu" parent="." node_paths=PackedStringArray("input_settings", "audio_settings") instance=ExtResource("7_hkjav")]
 visible = false
 input_settings = NodePath("../Input Settings")
+audio_settings = NodePath("../Audio settings")
 
 [node name="Input Settings" parent="." instance=ExtResource("8_6pnu3")]
 visible = false
+
+[node name="Audio settings" parent="." instance=ExtResource("9_ln68j")]
+visible = false

objects/ui/audio_settings.tscn

@@ -0,0 +1,96 @@
+[gd_scene load_steps=3 format=3 uid="uid://b5fx1vdfky307"]
+
+[ext_resource type="Script" uid="uid://dujk6pnftm7ra" path="res://scripts/ui/audio_settings.gd" id="1_g522b"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_g4ivv"]
+bg_color = Color(0, 0, 0, 1)
+
+[node name="Audio settings" type="Control" node_paths=PackedStringArray("master_volume_slider", "music_volume_slider", "sfx_volume_slider", "audio_settings_control")]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 6
+size_flags_vertical = 6
+script = ExtResource("1_g522b")
+master_volume_slider = NodePath("PanelContainer/MarginContainer/VBoxContainer/Master volume/HSlider")
+music_volume_slider = NodePath("PanelContainer/MarginContainer/VBoxContainer/Music volume/HSlider")
+sfx_volume_slider = NodePath("PanelContainer/MarginContainer/VBoxContainer/SFX volume/HSlider")
+audio_settings_control = NodePath(".")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_g4ivv")
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 8
+theme_override_constants/margin_top = 8
+theme_override_constants/margin_right = 8
+theme_override_constants/margin_bottom = 8
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+
+[node name="Audio" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+text = "audio"
+horizontal_alignment = 1
+vertical_alignment = 1
+uppercase = true
+
+[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer"]
+custom_minimum_size = Vector2(0, 32)
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="Master volume" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Master volume"]
+layout_mode = 2
+text = "Master volume"
+horizontal_alignment = 1
+
+[node name="HSlider" type="HSlider" parent="PanelContainer/MarginContainer/VBoxContainer/Master volume"]
+custom_minimum_size = Vector2(64, 0)
+layout_mode = 2
+value = 100.0
+
+[node name="Music volume" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/Music volume"]
+layout_mode = 2
+text = "Music volume"
+horizontal_alignment = 1
+
+[node name="HSlider" type="HSlider" parent="PanelContainer/MarginContainer/VBoxContainer/Music volume"]
+custom_minimum_size = Vector2(64, 0)
+layout_mode = 2
+value = 100.0
+
+[node name="SFX volume" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/SFX volume"]
+layout_mode = 2
+text = "Sounds volume"
+horizontal_alignment = 1
+
+[node name="HSlider" type="HSlider" parent="PanelContainer/MarginContainer/VBoxContainer/SFX volume"]
+custom_minimum_size = Vector2(64, 0)
+layout_mode = 2
+value = 100.0

scenes/main_menu.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://cl00e2ocomk3m"]
+[gd_scene load_steps=6 format=3 uid="uid://cl00e2ocomk3m"]
 
 [ext_resource type="PackedScene" uid="uid://8b6ol5sssbgo" path="res://objects/ui/main_menu.tscn" id="1_ekxnf"]
 [ext_resource type="PackedScene" uid="uid://y0ae6e7t70fj" path="res://objects/ui/settings_menu.tscn" id="2_bqqt6"]
 [ext_resource type="PackedScene" uid="uid://bwgmrcyj4mvu" path="res://objects/ui/credits.tscn" id="3_bqqt6"]
+[ext_resource type="PackedScene" uid="uid://b5fx1vdfky307" path="res://objects/ui/audio_settings.tscn" id="4_8ln24"]
+[ext_resource type="PackedScene" uid="uid://cvfsbiy5ggrpg" path="res://objects/ui/input_settings.tscn" id="5_rtw2f"]
 
 [node name="Main menu" type="CanvasLayer"]
 
@@ -10,8 +12,16 @@
 settings_control = NodePath("../Settings menu")
 credits_control = NodePath("../Credits")
 
-[node name="Settings menu" parent="." instance=ExtResource("2_bqqt6")]
+[node name="Settings menu" parent="." node_paths=PackedStringArray("input_settings", "audio_settings") instance=ExtResource("2_bqqt6")]
 visible = false
+input_settings = NodePath("../Input Settings")
+audio_settings = NodePath("../Audio settings")
 
 [node name="Credits" parent="." instance=ExtResource("3_bqqt6")]
 visible = false
+
+[node name="Audio settings" parent="." instance=ExtResource("4_8ln24")]
+visible = false
+
+[node name="Input Settings" parent="." instance=ExtResource("5_rtw2f")]
+visible = false

scripts/ui/audio_settings.gd

@@ -0,0 +1,104 @@
+extends Node
+
+@export var master_volume_slider: Slider
+@export var music_volume_slider: Slider
+@export var sfx_volume_slider: Slider
+@export var audio_settings_control: Control
+@export var mute_treshold: float = -20.0
+
+
+func _ready() -> void:
+	initialize()
+	if master_volume_slider:
+		master_volume_slider.value_changed.connect(_on_master_volume_slider_value_changed)
+	if music_volume_slider:
+		music_volume_slider.value_changed.connect(_on_music_volume_slider_value_changed)
+	if sfx_volume_slider:
+		sfx_volume_slider.value_changed.connect(_on_sfx_volume_slider_value_changed)
+
+	load_settings()
+
+
+func _unhandled_input(event: InputEvent) -> void:
+	if event.is_action_pressed("ui_cancel"):
+		if UiManager.is_screen_on_top(audio_settings_control):
+			save_settings()
+			UiManager.pop_screen()
+
+
+func initialize() -> void:
+	if master_volume_slider:
+		var volume_db: float = AudioServer.get_bus_volume_db(AudioServer.get_bus_index("Master"))
+		master_volume_slider.value = volume_db
+		master_volume_slider.min_value = mute_treshold
+		master_volume_slider.max_value = 0.0
+	if music_volume_slider:
+		var music_volume_db: float = AudioServer.get_bus_volume_db(AudioServer.get_bus_index("music"))
+		music_volume_slider.value = music_volume_db
+		music_volume_slider.min_value = mute_treshold
+		music_volume_slider.max_value = 0.0
+	if sfx_volume_slider:
+		var sfx_volume_db: float = AudioServer.get_bus_volume_db(AudioServer.get_bus_index("sfx"))
+		sfx_volume_slider.value = sfx_volume_db
+		sfx_volume_slider.min_value = mute_treshold
+		sfx_volume_slider.max_value = 0.0
+
+
+func _handle_mute(bus_index: int, value: float) -> void:
+	if AudioServer:
+		if value == mute_treshold:
+			AudioServer.set_bus_mute(bus_index, true)
+		else:
+			AudioServer.set_bus_mute(bus_index, false)
+
+
+func _on_master_volume_slider_value_changed(value: float) -> void:
+	if AudioServer:
+		AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Master"), value)
+		_handle_mute(AudioServer.get_bus_index("Master"), value)
+
+
+func _on_music_volume_slider_value_changed(value: float) -> void:
+	if AudioServer:
+		AudioServer.set_bus_volume_db(AudioServer.get_bus_index("music"), value)
+		_handle_mute(AudioServer.get_bus_index("music"), value)
+
+
+func _on_sfx_volume_slider_value_changed(value: float) -> void:
+	if AudioServer:
+		AudioServer.set_bus_volume_db(AudioServer.get_bus_index("sfx"), value)
+		_handle_mute(AudioServer.get_bus_index("sfx"), value)
+
+
+func save_settings() -> void:
+	if not AudioServer:
+		return
+
+	var settings_config := ConfigFileHandler.settings_config
+	settings_config.set_value("audio_settings", "master_volume", master_volume_slider.value)
+	settings_config.set_value("audio_settings", "music_volume", music_volume_slider.value)
+	settings_config.set_value("audio_settings", "sfx_volume", sfx_volume_slider.value)
+	settings_config.set_value("audio_settings", "mute_treshold", mute_treshold)
+	settings_config.save(ConfigFileHandler.SETTINGS_PATH)
+
+
+func load_settings() -> void:
+	if not AudioServer:
+		return
+
+	var settings_config := ConfigFileHandler.settings_config
+	if not settings_config.has_section("audio_settings"):
+		print("Audio settings section not found in config file.")
+		return
+
+	var master_volume: float = settings_config.get_value("audio_settings", "master_volume", 0.0)
+	var music_volume: float  = settings_config.get_value("audio_settings", "music_volume", 0.0)
+	var sfx_volume: float    = settings_config.get_value("audio_settings", "sfx_volume", 0.0)
+
+	if master_volume_slider:
+		master_volume_slider.value = master_volume
+	if music_volume_slider:
+		music_volume_slider.value = music_volume
+	if sfx_volume_slider:
+		sfx_volume_slider.value = sfx_volume
+	mute_treshold = settings_config.get_value("audio_settings", "mute_treshold", -20.0)

scripts/ui/audio_settings.gd.uid

@@ -0,0 +1 @@
+uid://dujk6pnftm7ra

scripts/ui/input_settings.gd

@@ -50,6 +50,14 @@ func _input(event: InputEvent) -> void:
 			accept_event()
 
 
+func _unhandled_input(event: InputEvent) -> void:
+	if event.is_action_pressed("ui_cancel"):
+		if UiManager.is_screen_on_top(self):
+			UiManager.pop_screen()
+			save_settings()
+			load_settings()
+
+
 func create_action_list() -> void:
 	InputMap.load_from_project_settings()
 	for item in action_list.get_children():
@@ -92,8 +100,16 @@ func on_reset_button_pressed() -> void:
 
 func save_settings() -> void:
 	config_file_handler.settings_config.set_value("input_settings", "input_actions", input_actions)
-	config_file_handler.settings_config.save(config_file_handler.SETTINGS_FILE_PATH)
+	config_file_handler.settings_config.save(config_file_handler.SETTINGS_PATH)
 
 
 func load_settings() -> void:
-	pass
+	if not config_file_handler.settings_config.has_section("input_settings"):
+		return
+
+	var actions = config_file_handler.settings_config.get_value("input_settings", "input_actions", {})
+	if not actions:
+		return
+
+	input_actions = actions
+	create_action_list()