add audio_manager and code refactoring

core/ai/agents/base/ai_base.tscn

@@ -1,9 +1,9 @@
 [gd_scene format=3 uid="uid://clx701xdwelgx"]
 
-[ext_resource type="Script" uid="uid://b30p1yqojbbbk" path="res://core/ai/ai_base/ai_base.gd" id="1_4d1nn"]
-[ext_resource type="Script" uid="uid://ps3vlu2qvmop" path="res://core/ai/ai_base/state_machine.gd" id="2_q1hg3"]
-[ext_resource type="Script" uid="uid://nga8qx56iwgu" path="res://core/ai/ai_base/idle_state.gd" id="3_26faq"]
-[ext_resource type="Script" uid="uid://bngfthvt04ivv" path="res://core/ai/ai_base/patrol_state.gd" id="4_lim44"]
+[ext_resource type="Script" uid="uid://b30p1yqojbbbk" path="res://core/ai/agents/base/ai_base.gd" id="1_4d1nn"]
+[ext_resource type="Script" uid="uid://ps3vlu2qvmop" path="res://core/ai/framework/state_machine.gd" id="2_q1hg3"]
+[ext_resource type="Script" uid="uid://nga8qx56iwgu" path="res://core/ai/agents/base/idle_state.gd" id="3_26faq"]
+[ext_resource type="Script" uid="uid://bngfthvt04ivv" path="res://core/ai/agents/base/patrol_state.gd" id="4_lim44"]
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_mh3lg"]
 

core/audio/audio_manager.gd

@@ -0,0 +1,31 @@
+extends Node
+
+const MIN_VOLUME: float = 0.0
+const MAX_VOLUME: float = 1.0
+
+func _ready() -> void:
+	load_save_data()
+
+func load_save_data() -> void:
+	for bus_name in GameState.save_data.audio_bus_volumes:
+		_apply_audio_bus_volume(bus_name, GameState.save_data.audio_bus_volumes[bus_name])
+
+func set_audio_bus_volume(bus_name: StringName, linear_value: float) -> void:
+	var normalized_bus_name := str(bus_name)
+	var clamped_value := clampf(linear_value, MIN_VOLUME, MAX_VOLUME)
+
+	GameState.save_data.audio_bus_volumes[normalized_bus_name] = clamped_value
+	_apply_audio_bus_volume(normalized_bus_name, clamped_value)
+	GameState.save_game()
+
+func get_audio_bus_volume(bus_name: StringName, default_value: float = 1.0) -> float:
+	return float(GameState.save_data.audio_bus_volumes.get(str(bus_name), default_value))
+
+func _apply_audio_bus_volume(bus_name: String, linear_value: float) -> void:
+	var bus_index := AudioServer.get_bus_index(bus_name)
+	if bus_index == -1:
+		return
+
+	var clamped_value := clampf(linear_value, MIN_VOLUME, MAX_VOLUME)
+	AudioServer.set_bus_volume_db(bus_index, linear_to_db(clamped_value))
+	AudioServer.set_bus_mute(bus_index, is_zero_approx(clamped_value))

core/audio/audio_manager.gd.uid

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

core/audio/settings/audio_option.gd

@@ -0,0 +1,56 @@
+extends VBoxContainer
+
+class_name AudioOption
+
+const MIN_VOLUME: float = 0.0
+const MAX_VOLUME: float = 1.0
+
+@export var bus_name: StringName = &"Master"
+@export var label_text: String = "Master Volume"
+@export_range(0.0, 1.0, 0.01) var default_volume: float = 1.0
+
+@onready var label: Label = $Label
+@onready var slider: HSlider = $HSlider
+
+func _ready() -> void:
+	slider.min_value = MIN_VOLUME
+	slider.max_value = MAX_VOLUME
+	slider.step = 0.01
+	slider.value_changed.connect(_on_slider_value_changed)
+	refresh()
+
+func refresh() -> void:
+	label.text = label_text
+
+	if not has_bus():
+		slider.set_value_no_signal(default_volume)
+		slider.editable = false
+		label.text = "%s (bus missing)" % label_text
+		return
+
+	slider.editable = true
+	var saved_volume := AudioManager.get_audio_bus_volume(bus_name, default_volume)
+	slider.set_value_no_signal(saved_volume)
+	apply_current_value()
+
+func reset_to_default() -> void:
+	slider.value = default_volume
+
+func apply_current_value() -> void:
+	_set_bus_volume(slider.value)
+
+func has_bus() -> bool:
+	return get_bus_index() != -1
+
+func get_bus_index() -> int:
+	return AudioServer.get_bus_index(bus_name)
+
+func _set_bus_volume(linear_value: float) -> void:
+	if not has_bus():
+		return
+
+	var clamped_value := clampf(linear_value, MIN_VOLUME, MAX_VOLUME)
+	AudioManager.set_audio_bus_volume(bus_name, clamped_value)
+
+func _on_slider_value_changed(value: float) -> void:
+	_set_bus_volume(value)

core/audio/settings/audio_option.gd.uid

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

core/audio/settings/audio_option.tscn

@@ -0,0 +1,14 @@
+[gd_scene format=3 uid="uid://cescrovsjlwke"]
+
+[ext_resource type="Script" uid="uid://bnh1y560h55vc" path="res://core/audio/settings/audio_option.gd" id="1_orafl"]
+
+[node name="AudioOption" type="VBoxContainer" unique_id=1509773712]
+custom_minimum_size = Vector2(300, 0)
+script = ExtResource("1_orafl")
+
+[node name="Label" type="Label" parent="." unique_id=781845786]
+layout_mode = 2
+text = "Master Volume"
+
+[node name="HSlider" type="HSlider" parent="." unique_id=1286896253]
+layout_mode = 2

core/audio/settings/settings_menu.gd

@@ -0,0 +1,36 @@
+extends Control
+
+class_name SettingsMenu
+
+@onready var audio_options_container: VBoxContainer = $%AudioOptionsContainer
+@onready var reset_button: Button = $%ResetToDefault_Button
+@onready var close_button: Button = $%Close_Button
+
+func _ready() -> void:
+	reset_button.pressed.connect(_on_reset_to_default_button_pressed)
+	close_button.pressed.connect(_on_close_button_pressed)
+	_refresh_audio_options()
+
+func _get_audio_options() -> Array[AudioOption]:
+	var audio_options: Array[AudioOption] = []
+
+	for child in audio_options_container.get_children():
+		if child is AudioOption:
+			audio_options.append(child)
+
+	return audio_options
+
+func _refresh_audio_options() -> void:
+	for audio_option in _get_audio_options():
+		audio_option.refresh()
+
+func _apply_current_audio_values() -> void:
+	for audio_option in _get_audio_options():
+		audio_option.apply_current_value()
+
+func _on_reset_to_default_button_pressed() -> void:
+	for audio_option in _get_audio_options():
+		audio_option.reset_to_default()
+
+func _on_close_button_pressed() -> void:
+	visible = false

core/audio/settings/settings_menu.gd.uid

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

core/audio/settings/settings_menu.tscn

@@ -0,0 +1,74 @@
+[gd_scene format=3 uid="uid://caqf471x0kttc"]
+
+[ext_resource type="Script" uid="uid://cvr25q1blyxg" path="res://core/audio/settings/settings_menu.gd" id="1_4lekq"]
+[ext_resource type="PackedScene" uid="uid://cescrovsjlwke" path="res://core/audio/settings/audio_option.tscn" id="1_hwcco"]
+
+[node name="SettingsMenu" type="Control" unique_id=1639777294]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_4lekq")
+
+[node name="PanelContainer" type="PanelContainer" parent="." unique_id=315821242]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -79.5
+offset_top = -110.0
+offset_right = 79.5
+offset_bottom = 110.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=648635784]
+layout_mode = 2
+size_flags_vertical = 0
+theme_override_constants/margin_left = 12
+theme_override_constants/margin_top = 12
+theme_override_constants/margin_right = 12
+theme_override_constants/margin_bottom = 12
+
+[node name="AudioOptionsContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer" unique_id=824023653]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/separation = 12
+
+[node name="MasterVolume_AudioOption" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=1509773712 instance=ExtResource("1_hwcco")]
+layout_mode = 2
+
+[node name="HSeparator" type="HSeparator" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=1053430754]
+layout_mode = 2
+
+[node name="MusicVolume_AudioOption" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=690924616 instance=ExtResource("1_hwcco")]
+layout_mode = 2
+bus_name = &"Music"
+label_text = "Music Volume"
+
+[node name="HSeparator2" type="HSeparator" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=453716295]
+layout_mode = 2
+
+[node name="SFXVolume_AudioOption" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=2096291127 instance=ExtResource("1_hwcco")]
+layout_mode = 2
+bus_name = &"SFX"
+label_text = "SFX Volume"
+
+[node name="HSeparator3" type="HSeparator" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=498553283]
+layout_mode = 2
+
+[node name="ResetToDefault_Button" type="Button" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=720420423]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 0
+text = "Reset To Default"
+
+[node name="Close_Button" type="Button" parent="PanelContainer/MarginContainer/AudioOptionsContainer" unique_id=1137906684]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 0
+text = "Close"

core/game_state/save_game_data.gd

@@ -3,11 +3,13 @@ extends Resource
 
 var unlocked_collectibles_ids: Array[String] = []
 var saved_photos: Array[String] = []
+var audio_bus_volumes: Dictionary[String, float] = {}
 
 func to_dictionary() -> Dictionary:
 	return {
 		"unlocked_collectibles_ids": unlocked_collectibles_ids,
 		"saved_photos": saved_photos,
+		"audio_bus_volumes": audio_bus_volumes,
 	}
 
 static func from_dictionary(data: Dictionary) -> SaveGameData:
@@ -21,4 +23,8 @@ static func from_dictionary(data: Dictionary) -> SaveGameData:
 		for photo_path in data["saved_photos"]:
 			save_game_data.saved_photos.append(str(photo_path))
 
+	if data.has("audio_bus_volumes") and data["audio_bus_volumes"] is Dictionary:
+		for bus_name in data["audio_bus_volumes"]:
+			save_game_data.audio_bus_volumes[str(bus_name)] = float(data["audio_bus_volumes"][bus_name])
+
 	return save_game_data

core/photo_mode/data/collectible_library.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Resource" script_class="CollectibleLibrary" format=3 uid="uid://c6pkpvsvimafb"]
 
-[ext_resource type="Script" uid="uid://bj34o0org55ei" path="res://core/photo_mode/collectible_resource.gd" id="1_3cgvf"]
-[ext_resource type="Script" uid="uid://hhuufh87skq5" path="res://core/photo_mode/collectible_library.gd" id="2_ggu10"]
+[ext_resource type="Script" uid="uid://bj34o0org55ei" path="res://core/photo_mode/data/collectible_resource.gd" id="1_3cgvf"]
+[ext_resource type="Script" uid="uid://hhuufh87skq5" path="res://core/photo_mode/data/collectible_library.gd" id="2_ggu10"]
 [ext_resource type="Texture2D" uid="uid://cx8d233y32kmu" path="res://icon.svg" id="2_pxmdy"]
 
 [sub_resource type="Resource" id="Resource_3cgvf"]

core/photo_mode/managers/collection_manager.gd

@@ -3,7 +3,7 @@ extends Node
 signal on_collectible_unlocked(collectible_id: String)
 signal on_photo_saved(filePath: String)
 
-var collectibles_library: CollectibleLibrary = preload("res://core/photo_mode/collectible_library.tres")
+var collectibles_library: CollectibleLibrary = preload("res://core/photo_mode/data/collectible_library.tres")
 
 var unlocked_collectibles_ids: Array[String] = []
 var saved_photos: Array[String] = []

core/photo_mode/runtime/collectible.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://bmkxt6btcx8qr"]
 
-[ext_resource type="Script" uid="uid://62d14boivr3g" path="res://core/photo_mode/collectible.gd" id="1_xse8c"]
+[ext_resource type="Script" uid="uid://62d14boivr3g" path="res://core/photo_mode/runtime/collectible.gd" id="1_xse8c"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_xse8c"]
 

core/photo_mode/runtime/photo_mode_controller.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://vni5kjalum6d"]
 
-[ext_resource type="Script" uid="uid://d7ln6iru6mq6" path="res://core/photo_mode/photo_mode_controller.gd" id="1_uhpya"]
+[ext_resource type="Script" uid="uid://d7ln6iru6mq6" path="res://core/photo_mode/runtime/photo_mode_controller.gd" id="1_uhpya"]
 
 [node name="PhotoModeController" type="Node3D" unique_id=695158870]
 process_mode = 3

core/photo_mode/ui/collectible_gallery.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://bvw086glfpcba"]
 
-[ext_resource type="Script" uid="uid://dq3qtcrdnikl7" path="res://core/photo_mode/collectible_gallery.gd" id="1_67tug"]
-[ext_resource type="PackedScene" uid="uid://dp7dvfauh5rpx" path="res://core/photo_mode/collectible_ui.tscn" id="2_or234"]
+[ext_resource type="Script" uid="uid://dq3qtcrdnikl7" path="res://core/photo_mode/ui/collectible_gallery.gd" id="1_67tug"]
+[ext_resource type="PackedScene" uid="uid://dp7dvfauh5rpx" path="res://core/photo_mode/ui/collectible_ui.tscn" id="2_or234"]
 
 [node name="CollectibleGallery" type="Control" unique_id=354419843]
 layout_mode = 3

core/photo_mode/ui/collectible_ui.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://dp7dvfauh5rpx"]
 
-[ext_resource type="Script" uid="uid://dxh8e1n16qjpp" path="res://core/photo_mode/collectible_ui.gd" id="1_tu5nx"]
+[ext_resource type="Script" uid="uid://dxh8e1n16qjpp" path="res://core/photo_mode/ui/collectible_ui.gd" id="1_tu5nx"]
 [ext_resource type="Texture2D" uid="uid://cx8d233y32kmu" path="res://icon.svg" id="1_x3wje"]
 
 [node name="CollectibleUI" type="Control" unique_id=201865221]

core/photo_mode/ui/photo.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://cvus62qkop3qi"]
 
-[ext_resource type="Script" uid="uid://dsey5dvc11vpq" path="res://core/photo_mode/photo.gd" id="1_u0arp"]
+[ext_resource type="Script" uid="uid://dsey5dvc11vpq" path="res://core/photo_mode/ui/photo.gd" id="1_u0arp"]
 
 [node name="Photo" type="Control" unique_id=201865221]
 custom_minimum_size = Vector2(200, 200)

core/photo_mode/ui/photo_gallery.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://b6r787sik5yil"]
 
-[ext_resource type="Script" uid="uid://k4iqrlkbjppl" path="res://core/photo_mode/photo_gallery.gd" id="1_bp5uf"]
-[ext_resource type="PackedScene" uid="uid://cvus62qkop3qi" path="res://core/photo_mode/photo.tscn" id="2_45wok"]
+[ext_resource type="Script" uid="uid://k4iqrlkbjppl" path="res://core/photo_mode/ui/photo_gallery.gd" id="1_bp5uf"]
+[ext_resource type="PackedScene" uid="uid://cvus62qkop3qi" path="res://core/photo_mode/ui/photo.tscn" id="2_45wok"]
 
 [node name="PhotoGallery" type="Control" unique_id=354419843]
 layout_mode = 3

core/radio/radio.gd

@@ -10,7 +10,6 @@ func _ready():
 
 func play_track(index: int = current_track_index):
 	if playlist.is_empty():
-		push_warning("Playlist is empty")
 		return
 		
 	current_track_index = posmod(index, playlist.size())

core/radio/radio.tscn

@@ -3,4 +3,5 @@
 [ext_resource type="Script" uid="uid://bwrgh6xlvhqch" path="res://core/radio/radio.gd" id="1_2akjj"]
 
 [node name="Radio" type="AudioStreamPlayer" unique_id=1234112225]
+bus = &"Music"
 script = ExtResource("1_2akjj")