From 61a03acb5cca8803af0d5e51a01d42f5c6a789d2 Mon Sep 17 00:00:00 2001 From: tpart Date: Sun, 23 Mar 2025 21:56:40 +0100 Subject: Replace controller buttons with selectable versions; Clean up code; Fix #251 --- client/menu/controller_buttons/controller_button.tscn | 9 --------- client/menu/lobby.gd | 2 +- client/menu/lobby.tscn | 14 ++++++++------ 3 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 client/menu/controller_buttons/controller_button.tscn (limited to 'client/menu') diff --git a/client/menu/controller_buttons/controller_button.tscn b/client/menu/controller_buttons/controller_button.tscn deleted file mode 100644 index de08693a..00000000 --- a/client/menu/controller_buttons/controller_button.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://b1f7bgn65j7b5"] - -[ext_resource type="Script" uid="uid://b1eomxildrq30" path="res://menu/controller_buttons/controller_button.gd" id="1_p2m8i"] - -[node name="ControllerButton" type="Button"] -offset_right = 8.0 -offset_bottom = 8.0 -focus_mode = 0 -script = ExtResource("1_p2m8i") diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd index 00c16cef..3405cebb 100644 --- a/client/menu/lobby.gd +++ b/client/menu/lobby.gd @@ -153,7 +153,7 @@ func _on_right_pressed(): selected_map = (selected_map + 1) % map_count select_map(selected_map) -func _on_controller_button_pressed(): +func _on_start_pressed(): if selected_map_name != null: var start_msg := "/start %s" % selected_map_name diff --git a/client/menu/lobby.tscn b/client/menu/lobby.tscn index eb116b4e..b26b2190 100644 --- a/client/menu/lobby.tscn +++ b/client/menu/lobby.tscn @@ -9,11 +9,11 @@ [ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="5_am8pt"] [ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="5_odwav"] [ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_tulu3"] -[ext_resource type="PackedScene" uid="uid://b1f7bgn65j7b5" path="res://menu/controller_buttons/controller_button.tscn" id="7_t6mox"] [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="8_cwbpa"] [ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"] [ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="10_bgene"] [ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://menu/controller_buttons/y.svg" id="11_5uugf"] +[ext_resource type="Script" uid="uid://b1eomxildrq30" path="res://menu/controller_buttons/controller_button.gd" id="12_7mu2u"] [sub_resource type="FontVariation" id="FontVariation_5xxr2"] base_font = ExtResource("8_cwbpa") @@ -143,21 +143,23 @@ layout_mode = 2 theme_override_constants/separation = 15 alignment = 1 -[node name="JoinSpectate" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer" instance=ExtResource("7_t6mox")] -custom_minimum_size = Vector2(148, 0) +[node name="JoinSpectate" type="Button" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] layout_mode = 2 text = "c.menu.ingame.spectate" expand_icon = true +script = ExtResource("12_7mu2u") controller_texture = ExtResource("11_5uugf") press_action = "join_spectate" +metadata/_custom_type_script = "uid://b1eomxildrq30" -[node name="Start" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer" instance=ExtResource("7_t6mox")] -custom_minimum_size = Vector2(148, 0) +[node name="Start" type="Button" parent="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] layout_mode = 2 text = "c.menu.lobby.start" expand_icon = true +script = ExtResource("12_7mu2u") controller_texture = ExtResource("9_q14bw") press_action = "start_game" +metadata/_custom_type_script = "uid://b1eomxildrq30" [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 @@ -184,4 +186,4 @@ alignment = 1 [connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right" to="." method="_on_right_pressed"] [connection signal="toggled" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/Bots/EnableBots" to="." method="_on_enable_bots_toggled"] [connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate" to="." method="_on_join_spectate_pressed"] -[connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_controller_button_pressed"] +[connection signal="pressed" from="HBoxContainer/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_start_pressed"] -- cgit v1.2.3-70-g09d2