mirror of
https://gitlab.com/open-fpsz/open-fpsz.git
synced 2026-07-16 00:44:50 +00:00
🩹 rename nickname to username
This commit is contained in:
parent
223aab2527
commit
a64383a511
5 changed files with 37 additions and 32 deletions
|
|
@ -17,10 +17,10 @@ class_name Scoreboard extends Control
|
|||
@export var _entries : Dictionary = {}
|
||||
|
||||
class ScoreboardEntry:
|
||||
var nickname : String
|
||||
var username : String
|
||||
var kills : int
|
||||
var score : int
|
||||
var nickname_label : Label = Label.new()
|
||||
var username_label : Label = Label.new()
|
||||
var kills_label : Label = Label.new()
|
||||
var score_label : Label = Label.new()
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ func _unhandled_input(event : InputEvent) -> void:
|
|||
hide()
|
||||
|
||||
func add_participant(participant : MatchParticipantComponent) -> void:
|
||||
_add_scoreboard_entry.rpc(participant.player_id, participant.nickname)
|
||||
_add_scoreboard_entry.rpc(participant.player_id, participant.username)
|
||||
|
||||
func remove_participant(participant : MatchParticipantComponent) -> void:
|
||||
_remove_scoreboard_entry.rpc(participant.player_id)
|
||||
|
|
@ -42,7 +42,7 @@ func increment_kill_count(participant : MatchParticipantComponent) -> void:
|
|||
func add_score_to_player(participant : MatchParticipantComponent, amount : int) -> void:
|
||||
var player_id : int = participant.player_id
|
||||
var entry : ScoreboardEntry = _entries[player_id]
|
||||
_update_scoreboard_entry.rpc(player_id, entry.nickname, entry.kills, entry.score + amount)
|
||||
_update_scoreboard_entry.rpc(player_id, entry.username, entry.kills, entry.score + amount)
|
||||
|
||||
@rpc("any_peer", "call_remote", "reliable")
|
||||
func request_scoreboard_from_authority() -> void:
|
||||
|
|
@ -50,21 +50,21 @@ func request_scoreboard_from_authority() -> void:
|
|||
var recipient_id : int = multiplayer.get_remote_sender_id()
|
||||
for entry_player_id : int in _entries:
|
||||
var entry : ScoreboardEntry = _entries[entry_player_id]
|
||||
_add_scoreboard_entry.rpc_id(recipient_id, entry_player_id, entry.nickname, entry.kills, entry.score)
|
||||
_add_scoreboard_entry.rpc_id(recipient_id, entry_player_id, entry.username, entry.kills, entry.score)
|
||||
|
||||
@rpc("authority", "call_local", "reliable")
|
||||
func _add_scoreboard_entry(player_id : int, nickname : String, kills : int = 0, score : int = 0) -> void:
|
||||
func _add_scoreboard_entry(player_id : int, username : String, kills : int = 0, score : int = 0) -> void:
|
||||
var new_entry : ScoreboardEntry = ScoreboardEntry.new()
|
||||
_entries[player_id] = new_entry
|
||||
%Scores.add_child(new_entry.nickname_label)
|
||||
%Scores.add_child(new_entry.username_label)
|
||||
%Scores.add_child(new_entry.kills_label)
|
||||
%Scores.add_child(new_entry.score_label)
|
||||
_update_scoreboard_entry(player_id, nickname, kills, score)
|
||||
_update_scoreboard_entry(player_id, username, kills, score)
|
||||
|
||||
@rpc("authority", "call_local", "reliable")
|
||||
func _update_scoreboard_entry(player_id : int, nickname : String, kills : int, score : int) -> void:
|
||||
func _update_scoreboard_entry(player_id : int, username : String, kills : int, score : int) -> void:
|
||||
var entry : ScoreboardEntry = _entries[player_id]
|
||||
entry.nickname = nickname
|
||||
entry.username = username
|
||||
entry.kills = kills
|
||||
entry.score = score
|
||||
_update_scoreboard_entry_ui(player_id)
|
||||
|
|
@ -72,13 +72,13 @@ func _update_scoreboard_entry(player_id : int, nickname : String, kills : int, s
|
|||
@rpc("authority", "call_local", "reliable")
|
||||
func _remove_scoreboard_entry(player_id : int) -> void:
|
||||
var entry : ScoreboardEntry = _entries[player_id]
|
||||
entry.nickname_label.queue_free()
|
||||
entry.username_label.queue_free()
|
||||
entry.kills_label.queue_free()
|
||||
entry.score_label.queue_free()
|
||||
_entries.erase(player_id)
|
||||
|
||||
func _update_scoreboard_entry_ui(player_id : int) -> void:
|
||||
var entry : ScoreboardEntry = _entries[player_id]
|
||||
entry.nickname_label.text = entry.nickname
|
||||
entry.username_label.text = entry.username
|
||||
entry.kills_label.text = str(entry.kills)
|
||||
entry.score_label.text = str(entry.score)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue