Experimental late join support

Author: DaXcess

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 **Additions**:
 - Added a keyboard shortcut (CTRL+C) to the lobby menu for easy copying of a steam lobby link
+- Added support for late joining
 
 # 1.0.2
 

Source/Entrypoint.cs

@@ -148,20 +148,44 @@ private static void SetupDefaultSceneUniversal()
     }
 
     /// <summary>
-    /// <see cref="GameDirector"/> is always present in the `Main` scene, so we use it as entrypoint
+    /// <see cref="GameDirector"/> is always present in the `Main` scene, so we use it as a base entrypoint
     /// </summary>
     [HarmonyPatch(typeof(GameDirector), nameof(GameDirector.Start))]
     [HarmonyPostfix]
     private static void OnStartup(GameDirector __instance)
     {
         VRInputSystem.instance.ActivateInput();
-    
+
         if (RunManager.instance.levelCurrent == RunManager.instance.levelMainMenu ||
-            RunManager.instance.levelCurrent == RunManager.instance.levelLobbyMenu ||
             RunManager.instance.levelCurrent == RunManager.instance.levelSplashScreen)
             OnStartupMainMenu();
-        else
-            OnStartupInGame();
+        
+        // We have to do some magic for the Lobby Menu level because of ✨late join✨
+    }
+
+    /// <summary>
+    /// Special custom entrypoint since we might swap levels shortly after GameDirector startup (Late join)
+    /// </summary>
+    [HarmonyPatch(typeof(LobbyMenuOpen), nameof(LobbyMenuOpen.Awake))]
+    [HarmonyPostfix]
+    private static void OnStartLobbyMenu()
+    {
+        if (RunManager.instance.levelCurrent == RunManager.instance.levelLobbyMenu)
+            OnStartupMainMenu();
+    }
+
+    /// <summary>
+    /// Use the Truck Start Room module to detect if we are in the actual game
+    /// </summary>
+    [HarmonyPatch(typeof(StartRoom), nameof(StartRoom.Start))]
+    [HarmonyPostfix]
+    private static void OnStartTruck(StartRoom __instance)
+    {
+        // The menu levels also have the truck so we should just ignore them
+        if (__instance.name is "Start Room - Main Menu(Clone)" or "Start Room - Lobby Menu(Clone)")
+            return;
+        
+        OnStartupInGame();
     }
 
     [HarmonyPatch(typeof(SplashScreen), nameof(SplashScreen.Start))]

Source/Managers/VRSession.cs

@@ -66,5 +66,8 @@ private void InitializeVRSession()
 
         // Initialize VR HUD
         HUD = global::HUD.instance.gameObject.AddComponent<GameHud>();
+        
+        // Initialize Handheld Map (if it wasn't created yet)
+        VRMapTool.Create();
     }
 }

Source/Patches/Player/MapToolPatches.cs

@@ -21,13 +21,7 @@ internal static class MapToolPatches
     [HarmonyPostfix]
     private static void OnMapToolCreated(MapToolController __instance)
     {
-        if (!__instance.PlayerAvatar.isLocal || VRSession.Instance is not {} session)
-            return;
-
-        __instance.transform.parent.parent = session.Player.MapParent;
-        __instance.transform.parent.localPosition = Vector3.zero;
-        __instance.transform.parent.localRotation = Quaternion.identity;
-        __instance.gameObject.AddComponent<VRMapTool>();
+        VRMapTool.Create();
     }
 
     /// <summary>

Source/Player/VRMapTool.cs

@@ -1,4 +1,5 @@
-using RepoXR.Managers;
+using System.Linq;
+using RepoXR.Managers;
 using UnityEngine;
 
 namespace RepoXR.Player;
@@ -18,6 +19,18 @@ public class VRMapTool : MonoBehaviour
     private RectTransform statsRect;
 
     public bool leftHanded;
+
+    public static void Create()
+    {
+        var tool = FindObjectsOfType<MapToolController>().FirstOrDefault(t => t.PlayerAvatar.isLocal);
+        if (instance != null || VRSession.Instance is not { } session || tool is null || !tool.PlayerAvatar.isLocal)
+            return;
+
+        tool.transform.parent.parent = session.Player.MapParent;
+        tool.transform.parent.localPosition = Vector3.zero;
+        tool.transform.parent.localRotation = Quaternion.identity;
+        tool.gameObject.AddComponent<VRMapTool>();
+    }
 
     private void Awake()
     {