From 4dcbc6787bd10237465aa63a3fa797f3aaebd939 Mon Sep 17 00:00:00 2001 From: denizk0461 Date: Wed, 16 Jul 2025 09:45:44 +0200 Subject: [PATCH] player names are now displayed above player hands --- components/web_client_tcp.gd | 5 +++-- elements/player_hand.gd | 3 +++ environment_manager.gd | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/components/web_client_tcp.gd b/components/web_client_tcp.gd index e1aff3a..13bc855 100644 --- a/components/web_client_tcp.gd +++ b/components/web_client_tcp.gd @@ -36,7 +36,8 @@ signal received_chat_message(client_name: String, message: String) signal connection_status_changed(new_status: ConnectionStatus) -signal client_order_received(client_ids: Array[String]) +# This signal is messy as fuck +signal client_order_received(client_ids: Array[String], client_ids_playing_order: Array[String], client_names: Array[String]) signal cards_received(cards: Dictionary) signal trump_received(trump_id: int) signal received_bet_request(disallowed_bet: int) @@ -133,7 +134,7 @@ func _handle_response(response: String) -> void: if data["current_round"] == 1: var playing_order: Array[String] = [] playing_order.assign(data["playing_order"]) - client_order_received.emit.call_deferred(playing_order) + client_order_received.emit.call_deferred(playing_order, _connected_client_ids, _connected_client_names) var received_cards = data["cards"] #print(received_cards) diff --git a/elements/player_hand.gd b/elements/player_hand.gd index 526f82e..f136fbb 100644 --- a/elements/player_hand.gd +++ b/elements/player_hand.gd @@ -30,6 +30,9 @@ func _ready() -> void: if hide_client_name: name_label.hide() +func set_player_name(player_name: String) -> void: + name_label.text = player_name + func add_card(card: PlayingCard) -> void: card_container.add_child(card) _arrange_cards() diff --git a/environment_manager.gd b/environment_manager.gd index 3018205..1c4eacf 100644 --- a/environment_manager.gd +++ b/environment_manager.gd @@ -31,7 +31,7 @@ var _own_client_id: String var _plays: Array[Play] var _trump_id: int = -1 -func _on_web_client_tcp_client_order_received(client_ids: Array[String]) -> void: +func _on_web_client_tcp_client_order_received(client_ids: Array[String], client_ids_playing_order: Array[String], client_names: Array[String]) -> void: var marker_positions: Array[Marker3D] match client_ids.size(): 3: @@ -69,6 +69,7 @@ func _on_web_client_tcp_client_order_received(client_ids: Array[String]) -> void hand = own_player_hand else: hand = player_hand_scene.instantiate() + hand.set_player_name(client_names[client_ids_playing_order.find(client_ids[index])]) marker_positions[index - 1].add_child(hand) hand_associations[client_ids[index]] = hand