Refine grapple controls and enable background functionality

Centralizes input handling into a dedicated controller, clarifying unhook conditions: R-key requires holding the gun, while double-crouch tap works when not holding it.
Introduces precise rope length adjustment using Shift + Mousewheel.
Allows the grapple gun to remain active and its rope controllable even when equipped in the background hand.
Updates grapple sound effects and core parameters like fire velocity and maximum line length.
Improves attachment collision checks and fixes a rope rendering issue.

Author: OpenTools-run

Data/Base.rte/Devices/Tools/GrappleGun/Grapple.lua

@@ -20,10 +20,10 @@ function Create(self)
     -- self.initializationOk = true -- This flag is effectively replaced by checking self.actionMode == 0 in Update.
 
     -- Core grapple properties
-    self.fireVel = 30      -- Initial velocity of the hook. Overwrites .ini FireVel.
-    self.hookRadius = 50   -- Reduced from 360 for more precise parent finding
+    self.fireVel = 40      -- Initial velocity of the hook. Overwrites .ini FireVel.
+    self.hookRadius = 360   -- Reduced from 360 for more precise parent finding
 
-    self.maxLineLength = 600   -- Maximum allowed length of the rope.
+    self.maxLineLength = 1000   -- Maximum allowed length of the rope.
     self.maxShootDistance = self.maxLineLength * 0.95 -- Hook will detach if it travels further than this before sticking.
     self.setLineLength = 0 -- Target length set by input/logic.
     self.lineStrength = 10000 -- Force threshold for breaking (effectively unbreakable).
@@ -82,6 +82,17 @@ function Create(self)
     -- Parent gun, parent actor, and related properties (Vel, anchor points, parentRadius)
     -- will be determined and set in the first Update call.
     -- No self.ToDelete = true will be set in Create.
+    
+    -- Add these new flags:
+    self.shouldUnhook = false      -- Flag set by gun to signal unhook
+    -- self.reloadKeyPressed = false  -- Track R key state to prevent spam
+    
+    -- Keep only the tap detection variables:
+    self.tapCounter = 0
+    self.canTap = false
+    self.tapTime = 150
+    self.tapAmount = 2
+    self.tapTimer = Timer()
 end
 
 function Update(self)
@@ -186,29 +197,6 @@ function Update(self)
         return
     end
 
-    local controller = parentActor:GetController()
-    if not controller then
-        self.ToDelete = true
-        return
-    end
-    local player = controller.Player or 0
-
-    -- Handle pie menu modes
-    if self.parentGun then
-        local mode = self.parentGun:GetNumberValue("GrappleMode")
-        if mode ~= 0 then
-            if mode == 3 then -- Unhook via Pie Menu
-                self.ToDelete = true
-                if self.parentGun then
-                    self.parentGun:RemoveNumberValue("GrappleMode")
-                end
-            else
-                self.pieSelection = mode
-                self.parentGun:RemoveNumberValue("GrappleMode")
-            end
-        end
-    end
-
     -- Standard update flags
     self.ToSettle = false -- Grapple claw should not settle
 
@@ -357,34 +345,37 @@ function Update(self)
     -- Player-specific controls and unhooking mechanisms
     if IsAHuman(parentActor) or IsACrab(parentActor) then
         if parentActor:IsPlayerControlled() then
-            -- R key unhooking functionality
-            local isHoldingGrapple = false
-            
-            -- Check if holding grapple in main hand
-            if self.parent.EquippedItem and self.parentGun and self.parent.EquippedItem.ID == self.parentGun.ID then
-                isHoldingGrapple = true
-            end
-            
-            -- Check if holding grapple in off-hand
-            local isHoldingInBG = self.parent.EquippedBGItem and self.parentGun and 
-                                 self.parent.EquippedBGItem.ID == self.parentGun.ID
-            
-            -- If reload key pressed while holding grapple gun, unhook
-            if controller:IsState(Controller.WEAPON_RELOAD) and (isHoldingGrapple or isHoldingInBG) then
-                print("R key unhook triggered!")  -- Debug message
-                self.ToDelete = true
-                return -- Exit immediately to prevent other checks
-            end
-            
-            -- Unhook with double-tap crouch (ONLY when NOT holding the gun)
-            if not isHoldingGrapple and not isHoldingInBG then
+            local controller = self.parent:GetController()
+            if controller then
+                -- ONLY use RopeInputController for all input handling
+                
+                -- 1. R key to unhook (when holding gun)
+                if RopeInputController.handleReloadKeyUnhook(self, controller) then
+                    print("Unhooking via R key!")
+                    self.ToDelete = true
+                    return
+                end
+                
+                -- 2. Double crouch-tap to unhook (when NOT holding gun)
                 if RopeInputController.handleTapDetection(self, controller) then
-                    print("Double-tap unhook triggered!")  -- Debug message
+                    print("Unhooking via double crouch!")
+                    self.ToDelete = true
+                    return
+                end
+                
+                -- 3. Pie menu unhook
+                if RopeInputController.handlePieMenuSelection(self) then
+                    print("Unhooking via pie menu!")
                     self.ToDelete = true
-                    return -- Exit immediately
+                    return
                 end
+                
+                -- 4. Other rope controls
+                RopeInputController.handleRopePulling(self)
+                RopeInputController.handleAutoRetraction(self, false)
             end
         end
+        
         -- Gun stance offset when holding the gun
         if self.parentGun and self.parentGun.RootID == parentActor.ID then
              if MovableMan:IsParticle(self.parentGun.Magazine) then -- Check if Magazine is a particle
@@ -394,27 +385,7 @@ function Update(self)
             self.parentGun.StanceOffset = Vector(self.lineLength, 0):RadRotate(offsetAngle)
         end
     end
-
-    -- Delegate all input handling to RopeInputController
-    -- 1. Pie menu selection (unhook, retract, extend)
-    if RopeInputController.handlePieMenuSelection(self) then
-        self.ToDelete = true
-        if self.parentGun then self.parentGun:RemoveNumberValue("GrappleMode") end
-        return
-    end
-    -- 2. R key (reload) to unhook
-    if RopeInputController.handleReloadKeyUnhook(self, controller) then
-        self.ToDelete = true
-        return
-    end
-    -- 3. Double-tap crouch to unhook (only if not holding gun)
-    if RopeInputController.handleTapDetection(self, controller) then
-        self.ToDelete = true
-        return
-    end
-    -- 4. Mousewheel and directional controls for rope length
-    RopeInputController.handleRopePulling(self)
-
+    
     -- Render the rope
     RopeRenderer.drawRope(self, player)
 

Data/Base.rte/Devices/Tools/GrappleGun/GrappleGun.lua

@@ -51,8 +51,8 @@ function Update(self)
         return
     end
 
-    local parentActor = ToActor(parent) -- Cast to Actor base type.
-    -- Specific casting to AHuman or ACrab can be done if needed for type-specific logic.
+    local parentActor = ToActor(parent) -- Cast to Actor base type
+    -- Specific casting to AHuman or ACrab can be done if needed for type-specific logic
 
     if not parentActor:IsPlayerControlled() or parentActor.Status >= Actor.DYING then
         self:Deactivate() -- Deactivate if not player controlled or if player is dying.
@@ -65,12 +65,15 @@ function Update(self)
         return
     end
 
-    -- Deactivate if equipped in the background arm and a foreground item exists,
-    -- to allow the foreground item (e.g., another weapon) to be used.
+    -- REMOVE/COMMENT OUT this section that deactivates in background:
+    --[[
     if parentActor.EquippedBGItem and parentActor.EquippedBGItem.ID == self.ID and parentActor.EquippedItem then
         self:Deactivate()
-        -- Potentially return here if no further logic should run for a BG equipped grapple gun.
+        // Potentially return here if no further logic should run for a BG equipped grapple gun.
     end
+    --]]
+    
+    -- Allow gun to stay active in background for rope functionality
 
     -- Magazine handling (visual representation of the hook's availability)
     if self.Magazine and MovableMan:IsParticle(self.Magazine) then
@@ -90,31 +93,15 @@ function Update(self)
                 self.SharpStanceOffset = Vector(spriteWidth, 1)
             end
 
-            -- Crouch-tap logic (potentially for recalling an active hook)
-            if controller:IsState(Controller.BODY_PRONE) then
-                if self.canTap then
-                    controller:SetState(Controller.BODY_PRONE, false) -- Prevent continuous prone state
-                    self.tapTimerJump:Reset()
-                    -- self.didTap = true; -- Mark that a tap occurred (if used elsewhere)
-                    self.canTap = false
-                    self.tapCounter = self.tapCounter + 1
-                end
-            else
-                self.canTap = true -- Allow first tap when not prone
-            end
-
-            if self.tapTimerJump:IsPastSimMS(self.tapTime) then
-                self.tapCounter = 0 -- Reset counter if too much time has passed
-            else
-                if self.tapCounter >= self.tapAmount then
-                    -- If enough taps, activate the gun. This might be intended to fire/recall.
-                    -- If a grapple is already out, Grapple.lua's tap detection should handle recall.
-                    -- If no grapple is out, this would fire a new one.
-                    -- Clarify the intent: is this to fire, or to send a signal to an existing grapple?
-                    self:Activate() -- This will typically fire the HDFirearm.
-                    self.tapCounter = 0
-                end
+            -- REMOVE the entire crouch-tap section from the gun - it should only be in the hook
+            -- The gun should NOT handle unhooking directly
+            
+            -- Only keep this for other gun functionality, NOT for unhooking:
+            if controller:IsState(Controller.WEAPON_RELOAD) then
+                -- Gun's own reload logic here (if any)
+                -- Do NOT send unhook signals from here
             end
+            
         end
 
         -- Guide arrow visibility logic
@@ -174,6 +161,8 @@ function Update(self)
             magParticle.Frame = 0      -- Standard frame
         else
             magParticle.Scale = 0 -- Hidden by active grapple (Grapple.lua also does this)
+            magParticle.RoundCount = 0 -- Visually empty
+
         end
     end
 end