diff options
| -rw-r--r-- | client/gui/overlays/lobby/lobby.gd | 24 | ||||
| -rw-r--r-- | client/gui/overlays/lobby/lobby.tscn | 13 |
2 files changed, 3 insertions, 34 deletions
diff --git a/client/gui/overlays/lobby/lobby.gd b/client/gui/overlays/lobby/lobby.gd index 431cec2d..8c372c70 100644 --- a/client/gui/overlays/lobby/lobby.gd +++ b/client/gui/overlays/lobby/lobby.gd @@ -36,9 +36,7 @@ var bot_dec_buttons := {} @onready var map_player_label = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Players @onready var map_difficulty_label = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/Map/Difficulty @onready var map_list_container = $Sidebar/Bottom/MarginContainer/VBoxContainer/MapList/VBoxContainer -@onready var map_list = $Sidebar/Bottom/MarginContainer/VBoxContainer/MapList -@onready var map_selector = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer @onready var prev_map = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left @onready var next_map = $Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right @@ -46,9 +44,6 @@ var bot_dec_buttons := {} @onready var bot_settings = $Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom/BotSettings @onready var bot_settings_conainer = $Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/ScrollContainerCustom -@onready var join_spectate = $Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate -@onready var start_button = $Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start - func _ready(): game.update_players.connect(update_players) initialize() @@ -173,24 +168,9 @@ func _on_start_pressed(): func _on_game_join_state_updated(state: Game.JoinState): match state: Game.JoinState.JOINED: - map_selector.show() - map_list.show() - bots_container.show() - start_button.disabled = false - join_spectate.disabled = false - join_spectate.text = tr("c.menu.ingame.spectate") + visible = true Game.JoinState.SPECTATING: - map_selector.hide() - map_list.hide() - bots_container.hide() - start_button.disabled = true - join_spectate.disabled = false - join_spectate.text = tr("c.menu.ingame.join") - Game.JoinState.WAITING: - join_spectate.disabled = true - -func _on_join_spectate_pressed(): - game.toggle_join() + visible = false func check_for_music(): if visible: diff --git a/client/gui/overlays/lobby/lobby.tscn b/client/gui/overlays/lobby/lobby.tscn index 58ae2add..78894dbd 100644 --- a/client/gui/overlays/lobby/lobby.tscn +++ b/client/gui/overlays/lobby/lobby.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://bc50la65ntifb"] +[gd_scene load_steps=16 format=3 uid="uid://bc50la65ntifb"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_u18ke"] [ext_resource type="Script" uid="uid://bssjvsu44l0fn" path="res://gui/overlays/lobby/lobby.gd" id="2_7657i"] @@ -13,7 +13,6 @@ [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="8_cwbpa"] [ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://gui/resources/icons/controller_x.svg" id="9_q14bw"] [ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="10_bgene"] -[ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://gui/resources/icons/controller_y.svg" id="11_5uugf"] [ext_resource type="Script" uid="uid://b1eomxildrq30" path="res://gui/components/controller_button.gd" id="12_7mu2u"] [sub_resource type="FontVariation" id="FontVariation_5xxr2"] @@ -165,15 +164,6 @@ layout_mode = 2 theme_override_constants/separation = 15 alignment = 1 -[node name="JoinSpectate" type="Button" parent="Sidebar/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" type="Button" parent="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer"] layout_mode = 2 text = "c.menu.lobby.start" @@ -187,5 +177,4 @@ metadata/_custom_type_script = "uid://b1eomxildrq30" [connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer/Left" to="." method="_on_left_pressed"] [connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer2/Right" to="." method="_on_right_pressed"] [connection signal="toggled" from="Sidebar/Bottom/MarginContainer/VBoxContainer/Bots/EnableBots" to="." method="_on_enable_bots_toggled"] -[connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/JoinSpectate" to="." method="_on_join_spectate_pressed"] [connection signal="pressed" from="Sidebar/Bottom/MarginContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_start_pressed"] |