Merge pull request 'merge lobby-system and player-character into develop' (#4) from lobby-system into develop

Reviewed-on: #4

splunk/game-logic/game_manager.gd

@@ -1,8 +1,8 @@
 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")
 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
 	
 	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)

splunk/networking/player_spawner.gd

@@ -1,10 +1,7 @@
-class_name LobbyPlayerSpawner
 extends MultiplayerSpawner
 
 @onready var player_scene: PackedScene = load("res://player/Player.tscn")
 
-var players_dict: Dictionary[int, Player] = {}
-
 
 func _ready() -> void:
 	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.position = Vector3.UP
 	
-	GameManager.players[int(peer_id)] = new_player
+	GameManager.players.append(int(peer_id))
 	
 	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()

splunk/networking/steam-manager.gd

@@ -26,12 +26,10 @@ func _ready() -> void:
 	Steam.lobby_joined.connect(_on_lobby_joined)
 	Steam.lobby_chat_update.connect(_on_lobby_chat_update)
 	Steam.p2p_session_request.connect(_on_p2p_session_request)
-	Steam.join_requested.connect(_on_lobby_join_requested)
 	
 	multiplayer.peer_connected.connect(_on_peer_connected)
 	multiplayer.peer_disconnected.connect(_on_peer_disconnected)
 	multiplayer.connected_to_server.connect(_on_connected_to_server)
-	multiplayer.server_disconnected.connect(_on_disconnected_from_server)
 	multiplayer.connection_failed.connect(_on_connection_failed)
 	
 	check_command_line()
@@ -39,6 +37,7 @@ func _ready() -> void:
 	multiplayer.server_relay = true
 	
 
+
 func _process(delta):
 	if not steam_initialized:
 		return
@@ -47,11 +46,8 @@ func _process(delta):
 
 func create_lobby():
 	print("[HOST] 1. Attempting to create lobby...")
-		
-	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):
 	if connect != 1:
@@ -76,11 +72,6 @@ func join_lobby(this_lobby_id: int):
 	Steam.joinLobby(this_lobby_id)
 
 
-func _on_lobby_join_requested(this_lobby_id: int, friend_id: int) -> void:
-	print("[CLIENT] 1. Attempting to join lobby (ID: %s)..." % this_lobby_id)
-	join_lobby(this_lobby_id)
-
-
 func _on_lobby_joined(this_lobby_id: int, _p, _l, response: int):
 	if response != Steam.CHAT_ROOM_ENTER_RESPONSE_SUCCESS:
 		print("[CLIENT] !!! Failed to join lobby: %s" % get_join_fail_reason(response))
@@ -100,10 +91,6 @@ func _on_connected_to_server():
 	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:
 	print("[P2P] ==> Session request from: %s. Accepting." % steam_id_remote)
 	Steam.acceptP2PSessionWithUser(steam_id_remote)
@@ -142,12 +129,11 @@ func _on_peer_connected(id: int):
 
 func _on_peer_disconnected(id: int):
 	print("[INFO] Peer %s has disconnected." % id)
-	GameManager.request_server_to_delete_player.rpc_id(1, id)
 	if players.has(id):
+		#players[id].queue_free()
 		players.erase(id)
 
 
-
 func _on_connection_failed() -> void:
 	print("[CLIENT] !!! Connection to the host failed.")
 
@@ -156,9 +142,7 @@ func _on_lobby_chat_update(_l_id, user_changed_id: int, _u_m_c_id, chat_state: i
 	var state_string = "UNKNOWN"
 	match chat_state:
 		Steam.CHAT_MEMBER_STATE_CHANGE_ENTERED: state_string = "ENTERED"
-		Steam.CHAT_MEMBER_STATE_CHANGE_LEFT: 
-			state_string = "LEFT"
-			
+		Steam.CHAT_MEMBER_STATE_CHANGE_LEFT: state_string = "LEFT"
 		Steam.CHAT_MEMBER_STATE_CHANGE_DISCONNECTED: state_string = "DISCONNECTED"
 	print("[LOBBY INFO] User %s has %s the lobby." % [user_changed_id, state_string])
 

splunk/project.godot

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