Added rescueZoneStats + Added trigger location information for bombsites + rescue zones + Minor other changes

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.1.1</Version>
+        <Version>2.2.0</Version>
     </PropertyGroup>
 
     <PropertyGroup Label="Package Metadata">

src/SourceEngine.Demo.Parser/DP/Handler/GameEventHandler.cs

@@ -574,9 +574,11 @@ public static void Apply(GameEvent rawEvent, DemoParser parser, bool parseChicke
 
 					//currently assumes only one rescue zone,
 					//might be able to use "site" in 'eventDescriptor' or 'rawEvent' to determine which rescue zone was used ?
-					rescued.RescueZone = (int)data["site"];
+					int rescueZone = (int)data["site"];
+					parser.rescueZoneIndex = rescueZone;
+					rescued.RescueZone = rescueZone;
 
-                    int hostage = (int)data["hostage"];
+					int hostage = (int)data["hostage"];
 
                     //works out which hostage was rescued
                     if (hostage == parser.hostageAIndex)
@@ -594,13 +596,13 @@ public static void Apply(GameEvent rawEvent, DemoParser parser, bool parseChicke
                         if (parser.hostageAIndex == -1)
                         {
                             rescued.Hostage = 'A';
-                            parser.hostageAIndex = hostage;
+							parser.hostageAIndex = hostage;
 							rescued.HostageIndex = parser.hostageAIndex;
 						}
                         else if (parser.hostageBIndex == -1)
                         {
                             rescued.Hostage = 'B';
-                            parser.hostageBIndex = hostage;
+							parser.hostageBIndex = hostage;
 							rescued.HostageIndex = parser.hostageBIndex;
 						}
                         else

src/SourceEngine.Demo.Parser/DemoParser.cs

@@ -386,6 +386,7 @@ public IEnumerable<Player> PlayingParticipants {
 		/// </summary>
 		public int hostageAIndex { get; internal set; } = -1;
 		public int hostageBIndex { get; internal set; } = -1;
+		public int rescueZoneIndex { get; internal set; } = -1;
 
 		/// <summary>
 		/// The ID of the CT-Team
@@ -1196,7 +1197,7 @@ void HandleWeapon (object sender, EntityCreatedEventArgs e)
 			}
 		}
 
-		internal List<BoundingBoxInformation> triggers = new List<BoundingBoxInformation>();
+		public List<BoundingBoxInformation> triggers = new List<BoundingBoxInformation>();
 		public void HandleBombSites()
 		{
 			SendTableParser.FindByName("CCSPlayerResource").OnNewEntity += (s1, newResource) => {

src/SourceEngine.Demo.Parser/Structs.cs

@@ -286,7 +286,7 @@ public static PlayerInfo ParseFrom(BinaryReader reader)
 	/// <summary>
 	/// This contains information about Collideables (specific edicts), mostly used for bombsites. 
 	/// </summary>
-	class BoundingBoxInformation
+	public class BoundingBoxInformation
 	{
 		public int Index { get; private set; }
 		public Vector Min { get; set; }

src/SourceEngine.Demo.Stats/DemoProcessor.cs

@@ -829,6 +829,7 @@ public AllStats CreateFiles(ProcessedData processedData, bool createJsonFile = t
 
 			allStats.bombsiteStats = GetBombsiteStats(processedData);
 			allStats.hostageStats = GetHostageStats(processedData);
+			allStats.rescueZoneStats = GetRescueZoneStats();
 
 			string[] nadeTypes = { "Flash", "Smoke", "HE", "Incendiary", "Decoy" };
 			var nadeGroups = GetNadeGroups(processedData, nadeTypes);
@@ -1340,6 +1341,9 @@ public List<bombsiteStats> GetBombsiteStats(ProcessedData processedData)
 		{
 			List<bombsiteStats> bombsiteStats = new List<bombsiteStats>();
 
+			var bombsiteATrigger = dp.triggers.Where(x => x.Index == dp.bombsiteAIndex).FirstOrDefault();
+			var bombsiteBTrigger = dp.triggers.Where(x => x.Index == dp.bombsiteBIndex).FirstOrDefault();
+
 			List<char> bombsitePlants = new List<char>(processedData.BombsitePlantValues.Select(x => x.Bombsite));
 			List<char> bombsiteExplosions = new List<char>(processedData.BombsiteExplodeValues.Select(x => x.Bombsite));
 			List<char> bombsiteDefuses = new List<char>(processedData.BombsiteDefuseValues.Select(x => x.Bombsite));
@@ -1352,8 +1356,32 @@ public List<bombsiteStats> GetBombsiteStats(ProcessedData processedData)
 			int explosionsB = bombsiteExplosions.Where(b => b.ToString().Equals("B")).Count();
 			int defusesB = bombsiteDefuses.Where(b => b.ToString().Equals("B")).Count();
 
-			bombsiteStats.Add(new bombsiteStats() { Bombsite = 'A', Plants = plantsA, Explosions = explosionsA, Defuses = defusesA });
-			bombsiteStats.Add(new bombsiteStats() { Bombsite = 'B', Plants = plantsB, Explosions = explosionsB, Defuses = defusesB });
+			bombsiteStats.Add(new bombsiteStats()
+			{
+				Bombsite = 'A',
+				Plants = plantsA,
+				Explosions = explosionsA,
+				Defuses = defusesA,
+				XPositionMin = bombsiteATrigger?.Min.X,
+				YPositionMin = bombsiteATrigger?.Min.Y,
+				ZPositionMin = bombsiteATrigger?.Min.Z,
+				XPositionMax = bombsiteATrigger?.Max.X,
+				YPositionMax = bombsiteATrigger?.Max.Y,
+				ZPositionMax = bombsiteATrigger?.Max.Z,
+			});
+			bombsiteStats.Add(new bombsiteStats()
+			{
+				Bombsite = 'B',
+				Plants = plantsB,
+				Explosions = explosionsB,
+				Defuses = defusesB,
+				XPositionMin = bombsiteBTrigger?.Min.X,
+				YPositionMin = bombsiteBTrigger?.Min.Y,
+				ZPositionMin = bombsiteBTrigger?.Min.Z,
+				XPositionMax = bombsiteBTrigger?.Max.X,
+				YPositionMax = bombsiteBTrigger?.Max.Y,
+				ZPositionMax = bombsiteBTrigger?.Max.Z,
+			});
 
 			return bombsiteStats;
 		}
@@ -1365,21 +1393,50 @@ public List<hostageStats> GetHostageStats(ProcessedData processedData)
 			List<char> hostagePickedUps = new List<char>(processedData.HostagePickedUpValues.Select(x => x.Hostage));
 			List<char> hostageRescues = new List<char>(processedData.HostageRescueValues.Select(x => x.Hostage));
 
-			var hostageIndexA = processedData.HostageRescueValues.Where(r => r.Hostage == 'A').FirstOrDefault()?.HostageIndex;
-			var hostageIndexB = processedData.HostageRescueValues.Where(r => r.Hostage == 'B').FirstOrDefault()?.HostageIndex;
-
 			int pickedUpsA = hostagePickedUps.Where(b => b.ToString().Equals("A")).Count();
 			int pickedUpsB = hostagePickedUps.Where(b => b.ToString().Equals("B")).Count();
 
 			int rescuesA = hostageRescues.Where(b => b.ToString().Equals("A")).Count();
 			int rescuesB = hostageRescues.Where(b => b.ToString().Equals("B")).Count();
 
-			hostageStats.Add(new hostageStats() { Hostage = 'A', HostageIndex = hostageIndexA, PickedUps = pickedUpsA, Rescues = rescuesA });
-			hostageStats.Add(new hostageStats() { Hostage = 'B', HostageIndex = hostageIndexB, PickedUps = pickedUpsB, Rescues = rescuesB });
+			hostageStats.Add(new hostageStats()
+			{
+				Hostage = 'A',
+				HostageIndex = dp.hostageAIndex,
+				PickedUps = pickedUpsA,
+				Rescues = rescuesA,
+			});
+			hostageStats.Add(new hostageStats()
+			{
+				Hostage = 'B',
+				HostageIndex = dp.hostageBIndex,
+				PickedUps = pickedUpsB,
+				Rescues = rescuesB,
+			});
 
 			return hostageStats;
 		}
 
+		public List<rescueZoneStats> GetRescueZoneStats()
+		{
+			List<rescueZoneStats> rescueZoneStats = new List<rescueZoneStats>();
+
+			var rescueZoneTrigger = dp.triggers.FirstOrDefault(); // assume only one rescue zone, (int)data["site"] in GameEventHandler.cs does not line up with newResource.Entity.ID at SendTableParser.FindByName("CBaseTrigger").OnNewEntity
+
+			rescueZoneStats.Add(new rescueZoneStats()
+			{
+				rescueZoneIndex = dp.rescueZoneIndex, // doesn't line up with the trigger Entity ID
+				XPositionMin = rescueZoneTrigger?.Min.X,
+				YPositionMin = rescueZoneTrigger?.Min.Y,
+				ZPositionMin = rescueZoneTrigger?.Min.Z,
+				XPositionMax = rescueZoneTrigger?.Max.X,
+				YPositionMax = rescueZoneTrigger?.Max.Y,
+				ZPositionMax = rescueZoneTrigger?.Max.Z,
+			});
+
+			return rescueZoneStats;
+		}
+
 		public List<IEnumerable<NadeEventArgs>> GetNadeGroups(ProcessedData processedData, string[] nadeTypes)
 		{
 			var flashes = processedData.GrenadeValues.Where(f => f.NadeType.ToString().Equals(nadeTypes[0]));

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

@@ -13,6 +13,7 @@ public class AllStats
         public List<roundsStats> roundsStats { get; set; }
         public List<bombsiteStats> bombsiteStats { get; set; }
         public List<hostageStats> hostageStats { get; set; }
+        public List<rescueZoneStats> rescueZoneStats { get; set; }
         public List<grenadesTotalStats> grenadesTotalStats { get; set; }
         public List<grenadesSpecificStats> grenadesSpecificStats { get; set; }
         public List<killsStats> killsStats { get; set; }

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

@@ -6,6 +6,12 @@ public class bombsiteStats
         public int Plants { get; set; }
         public int Explosions { get; set; }
         public int Defuses { get; set; }
+        public double? XPositionMin { get; set; }
+        public double? YPositionMin { get; set; }
+        public double? ZPositionMin { get; set; }
+        public double? XPositionMax { get; set; }
+        public double? YPositionMax { get; set; }
+        public double? ZPositionMax { get; set; }
 
         public bombsiteStats() { }
     }

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

@@ -0,0 +1,13 @@
+namespace SourceEngine.Demo.Stats.Models
+{
+	public class rescueZoneStats
+    {
+        public int? rescueZoneIndex { get; set; } // doesn't line up with the trigger Entity ID
+        public double? XPositionMin { get; set; }
+        public double? YPositionMin { get; set; }
+        public double? ZPositionMin { get; set; }
+        public double? XPositionMax { get; set; }
+        public double? YPositionMax { get; set; }
+        public double? ZPositionMax { get; set; }
+    }
+}