Bennydev
/
Benny
3
0
Fork 0
Code Issues Pull Requests Wiki Activity

Suppression factors in magazine size way more

This commit is contained in:
Fesiug 2023-12-09 20:39:23 -05:00
parent c17307bd20
commit fe4d4e12c7
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gamemodes/benny/gamemode/modules/gui/cl_spawnmenu.lua
View File

@ -52,18 +52,22 @@ local mewer = {
Size = 12, Size = 12,
Font = "Benny_10", Font = "Benny_10",
Stat = function( class ) Stat = function( class )
local dps = class.Damage * (1/class.Delay) local weight_1, weight_2 = 1, 3
local dpscalc = rmt1c( dps, 100, 373 ) local totalscore = (weight_1 + weight_2)
local magbonus-- = math.Remap( class.Ammo, 16, 40*2, -0.05, 0.3 ) weight_1, weight_2 = weight_1/totalscore, weight_2/totalscore
if class.Ammo > 20 then local score_1, score_2 = 1, 1
magbonus = 1-rmt1c( class.Ammo, 80, 20 )
magbonus = magbonus * 0.5 local truedelay = (1/class.Delay)
else if class.Firemodes[1].Mode == 1 then
magbonus = math.Remap( class.Ammo, 5, 20, -0.75, -0.1 ) truedelay = math.min( truedelay, 60/300 )
end end
local meowzor = math.ease.OutSine( math.Clamp( dpscalc + magbonus, 0, 1 ) ) score_1 = rmt1c( class.Damage * truedelay, 100, 350 )
print( class.Name, dps, dpscalc, math.Round( magbonus, 2 ), meowzor ) score_1 = score_1 * weight_1
return meowzor
score_2 = rmt1c( class.Ammo, 16, 42 )
score_2 = score_2 * weight_2
return score_1 + score_2
end, end,
-- "How much damage the weapon can output over a long period of time.\nDoes not consider armor penetration.\nAffected by Damage, RPM, Capacity and Reload Time." -- "How much damage the weapon can output over a long period of time.\nDoes not consider armor penetration.\nAffected by Damage, RPM, Capacity and Reload Time."
}, },

24
gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua
View File

@ -464,7 +464,7 @@ do -- Handguns
Delay = (60/900), Delay = (60/900),
Firemodes = FIREMODE_AUTOSEMI, Firemodes = FIREMODE_AUTOSEMI,
Ammo = 17, Ammo = 17,
Damage = 18, Damage = 22,
Spread = 60/60, Spread = 60/60,
SpreadAdd = 0.8, SpreadAdd = 0.8,
SpreadAddMax = 15, SpreadAddMax = 15,
@ -1043,19 +1043,19 @@ do -- Sniper rifles
Sound_MagOut = "M16A2.MagOut", Sound_MagOut = "M16A2.MagOut",
Sound_MagIn = "M16A2.MagIn", Sound_MagIn = "M16A2.MagIn",
Delay = (60/700), Delay = (60/140),
Firemodes = { Firemodes = {
{ Mode = 1 }, { Mode = 1 },
}, },
Ammo = 5, Ammo = 5,
Damage = 99, Damage = 99,
Spread = 5/60, Spread = 5/60,
SpreadAdd = 3, SpreadAdd = 9,
SpreadAddMax = 9, SpreadAddMax = 18,
SpreadDecay_Start = 0, SpreadDecay_Start = 4,
SpreadDecay_End = 12, SpreadDecay_End = 22,
SpreadDecay_RampTime = 0.3, SpreadDecay_RampTime = 1,
Speed_Move = 0.75, Speed_Move = 0.75,
Speed_Aiming = 0.75, Speed_Aiming = 0.75,
@ -1095,6 +1095,11 @@ do -- Machine guns
SpreadDecay_End = 36, SpreadDecay_End = 36,
SpreadDecay_RampTime = 0.6, SpreadDecay_RampTime = 0.6,
Speed_Move = 0.8,
Speed_Aiming = 0.75,
Speed_Reloading = 0.5,
Speed_Firing = 0.334,
Features = "firearm", Features = "firearm",
} }
@ -1124,6 +1129,11 @@ do -- Machine guns
SpreadDecay_End = 36, SpreadDecay_End = 36,
SpreadDecay_RampTime = 0.4, SpreadDecay_RampTime = 0.4,
Speed_Move = 0.8,
Speed_Aiming = 0.8,
Speed_Reloading = 0.75,
Speed_Firing = 0.334,
Features = "firearm", Features = "firearm",
} }