From 0378748b94450d8f422a84248273961843d82605 Mon Sep 17 00:00:00 2001 From: Fesiug Date: Sat, 16 Dec 2023 20:27:39 -0500 Subject: [PATCH] Use Sound_Cock --- gamemodes/benny/entities/weapons/benny/sh_reload.lua | 2 +- .../benny/gamemode/modules/weapons/sh_weapons.lua | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gamemodes/benny/entities/weapons/benny/sh_reload.lua b/gamemodes/benny/entities/weapons/benny/sh_reload.lua index 7859dfe..96a5733 100644 --- a/gamemodes/benny/entities/weapons/benny/sh_reload.lua +++ b/gamemodes/benny/entities/weapons/benny/sh_reload.lua @@ -130,7 +130,7 @@ function SWEP:Reload_MagIn( hand, curmag, optinv, optwep_table, optwep_class ) self:D_SetMagID( hand, mag ) self:D_SetClip( hand, inv[mag].Ammo ) wep_table.Loaded = mag - B_Sound( self, wep_class.Sound_MagCock ) + B_Sound( self, wep_class.Sound_Cock ) else B_Sound( self, "Common.NoAmmo" ) end diff --git a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua index 785bd39..82ecc25 100644 --- a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua +++ b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua @@ -145,11 +145,14 @@ do -- Sound definitions AddSound( "USP.MagIn", "benny/weapons/usp/magin.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "Glock.MagOut", "benny/weapons/glock/magout.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "Glock.MagIn", "benny/weapons/glock/magin.ogg", 70, 100, 0.5, CHAN_STATIC ) + AddSound( "Glock.Cock", "benny/weapons/glock/cock.ogg", 70, 100, 0.5, CHAN_STATIC ) + AddSound( "Deagle.Cock", "benny/weapons/deagle/cock.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "M16A2.MagOut", "benny/weapons/m16a2/magout.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "M16A2.MagIn", "benny/weapons/m16a2/magin.ogg", 70, 100, 0.5, CHAN_STATIC ) + AddSound( "M16A2.Cock", "benny/weapons/m16a2/cock.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "FNC.MagOut", "benny/weapons/fnc/magout.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "FNC.MagIn", "benny/weapons/fnc/magin.ogg", 70, 100, 0.5, CHAN_STATIC ) - AddSound( "FNC.MagCock", "benny/weapons/fnc/cock.ogg", 70, 100, 0.5, CHAN_STATIC ) + AddSound( "FNC.Cock", "benny/weapons/fnc/cock.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "AA12.MagOut", "benny/weapons/aa12/magout.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "AA12.MagIn", "benny/weapons/aa12/magin.ogg", 70, 100, 0.5, CHAN_STATIC ) AddSound( "SPAS12.MagOut", { @@ -475,6 +478,7 @@ do -- Handguns Sound_DryFire = "Common.Dryfire.Pistol", Sound_MagOut = "Glock.MagOut", Sound_MagIn = "Glock.MagIn", + Sound_Cock = "Glock.Cock", Delay = (60/900), Firemodes = FIREMODE_AUTOSEMI, @@ -583,6 +587,7 @@ do -- Handguns Sound_DryFire = "Common.Dryfire.Pistol", Sound_MagOut = "Anaconda.MagOut", Sound_MagIn = "Anaconda.MagIn", + Sound_Cock = "Deagle.Cock", Delay = (60/180), Firemodes = FIREMODE_SEMI, @@ -945,7 +950,7 @@ do -- Rifles Sound_DryFire = "Common.Dryfire.Rifle", Sound_MagOut = "FNC.MagOut", Sound_MagIn = "FNC.MagIn", - Sound_MagCock = "FNC.MagCock", + Sound_Cock = "FNC.Cock", Delay = (60/700), Firemodes = FIREMODE_AUTOSEMI, @@ -981,7 +986,7 @@ do -- Rifles Sound_DryFire = "Common.Dryfire.Rifle", Sound_MagOut = "FNC.MagOut", Sound_MagIn = "FNC.MagIn", - Sound_MagCock = "FNC.MagCock", + Sound_Cock = "FNC.Cock", Delay = (60/800), Firemodes = FIREMODE_AUTOSEMI, @@ -1017,6 +1022,7 @@ do -- Rifles Sound_DryFire = "Common.Dryfire.Rifle", Sound_MagOut = "M16A2.MagOut", Sound_MagIn = "M16A2.MagIn", + Sound_Cock = "M16A2.Cock", Delay = (60/700), Firemodes = {