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

Refactor Multiplayer code

Browse source
This commit is contained in:
Squinty 2024-04-26 22:24:34 +00:00
parent a1314dfea4
commit 4d577d751d
14 changed files with 127 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

57
modes/multiplayer.gd
View file

@ -26,24 +26,10 @@ class_name Multiplayer extends Node
@onready var scoreboard : Scoreboard = $Scoreboard
var _map_manager : Map
var _flag : Flag
var _flag_carrier_scoring_timer : Timer = Timer.new()
var team_chasers : Team
var team_rabbit : Team
signal connected_to_server
signal connection_failed
func _ready() -> void:
_flag_carrier_scoring_timer.wait_time = 10.0
_flag_carrier_scoring_timer.timeout.connect(_on_flag_carrier_scoring_timer_timeout)
add_child(_flag_carrier_scoring_timer)
team_chasers = Team.new()
team_chasers.team_id = 0
team_rabbit = Team.new()
team_rabbit.team_id = 1
func start_server(config : Dictionary) -> void:
# Check if required parameters are missing
var required_params : Array[String] = ["port", "map", "nickname"]
@ -74,13 +60,7 @@ func _on_connected_to_server(nickname : String) -> void:
func _on_connection_failed() -> void:
connection_failed.emit()
func _on_player_died(player : Player, killer_id : int) -> void:
if player.player_id != killer_id:
var node_name : String = str(killer_id)
if players.has_node(node_name):
var killer : Player = players.get_node(node_name)
scoreboard.increment_kill_count(killer)
scoreboard.add_score_to_player(killer, 10)
func _on_player_died(player : Player, _killer_id : int) -> void:
await get_tree().create_timer(RESPAWN_TIME).timeout
respawn_player(player)
@ -92,11 +72,12 @@ func add_player(peer_id : int, nickname : String) -> void:
var player : Player = PLAYER.instantiate()
player.name = str(peer_id)
player.player_id = peer_id
player.team_id = team_chasers.team_id
player.team_id = ($RabbitScoringComponent as RabbitScoringComponent)._team_chasers.team_id
player.nickname = nickname
player.global_position = _map_manager.get_player_spawn().position
players.add_child(player)
player.global_position = _map_manager.get_player_spawn().position
player.died.connect(_on_player_died)
$DeathmatchScoringComponent.subscribe_player(player)
scoreboard.add_player(player)
print("Peer `%s` connected" % player.name)
@ -106,45 +87,29 @@ func remove_player(peer_id : int) -> void:
var player : Player = players.get_node(node_name)
scoreboard.remove_player(player)
player.died.disconnect(_on_player_died)
$DeathmatchScoringComponent.unsubscribe_player(player)
player.queue_free()
print("Peer `%s` disconnected" % node_name)
func _load_map(scene : PackedScene, nickname : String) -> void:
var map_scene : Node = scene.instantiate()
_map_manager = map_scene
map_scene.ready.connect(_add_flag)
_map_manager = map_scene
map.add_child(map_scene)
if DisplayServer.get_name() != "headless":
add_player(1, nickname)
map.add_child(map_scene)
func _add_flag() -> void:
_flag = FLAG.instantiate()
_flag.grabbed.connect(_on_flag_grabbed)
_flag.regrabbed.connect(_on_flag_regrabbed)
_flag.dropped.connect(_on_flag_dropped)
_flag.global_position = _map_manager.get_flagstand().global_position
objectives.add_child(_flag)
var flag : Flag = FLAG.instantiate()
$RabbitScoringComponent.setup(flag)
objectives.add_child(flag)
flag.global_position = _map_manager.get_flagstand().global_position
@rpc("any_peer", "reliable")
func _join_match(nickname : String) -> void:
if is_multiplayer_authority():
add_player(multiplayer.get_remote_sender_id(), nickname)
func _on_flag_grabbed(grabber : Player) -> void:
grabber.team_id = team_rabbit.team_id
scoreboard.add_score_to_player(grabber, 10)
_flag_carrier_scoring_timer.start()
func _on_flag_regrabbed(grabber : Player) -> void:
grabber.team_id = team_rabbit.team_id
func _on_flag_dropped(dropper : Player) -> void:
dropper.team_id = team_chasers.team_id
_flag_carrier_scoring_timer.stop()
func _on_flag_carrier_scoring_timer_timeout() -> void:
scoreboard.add_score_to_player(_flag.last_carrier, 10)
func _exit_tree() -> void:
if is_multiplayer_authority():
multiplayer.peer_disconnected.disconnect(remove_player)

13
modes/multiplayer.tscn
View file

@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=3 uid="uid://bvwxfgygm2xb8"]
[gd_scene load_steps=7 format=3 uid="uid://bvwxfgygm2xb8"]
[ext_resource type="Script" path="res://modes/multiplayer.gd" id="1_r1kd6"]
[ext_resource type="PackedScene" uid="uid://cbhx1xme0sb7k" path="res://entities/player/player.tscn" id="2_og1vb"]
[ext_resource type="PackedScene" uid="uid://c88l3h0ph00c7" path="res://entities/flag/flag.tscn" id="3_h0rie"]
[ext_resource type="Script" path="res://maps/components/rabbit_scoring_component.gd" id="5_7woao"]
[ext_resource type="PackedScene" uid="uid://b8bosdd0o1lu7" path="res://interfaces/scoreboard/scoreboard.tscn" id="5_uj0pp"]
[ext_resource type="Script" path="res://maps/components/deathmatch_scoring_component.gd" id="6_iov4u"]
[node name="Multiplayer" type="Node"]
script = ExtResource("1_r1kd6")
@ -31,3 +33,12 @@ spawn_path = NodePath("../Objectives")
[node name="Scoreboard" parent="." instance=ExtResource("5_uj0pp")]
visible = false
[node name="RabbitScoringComponent" type="Node" parent="." node_paths=PackedStringArray("_scoreboard")]
script = ExtResource("5_7woao")
_scoreboard = NodePath("../Scoreboard")
[node name="DeathmatchScoringComponent" type="Node" parent="." node_paths=PackedStringArray("_players", "_scoreboard")]
script = ExtResource("6_iov4u")
_players = NodePath("../Players")
_scoreboard = NodePath("../Scoreboard")

3
modes/team.gd
View file

@ -1,3 +1,6 @@
class_name Team extends Object
var team_id : int
func _init(id : int) -> void:
team_id = id