From fe4d4e12c7797831eb7e34d1be25eff93bdb50bd Mon Sep 17 00:00:00 2001
From: Fesiug <publicfesiug@outlook.com>
Date: Sat, 9 Dec 2023 20:39:23 -0500
Subject: [PATCH] Suppression factors in magazine size way more

---
 .../gamemode/modules/gui/cl_spawnmenu.lua     | 26 +++++++++++--------
 .../gamemode/modules/weapons/sh_weapons.lua   | 24 ++++++++++++-----
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/gamemodes/benny/gamemode/modules/gui/cl_spawnmenu.lua b/gamemodes/benny/gamemode/modules/gui/cl_spawnmenu.lua
index ed6b5ba..2fa7063 100644
--- a/gamemodes/benny/gamemode/modules/gui/cl_spawnmenu.lua
+++ b/gamemodes/benny/gamemode/modules/gui/cl_spawnmenu.lua
@@ -52,18 +52,22 @@ local mewer = {
 		Size = 12,
 		Font = "Benny_10",
 		Stat = function( class )
-			local dps = class.Damage * (1/class.Delay)
-			local dpscalc = rmt1c( dps, 100, 373 )
-			local magbonus-- = math.Remap( class.Ammo, 16, 40*2, -0.05, 0.3 )
-			if class.Ammo > 20 then
-				magbonus = 1-rmt1c( class.Ammo, 80, 20 )
-				magbonus = magbonus * 0.5
-			else
-				magbonus = math.Remap( class.Ammo, 5, 20, -0.75, -0.1 )
+			local weight_1, weight_2 = 1, 3
+			local totalscore = (weight_1 + weight_2)
+			weight_1, weight_2 = weight_1/totalscore, weight_2/totalscore
+			local score_1, score_2 = 1, 1
+
+			local truedelay = (1/class.Delay)
+			if class.Firemodes[1].Mode == 1 then
+				truedelay = math.min( truedelay, 60/300 )
 			end
-			local meowzor = math.ease.OutSine( math.Clamp( dpscalc + magbonus, 0, 1 ) )
-			print( class.Name, dps, dpscalc, math.Round( magbonus, 2 ), meowzor )
-			return meowzor
+			score_1 = rmt1c( class.Damage * truedelay, 100, 350 )
+			score_1 = score_1 * weight_1
+
+			score_2 = rmt1c( class.Ammo, 16, 42 )
+			score_2 = score_2 * weight_2
+
+			return score_1 + score_2
 		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."
 	},
diff --git a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua
index f5e2b93..3b9a159 100644
--- a/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua
+++ b/gamemodes/benny/gamemode/modules/weapons/sh_weapons.lua
@@ -464,7 +464,7 @@ do -- Handguns
 		Delay = (60/900),
 		Firemodes = FIREMODE_AUTOSEMI,
 		Ammo = 17,
-		Damage = 18,
+		Damage = 22,
 		Spread = 60/60,
 		SpreadAdd = 0.8,
 		SpreadAddMax = 15,
@@ -1043,19 +1043,19 @@ do -- Sniper rifles
 		Sound_MagOut = "M16A2.MagOut",
 		Sound_MagIn = "M16A2.MagIn",
 
-		Delay = (60/700),
+		Delay = (60/140),
 		Firemodes = {
 			{ Mode = 1 },
 		},
 		Ammo = 5,
 		Damage = 99,
 		Spread = 5/60,
-		SpreadAdd = 3,
-		SpreadAddMax = 9,
+		SpreadAdd = 9,
+		SpreadAddMax = 18,
 		
-		SpreadDecay_Start = 0,
-		SpreadDecay_End = 12,
-		SpreadDecay_RampTime = 0.3,
+		SpreadDecay_Start = 4,
+		SpreadDecay_End = 22,
+		SpreadDecay_RampTime = 1,
 
 		Speed_Move = 0.75,
 		Speed_Aiming = 0.75,
@@ -1095,6 +1095,11 @@ do -- Machine guns
 		SpreadDecay_End = 36,
 		SpreadDecay_RampTime = 0.6,
 
+		Speed_Move = 0.8,
+		Speed_Aiming = 0.75,
+		Speed_Reloading = 0.5,
+		Speed_Firing = 0.334,
+
 		Features = "firearm",
 	}
 
@@ -1124,6 +1129,11 @@ do -- Machine guns
 		SpreadDecay_End = 36,
 		SpreadDecay_RampTime = 0.4,
 
+		Speed_Move = 0.8,
+		Speed_Aiming = 0.8,
+		Speed_Reloading = 0.75,
+		Speed_Firing = 0.334,
+
 		Features = "firearm",
 	}