openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-07-16 00:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ Refactor Scoreboard code and improve UI

Browse source
This commit is contained in:
Squinty 2024-04-24 20:11:17 +00:00
parent 0c5d7c1338
commit 017ed4d560
6 changed files with 158 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modes/multiplayer.gd
View file

@ -25,7 +25,6 @@ class_name Multiplayer extends Node
@onready var objectives : Node = $Objectives
@onready var map : Node = $Map
@onready var scoreboard : Scoreboard = $Scoreboard
@onready var scoreboard_ui : Node = $ScoreboardUI
var _map_manager : Map
var _flag : Flag
@ -71,7 +70,6 @@ func _on_player_died(player : Player, killer_id : int) -> void:
var killer : Player = players.get_node(node_name)
scoreboard.increment_kill_count(killer)
scoreboard.add_score_to_player(killer, 10)
scoreboard.broadcast_player_score_update(killer)
await get_tree().create_timer(RESPAWN_TIME).timeout
respawn_player(player)
@ -87,14 +85,14 @@ func add_player(peer_id : int, nickname : String) -> void:
player.global_position = _map_manager.get_player_spawn().position
players.add_child(player)
player.died.connect(_on_player_died)
scoreboard.add_entry(player)
scoreboard.add_player(player)
print("Peer `%s` connected" % player.name)
func remove_player(peer_id : int) -> void:
var node_name : String = str(peer_id)
if players.has_node(node_name):
var player : Player = players.get_node(node_name)
scoreboard.remove_entry(player)
scoreboard.remove_player(player)
player.die(-1)
player.queue_free()
print("Peer `%s` disconnected" % node_name)
@ -114,19 +112,6 @@ func _add_flag() -> void:
_flag.global_position = _map_manager.get_flagstand().global_position
objectives.add_child(_flag)
func _unhandled_input(event : InputEvent) -> void:
if event.is_action_pressed("scoreboard"):
var entries : Array = scoreboard.get_entries()
for entry : Scoreboard.ScoreboardEntry in entries:
var entry_label : Label = Label.new()
entry_label.text = "%s | kills: %s | score: %s" % [entry.nickname, entry.kills, entry.score]
%Scores.add_child(entry_label)
scoreboard_ui.show()
elif event.is_action_released("scoreboard"):
scoreboard_ui.hide()
for score_label in %Scores.get_children():
score_label.queue_free()
@rpc("any_peer", "reliable")
func _join_match(nickname : String) -> void:
if is_multiplayer_authority():
@ -134,7 +119,6 @@ func _join_match(nickname : String) -> void:
func _on_flag_grabbed(grabber : Player) -> void:
scoreboard.add_score_to_player(grabber, 10)
scoreboard.broadcast_player_score_update(grabber)
_flag_carrier_scoring_timer.start()
func _on_flag_dropped() -> void:
@ -142,7 +126,6 @@ func _on_flag_dropped() -> void:
func _on_flag_carrier_scoring_timer_timeout() -> void:
scoreboard.add_score_to_player(_flag.last_carrier, 10)
scoreboard.broadcast_player_score_update(_flag.last_carrier)
func _exit_tree() -> void:
if is_multiplayer_authority():