1 Commits

Author SHA1 Message Date
WiseNoodle
04440c0319 tweak tent rotation 2025-08-12 19:45:55 -04:00
5 changed files with 8 additions and 37 deletions

View File

@@ -1,8 +1,8 @@
extends Node extends Node
var players: Dictionary[int, Player] = {} var players: Array[int] = []
var player_spawner: LobbyPlayerSpawner var player_spawner: MultiplayerSpawner
@onready var debug_ui: PackedScene = preload("res://ui/multiplayer-debug-ui/multiplayer-debug-ui.tscn") @onready var debug_ui: PackedScene = preload("res://ui/multiplayer-debug-ui/multiplayer-debug-ui.tscn")
var debug_ui_instance var debug_ui_instance
@@ -29,8 +29,3 @@ func request_server_to_spawn_player(peer_id: int, player_name: String) -> void:
data["player_name"] = player_name data["player_name"] = player_name
player_spawner.spawn(data) player_spawner.spawn(data)
@rpc("any_peer", "call_local", "reliable")
func request_server_to_delete_player(peer_id: int) -> void:
player_spawner.delete_player(peer_id)

View File

@@ -379,7 +379,7 @@ transform = Transform3D(0.689594, 0, -0.724196, 0, 1, 0, 0.724196, 0, 0.689594,
[node name="Tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")] [node name="Tent" parent="Campsite/TentPlot3" instance=ExtResource("4_qjimh")]
[node name="TentPlot4" type="Marker3D" parent="Campsite"] [node name="TentPlot4" type="Marker3D" parent="Campsite"]
transform = Transform3D(-0.0217975, 0, 0.999762, 0, 1, 0, -0.999762, 0, -0.0217975, 6.53113, 0.334599, -2.31805) transform = Transform3D(-0.518758, 0, 0.854921, 0, 1, 0, -0.854921, 0, -0.518758, 6.53113, 0.334599, -2.31805)
[node name="Tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")] [node name="Tent" parent="Campsite/TentPlot4" instance=ExtResource("4_qjimh")]

View File

@@ -1,10 +1,7 @@
class_name LobbyPlayerSpawner
extends MultiplayerSpawner extends MultiplayerSpawner
@onready var player_scene: PackedScene = load("res://player/Player.tscn") @onready var player_scene: PackedScene = load("res://player/Player.tscn")
var players_dict: Dictionary[int, Player] = {}
func _ready() -> void: func _ready() -> void:
spawn_function = spawn_player spawn_function = spawn_player
@@ -20,12 +17,6 @@ func spawn_player(data: Dictionary) -> Player:
new_player.set_player_name(peer_id, player_name) new_player.set_player_name(peer_id, player_name)
new_player.position = Vector3.UP new_player.position = Vector3.UP
GameManager.players[int(peer_id)] = new_player GameManager.players.append(int(peer_id))
return new_player return new_player
func delete_player(id: int) -> void:
var player_to_delete = GameManager.players[id]
GameManager.players.erase(id)
player_to_delete.queue_free()

View File

@@ -31,7 +31,6 @@ func _ready() -> void:
multiplayer.peer_connected.connect(_on_peer_connected) multiplayer.peer_connected.connect(_on_peer_connected)
multiplayer.peer_disconnected.connect(_on_peer_disconnected) multiplayer.peer_disconnected.connect(_on_peer_disconnected)
multiplayer.connected_to_server.connect(_on_connected_to_server) multiplayer.connected_to_server.connect(_on_connected_to_server)
multiplayer.server_disconnected.connect(_on_disconnected_from_server)
multiplayer.connection_failed.connect(_on_connection_failed) multiplayer.connection_failed.connect(_on_connection_failed)
check_command_line() check_command_line()
@@ -47,11 +46,8 @@ func _process(delta):
func create_lobby(): func create_lobby():
print("[HOST] 1. Attempting to create lobby...") print("[HOST] 1. Attempting to create lobby...")
Steam.createLobby(Steam.LOBBY_TYPE_FRIENDS_ONLY, 4)
if lobby_id == 0:
Steam.createLobby(Steam.LOBBY_TYPE_FRIENDS_ONLY, 4)
else:
print("Cant host, already in a lobby")
func _on_lobby_created(connect: int, this_lobby_id: int): func _on_lobby_created(connect: int, this_lobby_id: int):
if connect != 1: if connect != 1:
@@ -100,10 +96,6 @@ func _on_connected_to_server():
GameManager.request_server_to_spawn_player.rpc_id(1, multiplayer.get_unique_id(), steam_username) GameManager.request_server_to_spawn_player.rpc_id(1, multiplayer.get_unique_id(), steam_username)
func _on_disconnected_from_server():
pass
func _on_p2p_session_request(steam_id_remote: int) -> void: func _on_p2p_session_request(steam_id_remote: int) -> void:
print("[P2P] ==> Session request from: %s. Accepting." % steam_id_remote) print("[P2P] ==> Session request from: %s. Accepting." % steam_id_remote)
Steam.acceptP2PSessionWithUser(steam_id_remote) Steam.acceptP2PSessionWithUser(steam_id_remote)
@@ -142,12 +134,11 @@ func _on_peer_connected(id: int):
func _on_peer_disconnected(id: int): func _on_peer_disconnected(id: int):
print("[INFO] Peer %s has disconnected." % id) print("[INFO] Peer %s has disconnected." % id)
GameManager.request_server_to_delete_player.rpc_id(1, id)
if players.has(id): if players.has(id):
#players[id].queue_free()
players.erase(id) players.erase(id)
func _on_connection_failed() -> void: func _on_connection_failed() -> void:
print("[CLIENT] !!! Connection to the host failed.") print("[CLIENT] !!! Connection to the host failed.")
@@ -156,9 +147,7 @@ func _on_lobby_chat_update(_l_id, user_changed_id: int, _u_m_c_id, chat_state: i
var state_string = "UNKNOWN" var state_string = "UNKNOWN"
match chat_state: match chat_state:
Steam.CHAT_MEMBER_STATE_CHANGE_ENTERED: state_string = "ENTERED" Steam.CHAT_MEMBER_STATE_CHANGE_ENTERED: state_string = "ENTERED"
Steam.CHAT_MEMBER_STATE_CHANGE_LEFT: Steam.CHAT_MEMBER_STATE_CHANGE_LEFT: state_string = "LEFT"
state_string = "LEFT"
Steam.CHAT_MEMBER_STATE_CHANGE_DISCONNECTED: state_string = "DISCONNECTED" Steam.CHAT_MEMBER_STATE_CHANGE_DISCONNECTED: state_string = "DISCONNECTED"
print("[LOBBY INFO] User %s has %s the lobby." % [user_changed_id, state_string]) print("[LOBBY INFO] User %s has %s the lobby." % [user_changed_id, state_string])

View File

@@ -20,10 +20,6 @@ config/icon="res://icon.svg"
SteamManager="*res://networking/steam-manager.gd" SteamManager="*res://networking/steam-manager.gd"
GameManager="*res://game-logic/game_manager.gd" GameManager="*res://game-logic/game_manager.gd"
[display]
window/vsync/vsync_mode=0
[editor_plugins] [editor_plugins]
enabled=PackedStringArray("res://addons/freecam_3D/plugin.cfg") enabled=PackedStringArray("res://addons/freecam_3D/plugin.cfg")