1 files changed, 31 insertions, 21 deletions

@@ -154,7 +154,7 @@ func _on_lobby_created(result: int, lobby_id: int) -> void:
         _ignore = Steam.setLobbyData(lobby_id, "save_file", global.save_file.to_lower())
         _ignore = Steam.setLobbyData(lobby_id, "racing_vip", str(player_steam_id))
         _ignore = Steam.setLobbyData(lobby_id, "closed", "false")
-        is_vip = true
+        _become_vip()
         _request_lobby_list()
 
 
@@ -166,7 +166,7 @@ func _on_lobby_joined(lobby_id: int, _permissions: int, _locked: bool, result: i
                 Steam.leaveLobby(active_lobby_id)
         active_lobby_id = lobby_id
         if Steam.getLobbyData(lobby_id, "racing_vip") == str(player_steam_id):
-                is_vip = true
+                _become_vip()
         _update_lobby_members()
 
 
@@ -249,15 +249,14 @@ func _read_p2p_packet() -> void:
                                 )
                         if "start_x" in data:
                                 race_manager.level = data["level"]
-                                race_manager.start_pos = [
-                                        data["start_name"],
-                                        int(data["start_x"]),
-                                        int(data["start_y"]),
-                                        int(data["start_z"])
-                                ]
-                                race_manager.end_pos = [
-                                        data["end_name"], int(data["end_x"]), int(data["end_y"]), int(data["end_z"])
-                                ]
+                                race_manager.start_pos = {
+                                        "title": data["start_name"],
+                                        "pos": [int(data["start_x"]), int(data["start_y"]), int(data["start_z"])]
+                                }
+                                race_manager.end_pos = {
+                                        "title": data["end_name"],
+                                        "pos": [int(data["end_x"]), int(data["end_y"]), int(data["end_z"])]
+                                }
 
                                 is_starting = true
                                 _start_game()
@@ -302,13 +301,22 @@ func _send_p2p_packet(data: Dictionary, recipient_id: int, mode: int, needs_ack:
         var _ignore = Steam.sendP2PPacket(recipient_id, serialized, mode)
 
 
+func _become_vip():
+        is_vip = true
+        get_node("Panel/ItemList").margin_left = 226
+        get_node("Panel/Settings").visible = true
+
+
 func _main_button_pressed():
         if everyone_ready and is_vip:
                 get_node("Panel/main_button").disabled = true
 
                 var _ignore = Steam.setLobbyData(active_lobby_id, "closed", "true")
 
-                var route = router.choose_route()
+                var route = router.choose_route(
+                        get_node("Panel/Settings/LevelOption").get_selected_id(),
+                        get_node("Panel/Settings/LengthOption").get_selected_id()
+                )
                 var start_pos = route[1]
                 var end_pos = route[2]
 
@@ -327,14 +335,14 @@ func _main_button_pressed():
                         _send_p2p_packet(
                                 {
                                         "level": route[0],
-                                        "start_name": start_pos[0],
-                                        "start_x": str(start_pos[1]),
-                                        "start_y": str(start_pos[2]),
-                                        "start_z": str(start_pos[3]),
-                                        "end_name": end_pos[0],
-                                        "end_x": str(end_pos[1]),
-                                        "end_y": str(end_pos[2]),
-                                        "end_z": str(end_pos[3]),
+                                        "start_name": start_pos["title"],
+                                        "start_x": str(start_pos["pos"][0]),
+                                        "start_y": str(start_pos["pos"][1]),
+                                        "start_z": str(start_pos["pos"][2]),
+                                        "end_name": end_pos["title"],
+                                        "end_x": str(end_pos["pos"][0]),
+                                        "end_y": str(end_pos["pos"][1]),
+                                        "end_z": str(end_pos["pos"][2]),
                                 },
                                 RECIPIENT_BROADCAST_ALL,
                                 Steam.P2P_SEND_RELIABLE,
@@ -361,7 +369,9 @@ func _start_game():
         Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
         global.map = race_manager.level
         global.entry_point = Vector3(
-                race_manager.start_pos[1], race_manager.start_pos[2] + 1, race_manager.start_pos[3]
+                race_manager.start_pos["pos"][0],
+                race_manager.start_pos["pos"][1] + 1,
+                race_manager.start_pos["pos"][2]
         )
         global.entry_rotate = Vector3(0, 0, 0)
         global.sets_entry_point = true