Fixed hostage rescue zone positions

Author: JimmyWoodhouse

src/SourceEngine.Demo.Parser/DP/Entity.cs

@@ -140,35 +140,27 @@ class PropertyEntry
 		 * The single purpose for this is to see what kind of values an entity has. You can check this faster with this thing.
 		 * Really, ignore it if you don't know what you're doing.
 		 */
-		[Obsolete("Don't use this attribute. It is only avaible for debugging. Bind to the correct event instead."
-		#if !DEBUG
-			, true
-		#endif
-			)]
+		[Obsolete("Don't use this attribute. It is only avaible for debugging. Bind to the correct event instead.", false)]
 		#pragma warning disable 0067 // this is unused in release builds, just as it should be
-		public event EventHandler<PropertyUpdateEventArgs<object>>  DataRecivedDontUse;
+		public event EventHandler<PropertyUpdateEventArgs<object>> DataRecivedDontUse;
 		#pragma warning restore 0067
 
-		[Conditional("DEBUG")]
+		//[Conditional("DEBUG")]
 		private void FireDataReceived_DebugEvent(object val, Entity e)
 		{
-			#if DEBUG
 			#pragma warning disable 0618
 			if (DataRecivedDontUse != null)
 				DataRecivedDontUse(this, new PropertyUpdateEventArgs<object>(val, e, this));
 			#pragma warning restore 0618
-			#endif
 		}
 
 
-		[Conditional("DEBUG")]
+		//[Conditional("DEBUG")]
 		private void DeleteDataRecived()
 		{
-			#if DEBUG
 			#pragma warning disable 0618
 			DataRecivedDontUse = null;
 			#pragma warning restore 0618
-			#endif
 		}
 
 		public void Decode(IBitStream stream, Entity e)
@@ -291,7 +283,7 @@ public override string ToString()
 			return string.Format("[PropertyEntry: Entry={0}]", Entry);
 		}
 
-		[Conditional("DEBUG")]
+		//[Conditional("DEBUG")]
 		public void CheckBindings(Entity e)
 		{
 			if (IntRecived != null && this.Entry.Prop.Type != SendPropertyType.Int)

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

@@ -187,7 +187,7 @@ public static void Apply(GameEvent rawEvent, DemoParser parser, bool parseChicke
                 }
 
                 //makes sure that bombsite triggers' vector values have been set if they exist
-                parser.HandleBombSites();
+                parser.HandleBombSitesAndRescueZones();
 
                 //checks if the map contains bombsite triggers to figure out the gamemode
                 var bombsiteCenterA = parser.bombsiteACenter;
@@ -343,9 +343,13 @@ public static void Apply(GameEvent rawEvent, DemoParser parser, bool parseChicke
 					if (hurt.Attacker != null && hurt.Weapon.Class != EquipmentClass.Grenade && hurt.Attacker.Weapons.Any ()) {
 						var originalString = hurt.Weapon.OriginalString; // original string is lost when setting hurt.Weapon to hurt.Attacker.ActiveWeapon
 					    hurt.Weapon = new Player(hurt.Attacker).ActiveWeapon;
-						hurt.Weapon.Owner = new Player(hurt.Weapon.Owner);
-						hurt.Weapon.OriginalString = originalString;
-						hurt.WeaponString = originalString;
+
+						if (hurt.Weapon != null)
+						{
+							hurt.Weapon.Owner = new Player(hurt.Weapon.Owner);
+							hurt.Weapon.OriginalString = originalString;
+							hurt.WeaponString = originalString;
+						}
 					}
 
 					hurt.TimeInRound = parser.CurrentTime - timestampFreezetimeEnded;

src/SourceEngine.Demo.Parser/DemoParser.cs

@@ -387,6 +387,7 @@ public IEnumerable<Player> PlayingParticipants {
 		public int hostageAIndex { get; internal set; } = -1;
 		public int hostageBIndex { get; internal set; } = -1;
 		public int rescueZoneIndex { get; internal set; } = -1;
+		public Vector rescueZoneCenter { get; internal set; } = new Vector();
 
 		/// <summary>
 		/// The ID of the CT-Team
@@ -784,7 +785,7 @@ private void BindEntites()
 			//Okay, first the team-stuff.
 			HandleTeamScores();
 
-			HandleBombSites();
+			HandleBombSitesAndRescueZones();
 
 			HandlePlayers();
 
@@ -1198,28 +1199,78 @@ void HandleWeapon (object sender, EntityCreatedEventArgs e)
 		}
 
 		public List<BoundingBoxInformation> triggers = new List<BoundingBoxInformation>();
-		public void HandleBombSites()
+		public void HandleBombSitesAndRescueZones()
 		{
 			SendTableParser.FindByName("CCSPlayerResource").OnNewEntity += (s1, newResource) => {
+				// defuse
 				newResource.Entity.FindProperty("m_bombsiteCenterA").VectorRecived += (s2, center) => {
 					bombsiteACenter = center.Value;
 				};
 				newResource.Entity.FindProperty("m_bombsiteCenterB").VectorRecived += (s3, center) => {
 					bombsiteBCenter = center.Value;
 				};
+
+				// hostage (for multiple hostage rescue zones, use 001, 002 and 003)
+				newResource.Entity.FindProperty("m_hostageRescueX.000").DataRecivedDontUse += (s4, center) =>
+				{
+					if (!(rescueZoneCenter.X != 0 && Convert.ToSingle(center.Value) == 0))
+					{
+						rescueZoneCenter.X = Convert.ToSingle(center.Value);
+					}
+				};
+				newResource.Entity.FindProperty("m_hostageRescueY.000").DataRecivedDontUse += (s5, center) =>
+				{
+					if (!(rescueZoneCenter.Y != 0 && Convert.ToSingle(center.Value) == 0))
+					{
+						rescueZoneCenter.Y = Convert.ToSingle(center.Value);
+					}
+				};
+				newResource.Entity.FindProperty("m_hostageRescueZ.000").DataRecivedDontUse += (s6, center) =>
+				{
+					if (!(rescueZoneCenter.Z != 0 && Convert.ToSingle(center.Value) == 0))
+					{
+						rescueZoneCenter.Z = Convert.ToSingle(center.Value);
+					}
+				};
 			};
 
 			SendTableParser.FindByName("CBaseTrigger").OnNewEntity += (s1, newResource) => {
 
 				BoundingBoxInformation trigger = new BoundingBoxInformation(newResource.Entity.ID);
 				triggers.Add(trigger);
 
+				// if bombsites, it gets x,y,z values from the world origin (0,0,0)
+				// if hostage rescue zones, it gets x,y,z values relative to the entity's origin
 				newResource.Entity.FindProperty("m_Collision.m_vecMins").VectorRecived += (s2, vector) => {
-					trigger.Min = vector.Value;
+					if (bombsiteACenter.Absolute == 0 && bombsiteBCenter.Absolute == 0) // is hostage
+					{
+						trigger.Min = new Vector()
+						{
+							X = rescueZoneCenter.X + vector.Value.X,
+							Y = rescueZoneCenter.Y + vector.Value.Y,
+							Z = rescueZoneCenter.Z + vector.Value.Z,
+						};
+					}
+					else // is defuse
+					{
+						trigger.Min = vector.Value;
+					}
 				};
 
 				newResource.Entity.FindProperty("m_Collision.m_vecMaxs").VectorRecived += (s3, vector) => {
-					trigger.Max = vector.Value;
+					if (bombsiteACenter.Absolute == 0 && bombsiteBCenter.Absolute == 0) // is hostage
+					{
+						trigger.Max = new Vector()
+						{
+							X = rescueZoneCenter.X + vector.Value.X,
+							Y = rescueZoneCenter.Y + vector.Value.Y,
+							Z = rescueZoneCenter.Z + vector.Value.Z,
+						};
+					}
+					else // is defuse
+					{
+						trigger.Max = vector.Value;
+					}
 				};
 			};
 

src/SourceEngine.Demo.Stats/DemoProcessor.cs

@@ -829,7 +829,7 @@ public AllStats CreateFiles(ProcessedData processedData, bool createJsonFile = t
 
 			allStats.bombsiteStats = GetBombsiteStats(processedData);
 			allStats.hostageStats = GetHostageStats(processedData);
-			allStats.rescueZoneStats = GetRescueZoneStats(processedData);
+			allStats.rescueZoneStats = GetRescueZoneStats();
 
 			string[] nadeTypes = { "Flash", "Smoke", "HE", "Incendiary", "Decoy" };
 			var nadeGroups = GetNadeGroups(processedData, nadeTypes);
@@ -1420,7 +1420,7 @@ public List<hostageStats> GetHostageStats(ProcessedData processedData)
 			return hostageStats;
 		}
 
-		public List<rescueZoneStats> GetRescueZoneStats(ProcessedData processedData)
+		public List<rescueZoneStats> GetRescueZoneStats()
 		{
 			List<rescueZoneStats> rescueZoneStats = new List<rescueZoneStats>();