Item rotation fix and new turning keybind

DaXcess · Jul 27, 2024 · 04cdf28 · 04cdf28
1 parent d622f2e
commit 04cdf28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Resources/lethalcompanyvr b/Resources/lethalcompanyvr
diff --git a/Source/Input/RemappableControls.cs b/Source/Input/RemappableControls.cs
@@ -57,7 +57,9 @@ public Sprite this[string controlPath]
 
             var path = Regex.Replace(controlPath.ToLowerInvariant(), @"<[^>]+>([^ ]+)", "$1");
             var hand = path.Split('/')[0].TrimStart('{').TrimEnd('}');
-            controlPath = string.Join("/", path.Split('/').Skip(1)).TrimStart('{').TrimEnd('}');
+            controlPath = Regex.Replace(string.Join("/", path.Split('/').Skip(1)), @"{(.*)}", "$1");
+
+            Logger.LogDebug(controlPath);
 
             return (hand, controlPath) switch
             {

diff --git a/Source/Patches/PlayerControllerPatches.cs b/Source/Patches/PlayerControllerPatches.cs
@@ -360,8 +360,11 @@ private static IEnumerable<CodeInstruction> DropItemWithHandRotation(IEnumerable
 
         static int GetHandRotation(PlayerControllerB player)
         {
-            var dir = VRSession.Instance.LocalPlayer.PrimaryController.InteractOrigin.forward;
-            return (int)(Mathf.Atan2(dir.x, dir.z) * Mathf.Rad2Deg);
+            var item = player.currentlyHeldObjectServer;
+            var restOffset = Quaternion.Euler(item.itemProperties.restingRotation.x, 0,
+                item.itemProperties.restingRotation.z);
+            return (int)(item.transform.eulerAngles.y - item.itemProperties.floorYOffset - 90 +
+                         restOffset.eulerAngles.y);
         }
     }
 }