From 195c1b206aa0db919bf85367b4ab70f4a3c90029 Mon Sep 17 00:00:00 2001 From: techrunner Date: Fri, 9 Aug 2024 16:43:41 -0500 Subject: [PATCH] Added Slider range Min, Max, and Step as Vector 3 to Settings dictionary --- .../Component Scripts/Settings_Option.gd | 6 ++- Assets/scripts/global_settings.gd | 37 ++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Assets/scripts/Component Scripts/Settings_Option.gd b/Assets/scripts/Component Scripts/Settings_Option.gd index 0235690..e55517e 100644 --- a/Assets/scripts/Component Scripts/Settings_Option.gd +++ b/Assets/scripts/Component Scripts/Settings_Option.gd @@ -2,10 +2,14 @@ extends HBoxContainer @export var Setting:GlobalSettings.Setting = GlobalSettings.Setting.Test_Value -# Called when the node enters the scene tree for the first time. func _ready(): $Label.text = GlobalSettings.GetSettingName(Setting) $HSlider.value = GlobalSettings.GetSetting(Setting) + var SliderRange = GlobalSettings.GetSettingRange(Setting) + $HSlider.min_value = SliderRange.x + $HSlider.max_value = SliderRange.y + $HSlider.step = SliderRange.z func _on_setting_slider_value_changed(value:float): GlobalSettings.SetSetting(Setting, value) + print(Setting, value) diff --git a/Assets/scripts/global_settings.gd b/Assets/scripts/global_settings.gd index 1061be1..953f7e5 100644 --- a/Assets/scripts/global_settings.gd +++ b/Assets/scripts/global_settings.gd @@ -13,39 +13,39 @@ var HasGeneratorKey = false var Settings:Dictionary = { Setting.Mouse_Speed: { - "value": 0.02, + "value": 1, "text": "Mouse Speed", - "range": Vector2(0.0001, 0.09) + "range": Vector3(0.5, 4, .05) }, Setting.Joystick_Speed: { - "value": 2, + "value": 4.0, "text": "Joystick Speed", - "range": Vector2(0.5, 4) + "range": Vector3(2, 6, 0.25) }, Setting.SFX_Volume: { - "value": 100, + "value": 100.0, "text": "SFX Volume", - "range": Vector2(0,100) + "range": Vector3(0,100, 0.5) }, Setting.Music_Volume: { - "value": 100, + "value": 100.0, "text": "Music Volume", - "range": Vector2(0,100) + "range": Vector3(0,100, 0.5) }, Setting.Voice_Volume: { - "value": 100, + "value": 100.0, "text": "Voice Volume", - "range": Vector2(0,100) + "range": Vector3(0,100, 0.5) }, Setting.FOV: { - "value": 95, + "value": 95.0, "text": "FOV", - "range": Vector2(75,115) + "range": Vector3(75,115, 1) }, Setting.Test_Value: { - "value": 69, + "value": 69.0, "text": "Test Value", - "range": Vector2(0,100) + "range": Vector3(0,100, 0.25) } } @@ -58,19 +58,20 @@ func GetSetting(SettingName): return Settings.get(SettingName).get("value") func GetSettingName(SettingName): - return Setting.get(SettingName).get("text") + return Settings.get(SettingName).get("text") func GetSettingRange(SettingName): - return Setting.get(SettingName).get("range") + return Settings.get(SettingName).get("range") func SetSetting(SettingName, value): Settings[SettingName]["value"] = value + print(value) func PrintSettings(): - for setting in Settings.keys(): - print(setting, ":", Settings.get(setting)) + for key in Settings.keys(): + print(key, ":", Settings.get(key)) func SetCurrentMap(selected_map):