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

✨ env settings and maps / env management

Browse source
This commit is contained in:
anyreso 2024-04-27 14:52:11 -04:00
parent e2a9353e7a
commit 2a676a519c
15 changed files with 761 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modes/demo.tscn
View file

@ -15,6 +15,7 @@ script/source = "extends Node
func _ready() -> void:
player_node.died.connect(respawn_player)
MapsManager.current_map = $Desert
func respawn_player(player : Player, _killer_id : int) -> void:
player.respawn(player_respawn_location)

15
modes/multiplayer.gd → modes/multiplayer/multiplayer.gd
View file

@ -25,7 +25,6 @@ class_name Multiplayer extends Node
@onready var map : Node = $Map
@onready var scoreboard : Scoreboard = $Scoreboard
var _map_manager : Map
var _flag : Flag
var _flag_carrier_scoring_timer : Timer = Timer.new()
@ -85,17 +84,17 @@ func _on_player_died(player : Player, killer_id : int) -> void:
respawn_player(player)
func respawn_player(player : Player) -> void:
var spawn_location : Vector3 = _map_manager.get_player_spawn().position
var spawn_location : Vector3 = MapsManager.get_player_spawn().position
player.respawn.rpc(spawn_location)
func add_player(peer_id : int, nickname : String) -> void:
var player : Player = PLAYER.instantiate()
players.add_child(player)grep
player.name = str(peer_id)
player.player_id = peer_id
player.team_id = team_chasers.team_id
player.nickname = nickname
player.global_position = _map_manager.get_player_spawn().position
players.add_child(player)
player.global_position = MapsManager.get_player_spawn().position
player.died.connect(_on_player_died)
scoreboard.add_player(player)
print("Peer `%s` connected" % player.name)
@ -111,17 +110,17 @@ func remove_player(peer_id : int) -> void:
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.add_child(map_scene)
MapsManager.current_map = map_scene
MapsManager.current_map.ready.connect(_add_flag)
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.dropped.connect(_on_flag_dropped)
_flag.global_position = _map_manager.get_flagstand().global_position
_flag.global_position = MapsManager.flagstand.global_position
objectives.add_child(_flag)
@rpc("any_peer", "reliable")

4
modes/multiplayer.tscn → modes/multiplayer/multiplayer.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://bvwxfgygm2xb8"]
[ext_resource type="Script" path="res://modes/multiplayer.gd" id="1_r1kd6"]
[ext_resource type="Script" path="res://modes/multiplayer/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="PackedScene" uid="uid://b8bosdd0o1lu7" path="res://interfaces/scoreboard/scoreboard.tscn" id="5_uj0pp"]
@ -9,6 +9,8 @@
script = ExtResource("1_r1kd6")
PLAYER = ExtResource("2_og1vb")
FLAG = ExtResource("3_h0rie")
MAX_CLIENTS = null
RESPAWN_TIME = null
[node name="Map" type="Node" parent="."]

3
modes/team.gd
View file

@ -1,3 +0,0 @@
class_name Team extends Object
var team_id : int