From 5ee6a7c4a8fda3b5b3630c4ac71f6d24e99d8ef1 Mon Sep 17 00:00:00 2001
From: Rendo <geometicalplayer@gmail.com>
Date: Sun, 7 Dec 2025 19:09:53 +0500
Subject: [PATCH] fixed settings

---
 scenes/gui/client_settings.tscn     | 13 +++++++------
 scripts/gui/client_settings_menu.gd | 23 +++++++++++------------
 scripts/multiplayer/lobby.gd        |  1 +
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/scenes/gui/client_settings.tscn b/scenes/gui/client_settings.tscn
index 96e7187..241c791 100644
--- a/scenes/gui/client_settings.tscn
+++ b/scenes/gui/client_settings.tscn
@@ -32,7 +32,7 @@ layout_mode = 2
 layout_mode = 2
 text = "Чувствительность"
 
-[node name="HSlider" type="HSlider" parent="CenterContainer/PanelContainer/VBoxContainer/Sensitivity"]
+[node name="SensitivitySlider" type="HSlider" parent="CenterContainer/PanelContainer/VBoxContainer/Sensitivity"]
 custom_minimum_size = Vector2(256, 0)
 layout_mode = 2
 size_flags_horizontal = 3
@@ -41,7 +41,7 @@ max_value = 0.1
 step = 0.001
 value = 0.02
 
-[node name="SpinBox" type="SpinBox" parent="CenterContainer/PanelContainer/VBoxContainer/Sensitivity"]
+[node name="SensitivityBox" type="SpinBox" parent="CenterContainer/PanelContainer/VBoxContainer/Sensitivity"]
 layout_mode = 2
 max_value = 0.1
 step = 0.001
@@ -63,7 +63,8 @@ max_value = 1.0
 step = 0.01
 value = 1.0
 
-[connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/FullscreenButton" to="." method="_on_check_button_toggled"]
-[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/Sensitivity/HSlider" to="." method="_on_h_slider_value_changed"]
-[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/Sensitivity/SpinBox" to="." method="_on_spin_box_value_changed"]
-[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/GameplayMainAudio/GameplayMainSlider" to="." method="_on_gameplay_main_slider_value_changed"]
+[connection signal="pressed" from="CenterContainer/PanelContainer/VBoxContainer/FullscreenButton" to="CenterContainer/PanelContainer" method="_on_fullscreen_button_pressed"]
+[connection signal="toggled" from="CenterContainer/PanelContainer/VBoxContainer/FullscreenButton" to="CenterContainer/PanelContainer" method="_on_fullscreen_button_toggled"]
+[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/Sensitivity/SensitivitySlider" to="CenterContainer/PanelContainer" method="_on_sensitivity_slider_value_changed"]
+[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/Sensitivity/SensitivityBox" to="CenterContainer/PanelContainer" method="_on_sensitivity_box_value_changed"]
+[connection signal="value_changed" from="CenterContainer/PanelContainer/VBoxContainer/GameplayMainAudio/GameplayMainSlider" to="CenterContainer/PanelContainer" method="_on_gameplay_main_slider_value_changed"]
diff --git a/scripts/gui/client_settings_menu.gd b/scripts/gui/client_settings_menu.gd
index da89a96..33751ec 100644
--- a/scripts/gui/client_settings_menu.gd
+++ b/scripts/gui/client_settings_menu.gd
@@ -2,18 +2,6 @@ extends Control
 
 var cached_mouse_state: Input.MouseMode
 
-func _on_check_button_toggled(toggled_on: bool) -> void:
-	DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN if toggled_on else DisplayServer.WINDOW_MODE_WINDOWED)
-
-func _on_h_slider_value_changed(value: float) -> void:
-	$VBoxContainer/Sensitivity/SpinBox.set_value_no_signal(value)
-	ClientSettings.SENSITIVITY = value
-
-
-func _on_spin_box_value_changed(value: float) -> void:
-	$VBoxContainer/Sensitivity/HSlider.set_value_no_signal(value)
-	ClientSettings.SENSITIVITY = value
-
 func _input(event: InputEvent) -> void:
 	if event.is_action_pressed("menu_settings"):
 		visible = not visible
@@ -26,3 +14,14 @@ func _input(event: InputEvent) -> void:
 
 func _on_gameplay_main_slider_value_changed(value: float) -> void:
 	AudioServer.set_bus_volume_linear(1,value)
+
+func _on_fullscreen_button_toggled(toggled_on: bool) -> void:
+	DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN if toggled_on else DisplayServer.WINDOW_MODE_WINDOWED)
+
+func _on_sensitivity_slider_value_changed(value: float) -> void:
+	$VBoxContainer/Sensitivity/SpinBox.set_value_no_signal(value)
+	ClientSettings.SENSITIVITY = value
+
+func _on_sensitivity_box_value_changed(value: float) -> void:
+	$VBoxContainer/Sensitivity/HSlider.set_value_no_signal(value)
+	ClientSettings.SENSITIVITY = value
diff --git a/scripts/multiplayer/lobby.gd b/scripts/multiplayer/lobby.gd
index a240d78..06f4e76 100644
--- a/scripts/multiplayer/lobby.gd
+++ b/scripts/multiplayer/lobby.gd
@@ -15,6 +15,7 @@ var attack_team: Array[int] = []
 var defence_team: Array[int] = []
 var specators_team: Array[int] = []
 
+# Host defined variables
 var win_score = 13
 var half_rounds = 12