nett00n/skelly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better sound sliders

Browse Source
This commit is contained in:
Vladimir nett00n Budylnikov
2025-07-24 20:04:45 +04:00
parent e4ea38ae25
commit fe69347625
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/Main.gd
View File

@@ -3,6 +3,9 @@ extends Control
@onready var press_any_key_screen = $PressAnyKeyScreen @onready var press_any_key_screen = $PressAnyKeyScreen
var current_menu = null var current_menu = null
const MAIN_MENU_SCENE = preload("res://ui/MainMenu.tscn")
const SETTINGS_MENU_SCENE = preload("res://ui/SettingsMenu.tscn")
func _ready(): func _ready():
print("Main scene ready") print("Main scene ready")
press_any_key_screen.any_key_pressed.connect(_on_any_key_pressed) press_any_key_screen.any_key_pressed.connect(_on_any_key_pressed)
@@ -14,14 +17,14 @@ func _on_any_key_pressed():
func show_main_menu(): func show_main_menu():
clear_current_menu() clear_current_menu()
var main_menu = preload("res://ui/MainMenu.tscn").instantiate() var main_menu = MAIN_MENU_SCENE.instantiate()
main_menu.open_settings.connect(_on_open_settings) main_menu.open_settings.connect(_on_open_settings)
add_child(main_menu) add_child(main_menu)
current_menu = main_menu current_menu = main_menu
func show_settings_menu(): func show_settings_menu():
clear_current_menu() clear_current_menu()
var settings_menu = preload("res://ui/SettingsMenu.tscn").instantiate() var settings_menu = SETTINGS_MENU_SCENE.instantiate()
settings_menu.back_to_main_menu.connect(_on_back_to_main_menu) settings_menu.back_to_main_menu.connect(_on_back_to_main_menu)
add_child(settings_menu) add_child(settings_menu)
current_menu = settings_menu current_menu = settings_menu

49
scripts/SettingsMenu.gd
View File

@@ -7,36 +7,32 @@ signal back_to_main_menu
@onready var sfx_slider = $SettingsContainer/SFXVolumeContainer/SFXVolumeSlider @onready var sfx_slider = $SettingsContainer/SFXVolumeContainer/SFXVolumeSlider
@onready var language_selector = $SettingsContainer/LanguageContainer/LanguageSelector @onready var language_selector = $SettingsContainer/LanguageContainer/LanguageSelector
@export var settings_manager: Node = SettingsManager
@export var localization_manager: Node = LocalizationManager
var language_codes = [] var language_codes = []
func _ready(): func _ready():
print("SettingsMenu ready") print("SettingsMenu ready")
# Load current settings into sliders
master_slider.value = SettingsManager.get_setting("master_volume")
music_slider.value = SettingsManager.get_setting("music_volume")
sfx_slider.value = SettingsManager.get_setting("sfx_volume")
# Connect slider signals var volume_sliders = {
master_slider.value_changed.connect(_on_master_volume_changed) "master_volume": master_slider,
music_slider.value_changed.connect(_on_music_volume_changed) "music_volume": music_slider,
sfx_slider.value_changed.connect(_on_sfx_volume_changed) "sfx_volume": sfx_slider
}
for setting_key in volume_sliders.keys():
var slider = volume_sliders[setting_key]
slider.value = settings_manager.get_setting(setting_key)
slider.value_changed.connect(_on_volume_slider_changed.bind(setting_key))
# Setup language selector from JSON data
setup_language_selector() setup_language_selector()
update_text() update_text()
func _on_volume_slider_changed(value, setting_key):
func _on_master_volume_changed(value: float): var pretty_name = setting_key.capitalize().replace("_", " ")
SettingsManager.set_setting("master_volume", value) settings_manager.set_setting(setting_key, value)
print("Master volume changed to: ", value) print("%s changed to: %f" % [pretty_name, value])
func _on_music_volume_changed(value: float):
SettingsManager.set_setting("music_volume", value)
print("Music volume changed to: ", value)
func _on_sfx_volume_changed(value: float):
SettingsManager.set_setting("sfx_volume", value)
print("SFX volume changed to: ", value)
func _input(event): func _input(event):
if event.is_action_pressed("ui_cancel") or event.is_action_pressed("ui_menu_toggle"): if event.is_action_pressed("ui_cancel") or event.is_action_pressed("ui_menu_toggle"):
@@ -49,7 +45,7 @@ func _on_back_button_pressed():
back_to_main_menu.emit() back_to_main_menu.emit()
func setup_language_selector(): func setup_language_selector():
var languages_data = SettingsManager.get_languages_data() var languages_data = settings_manager.get_languages_data()
if languages_data.has("languages"): if languages_data.has("languages"):
language_selector.clear() language_selector.clear()
language_codes.clear() language_codes.clear()
@@ -59,22 +55,19 @@ func setup_language_selector():
var display_name = languages_data.languages[lang_code]["display_name"] var display_name = languages_data.languages[lang_code]["display_name"]
language_selector.add_item(display_name) language_selector.add_item(display_name)
# Set current language selection var current_lang = settings_manager.get_setting("language")
var current_lang = SettingsManager.get_setting("language")
var lang_index = language_codes.find(current_lang) var lang_index = language_codes.find(current_lang)
if lang_index >= 0: if lang_index >= 0:
language_selector.selected = lang_index language_selector.selected = lang_index
# Remove the old get_language_index function and update this one:
func _on_language_selector_item_selected(index: int): func _on_language_selector_item_selected(index: int):
if index < language_codes.size(): if index < language_codes.size():
var selected_lang = language_codes[index] var selected_lang = language_codes[index]
SettingsManager.set_setting("language", selected_lang) settings_manager.set_setting("language", selected_lang)
print("Language changed to: ", selected_lang) print("Language changed to: ", selected_lang)
LocalizationManager.change_language(selected_lang) localization_manager.change_language(selected_lang)
func update_text(): func update_text():
# Update all the label texts when language changes
$SettingsContainer/SettingsTitle.text = tr("settings_title") $SettingsContainer/SettingsTitle.text = tr("settings_title")
$SettingsContainer/MasterVolumeContainer/MasterVolume.text = tr("master_volume") $SettingsContainer/MasterVolumeContainer/MasterVolume.text = tr("master_volume")
$SettingsContainer/MusicVolumeContainer/MusicVolume.text = tr("music_volume") $SettingsContainer/MusicVolumeContainer/MusicVolume.text = tr("music_volume")