Refine grapple gun logic for improved ownership checks and background functionality

Author: OpenTools-run

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

@@ -192,11 +192,43 @@ function Update(self)
 
     local parentActor = self.parent -- self.parent is already an Actor type from the setup block
 
-    -- Remove the HasObject check - allow grapple to persist even when gun is not equipped
+    -- Check if grapple gun still exists - either equipped or in inventory
     if not self.parentGun or self.parentGun.ID == rte.NoMOID then
         self.ToDelete = true
         return
     end
+    
+    -- Check if the gun still belongs to the parent actor
+    local shouldDelete = false
+    
+    if self.parentGun.RootID == parentActor.ID then
+        -- Gun is equipped by our parent - all good
+    elseif self.parentGun.RootID == rte.NoMOID then
+        -- Gun is unequipped - check if it's in our parent's inventory
+        local gunInInventory = false
+        if parentActor.Inventory then
+            for item in parentActor.Inventory do
+                if item and item.ID == self.parentGun.ID then
+                    gunInInventory = true
+                    break
+                end
+            end
+        end
+        if not gunInInventory then
+            shouldDelete = true
+        end
+    else
+        -- Gun is equipped by someone else
+        local currentOwner = MovableMan:GetMOFromID(self.parentGun.RootID)
+        if currentOwner and IsActor(currentOwner) and currentOwner.ID ~= parentActor.ID then
+            shouldDelete = true
+        end
+    end
+    
+    if shouldDelete then
+        self.ToDelete = true
+        return
+    end
 
     -- Standard update flags
     self.ToSettle = false -- Grapple claw should not settle
@@ -320,34 +352,43 @@ function Update(self)
         self.Pos.Y = self.apy[self.currentSegments]
     end
 
-    -- Aim the gun
+    -- Aim the gun only if it's currently equipped
     if self.parentGun and self.parentGun.ID ~= rte.NoMOID then
-        local flipAng = parentActor.HFlipped and math.pi or 0
-        self.parentGun.RotAngle = self.lineVec.AbsRadAngle + flipAng
-        if MovableMan:IsParticle(self.parentGun.Magazine) then -- Check if Magazine is a particle
-             ToMOSParticle(self.parentGun.Magazine).Scale = 0 -- Hide magazine when grapple is active
-        end
-
-        -- Handle unhooking from firing the gun again
-        if self.parentGun.FiredFrame then
-            if self.actionMode == 1 then -- If flying, just delete
+        local gunIsEquipped = (self.parentGun.RootID == parentActor.ID)
+        
+        if gunIsEquipped then
+            local flipAng = parentActor.HFlipped and math.pi or 0
+            self.parentGun.RotAngle = self.lineVec.AbsRadAngle + flipAng
+            
+            -- Handle unhooking from firing the gun again - ONLY when gun is equipped
+            if self.parentGun.FiredFrame then
+                if self.actionMode == 1 then -- If flying, just delete
+                    self.ToDelete = true
+                elseif self.actionMode > 1 then -- If attached, mark as ready to release
+                    self.canRelease = true 
+                end
+            end
+            -- If marked ready and gun is fired again (or activated for some guns)
+            if self.canRelease and self.parentGun.FiredFrame and 
+               (self.parentGun.Vel.Y ~= -1 or self.parentGun:IsActivated()) then
                 self.ToDelete = true
-            elseif self.actionMode > 1 then -- If attached, mark as ready to release
-                self.canRelease = true 
             end
         end
-        -- If marked ready and gun is fired again (or activated for some guns)
-        if self.canRelease and self.parentGun.FiredFrame and 
-           (self.parentGun.Vel.Y ~= -1 or self.parentGun:IsActivated()) then -- Original logic for release condition
-            self.ToDelete = true
+        
+        -- Always hide magazine when grapple is active, regardless of equipped status
+        if MovableMan:IsParticle(self.parentGun.Magazine) then -- Check if Magazine is a particle
+             ToMOSParticle(self.parentGun.Magazine).Scale = 0 -- Hide magazine when grapple is active
         end
     end
 
     -- Player-specific controls and unhooking mechanisms
     if IsAHuman(parentActor) or IsACrab(parentActor) then
         if parentActor:IsPlayerControlled() then
             local controller = self.parent:GetController()
-            if controller then
+            local gunIsEquipped = self.parentGun and (self.parentGun.RootID == parentActor.ID)
+            
+            if controller and gunIsEquipped then
+                -- Only handle unhook inputs when gun is equipped
                 -- 1. Handle R key (reload) to unhook - use the module function
                 if RopeInputController.handleReloadKeyUnhook(self, controller) then
                     self.ToDelete = true
@@ -371,8 +412,10 @@ function Update(self)
                     self.parentGun.Magazine.RoundCount = 0
                     self.parentGun.Magazine.Scale = 0 -- Hide the magazine
                 end
-                
-                -- 4. Other rope controls (climbing, length adjustment)
+            end
+            
+            if controller then
+                -- Always allow rope movement controls regardless of gun equipped status
                 RopeInputController.handleRopePulling(self)
                 RopeInputController.handleAutoRetraction(self, false)
             end

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

@@ -50,60 +50,65 @@ function Update(self)
 
     -- Ensure the gun is held by a valid, player-controlled Actor.
     if not parent or not IsActor(parent) then
-        self:Deactivate()
+        self:Deactivate() -- If not held by an actor, deactivate.
         return
     end
 
-    local parentActor = ToActor(parent)
+    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()
+        self:Deactivate() -- Deactivate if not player controlled or if player is dying.
         return
     end
 
     local controller = parentActor:GetController()
     if not controller then
-        self:Deactivate()
+        self:Deactivate() -- Should not happen if IsPlayerControlled is true, but good check.
         return
     end
 
+    -- 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.
+    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
         local magazineParticle = ToMOSParticle(self.Magazine)
 
-        -- Check if we have an active grapple
-        local hasActiveGrapple = false
-        for mo in MovableMan.AddedActors do
-            if mo and mo.PresetName == "Grapple Gun Claw" and mo.parentGun and mo.parentGun.ID == self.ID then
-                hasActiveGrapple = true
-                break
-            end
-        end
-        
-        -- Update magazine based on grapple state
-        if hasActiveGrapple then
-            magazineParticle.RoundCount = 0 -- Empty when grapple is out
-            magazineParticle.Scale = 0 -- Hidden
-            self.hasGrappleActive = true
-        elseif self.hasGrappleActive and not hasActiveGrapple then
-            -- Grapple just returned, restore ammo
-            magazineParticle.RoundCount = 1
-            magazineParticle.Scale = 1
-            magazineParticle.Frame = 0
-            self.hasGrappleActive = false
-        end
-        
-        -- Set stance offset when hook is loaded
-        if magazineParticle.Scale == 1 then
-            local parentSprite = ToMOSprite(self:GetParent())
+        -- Double tapping crouch retrieves the hook (if a grapple is active)
+        -- This logic seems to be for initiating a retrieve action from the gun itself.
+        -- The actual unhooking is handled by the Grapple.lua script's tap detection.
+        -- This section might be redundant if Grapple.lua's tap detection is comprehensive.
+        if magazineParticle.Scale == 1 then -- Assuming Scale 1 means hook is "loaded" / available to fire
+            -- The following stance offsets seem to be for when the hook is *not* fired yet.
+            -- Consider if this is the correct condition.
+            local parentSprite = ToMOSprite(self:GetParent()) -- Assuming self:GetParent() is the gun's sprite component
             if parentSprite then
                 local spriteWidth = parentSprite:GetSpriteWidth() or 0
                 self.StanceOffset = Vector(spriteWidth, 1)
                 self.SharpStanceOffset = Vector(spriteWidth, 1)
             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
+        -- Show if magazine scale is 0 (hook is fired) AND not sharp aiming, OR if parent is moving fast.
         local shouldShowGuide = false
         if magazineParticle.Scale == 0 and not controller:IsState(Controller.AIM_SHARP) then
             shouldShowGuide = true
@@ -112,26 +117,77 @@ function Update(self)
         end
         self.guide = shouldShowGuide
     else
-        self.guide = false
+        self.guide = false -- No magazine or not a particle, so no guide based on it.
     end
 
     -- Draw the guide arrow if enabled and valid
     if self.guide and self.arrow and self.arrow.ID ~= rte.NoMOID then
         local frame = 0
         if parentActor.Vel and parentActor.Vel:MagnitudeIsGreaterThan(12) then
-            frame = 1
+            frame = 1 -- Use a different arrow frame for higher speeds
         end
 
-        local eyePos = parentActor.EyePos or Vector(0,0)
-        local startPos = (parentActor.Pos + eyePos + self.Pos)/3
+        -- Calculate positions for drawing the arrow
+        -- EyePos might not exist on all Actor types, ensure parentActor has it or use a fallback.
+        local eyePos = parentActor.EyePos or Vector(0,0) 
+        local startPos = (parentActor.Pos + eyePos + self.Pos)/3 -- Averaged position
         local aimAngle = parentActor:GetAimAngle(true)
-        local aimDistance = parentActor.AimDistance or 50
+        local aimDistance = parentActor.AimDistance or 50 -- Default AimDistance if not present
         local guidePos = startPos + Vector(aimDistance + (parentActor.Vel and parentActor.Vel.Magnitude or 0), 0):RadRotate(aimAngle)
 
+        -- Ensure the arrow MO still exists before trying to draw with it
         if MovableMan:IsValid(self.arrow) then
              PrimitiveMan:DrawBitmapPrimitive(ActivityMan:GetActivity():ScreenOfPlayer(controller.Player), guidePos, self.arrow, aimAngle, frame)
         else
-            self.arrow = nil
+            self.arrow = nil -- Arrow MO was deleted, nullify reference
+        end
+    end
+    
+    -- Check if we have an active grapple
+    local hasActiveGrapple = false
+    for mo in MovableMan.AddedActors do
+        if mo and mo.PresetName == "Grapple Gun Claw" and mo.parentGun and mo.parentGun.ID == self.ID then
+            hasActiveGrapple = true
+            break
+        end
+    end
+    
+    -- Update magazine based on grapple state
+    if self.Magazine and MovableMan:IsParticle(self.Magazine) then
+        local mag = ToMOSParticle(self.Magazine)
+        if hasActiveGrapple then
+            mag.RoundCount = 0 -- Empty when grapple is out
+            self.hasGrappleActive = true
+        elseif self.hasGrappleActive and not hasActiveGrapple then
+            -- Grapple just returned, restore ammo
+            mag.RoundCount = 1
+            self.hasGrappleActive = false
+        end
+    end
+
+    -- Ensure magazine is visually "full" and ready if no grapple is active.
+    -- This assumes the HDFirearm's standard magazine logic handles firing.
+    -- If a grapple claw MO (the projectile) is active, Grapple.lua will hide the magazine.
+    -- This section ensures it's visible when no grapple is out.
+    if self.Magazine and MovableMan:IsParticle(self.Magazine) then
+        local magParticle = ToMOSParticle(self.Magazine)
+        local isActiveGrapple = false
+        -- Check if there's an active grapple associated with this gun
+        for mo_instance in MovableMan:GetMOsByPreset("Grapple Gun Claw") do
+            if mo_instance and mo_instance.parentGun and mo_instance.parentGun.ID == self.ID then
+                isActiveGrapple = true
+                break
+            end
+        end
+
+        if not isActiveGrapple then
+            magParticle.RoundCount = 1 -- Visually full
+            magParticle.Scale = 1      -- Visible
+            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