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

Merge pull request 'settings reset button' (#2) from settings-reset-button into main

Browse Source 
Reviewed-on: #2
This commit is contained in:
nett00n
2025-07-24 20:02:32 +02:00
parent e732f9b6da dac3d42b6b
commit 1b95573720
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/SettingsManager.gd
View File

@@ -82,3 +82,9 @@ func load_languages():
func get_languages_data(): func get_languages_data():
return languages_data return languages_data
func reset_settings_to_defaults() -> void:
for key in default_settings.keys():
settings[key] = default_settings[key]
_apply_setting_side_effect(key, settings[key])
save_settings()

47
scripts/SettingsMenu.gd
View File

@@ -13,22 +13,38 @@ signal back_to_main_menu
var language_codes = [] var language_codes = []
func _ready(): func _ready():
add_to_group("localizable")
print("SettingsMenu ready") print("SettingsMenu ready")
var volume_sliders = {
"master_volume": master_slider,
"music_volume": music_slider,
"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() setup_language_selector()
var master_callback = _on_volume_slider_changed.bind("master_volume")
if not master_slider.value_changed.is_connected(master_callback):
master_slider.value_changed.connect(master_callback)
var music_callback = _on_volume_slider_changed.bind("music_volume")
if not music_slider.value_changed.is_connected(music_callback):
music_slider.value_changed.connect(music_callback)
var sfx_callback = _on_volume_slider_changed.bind("sfx_volume")
if not sfx_slider.value_changed.is_connected(sfx_callback):
sfx_slider.value_changed.connect(sfx_callback)
if not language_selector.item_selected.is_connected(Callable(self, "_on_language_selector_item_selected")):
language_selector.item_selected.connect(_on_language_selector_item_selected)
_update_controls_from_settings()
update_text() update_text()
func _update_controls_from_settings():
master_slider.value = settings_manager.get_setting("master_volume")
music_slider.value = settings_manager.get_setting("music_volume")
sfx_slider.value = settings_manager.get_setting("sfx_volume")
var current_lang = settings_manager.get_setting("language")
var lang_index = language_codes.find(current_lang)
if lang_index >= 0:
language_selector.selected = lang_index
func _on_volume_slider_changed(value, setting_key): func _on_volume_slider_changed(value, setting_key):
settings_manager.set_setting(setting_key, value) settings_manager.set_setting(setting_key, value)
@@ -77,3 +93,10 @@ func update_text():
$SettingsContainer/SFXVolumeContainer/SFXVolume.text = tr("sfx_volume") $SettingsContainer/SFXVolumeContainer/SFXVolume.text = tr("sfx_volume")
$SettingsContainer/LanguageContainer/LanguageLabel.text = tr("language") $SettingsContainer/LanguageContainer/LanguageLabel.text = tr("language")
$BackButtonContainer/BackButton.text = tr("back") $BackButtonContainer/BackButton.text = tr("back")
func _on_reset_setting_button_pressed() -> void:
print("Resetting settings")
settings_manager.reset_settings_to_defaults()
_update_controls_from_settings()
localization_manager.change_language(settings_manager.get_setting("language"))

1
ui/SettingsMenu.tscn
View File

@@ -150,3 +150,4 @@ text = "Reset settings to default"
[connection signal="value_changed" from="SettingsContainer/SFXVolumeContainer/SFXVolumeSlider" to="." method="_on_sfx_volume_changed"] [connection signal="value_changed" from="SettingsContainer/SFXVolumeContainer/SFXVolumeSlider" to="." method="_on_sfx_volume_changed"]
[connection signal="item_selected" from="SettingsContainer/LanguageContainer/LanguageSelector" to="." method="_on_language_selector_item_selected"] [connection signal="item_selected" from="SettingsContainer/LanguageContainer/LanguageSelector" to="." method="_on_language_selector_item_selected"]
[connection signal="pressed" from="BackButtonContainer/BackButton" to="." method="_on_back_button_pressed"] [connection signal="pressed" from="BackButtonContainer/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="pressed" from="ResetSettingsContainer/ResetSettingButton" to="." method="_on_reset_setting_button_pressed"]