v1.1.13 - Added TimeInRound to FeedbackMessages

Author: Jimmy T-W

TopStatsWaffle.Tests/TopStatsWaffleTests.cs

@@ -344,7 +344,7 @@ public void Should_return_version_number_correctly()
 				AllStats allStats = MatchData.CreateFiles(ProcessedData, false);
 
 				// Assess
-				allStats.versionNumber.Version.ShouldBe("1.1.11");
+				allStats.versionNumber.Version.ShouldBe("1.1.13");
 			}
 
 			[Fact]
@@ -412,6 +412,7 @@ public void MockData()
 					YLastAlivePosition = 130,
 					ZLastAlivePosition = 140,
 					Message = "bad map",
+					TimeInRound = 31.7568,
 				}
 			};
 

TopStatsWaffle/DemoProcessor.cs

@@ -266,6 +266,19 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool lowOu
 					string[] currentPositions = SplitPositionString(player?.Position.ToString());
 					string[] lastAlivePositions = playerAlive ? null : SplitPositionString(player?.LastAlivePosition.ToString());
 
+					var roundsEndedEvents = md.events.Where(k => k.Key.Name.ToString() == "RoundEndedEventArgs").Select(v => v.Value);
+					var freezetimesEndedEvents = md.events.Where(k => k.Key.Name.ToString() == "FreezetimeEndedEventArgs").Select(v => v.Value).ElementAt(0);
+
+					int numOfRoundsEnded = roundsEndedEvents.Count() > 0 ? roundsEndedEvents.ElementAt(0).Count() : 0;
+					int numOfFreezetimesEnded = freezetimesEndedEvents.Count();
+
+					float timeInRound = 0; // Stays as '0' if sent during freezetime
+					if (numOfFreezetimesEnded > numOfRoundsEnded)
+					{
+						var freezetimeEnded = (FreezetimeEndedEventArgs)freezetimesEndedEvents.LastOrDefault(); // would it be better to use '.OrderByDescending(f => f.TimeEnd).FirstOrDefault()' ?
+						timeInRound = dp.CurrentTime - freezetimeEnded.TimeEnd;
+					}
+
 					FeedbackMessage feedbackMessage = new FeedbackMessage()
 					{
 						Round = round,
@@ -277,7 +290,8 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool lowOu
 						XLastAlivePosition = (lastAlivePositions != null) ? (double?)double.Parse(lastAlivePositions[1]) : null,
 						YLastAlivePosition = (lastAlivePositions != null) ? (double?)double.Parse(lastAlivePositions[2]) : null,
 						ZLastAlivePosition = (lastAlivePositions != null) ? (double?)double.Parse(lastAlivePositions[3]) : null,
-						Message = text
+						Message = text,
+						TimeInRound = timeInRound, // counts messages sent after the round_end event fires as the next round, set to '0' as if it was the next round's warmup (done this way instead of using round starts to avoid potential issues when restarting rounds)
 					};
 
                     md.addEvent(typeof(FeedbackMessage), feedbackMessage);
@@ -294,9 +308,24 @@ public static MatchData FromDemoFile(string file, bool parseChickens, bool lowOu
                 // if round_freeze_end event did not get fired in this round due to error
                 while (numOfFreezetimesEnded <= numOfRoundsEnded)
                 {
-                    dp.RaiseFreezetimeEnded();
+                    dp.RaiseFreezetimeEnded(new FreezetimeEndedEventArgs()
+					{
+						TimeEnd = -1, // no idea when this actually ended without guessing
+					});
                     numOfFreezetimesEnded = freezetimesEndedEvents.ElementAt(0).Count();
-                }
+
+					// set the TimeInRound value to '-1' for any feedback messages sent this round, as it will be wrong
+					if (md.events.Any(k => k.Key.Name.ToString() == "FeedbackMessage"))
+					{
+						foreach (FeedbackMessage message in md.events.Where(k => k.Key.Name.ToString() == "FeedbackMessage").Select(v => v.Value)?.ElementAt(0))
+						{
+							if (message.Round == numOfFreezetimesEnded)
+							{
+								message.TimeInRound = -1;
+							}
+						}
+					}
+				}
 
                 md.addEvent(typeof(RoundEndedEventArgs), e);
 
@@ -635,7 +664,7 @@ public DataAndPlayerNames GetDataAndPlayerNames(ProcessedData processedData)
 
 		public versionNumber GetVersionNumber()
 		{
-			return new versionNumber() { Version = "1.1.12" };
+			return new versionNumber() { Version = "1.1.13" };
 		}
 
 		public List<string> GetSupportedGamemodes()

TopStatsWaffle/Models/FeedbackMessage.cs

@@ -12,7 +12,8 @@ public class FeedbackMessage
 		public double? YLastAlivePosition { get; set; }
 		public double? ZLastAlivePosition { get; set; }
 		public string Message { get; set; }
+		public double TimeInRound { get; set; }
 
-        public FeedbackMessage() { }
+		public FeedbackMessage() { }
     }
 }