1.1.9

DaXcess · Feb 3, 2024 · 610e7ad · 610e7ad
1 parent 25d42c0
commit 610e7ad
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.1.9
+
+**Bug fixes:**
+
+- Fixed helmet (and volumetric plane) positioning after death
+
 # 1.1.8
 
 **Bug fixes:**

diff --git a/LCVR.csproj b/LCVR.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>LCVR</AssemblyName>
     <Description>Collecting Scrap in VR</Description>
-    <Version>1.1.8</Version>
+    <Version>1.1.9</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>12.0</LangVersion>
     <Title>LethalCompanyVR</Title>

diff --git a/LCVR/Plugin.cs b/LCVR/Plugin.cs
@@ -35,7 +35,7 @@ public class Plugin : BaseUnityPlugin
     {
         public const string PLUGIN_GUID = "io.daxcess.lcvr";
         public const string PLUGIN_NAME = "LCVR";
-        public const string PLUGIN_VERSION = "1.1.8";
+        public const string PLUGIN_VERSION = "1.1.9";
 
         private readonly string[] GAME_ASSEMBLY_HASHES = [
             "AAC6149C355A19865C0F67FD0C1D7111D4F418EF94D700265B591665B4CDCE73", // V45

diff --git a/Patches/PlayerControllerPatches.cs b/Patches/PlayerControllerPatches.cs
@@ -151,6 +151,25 @@ private static IEnumerable<CodeInstruction> PatchOnDisable(IEnumerable<CodeInstr
             return codes.AsEnumerable();
         }
 
+        [HarmonyPatch(typeof(PlayerControllerB), nameof(PlayerControllerB.KillPlayer))]
+        [HarmonyTranspiler]
+        private static IEnumerable<CodeInstruction> PatchKillPlayer(IEnumerable<CodeInstruction> instructions)
+        {
+            var codes = new List<CodeInstruction>(instructions);
+
+            // Fix visor being repositioned on death
+            var startIndex = codes.FindIndex(code => code.opcode == OpCodes.Ldfld && code.operand == (object)Field(typeof(PlayerControllerB), nameof(PlayerControllerB.localVisor))) - 1;
+            var endIndex = startIndex + 6;
+
+            for (var i = startIndex; i <= endIndex; i++)
+            {
+                codes[i].opcode = OpCodes.Nop;
+                codes[i].operand = null;
+            }
+
+            return codes.AsEnumerable();
+        }
+
         /// <summary>
         /// Adds an arbitrary deadzone since the ScrollMouse gets performed if you only even touch the joystick a little bit
         /// </summary>