Complete new item interaction

Source/Items/VRBeltBagItem.cs

@@ -0,0 +1,63 @@
+using LCVR.Input;
+using LCVR.Player;
+using UnityEngine;
+using UnityEngine.XR;
+
+namespace LCVR.Items;
+
+public class VRBeltBagItem : VRItem<BeltBagItem>
+{
+    private ShakeDetector shake;
+    private ShakeDetector shakeBig;
+    private BeltBagInventoryUI inventoryUI;
+
+    private float lastShakeTime;
+    private float lastItemDrop;
+    private float minWaitTime = 0.3f;
+
+    protected override void Awake()
+    {
+        base.Awake();
+
+        shake = new ShakeDetector(transform, 0.06f, true);
+        shakeBig = new ShakeDetector(transform, 0.1f, true);
+        inventoryUI = FindObjectOfType<BeltBagInventoryUI>(true);
+
+        shake.onShake += () =>
+        {
+            if (Time.realtimeSinceStartup - lastShakeTime > 0.5f)
+                return;
+
+            if (item.currentPlayerChecking != StartOfRound.Instance.localPlayerController)
+                return;
+
+            if (transform.forward.y > -0.6)
+                return;
+
+            if (Time.realtimeSinceStartup - lastItemDrop < minWaitTime)
+                return;
+
+            if (item.objectsInBag.Count < 1)
+                return;
+
+            inventoryUI.RemoveItemFromUI(item.objectsInBag.Count - 1);
+            lastItemDrop = Time.realtimeSinceStartup;
+            lastShakeTime = Time.realtimeSinceStartup;
+            minWaitTime = Random.Range(0.1f, 0.3f);
+
+            RoundManager.PlayRandomClip(item.bagAudio, item.grabItemInBagSFX, audibleNoiseID: -1);
+            VRSession.VibrateController(XRNode.RightHand, 0.1f, 0.5f);
+        };
+
+        shakeBig.onShake += () =>
+        {
+            lastShakeTime = Time.realtimeSinceStartup;
+        };
+    }
+
+    protected override void OnUpdate()
+    {
+        shake.Update();
+        shakeBig.Update();
+    }
+}

Source/Items/VRManeaterBaby.cs

@@ -26,7 +26,7 @@ internal class VRManEaterBaby : VRItem<CaveDwellerPhysicsProp>
         var source = VRSession.Instance.LocalPlayer.PrimaryController.transform;
 
         shake = new ShakeDetector(source, 0.015f, true);
-        shakeBig = new ShakeDetector(source, 0.04f, true);
+        shakeBig = new ShakeDetector(source, 0.05f, true);
 
         shake.onShake += OnShakeMotion;
         shakeBig.onShake += OnShakeBigMotion;

Source/Patches/HarmonyPatcher.cs

@@ -49,7 +49,7 @@ private static void Patch(Harmony patcher, LCVRPatchTarget target)
             }
             catch (Exception e)
             {
-                Logger.LogError($"Failed to apply patches from {type}: {e.Message}");
+                Logger.LogError($"Failed to apply patches from {type}: {e.Message}, {e.InnerException}");
             }
         });
     }

Source/Patches/Items/BeltItemPatches.cs

@@ -41,6 +41,5 @@ private static bool CloseBagPatch(BeltBagItem __instance, bool buttonDown)
 
         StartOfRound.Instance.localPlayerController.SetInSpecialMenu(false);
         return false;
-
     }
 }

Source/Patches/PlayerControllerPatches.cs

@@ -341,7 +341,8 @@ private static IEnumerable<CodeInstruction> AllowActivateDuringMenu(IEnumerable<
             .MatchForward(false,
                 new CodeMatch(OpCodes.Ldfld, Field(typeof(PlayerControllerB), nameof(PlayerControllerB.inSpecialMenu))))
             .Advance(-1)
-            .RemoveInstructions(4)
+            .SetOpcodeAndAdvance(OpCodes.Nop)
+            .RemoveInstructions(3)
             .InstructionEnumeration();
     }
 }

Source/Player/Items.cs

@@ -17,7 +17,8 @@ internal static class Items
         { "Flashlight", typeof(VRFlashlight) },
         { "Laser pointer", typeof(VRFlashlight) },
         { "Kitchen knife", typeof(VRKnife) },
-        { "Maneater", typeof(VRManEaterBaby) }
+        { "Maneater", typeof(VRManEaterBaby) },
+        { "Belt bag", typeof(VRBeltBagItem) }
     };
 
     public static readonly Dictionary<string, (Vector3, Vector3)> itemOffsets = new()

Source/Player/VRController.cs

@@ -98,9 +98,9 @@ public static void DisableInteractTrigger(string objectName)
         DisabledInteractTriggers.Add(objectName);
     }
 
-    public void EnableDebugInteractorVisual(bool enabled = true)
+    public void ShowDebugInteractorVisual(bool visible = true)
     {
-        debugLineRenderer.enabled = enabled && Plugin.Config.EnableInteractRay.Value;
+        debugLineRenderer.enabled = visible && Plugin.Config.EnableInteractRay.Value;
     }
 
     private void OnInteractPerformed(InputAction.CallbackContext context)
@@ -133,9 +133,9 @@ private void OnInteractPerformed(InputAction.CallbackContext context)
                 return;
 
             // Handle belt bag item
-            if (PlayerController.currentlyHeldObjectServer is { itemProperties.itemId: 20 })
+            if (PlayerController.currentlyHeldObjectServer is BeltBagItem bag)
             {
-                BeginBagTool();
+                BeginBagTool(bag);
                 return;
             }
 
@@ -371,13 +371,8 @@ private void BeginGrabObject()
         GrabItem(hit.collider.transform.gameObject.GetComponent<GrabbableObject>());
     }
 
-    private void BeginBagTool()
+    private void BeginBagTool(BeltBagItem bag)
     {
-        // TODO: Remove line
-        var line = DebugLinePool.GetLine("BagTool");
-        line.startColor = line.endColor = Color.red;
-        line.SetPositions([InteractOrigin.position, InteractOrigin.position + InteractOrigin.forward * 4]);
-
         var ray = new Ray(InteractOrigin.position, InteractOrigin.forward);
         if (!ray.Raycast(out var hit, 4, 1073742144))
             return;
@@ -386,7 +381,7 @@ private void BeginBagTool()
         if (item == null || item == PlayerController.currentlyHeldObjectServer || !CanBeInsertedIntoBag(item))
             return;
 
-        ((BeltBagItem)PlayerController.currentlyHeldObjectServer).TryAddObjectToBag(item);
+        bag.TryAddObjectToBag(item);
     }
 
     public void GrabItem(GrabbableObject item)

Source/Player/VRSession.cs

@@ -394,7 +394,7 @@ public void OnEnterTerminal()
         HUD.TerminalKeyboard.PresentKeyboard();
 
         LocalPlayer.EnableInteractorVisuals();
-        LocalPlayer.PrimaryController.EnableDebugInteractorVisual(false);
+        LocalPlayer.PrimaryController.ShowDebugInteractorVisual(false);
     }
 
     public void OnExitTerminal()
@@ -403,7 +403,7 @@ public void OnExitTerminal()
             HUD.TerminalKeyboard.Close();
 
         LocalPlayer.EnableInteractorVisuals(false);
-        LocalPlayer.PrimaryController.EnableDebugInteractorVisual();
+        LocalPlayer.PrimaryController.ShowDebugInteractorVisual();
     }
 
     public void OnPauseMenuOpened()

Source/Plugin.cs

@@ -31,7 +31,7 @@ public class Plugin : BaseUnityPlugin
 
     private readonly string[] GAME_ASSEMBLY_HASHES =
     [
-        "9FB376FFA068AC5D6B7924F18CC6603C23F9FFE4CA2232C9E0DA552887298782", // V64 Beta
+        "323BFD6C60F97171C1011F758E7C2205730DB939C31E3DABEEA2D68EFF0B722F", // V64 Beta
     ];
 
     public new static Config Config { get; private set; }