From f8cb3fedc5b7281cd0a11d15071c4dfe52bca09a Mon Sep 17 00:00:00 2001 From: Fesiug Date: Tue, 14 Nov 2023 01:12:55 -0500 Subject: [PATCH] Add discard, discard nades. --- gamemodes/benny/gamemode/modules/player/sh_player.lua | 6 ++++++ gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gamemodes/benny/gamemode/modules/player/sh_player.lua b/gamemodes/benny/gamemode/modules/player/sh_player.lua index 10d752f..a1f60f8 100644 --- a/gamemodes/benny/gamemode/modules/player/sh_player.lua +++ b/gamemodes/benny/gamemode/modules/player/sh_player.lua @@ -42,6 +42,12 @@ function PT:INV_Get() return self.INV end +function PT:INV_Discard( id ) + if self:INV_Get()[ id ] then + self:INV_Get()[ id ] = nil + end +end + do local translat = { ["melee"] = { 1, 1 }, diff --git a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua index 3fc4771..584f28e 100644 --- a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua +++ b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua @@ -928,6 +928,9 @@ do -- Grenades, nothing here is guaranteed. if !class.GrenadeCharge then self:SetGrenadeDownStart( CurTime() ) end self:TPFire() if SERVER then GrenadeThrow( self, data ) end + local id = self:D_GetID( false ) + self:BHolster( false ) + p:INV_Discard( id ) end end return true @@ -938,6 +941,9 @@ do -- Grenades, nothing here is guaranteed. self:SetGrenadeDown( false ) self:TPFire() if SERVER then GrenadeThrow( self, data ) end + local id = self:D_GetID( false ) + self:BHolster( false ) + p:INV_Discard( id ) end return true end