1.2.2 patch

- Updated CHANGELOG.md - Fixed VR players not sinking (visual) - Fixed spectator underwater filter issues
DaXcess · Apr 17, 2024 · c7f3127 · c7f3127
1 parent fade407
commit c7f3127
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.2.2
+
+**Game Version**:
+- Added compatibility with V50 Patch 1
+
+**Bug Fixes**:
+- Fixed visual glitch where VR players would not appear to be sinking in mud
+
+**Mod Compatibility**:
+- Fixed lighting culling issues when CullFactory is installed
+
 # 1.2.1
 
 ### V50 IS HERE

diff --git a/Source/Networking/VRNetPlayer.cs b/Source/Networking/VRNetPlayer.cs
@@ -16,14 +16,14 @@ public class VRNetPlayer : MonoBehaviour
 {
     private ChainIKConstraintData originalLeftArmConstraintData;
     private ChainIKConstraintData originalRightArmConstraintData;
-    
+
     private GameObject playerGhost;
     private Transform usernameBillboard;
     private CanvasGroup usernameAlpha;
     private TextMeshProUGUI usernameText;
 
     private bool spectatorWasParentedToShip;
-    
+
     private Transform xrOrigin;
     private Transform leftController;
     private Transform rightController;
@@ -46,7 +46,7 @@ public class VRNetPlayer : MonoBehaviour
 
     public PlayerControllerB PlayerController { get; private set; }
     public Bones Bones { get; private set; }
-    
+
     public Transform LeftItemHolder { get; private set; }
     public Transform RightItemHolder { get; private set; }
 
@@ -111,20 +111,20 @@ private void Awake()
         usernameAlpha = playerGhost.GetComponentInChildren<CanvasGroup>();
 
         playerGhost.GetComponentInChildren<SpectatorGhost>().player = this;
-        
+
         // Disable rendering ghost until player dies
         foreach (var renderer in playerGhost.GetComponentsInChildren<MeshRenderer>())
         {
             renderer.enabled = false;
         }
-        
+
         // Set username text
         if (PlayerController.playerSteamId is 76561198438308784 or 76561199575858981)
         {
             usernameText.color = new Color(0, 1, 1, 1);
             usernameText.fontStyle = FontStyles.Bold;
         }
-        
+
         usernameText.text = $"<noparse>{PlayerController.playerUsername}</noparse>";
     }
 
@@ -195,7 +195,8 @@ private void Update()
                 transform.position.z + (modelOffset.z * 1.5f) - (cameraPosAccounted.z * 1.5f)
             );
 
-            Bones.Model.localPosition = transform.InverseTransformPoint(transform.position + modelOffset);
+            Bones.Model.localPosition = transform.InverseTransformPoint(transform.position + modelOffset) +
+                                        Vector3.down * (2.5f * PlayerController.sinkingValue);
         }
         else
         {
@@ -236,7 +237,7 @@ private void LateUpdate()
         {
             rightFingerCurler?.Update();
         }
-        
+
         // Rotate spectator username billboard
         if (StartOfRound.Instance.localPlayerController.localVisorTargetPoint is not null)
         {
@@ -265,7 +266,7 @@ public void HideSpectatorGhost()
         {
             renderer.enabled = false;
         }
-        
+
         usernameAlpha.alpha = 0f;
     }
 
@@ -279,7 +280,7 @@ public void ShowSpectatorNameBillboard()
 
         usernameAlpha.alpha = 1f;
     }
-    
+
     internal void UpdateTargetTransforms(DNet.Rig rig)
     {
         leftController.localPosition = rig.leftHandPosition;
@@ -321,7 +322,7 @@ internal void UpdateSpectatorTransforms(DNet.SpectatorRig rig)
         }
 
         spectatorWasParentedToShip = rig.parentedToShip;
-        
+
         head.localPosition = rig.headPosition;
         head.eulerAngles = rig.headRotation;
 
@@ -343,7 +344,7 @@ internal void UpdateSpectatorTransforms(DNet.SpectatorRig rig)
     void OnDestroy()
     {
         Destroy(playerGhost);
-        
+
         Bones.ResetToPrefabPositions();
 
         Destroy(Bones.LeftArmRig.GetComponent<TwoBoneIKConstraint>());
@@ -357,4 +358,4 @@ void OnDestroy()
 
         GetComponentInChildren<RigBuilder>().Build();
     }
-}
+}
diff --git a/Source/Patches/Spectating/EnvironmentPatches.cs b/Source/Patches/Spectating/EnvironmentPatches.cs
@@ -113,4 +113,43 @@ private static bool PreventTeleportDeadPlayer(ShipTeleporter __instance, ref IEn
         __result = Utils.NopRoutine();
         return false;
     }
+
+    /// <summary>
+    /// Prevent the spectator camera (which is not used) from triggering the underwater filter
+    /// </summary>
+    [HarmonyPatch(typeof(HUDManager), nameof(HUDManager.UnderwaterScreenFilters))]
+    [HarmonyTranspiler]
+    private static IEnumerable<CodeInstruction> SpectatorCamDontTriggerWater(IEnumerable<CodeInstruction> instructions)
+    {
+        return new CodeMatcher(instructions)
+            .MatchForward(false, [new CodeMatch(OpCodes.Ldc_I4_1)])
+            .SetOpcodeAndAdvance(OpCodes.Ldc_I4_0)
+            .InstructionEnumeration();
+    }
+
+    /// <summary>
+    /// Allow dead players to still experience the underwater filter
+    /// </summary>
+    [HarmonyPatch(typeof(PlayerControllerB), nameof(PlayerControllerB.SetFaceUnderwaterFilters))]
+    [HarmonyTranspiler]
+    private static IEnumerable<CodeInstruction> EnableDeadPlayerUnderwater(IEnumerable<CodeInstruction> instructions)
+    {
+        return new CodeMatcher(instructions)
+            .Advance(1)
+            .RemoveInstructions(4)
+            .InstructionEnumeration();
+    }
+
+    /// <summary>
+    /// Prevent dead players from dying again if they are underwater as a spectator
+    /// </summary>
+    [HarmonyPatch(typeof(PlayerControllerB), nameof(PlayerControllerB.SetFaceUnderwaterFilters))]
+    [HarmonyPostfix]
+    private static void UnderwaterPreventDeath(PlayerControllerB __instance)
+    {
+        if (!__instance.isPlayerDead)
+            return;
+
+        StartOfRound.Instance.drowningTimer = 1;
+    }
 }