From d862cc46ee54bf95604e8514018730b7768ef62e Mon Sep 17 00:00:00 2001 From: Fesiug Date: Fri, 8 Dec 2023 18:46:53 -0500 Subject: [PATCH] Holstering akimbos! --- gamemodes/benny/entities/weapons/benny/shared.lua | 13 ++++++++----- gamemodes/benny/gamemode/modules/player/sh_hud.lua | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gamemodes/benny/entities/weapons/benny/shared.lua b/gamemodes/benny/entities/weapons/benny/shared.lua index 6e2499d..05c76f4 100644 --- a/gamemodes/benny/entities/weapons/benny/shared.lua +++ b/gamemodes/benny/entities/weapons/benny/shared.lua @@ -209,6 +209,12 @@ function SWEP:BThinkHolster( hand ) if self:D_GetHolstering( hand ) == 0 then self:D_SetHolstering( hand, -1 ) self:BHolster( hand ) + local p = self:GetOwner() + local req = self:D_GetReqID( hand ) + local inv = p:INV_Get() + if req != "" and inv[req] then + self:BDeploy( hand, req ) + end end end @@ -216,10 +222,7 @@ function SWEP:Think() local p = self:GetOwner() local inv = p:INV_Get() - local L, R = true, false - local curr_l, curr_r = self:D_GetID( true ), self:D_GetID( false ) - - for i=1, 1 do + for i=1, 2 do local hand = i==2 local req = self:D_GetReqID( hand ) local curr = self:D_GetID( hand ) @@ -236,7 +239,7 @@ function SWEP:Think() end end - self:BThinkHolster( R ) + self:BThinkHolster( hand ) -- print( self:D_GetReqID( hand ), self:D_GetID( hand ) ) end diff --git a/gamemodes/benny/gamemode/modules/player/sh_hud.lua b/gamemodes/benny/gamemode/modules/player/sh_hud.lua index c2984a9..69f8e21 100644 --- a/gamemodes/benny/gamemode/modules/player/sh_hud.lua +++ b/gamemodes/benny/gamemode/modules/player/sh_hud.lua @@ -34,7 +34,11 @@ local function beatup( ply, num ) end end end - return ply:SetReqID1( "" ) + if ply:KeyDown(IN_ZOOM) then + return ply:SetReqID2( "" ) + else + return ply:SetReqID1( "" ) + end end hook.Add( "PlayerButtonDown", "Benny_PlayerButtonDown_Inv", function( ply, button )