diff --git a/Scenes/Prefabs/UI/SettingsMenu.tscn b/Scenes/Prefabs/UI/SettingsMenu.tscn index 01e8360..aa9db53 100644 --- a/Scenes/Prefabs/UI/SettingsMenu.tscn +++ b/Scenes/Prefabs/UI/SettingsMenu.tscn @@ -324,9 +324,8 @@ values = ["VIDEO_HUD_STRETCHED", "VIDEO_HUD_CENTER"] [node name="FrameLimit" parent="PanelContainer/MarginContainer/VBoxContainer/Video" instance=ExtResource("3_dl6kk")] layout_mode = 2 option_key = "frame_limit" -title = "Frame_Limit" -value_descs = Array[String](["Unlimited", "60fps", "120fps", "144fps", "240fps"]) -values = [0, 60, 120, 144, 240] +title = "FRAME LIMIT" +values = ["Unlimited", "60fps", "120fps", "144fps", "240fps"] [node name="WindowChanger" type="Node" parent="PanelContainer/MarginContainer/VBoxContainer/Video"] script = ExtResource("5_hnwhb") @@ -891,6 +890,7 @@ script = ExtResource("19_k6yev") [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/VSync" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="vsync_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/DropShadows" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="drop_shadows_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/HudStyle" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="hud_style_changed"] +[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/FrameLimit" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="frame_limit_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode" to="PanelContainer/MarginContainer/VBoxContainer/Audio/AudioAdjuster" method="master_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2" to="PanelContainer/MarginContainer/VBoxContainer/Audio/AudioAdjuster" method="music_changed"] [connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3" to="PanelContainer/MarginContainer/VBoxContainer/Audio/AudioAdjuster" method="sfx_changed"] diff --git a/Scripts/UI/WindowChanger.gd b/Scripts/UI/WindowChanger.gd index b6f6e93..ca558f0 100644 --- a/Scripts/UI/WindowChanger.gd +++ b/Scripts/UI/WindowChanger.gd @@ -22,6 +22,7 @@ func window_size_changed(new_value := 0) -> void: func vsync_changed(new_value := 0) -> void: DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if new_value == 1 else DisplayServer.VSYNC_DISABLED) + Settings.file.video.vsync = new_value func drop_shadows_changed(new_value := 0) -> void: @@ -45,7 +46,17 @@ func language_changed(new_value := 0) -> void: %Flag.region_rect.position.x = new_value * 16 func frame_limit_changed(new_value := 0) -> void: - Engine.max_fps = new_value + print_debug(str(new_value)) + + var new_framerate := 0 + match new_value: + + 1: new_framerate = 60 + 2: new_framerate = 120 + 3: new_framerate = 144 + 4: new_framerate = 240 + + Engine.max_fps = new_framerate Settings.file.video.frame_limit = new_value func set_value(value_name := "", value := 0) -> void: