Rendo/Chelimbalo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI Inprovements

Browse source
This commit is contained in:
Rendo 2025-12-21 02:37:17 +05:00
commit 49589d84d6
6 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gui/client_settings/client_settings.tscn
View file

@ -21,7 +21,7 @@ layout_mode = 2
custom_minimum_size = Vector2(512, 256)
layout_mode = 2
tab_alignment = 1
current_tab = 3
current_tab = 2
[node name="gameplay" type="VBoxContainer" parent="CenterContainer/VBoxContainer/PanelContainer"]
visible = false
@ -38,7 +38,6 @@ layout_mode = 2
text = "fullscreen"
[node name="controls" type="VBoxContainer" parent="CenterContainer/VBoxContainer/PanelContainer"]
visible = false
layout_mode = 2
metadata/_tab_index = 2
@ -54,6 +53,7 @@ unique_name_in_owner = true
custom_minimum_size = Vector2(256, 0)
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 1
min_value = 0.001
max_value = 0.02
step = 0.001
@ -68,7 +68,23 @@ value = 0.02
allow_greater = true
allow_lesser = true
[node name="ToggleCrouch" type="CheckButton" parent="CenterContainer/VBoxContainer/PanelContainer/controls"]
unique_name_in_owner = true
layout_mode = 2
text = "toggle_crouch"
[node name="ToggleScope" type="CheckButton" parent="CenterContainer/VBoxContainer/PanelContainer/controls"]
unique_name_in_owner = true
layout_mode = 2
text = "toggle_scope"
[node name="ToggleWalk" type="CheckButton" parent="CenterContainer/VBoxContainer/PanelContainer/controls"]
unique_name_in_owner = true
layout_mode = 2
text = "toggle_walk"
[node name="audio" type="VBoxContainer" parent="CenterContainer/VBoxContainer/PanelContainer"]
visible = false
layout_mode = 2
metadata/_tab_index = 3
@ -83,6 +99,7 @@ text = "audio_gameplay"
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 1
max_value = 1.0
step = 0.01
value = 1.0
@ -102,6 +119,9 @@ text = "Покинуть сессию"
[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/video/FullscreenButton" to="CenterContainer" method="_on_fullscreen_button_toggled"]
[connection signal="value_changed" from="CenterContainer/VBoxContainer/PanelContainer/controls/Sensitivity/SensitivitySlider" to="CenterContainer" method="_on_sensitivity_slider_value_changed"]
[connection signal="value_changed" from="CenterContainer/VBoxContainer/PanelContainer/controls/Sensitivity/SensitivityBox" to="CenterContainer" method="_on_sensitivity_box_value_changed"]
[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/controls/ToggleCrouch" to="CenterContainer" method="_on_toggle_crouch_toggled"]
[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/controls/ToggleScope" to="CenterContainer" method="_on_toggle_scope_toggled"]
[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/controls/ToggleWalk" to="CenterContainer" method="_on_toggle_walk_toggled"]
[connection signal="value_changed" from="CenterContainer/VBoxContainer/PanelContainer/audio/GameplayMainAudio/GameplayMainSlider" to="CenterContainer" method="_on_gameplay_main_slider_value_changed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/StopSession" to="CenterContainer" method="_on_stop_session_pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/LeaveButton" to="CenterContainer" method="_on_leave_button_pressed"]

15
gui/client_settings/client_settings_menu.gd
View file

@ -9,6 +9,9 @@ func _ready() -> void:
Lobby.lobby_closed.connect(%StopSession.hide)
%SensitivitySlider.set_value_no_signal(ClientSettings.SENSITIVITY)
%SensitivityBox.set_value_no_signal(ClientSettings.SENSITIVITY)
%ToggleCrouch.set_pressed_no_signal(ClientSettings.TOGGLE_CROUCH)
%ToggleScope.set_pressed_no_signal(ClientSettings.TOGGLE_SCOPE)
%ToggleWalk.set_pressed_no_signal(ClientSettings.TOGGLE_WALK)
func _input(event: InputEvent) -> void:
if event.is_action_pressed("menu_settings"):
@ -39,3 +42,15 @@ func _on_leave_button_pressed() -> void:
func _on_stop_session_pressed() -> void:
if multiplayer.is_server():
Session.end_session()
func _on_toggle_crouch_toggled(toggled_on: bool) -> void:
ClientSettings.TOGGLE_CROUCH = toggled_on
func _on_toggle_scope_toggled(toggled_on: bool) -> void:
ClientSettings.TOGGLE_SCOPE = toggled_on
func _on_toggle_walk_toggled(toggled_on: bool) -> void:
ClientSettings.TOGGLE_WALK = toggled_on