Fix more V73 stuff, and spectator stuff

Author: DaXcess

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 **Fixes**:
 - Fixed voting only being available once before having to restart the game
+- Fixed late join players not showing up in the spectating menu
 - Unity's Input System crashing when trying to resolve missing soft dependencies
 
 # 1.4.0

LCVR.csproj

@@ -43,8 +43,8 @@
     <PackageReference Include="Unity.Animation.Rigging" Version="1.2.1" />
     <PackageReference Include="Unity.InputSystem" Version="1.14.0" />
     <PackageReference Include="Unity.Netcode.Runtime" Version="1.6.0" />
-    <PackageReference Include="Unity.RenderPipelines.Core" Version="14.0.8" />
-    <PackageReference Include="Unity.RenderPipelines.HighDefinition" Version="14.0.8" />
+    <PackageReference Include="Unity.RenderPipelines.Core" Version="14.0.12" />
+    <PackageReference Include="Unity.RenderPipelines.HighDefinition" Version="14.0.12" />
     <PackageReference Include="Unity.TextMeshPro" Version="3.0.6" />
     <PackageReference Include="Unity.XR.CoreUtils" Version="2.2.3" />
     <PackageReference Include="Unity.XR.Interaction.Toolkit" Version="2.5.3" />

Source/Managers/SpectatingManager.cs

@@ -174,7 +174,7 @@ internal void PlayerRevive()
         ToggleLights(false);
         StopSpectatingPlayer();
 
-        VRSession.Instance.HUD.SpectatingMenu.enabled = false;
+        VRSession.Instance.HUD.SpectatingMenu.PlayerRevived();
     }
 
     internal void CastVote() => TimeOfDay.Instance.VoteShipToLeaveEarly();
@@ -199,8 +199,8 @@ internal void SpectatePlayer(PlayerControllerB targetPlayer)
 
         HUDManager.Instance.SetSpectatingTextToPlayer(SpectatedPlayer);
 
-        if (Compat.IsLoaded(Compat.MoreCompany))
-            MoreCompanyCompatibility.EnablePlayerCosmetics(SpectatedPlayer, false);
+        // if (Compat.IsLoaded(Compat.MoreCompany))
+        //     MoreCompanyCompatibility.EnablePlayerCosmetics(SpectatedPlayer, false);
     }
 
     // ReSharper disable Unity.PerformanceAnalysis

Source/Patches/AssemblyTypePatches.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using HarmonyLib;
+using UnityEngine.Rendering;
+
+namespace LCVR.Patches;
+
+[LCVRPatch(LCVRPatchTarget.Universal)]
+[HarmonyPatch]
+internal static class AssemblyTypePatches
+{
+    [HarmonyPatch(typeof(CoreUtils), nameof(CoreUtils.GetAllAssemblyTypes))]
+    [HarmonyPrefix]
+    private static bool ReplaceGetAllAssemblyTypes(ref IEnumerable<Type> __result)
+    {
+        __result = GetAllAssemblyTypes();
+        return false;
+    }
+
+    private static IEnumerable<Type> GetAllAssemblyTypes()
+    {
+        CoreUtils.m_AssemblyTypes ??= AppDomain.CurrentDomain.GetAssemblies().SelectMany(delegate(Assembly a)
+        {
+            try
+            {
+                return a.GetTypes();
+            }
+            catch (ReflectionTypeLoadException ex)
+            {
+                return ex.Types.Where(t => t != null);
+            }
+        });
+
+        return CoreUtils.m_AssemblyTypes;
+    }
+}

Source/UI/Spectating/SpectatingMenu.cs

@@ -152,11 +152,37 @@ public void UpdateBoxes()
             Destroy(go);
         }
 
+        // Check for players that joined (late join)
+        foreach (var player in StartOfRound.Instance.allPlayerScripts)
+        {
+            var playerExists = player.isPlayerDead || player.isPlayerControlled;
+            var idx = playerBoxes.FindIndex(box => box.IsPlayer(player));
+
+            if (!playerExists || idx != -1)
+                continue;
+
+            var box = Instantiate(spectatingPlayerPrefab, playersContainer).GetComponent<SpectatingPlayer>();
+            box.Setup(player);
+
+            playerBoxes.Add(box);
+        }
+
         // Update all boxes
         foreach (var box in playerBoxes)
             box.UpdateState();
     }
 
+    public void PlayerRevived()
+    {
+        voteProgress = 0;
+        voteProgressBar.localScale = new Vector3(0, 1, 1);
+
+        voteButton.GetComponentInChildren<TextMeshProUGUI>().text = "VOTE TO LEAVE";
+        voteButton.interactable = true;
+
+        enabled = false;
+    }
+
     private void HandleGaze()
     {
         if (UnityEngine.Physics.Raycast(new Ray(raySource.position - raySource.forward * 0.5f, raySource.forward),
@@ -183,7 +209,7 @@ private void HandleVoting()
         if (StartOfRound.Instance.shipIsLeaving || !StartOfRound.Instance.currentLevel.planetHasTime)
             return;
 
-        voteProgress += Time.deltaTime * (isVoting ? 0.2f : -0.4f);
+        voteProgress += Time.deltaTime * (isVoting ? 0.3f : -0.5f);
         voteProgress = Mathf.Clamp01(voteProgress);
 
         voteProgressBar.localScale = new Vector3(Mathf.SmoothStep(0, 1, voteProgress), 1, 1);