From e8b9acb761dda1b28ddae51a78dbcbe50b6034f0 Mon Sep 17 00:00:00 2001 From: unfa Date: Sat, 19 Jun 2021 00:31:22 +0200 Subject: [PATCH] Chat now uses player names; random player names for testing --- Game/Assets/Characters/Player.gd | 12 +++++++++--- Game/Assets/HUD/Chat.gd | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Game/Assets/Characters/Player.gd b/Game/Assets/Characters/Player.gd index 1838491..12eea51 100644 --- a/Game/Assets/Characters/Player.gd +++ b/Game/Assets/Characters/Player.gd @@ -25,7 +25,7 @@ extends CharacterBody3D @onready var climb_check_y = climb_check.position.y @onready var ground_check_y = ground_check.position.y -class player_info: +class PlayerInfo: var name: String var team: int var color: Color @@ -34,10 +34,9 @@ class player_info: self.name = name self.team = team self.color = color - var input_active = false -@remotesync var info = player_info.new("unfa", 0, Color("#CE0000")) +@remotesync var player_info: PlayerInfo var base_fov = 90 var view_zoom := 1.0 : set(zoom): @@ -84,6 +83,13 @@ var gravity_vec := Vector3.ZERO func _ready() -> void: #Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) view_zoom = 1.0 + + # generate random names for testing + var player_name = "" + for i in range(0, 4): + player_name += ['a','b','c'][randi() % 2] + + player_info = PlayerInfo.new(player_name, 0, Color("#CE0000")) rpc_config(&"move_and_slide", MultiplayerAPI.RPC_MODE_PUPPETSYNC) rpc_config(&"aim", MultiplayerAPI.RPC_MODE_PUPPETSYNC) diff --git a/Game/Assets/HUD/Chat.gd b/Game/Assets/HUD/Chat.gd index 0ff8f0e..e665c9c 100644 --- a/Game/Assets/HUD/Chat.gd +++ b/Game/Assets/HUD/Chat.gd @@ -54,7 +54,8 @@ func _unhandled_input(_event) -> void: # doesn't work over network due to missing RPC implementation in Godot 4 @remotesync func chat_message(sender_id: int, recipient_team, message: String) -> void: - chat_history.text += '\n' + str(sender_id) + " | " + message + var sender_name = main.get_node("Players").get_node(str(sender_id)).player_info.name + chat_history.text += '\n' + str(sender_name) + " | " + message func _on_LineEdit_text_entered(new_text): # RPC is currently not implemented in the engine