From 8d0a23eb51e0166507c191a6e87d744ea14b462f Mon Sep 17 00:00:00 2001 From: Fesiug Date: Mon, 1 Jan 2024 17:08:11 -0500 Subject: [PATCH] Shift over one, fix deagle mag --- .../gamemode/modules/weapons/sh_weapons.lua | 278 +++++++++--------- 1 file changed, 143 insertions(+), 135 deletions(-) diff --git a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua index 1e83e0a..6eaa70e 100644 --- a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua +++ b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua @@ -22,174 +22,182 @@ do -- Sound definitions end -ItemDef("base", { - Name = "Base Item", - Category = "base", - Type = "base", - Description = "Base of everything", +do -- Bases - WModel = "models/weapons/w_357.mdl", + ItemDef("base", { + Name = "Base Item", + Category = "base", + Type = "base", + Description = "Base of everything", - Speed_Move = 1, - Speed_Aiming = 1, - Speed_Reloading = 1, - Speed_Firing = 1, - Speed_FiringTime = 0.2, - ShootHolsterTime = 0, + WModel = "models/weapons/w_357.mdl", - Func_Attack = function( self, hand ) - end, + Speed_Move = 1, + Speed_Aiming = 1, + Speed_Reloading = 1, + Speed_Firing = 1, + Speed_FiringTime = 0.2, + ShootHolsterTime = 0, - Func_Attack2 = function( self, hand ) - end, + Func_Attack = function( self, hand ) + end, - Func_Reload = function( self, hand ) - end, + Func_Attack2 = function( self, hand ) + end, - Func_Deploy = function( self, hand ) - end, + Func_Reload = function( self, hand ) + end, - Func_HolsterStart = function( self, hand ) - end, + Func_Deploy = function( self, hand ) + end, - Func_HolsterFinish = function( self, hand ) - end, -}) + Func_HolsterStart = function( self, hand ) + end, -ItemDef("base_firearm", { - Name = "Base Firearm", - Category = "base", - Base = "base", - Description = "Base for firearms", - Features = "firearm", + Func_HolsterFinish = function( self, hand ) + end, + }) - WModel = "models/weapons/w_pistol.mdl", - HoldType = "pistol", + ItemDef("base_firearm", { + Name = "Base Firearm", + Category = "base", + Base = "base", + Description = "Base for firearms", + Features = "firearm", - -- Firearm specific - Firemodes = { - { - Mode = 1, + WModel = "models/weapons/w_pistol.mdl", + HoldType = "pistol", + + -- Firearm specific + Firemodes = { + { + Mode = 1, + }, }, - }, - Damage = 0, - AmmoStd = 1, - Pellets = 1, - Delay = 60/600, + Damage = 0, + AmmoStd = 1, + Pellets = 1, + Delay = 60/600, - Spread = 0, - SpreadAdd = 0, - SpreadAddMax = 1, - - SpreadDecay_Start = 1, - SpreadDecay_End = 2, - SpreadDecay_RampTime = 1, - - Reload_MagOut = 0.2, - Reload_MagIn = 0.8, - Reload_MagIn_Bonus1 = 0.56, - Reload_MagIn_Bonus2 = 0.56+0.1, + Spread = 0, + SpreadAdd = 0, + SpreadAddMax = 1, + + SpreadDecay_Start = 1, + SpreadDecay_End = 2, + SpreadDecay_RampTime = 1, + + Reload_MagOut = 0.2, + Reload_MagIn = 0.8, + Reload_MagIn_Bonus1 = 0.56, + Reload_MagIn_Bonus2 = 0.56+0.1, - Func_Attack = function( self, hand ) - end, -}) + Func_Attack = function( self, hand ) + end, + }) -ItemDef("base_melee", { - Name = "Base Melee", - Category = "base", - Base = "base", - Description = "Base for melee weapons", - Features = "firearm", + ItemDef("base_melee", { + Name = "Base Melee", + Category = "base", + Base = "base", + Description = "Base for melee weapons", + Features = "firearm", - WModel = "models/weapons/w_pistol.mdl", - HoldType = "pistol", + WModel = "models/weapons/w_pistol.mdl", + HoldType = "pistol", - -- Firearm specific - Firemodes = { - { - Mode = 1, + -- Firearm specific + Firemodes = { + { + Mode = 1, + }, }, - }, - Damage = 0, - Delay = 60/600, + Damage = 0, + Delay = 60/600, - Spread = 0, - SpreadAdd = 0, - SpreadAddMax = 1, - - SpreadDecay_Start = 1, - SpreadDecay_End = 2, - SpreadDecay_RampTime = 1, + Spread = 0, + SpreadAdd = 0, + SpreadAddMax = 1, + + SpreadDecay_Start = 1, + SpreadDecay_End = 2, + SpreadDecay_RampTime = 1, - Func_Attack = function( self, hand ) - end, -}) + Func_Attack = function( self, hand ) + end, + }) -ItemDef("base_grenade", { - Name = "Base Grenade", - Category = "grenade", - Base = "base", - Description = "Base for grenades", - Features = "grenade", + ItemDef("base_grenade", { + Name = "Base Grenade", + Category = "grenade", + Base = "base", + Description = "Base for grenades", + Features = "grenade", - WModel = "models/weapons/w_grenade.mdl", - HoldType = "slam", -}) + WModel = "models/weapons/w_grenade.mdl", + HoldType = "slam", + }) -ItemDef("base_magazine", { - Name = "Base Magazine", - Category = "magazine", - Base = "base", - Description = "Base for magazines", - Features = "magazine", + ItemDef("base_magazine", { + Name = "Base Magazine", + Category = "magazine", + Base = "base", + Description = "Base for magazines", + Features = "magazine", - WModel = "models/weapons/w_slam.mdl", - HoldType = "slam", -}) + WModel = "models/weapons/w_slam.mdl", + HoldType = "slam", + }) -ItemDef("deagle", { - Name = "DEAGLE", - Description = "Autoloading .50 caliber pistol.", - Base = "base_firearm", - Category = "pistol", +end - WModel = "models/weapons/w_pist_deagle.mdl", - HoldType = "revolver", +do -- Pistols + ItemDef("deagle", { + Name = "DEAGLE", + Description = "Autoloading .50 caliber pistol.", + Base = "base_firearm", + Category = "pistol", - Sound_Fire = "Anaconda.Fire", - Sound_DryFire = "Common.Dryfire.Pistol", - Sound_MagOut = "Anaconda.MagOut", - Sound_MagIn = "Anaconda.MagIn", - Sound_Cock = "Deagle.Cock", + WModel = "models/weapons/w_pist_deagle.mdl", + HoldType = "revolver", - -- - AmmoStd = 7, - Delay = (60/180), - Firemodes = FIREMODE_SEMI, - Damage = 47, - Spread = 30/60, - SpreadAdd = 4, - SpreadAddMax = 15, - - SpreadDecay_Start = 8, - SpreadDecay_End = 25, - SpreadDecay_RampTime = 0.5, + Sound_Fire = "Anaconda.Fire", + Sound_DryFire = "Common.Dryfire.Pistol", + Sound_MagOut = "Anaconda.MagOut", + Sound_MagIn = "Anaconda.MagIn", + Sound_Cock = "Deagle.Cock", - Speed_Move = 0.95, - Speed_Aiming = 0.95, - Speed_Reloading = 0.95, - Speed_Firing = 0.95, - Speed_FiringTime = 0.5, -}) + -- + AmmoStd = 7, + Delay = (60/180), + Firemodes = FIREMODE_SEMI, + Damage = 47, + Spread = 30/60, + SpreadAdd = 4, + SpreadAddMax = 15, + + SpreadDecay_Start = 8, + SpreadDecay_End = 25, + SpreadDecay_RampTime = 0.5, -ItemDef("mag_deagle", { - Name = "MAG: DEAGLE 7-rnd", - Base = "base_magazine", + Speed_Move = 0.95, + Speed_Aiming = 0.95, + Speed_Reloading = 0.95, + Speed_Firing = 0.95, + Speed_FiringTime = 0.5, + }) - Ammo = 14, -}) + ItemDef("mag_deagle", { + Name = "MAG: DEAGLE 7-rnd", + Base = "base_magazine", + + Ammo = 7, + }) + + +end --[[ ItemDef("deagle", { Name = "DEAGLE",