v1.1.14 - Fixed logic for Wingman Hostage matches + added tests + minor formatting changes

Author: JimmyWoodhouse

TopStatsWaffle.Tests/TopStatsWaffleTests.cs

@@ -154,7 +154,7 @@ public void Should_return_kills_stats_correctly()
 			}
 
 			[Fact]
-			public void Should_return_map_info_correctly()
+			public void Should_return_map_info_correctly_for_defuse_maps()
 			{
 				// Arrange
 
@@ -168,6 +168,99 @@ public void Should_return_map_info_correctly()
 				allStats.mapInfo.TestType.ShouldBe("Defuse");
 			}
 
+			[Fact]
+			public void Should_return_map_info_correctly_for_hostage_maps()
+			{
+				// Arrange
+				var ProcessedData2 = ProcessedData;
+				ProcessedData2.DemoInformation = new DemoInformation()
+				{
+					DemoName = "demo2",
+					MapName = "de_testmap2",
+					TestDate = new DateTime(2020, 1, 1, 0, 0, 0).ToString(),
+					TestType = "Hostage",
+				};
+				ProcessedData2.MatchStartValues = new List<MatchStartedEventArgs>()
+				{
+					new MatchStartedEventArgs
+					{
+						Mapname = "de_testmap2",
+						HasBombsites = false,
+					}
+				};
+
+				// Act
+				AllStats allStats = MatchData.CreateFiles(ProcessedData, false);
+
+				// Assess
+				allStats.mapInfo.DemoName.ShouldBe("demo2");
+				allStats.mapInfo.MapName.ShouldBe("de_testmap2");
+				allStats.mapInfo.TestDate.ShouldBe(new DateTime(2020, 1, 1, 0, 0, 0).ToString());
+				allStats.mapInfo.TestType.ShouldBe("Hostage");
+			}
+
+			[Fact]
+			public void Should_return_map_info_correctly_for_wingman_defuse_maps()
+			{
+				// Arrange
+				var ProcessedData3 = ProcessedData;
+				ProcessedData3.DemoInformation = new DemoInformation()
+				{
+					DemoName = "demo3",
+					MapName = "de_testmap3",
+					TestDate = new DateTime(2020, 1, 1, 0, 0, 0).ToString(),
+					TestType = "Wingman",
+				};
+				ProcessedData3.MatchStartValues = new List<MatchStartedEventArgs>()
+				{
+					new MatchStartedEventArgs
+					{
+						Mapname = "de_testmap3",
+						HasBombsites = true,
+					}
+				};
+
+				// Act
+				AllStats allStats = MatchData.CreateFiles(ProcessedData, false);
+
+				// Assess
+				allStats.mapInfo.DemoName.ShouldBe("demo3");
+				allStats.mapInfo.MapName.ShouldBe("de_testmap3");
+				allStats.mapInfo.TestDate.ShouldBe(new DateTime(2020, 1, 1, 0, 0, 0).ToString());
+				allStats.mapInfo.TestType.ShouldBe("Wingman");
+			}
+
+			[Fact]
+			public void Should_return_map_info_correctly_for_wingman_hostage_maps()
+			{
+				// Arrange
+				var ProcessedData3 = ProcessedData;
+				ProcessedData3.DemoInformation = new DemoInformation()
+				{
+					DemoName = "demo4",
+					MapName = "de_testmap4",
+					TestDate = new DateTime(2020, 1, 1, 0, 0, 0).ToString(),
+					TestType = "Wingman",
+				};
+				ProcessedData3.MatchStartValues = new List<MatchStartedEventArgs>()
+				{
+					new MatchStartedEventArgs
+					{
+						Mapname = "de_testmap4",
+						HasBombsites = false,
+					}
+				};
+
+				// Act
+				AllStats allStats = MatchData.CreateFiles(ProcessedData, false);
+
+				// Assess
+				allStats.mapInfo.DemoName.ShouldBe("demo4");
+				allStats.mapInfo.MapName.ShouldBe("de_testmap4");
+				allStats.mapInfo.TestDate.ShouldBe(new DateTime(2020, 1, 1, 0, 0, 0).ToString());
+				allStats.mapInfo.TestType.ShouldBe("Wingman");
+			}
+
 			[Fact]
 			public void Should_return_player_stats_correctly()
 			{
@@ -344,7 +437,7 @@ public void Should_return_version_number_correctly()
 				AllStats allStats = MatchData.CreateFiles(ProcessedData, false);
 
 				// Assess
-				allStats.versionNumber.Version.ShouldBe("1.1.13");
+				allStats.versionNumber.Version.ShouldBe("1.1.14");
 			}
 
 			[Fact]

TopStatsWaffle/DemoProcessor.cs

@@ -32,6 +32,8 @@ public class PlayerWeapon
 
     public class MatchData
     {
+		private static DemoParser dp;
+
         public Dictionary<Type, List<object>> events = new Dictionary<Type, List<object>>();
 
         Dictionary<int, TickCounter> playerTicks = new Dictionary<int, TickCounter>();
@@ -183,7 +185,7 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool lowOu
             MatchData md = new MatchData();
 
             //Create demo parser instance
-            DemoParser dp = new DemoParser(File.OpenRead(file), parseChickens);
+            dp = new DemoParser(File.OpenRead(file), parseChickens);
 
             dp.ParseHeader();
 
@@ -578,13 +580,14 @@ public AllStats CreateFiles(ProcessedData processedData, bool createJsonFile = t
 
 			var dataAndPlayerNames = GetDataAndPlayerNames(processedData);
 
-			AllStats allStats = new AllStats();
-
-			allStats.versionNumber = GetVersionNumber();
-			allStats.supportedGamemodes = GetSupportedGamemodes();
-			allStats.mapInfo = GetMapInfo(processedData, mapNameSplit);
-			allStats.tanookiStats = processedData.tanookiStats;
-            allStats.playerStats = GetPlayerStats(processedData, dataAndPlayerNames.Data, dataAndPlayerNames.PlayerNames);
+			AllStats allStats = new AllStats
+			{
+				versionNumber = GetVersionNumber(),
+				supportedGamemodes = GetSupportedGamemodes(),
+				mapInfo = GetMapInfo(processedData, mapNameSplit),
+				tanookiStats = processedData.tanookiStats,
+				playerStats = GetPlayerStats(processedData, dataAndPlayerNames.Data, dataAndPlayerNames.PlayerNames)
+			};
 
 			var generalroundsStats = GetGeneralRoundsStats(processedData, dataAndPlayerNames.PlayerNames);
 			allStats.winnersStats = generalroundsStats.winnersStats;
@@ -664,7 +667,7 @@ public DataAndPlayerNames GetDataAndPlayerNames(ProcessedData processedData)
 
 		public versionNumber GetVersionNumber()
 		{
-			return new versionNumber() { Version = "1.1.13" };
+			return new versionNumber() { Version = "1.1.14" };
 		}
 
 		public List<string> GetSupportedGamemodes()
@@ -683,21 +686,24 @@ public mapInfo GetMapInfo(ProcessedData processedData, string[] mapNameSplit)
 			// attempts to get the gamemode
 			var roundsWonReasons = GetRoundsWonReasons(processedData.RoundEndReasonValues);
 
-			if (processedData.MatchStartValues.Any(m => m.HasBombsites) || processedData.BombsitePlantValues.Count() > 0 || roundsWonReasons.Any(w => w.ToString() == winReasonBombed) || roundsWonReasons.Any(w => w.ToString() == winReasonDefused) || roundsWonReasons.Any(w => w.ToString() == winReasonTSaved))
+			if (processedData.TeamPlayersValues.Any(t => t.Terrorists.Count() > 2 && processedData.TeamPlayersValues.Any(ct => ct.CounterTerrorists.Count() > 2)))
 			{
-				if (processedData.TeamPlayersValues.Any(t => t.Terrorists.Count() > 2 && processedData.TeamPlayersValues.Any(ct => ct.CounterTerrorists.Count() > 2)))
+				if (dp.bombsiteAIndex > -1 || dp.bombsiteBIndex > -1 || processedData.MatchStartValues.Any(m => m.HasBombsites))
 				{
 					mapInfo.GameMode = "Defuse";
 				}
-				else
+				else if ((dp.hostageAIndex > -1 || dp.hostageBIndex > -1) && !processedData.MatchStartValues.Any(m => m.HasBombsites))
 				{
-					mapInfo.GameMode = "Wingman";
+					mapInfo.GameMode = "Hostage";
+				}
+				else // what the hell is this gamemode ??
+				{
+					mapInfo.GameMode = "Unknown";
 				}
 			}
-			else // assumes it's hostage if no bomb events are triggered --- is there a better way to decide this since matches with no plants will fall into this category ???
-				 // maybe instead check the entity list for entities that are bombs or hostages?
+			else
 			{
-				mapInfo.GameMode = "Hostage";
+				mapInfo.GameMode = "Wingman";
 			}
 
 			return mapInfo;