Added EquipmentClass & EquipmentType to KillsStats + Created the concept of EquipmentType in the parser

Author: JimmyWoodhouse

Directory.Build.props

@@ -15,7 +15,7 @@
         <Company>Source Engine Discord</Company>
         <Copyright>© 2014 EHVAG, 2020 Source Engine Discord and contributors</Copyright>
         <Product>SourceEngine.Demo</Product>
-        <Version>2.0.3</Version>
+        <Version>2.0.4</Version>
     </PropertyGroup>
 
     <PropertyGroup Label="Package Metadata">

src/SourceEngine.Demo.Parser/Events.cs

@@ -449,6 +449,13 @@ public EquipmentClass Class
 				return (EquipmentClass)(((int)Weapon / 100) + 1);
 			}
 		}
+		public EquipmentType Type
+		{
+			get
+			{
+				return GetEquipmentType(Weapon, Class);
+			}
+		}
 
 		public string OriginalString { get; set; }
 
@@ -491,6 +498,39 @@ internal Equipment(string originalString, string skin)
 
 		const string WEAPON_PREFIX = "weapon_";
 
+		private EquipmentType GetEquipmentType(EquipmentElement weapon, EquipmentClass weaponClass)
+		{
+			switch (weaponClass)
+			{
+				case EquipmentClass.Heavy:
+					if (weapon == EquipmentElement.M249 || weapon == EquipmentElement.Negev)
+						return EquipmentType.LMG;
+					else
+						return EquipmentType.Shotgun;
+				case EquipmentClass.Rifle:
+					if (weapon == EquipmentElement.Scout || weapon == EquipmentElement.AWP)
+						return EquipmentType.Sniper;
+					else
+						return EquipmentType.AssaultRifle;
+				case EquipmentClass.Equipment:
+					if (weapon == EquipmentElement.Zeus)
+						return EquipmentType.Zeus;
+					else if (weapon == EquipmentElement.Knife)
+						return EquipmentType.Knife;
+					else
+						return EquipmentType.Shotgun;
+				case EquipmentClass.Pistol:
+					return EquipmentType.Pistol;
+				case EquipmentClass.SMG:
+					return EquipmentType.SMG;
+				case EquipmentClass.Grenade:
+					return EquipmentType.Grenade;
+				default:
+					return EquipmentType.Unknown;
+
+			}
+		}
+
 		public static EquipmentElement MapEquipment(string OriginalString)
 		{
 			EquipmentElement weapon = EquipmentElement.Unknown;
@@ -674,7 +714,7 @@ public enum EquipmentElement
 	{
 		Unknown = 0,
 
-		//Pistoles
+		//Pistols
 		P2000 = 1,
 		Glock = 2,
 		P250 = 3,
@@ -745,4 +785,19 @@ public enum EquipmentClass
 		Equipment = 5,
 		Grenade = 6,
 	}
+
+	public enum EquipmentType // added to separate weapon groups better
+	{
+		Unknown = 0,
+		Pistol = 1,
+		SMG = 2,
+		LMG = 3,
+		Shotgun = 4,
+		AssaultRifle = 5,
+		Sniper = 6,
+		Grenade = 7,
+		Zeus = 8,
+		Knife = 9,
+		Equipment = 10,
+	}
 }

src/SourceEngine.Demo.Stats/DemoProcessor.cs

@@ -1373,11 +1373,15 @@ public List<killsStats> GetKillsStats(ProcessedData processedData, Dictionary<lo
 						long assisterSteamId = playerKilledEvent.Assister != null ? ((playerKilledEvent.Assister.SteamID == 0) ? GetSteamIdByPlayerName(playerNames, playerKilledEvent.Assister.Name) : playerKilledEvent.Assister.SteamID) : 0;
 
 						var weaponUsed = weaponKillers.ElementAt(i).Weapon.ToString();
+						var weaponUsedClass = weaponKillers.ElementAt(i).Class.ToString();
+						var weaponUsedType = weaponKillers.ElementAt(i).Type.ToString();
 						var numOfPenetrations = penetrations.ElementAt(i);
 
 						if (weaponUsed == null || weaponUsed == string.Empty)
 						{
 							weaponUsed = weaponKillers.ElementAt(i).OriginalString.ToString();
+							weaponUsedClass = "Unknown";
+							weaponUsedType = "Unknown";
 						}
 
 						bool firstKillOfTheRound = (killsStats.Any(k => k.Round == round && k.FirstKillOfTheRound == true)) ? false : true;
@@ -1387,6 +1391,8 @@ public List<killsStats> GetKillsStats(ProcessedData processedData, Dictionary<lo
 							Round = round,
 							TimeInRound = playerKilledEvent.TimeInRound,
 							Weapon = weaponUsed,
+							WeaponClass = weaponUsedClass,
+                            WeaponType = weaponUsedType,
 							KillerSteamID = killerSteamId,
 							KillerBotTakeover = playerKilledEvent.KillerBotTakeover,
 							XPositionKill = double.Parse(killPositionSplit[0]),

src/SourceEngine.Demo.Stats/Models/KillsStats.cs

@@ -5,6 +5,8 @@ public class killsStats
         public int Round { get; set; }
         public double TimeInRound { get; set; }
         public string Weapon { get; set; }
+        public string WeaponClass { get; set; }
+        public string WeaponType { get; set; }
         public long KillerSteamID { get; set; }
         public bool KillerBotTakeover { get; internal set; }
         public double XPositionKill { get; set; }