Skip to content

Commit 2ed4d3a

Browse files
committed
Change Equipment.Type property to a string property named SubclassName
The underlying EquipmentType enum wasn't being used directly. Its definition had some redundancies with the EquipmentClass enum. Rename the property to something clearer; the difference between the terms "Type" and "Class" is vague.
1 parent 5333c17 commit 2ed4d3a

File tree

2 files changed

+14
-33
lines changed

2 files changed

+14
-33
lines changed

src/SourceEngine.Demo.Parser/Events.cs

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -474,27 +474,23 @@ public class Equipment
474474

475475
public EquipmentClass Class => (EquipmentClass)((int)Weapon / 100 + 1);
476476

477-
public EquipmentType Type
477+
public string SubclassName
478478
{
479479
get
480480
{
481481
return Weapon switch
482482
{
483-
EquipmentElement.M249 => EquipmentType.LMG,
484-
EquipmentElement.Negev => EquipmentType.LMG,
485-
EquipmentElement.Scout => EquipmentType.Sniper,
486-
EquipmentElement.AWP => EquipmentType.Sniper,
487-
EquipmentElement.Zeus => EquipmentType.Zeus,
488-
EquipmentElement.Knife => EquipmentType.Knife,
483+
EquipmentElement.M249 => "LMG",
484+
EquipmentElement.Negev => "LMG",
485+
EquipmentElement.Scout => "Sniper",
486+
EquipmentElement.AWP => "Sniper",
487+
EquipmentElement.Zeus => "Zeus",
488+
EquipmentElement.Knife => "Knife",
489489
_ => Class switch
490490
{
491-
EquipmentClass.Heavy => EquipmentType.Shotgun,
492-
EquipmentClass.Rifle => EquipmentType.AssaultRifle,
493-
EquipmentClass.Equipment => EquipmentType.Equipment,
494-
EquipmentClass.Pistol => EquipmentType.Pistol,
495-
EquipmentClass.SMG => EquipmentType.SMG,
496-
EquipmentClass.Grenade => EquipmentType.Grenade,
497-
_ => EquipmentType.Unknown
491+
EquipmentClass.Heavy => "Shotgun",
492+
EquipmentClass.Rifle => "AssaultRifle",
493+
_ => Class.ToString()
498494
}
499495
};
500496
}
@@ -754,19 +750,4 @@ public enum EquipmentClass
754750
Equipment = 5,
755751
Grenade = 6,
756752
}
757-
758-
public enum EquipmentType // added to separate weapon groups better
759-
{
760-
Unknown = 0,
761-
Pistol = 1,
762-
SMG = 2,
763-
LMG = 3,
764-
Shotgun = 4,
765-
AssaultRifle = 5,
766-
Sniper = 6,
767-
Grenade = 7,
768-
Zeus = 8,
769-
Knife = 9,
770-
Equipment = 10,
771-
}
772753
}

src/SourceEngine.Demo.Stats/DemoProcessor.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ public List<hostageStats> GetHostageStats(ProcessedData processedData)
13981398
{
13991399
List<hostageStats> hostageStats = new List<hostageStats>();
14001400

1401-
var hostageIndexA = processedData.HostageRescueValues.Where(r => r.Hostage == 'A').FirstOrDefault()?.HostageIndex;
1401+
var hostageIndexA = processedData.HostageRescueValues.Where(r => r.Hostage == 'A').FirstOrDefault()?.HostageIndex;
14021402
var hostageIndexB = processedData.HostageRescueValues.Where(r => r.Hostage == 'B').FirstOrDefault()?.HostageIndex;
14031403

14041404
List<char> hostagePickedUps = new List<char>(processedData.HostagePickedUpValues.Select(x => x.Hostage));
@@ -1539,7 +1539,7 @@ public List<killsStats> GetKillsStats(ProcessedData processedData, Dictionary<lo
15391539

15401540
var weaponUsed = weaponKillers.ElementAt(i).Weapon.ToString();
15411541
var weaponUsedClass = weaponKillers.ElementAt(i).Class.ToString();
1542-
var weaponUsedType = weaponKillers.ElementAt(i).Type.ToString();
1542+
var weaponUsedType = weaponKillers.ElementAt(i).SubclassName;
15431543
var numOfPenetrations = penetrations.ElementAt(i);
15441544

15451545
if (weaponUsed == null || weaponUsed == string.Empty)
@@ -1919,7 +1919,7 @@ public List<firstDamageStats> GetFirstDamageStats(ProcessedData processedData)
19191919
ZPositionVictim = firstDamage.ZPositionPlayer,
19201920
Weapon = firstDamage.Weapon.Weapon.ToString(),
19211921
WeaponClass = firstDamage.Weapon.Class.ToString(),
1922-
WeaponType = firstDamage.Weapon.Type.ToString(),
1922+
WeaponType = firstDamage.Weapon.SubclassName,
19231923
};
19241924

19251925
firstDamageStats[round - 1].FirstDamageToEnemyByPlayers.Add(firstDamageByPlayer);
@@ -2254,7 +2254,7 @@ public bool GetIfTeamSwapOrdersAreNormalOrderByHalfAndOvertimeCount(string half,
22542254
public static int? GetMinRoundsForWin(string testType)
22552255
{
22562256
string gamemode = testType.ToLower();
2257-
2257+
22582258
if (gamemode == "unknown")
22592259
{
22602260
return null;

0 commit comments

Comments
 (0)