Add song end time to results screen

MatrikMoon · Dec 9, 2023 · 43ff7a4 · 43ff7a4
1 parent 5794f8d
commit 43ff7a4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/TournamentAssistant/UI/FlowCoordinators/RoomCoordinator.cs b/TournamentAssistant/UI/FlowCoordinators/RoomCoordinator.cs
@@ -588,7 +588,9 @@ public void SongFinished(StandardLevelScenesTransitionSetupDataSO standardLevelS
                             Difficulties = map.parentDifficultyBeatmapSet.difficultyBeatmaps.Select(x => (int)x.difficulty).ToArray()
                         }
                     },
-                    Score = results.modifiedScore
+                    Score = results.modifiedScore,
+                    Misses = results.missedCount,
+                    EndTime = results.endSongTime
                 };
 
                 if (results.levelEndStateType == LevelCompletionResults.LevelEndStateType.Cleared)

diff --git a/TournamentAssistantProtos b/TournamentAssistantProtos
diff --git a/TournamentAssistantShared/Constants.cs b/TournamentAssistantShared/Constants.cs
@@ -8,8 +8,8 @@ namespace TournamentAssistantShared
     public static class Constants
     {
         public const string NAME = "TournamentAssistant";
-        public const string VERSION = "0.7.4";
-        public const int VERSION_CODE = 074;
+        public const string VERSION = "0.7.8";
+        public const int VERSION_CODE = 078;
         public const string MASTER_SERVER = "tournamentassistant.net";
         public const string Changelog =
             "0.0.1: Begin assembling UI for coordinator panels\n" +
@@ -64,7 +64,8 @@ public static class Constants
             "0.7.0: Some server synchronization fixes, for players and users that means more stability\n" +
             "0.7.3: Update for 1.29.1\n" +
             "0.7.4: Score update fix\n" +
-            "0.7.5: Add ability for players to select Pro Mode";
+            "0.7.5: Add ability for players to select Pro Mode\n" +
+            "0.7.8: Added song end time to results";
 
         public enum BeatmapDifficulty
         {

diff --git a/TournamentAssistantUI/UI/UserControls/GameOverDialog.xaml b/TournamentAssistantUI/UI/UserControls/GameOverDialog.xaml
@@ -37,6 +37,7 @@
                         <TextBlock FontSize="12" HorizontalAlignment="Center" Text="{Binding Type, StringFormat=Result: \{0\}}" />
                         <TextBlock FontSize="12" HorizontalAlignment="Center" Text="{Binding Score, StringFormat=Score: \{0\}}" />
                         <TextBlock FontSize="12" HorizontalAlignment="Center" Text="{Binding Misses, StringFormat=Misses: \{0\}}" />
+                        <TextBlock FontSize="12" HorizontalAlignment="Center" Text="{Binding EndTime, StringFormat=End Time: \{0\}}" />
                         <TextBlock FontSize="12" HorizontalAlignment="Center" Text="{Binding Distance, StringFormat=Diff: +\{0\}}" />
                     </StackPanel>
                 </DataTemplate>

diff --git a/TournamentAssistantUI/UI/UserControls/GameOverDialog.xaml.cs b/TournamentAssistantUI/UI/UserControls/GameOverDialog.xaml.cs
@@ -13,13 +13,12 @@ namespace TournamentAssistantUI.UI.UserControls
     /// </summary>
     public partial class GameOverDialog : UserControl
     {
-        public class SongFinishedWithDistanceFromFirstPlayerAndMisses : Push.SongFinished
+        public class SongFinishedWithDistanceFromFirstPlayer : Push.SongFinished
         {
             public int Distance { get; set; }
-            public int Misses { get; set; }
         }
 
-        public List<SongFinishedWithDistanceFromFirstPlayerAndMisses> Results { get; set; }
+        public List<SongFinishedWithDistanceFromFirstPlayer> Results { get; set; }
         private Dictionary<string, RealtimeScore> latestRealtimeScores { get; set; }
 
         public GameOverDialog(List<Push.SongFinished> results, Dictionary<string, RealtimeScore> latestScores)
@@ -30,15 +29,16 @@ public GameOverDialog(List<Push.SongFinished> results, Dictionary<string, Realti
             var firstPlace = orderedResults.First();
 
             Results = orderedResults.Select(x => {
-                latestRealtimeScores.TryGetValue(x.Player.Guid, out var lastRealtimeScore);
-                return new SongFinishedWithDistanceFromFirstPlayerAndMisses
+                // latestRealtimeScores.TryGetValue(x.Player.Guid, out var lastRealtimeScore);
+                return new SongFinishedWithDistanceFromFirstPlayer
                 {
                     Beatmap = x.Beatmap,
                     Player = x.Player,
                     Score = x.Score,
                     Type = x.Type,
                     Distance = x.Score - firstPlace.Score,
-                    Misses = lastRealtimeScore?.notesMissed ?? 0
+                    Misses = x.Misses,
+                    EndTime = x.EndTime
                 };
             }).ToList();