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

✨ enforce static typing

Browse source
This commit is contained in:
anyreso 2024-04-19 06:19:21 +00:00 • committed by Squinty
parent 09880cc957
commit e44426c2cc
36 changed files with 271 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modes/demo.tscn
View file

@ -9,14 +9,14 @@
script/source = "extends Node
@onready var player_node : Player = $Player
@onready var target_dummy = $TargetDummy
@onready var target_dummy : RigidBody3D = $TargetDummy
@onready var player_respawn_location = player_node.position
@onready var player_respawn_location : Vector3 = player_node.position
func _ready():
func _ready() -> void:
player_node.died.connect(respawn_player)
func respawn_player(player):
func respawn_player(player : Player) -> void:
player.respawn(player_respawn_location)
"

34
modes/multiplayer.tscn
View file

@ -13,18 +13,18 @@ script/source = "class_name Multiplayer extends Node
@export var FLAG : PackedScene
@export var MAX_CLIENTS : int = 24
@onready var map = $Map
@onready var players = $Players
@onready var objectives = $Objectives
@onready var map : Node = $Map
@onready var players : Node = $Players
@onready var objectives : Node = $Objectives
signal connected_to_server
signal connection_failed
func load_map(scene : PackedScene):
func load_map(scene : PackedScene) -> void:
map.add_child(scene.instantiate())
func start_server(port, nickname):
var peer = ENetMultiplayerPeer.new()
func start_server(port : int, nickname : String) -> void:
var peer : ENetMultiplayerPeer = ENetMultiplayerPeer.new()
peer.create_server(port, MAX_CLIENTS)
multiplayer.multiplayer_peer = peer
@ -38,24 +38,24 @@ func start_server(port, nickname):
add_flag()
func join_server(host, port, nickname):
var peer = ENetMultiplayerPeer.new()
func join_server(host : String, port : int, nickname : String) -> void:
var peer : ENetMultiplayerPeer= ENetMultiplayerPeer.new()
peer.create_client(host, port)
multiplayer.connected_to_server.connect(_on_connected_to_server.bind(nickname))
multiplayer.connection_failed.connect(_on_connection_failed)
multiplayer.multiplayer_peer = peer
func _on_connected_to_server(nickname):
func _on_connected_to_server(nickname : String) -> void:
connected_to_server.emit()
_join_match.rpc(nickname)
func _on_connection_failed():
func _on_connection_failed() -> void:
connection_failed.emit()
func respawn_player(player):
func respawn_player(player : Player) -> void:
player.respawn(Vector3(0.0, 150.0, 0.0))
func add_player(peer_id : int, nickname : String):
func add_player(peer_id : int, nickname : String) -> void:
var player : Player = PLAYER.instantiate()
player.name = str(peer_id)
player.player_id = peer_id
@ -65,8 +65,8 @@ func add_player(peer_id : int, nickname : String):
player.died.connect(respawn_player)
print(\"Peer `%s` connected\" % player.name)
func remove_player(peer_id : int):
var node_name = str(peer_id)
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)
player.die()
@ -74,17 +74,17 @@ func remove_player(peer_id : int):
print(\"Peer `%s` disconnected\" % node_name)
@rpc(\"any_peer\")
func _join_match(nickname):
func _join_match(nickname : String) -> void:
if multiplayer.is_server():
add_player(multiplayer.get_remote_sender_id(), nickname)
func add_flag():
func add_flag() -> void:
var flag : Flag = FLAG.instantiate()
flag.position = Vector3(5.0, 100.0, 0.0)
objectives.add_child(flag)
func _exit_tree():
func _exit_tree() -> void:
if multiplayer.is_server():
multiplayer.peer_connected.disconnect(add_player)
multiplayer.peer_disconnected.disconnect(remove_player)