From 254ded06df368e9fc85ddf3cabab469665979e1a Mon Sep 17 00:00:00 2001 From: Micdu70 Date: Tue, 21 May 2024 11:41:26 +0200 Subject: [PATCH] Bug fix --- Entities/LogFileWatcher.cs | 20 +++++++++++--------- Views/Stats.cs | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Entities/LogFileWatcher.cs b/Entities/LogFileWatcher.cs index 2965704f7..a3a0638b3 100644 --- a/Entities/LogFileWatcher.cs +++ b/Entities/LogFileWatcher.cs @@ -334,14 +334,15 @@ private void AddLineAfterClientShutdown() { }; private bool IsRealFinalRound(string roundId, string showId) { - if ((showId.StartsWith("show_wle_s10_") && showId.IndexOf("_srs", StringComparison.OrdinalIgnoreCase) != -1) + if ((showId.StartsWith("knockout_fp") && showId.EndsWith("_srs")) + || (showId.StartsWith("show_wle_s10_") && showId.IndexOf("_srs", StringComparison.OrdinalIgnoreCase) != -1) || showId.IndexOf("wle_s10_player_round_", StringComparison.OrdinalIgnoreCase) != -1 || showId.StartsWith("wle_mrs_shuffle_") || showId.StartsWith("wle_shuffle_") || showId.StartsWith("current_wle_fp") || showId.StartsWith("wle_s10_cf_round_") || string.Equals(showId, "wle_playful_shuffle") - || ((showId.StartsWith("event_") && showId.EndsWith("_fools")) && roundId.StartsWith("wle_shuffle_"))) { + || (showId.StartsWith("event_") && showId.EndsWith("_fools") && roundId.StartsWith("wle_shuffle_"))) { return true; } @@ -396,11 +397,9 @@ private bool IsModeException(string roundId, string showId) { || roundId.IndexOf("round_hexaring_event_only", StringComparison.OrdinalIgnoreCase) != -1 || roundId.IndexOf("round_hexaring_event_walnut", StringComparison.OrdinalIgnoreCase) != -1 || roundId.IndexOf("round_hexsnake_event_walnut", StringComparison.OrdinalIgnoreCase) != -1 - || roundId.IndexOf("round_kraken_attack_event_only_survival", StringComparison.OrdinalIgnoreCase) != - -1 + || roundId.IndexOf("round_kraken_attack_event_only_survival", StringComparison.OrdinalIgnoreCase) != -1 || roundId.IndexOf("round_thin_ice_event_only", StringComparison.OrdinalIgnoreCase) != -1 - || roundId.IndexOf("round_blastball_arenasurvival_blast_ball_trials", - StringComparison.OrdinalIgnoreCase) != -1 + || roundId.IndexOf("round_blastball_arenasurvival_blast_ball_trials", StringComparison.OrdinalIgnoreCase) != -1 || roundId.IndexOf("round_robotrampage_arena_2_ss2_show1", StringComparison.OrdinalIgnoreCase) != -1 || string.Equals(showId, "event_blast_ball_banger_template") || showId.StartsWith("knockout_"); @@ -432,10 +431,13 @@ private bool IsModeFinalException(string roundId) { || (roundId.IndexOf("round_robotrampage_arena_2_ss2_show1", StringComparison.OrdinalIgnoreCase) != -1 && roundId.EndsWith("_03", StringComparison.OrdinalIgnoreCase)) - + || string.Equals(roundId, "round_blastball_arenasurvival_blast_ball_banger") - - || roundId.StartsWith("knockout_fp10_final_"); + + || (!string.Equals(roundId, "knockout_fp10_final_8") + && roundId.StartsWith("knockout_fp", StringComparison.OrdinalIgnoreCase) + && (roundId.EndsWith("_opener_4", StringComparison.OrdinalIgnoreCase) + || roundId.IndexOf("_final", StringComparison.OrdinalIgnoreCase) != -1)); } private bool IsTeamException(string roundId) { diff --git a/Views/Stats.cs b/Views/Stats.cs index 2e4f2d5d8..1e6b28280 100644 --- a/Views/Stats.cs +++ b/Views/Stats.cs @@ -2896,7 +2896,9 @@ where string.Equals(ri.ShowNameId, "wle_mrs_survival_showdown") ri.CreativeGameModeId = "GAMEMODE_GAUNTLET"; ri.SceneName = "GAMEMODE_GAUNTLET"; } - + this.StatsDB.BeginTrans(); + this.RoundDetails.Update(roundInfoList2); + this.StatsDB.Commit(); this.CurrentSettings.Version = 82; this.SaveUserSettings(); } @@ -3136,6 +3138,37 @@ where string.Equals(ri.ShowNameId, "event_april_fools") && ri.IsFinal == false this.CurrentSettings.Version = 93; this.SaveUserSettings(); } + + if (this.CurrentSettings.Version == 93) { + List roundInfoList = (from ri in this.RoundDetails.FindAll() + where !string.IsNullOrEmpty(ri.ShowNameId) && ri.ShowNameId.StartsWith("knockout_") + select ri).ToList(); + + foreach (RoundInfo ri in roundInfoList) { + ri.IsFinal = (ri.Name.StartsWith("knockout_fp") && ri.Name.IndexOf("_final") != -1) || (ri.ShowNameId.StartsWith("knockout_fp") && ri.ShowNameId.EndsWith("_srs")); + } + this.StatsDB.BeginTrans(); + this.RoundDetails.Update(roundInfoList); + this.StatsDB.Commit(); + + DateTime dateCond = new DateTime(2024, 5, 15, 12, 0, 0, DateTimeKind.Utc); + List roundInfoList2 = (from ri in this.RoundDetails.FindAll() + where !string.IsNullOrEmpty(ri.ShowNameId) && + ri.Start >= dateCond && + ri.ShowNameId.StartsWith("knockout_") + select ri).ToList(); + + foreach (RoundInfo ri in roundInfoList2) { + ri.IsFinal = string.Equals(ri.Name, "round_blastball_arenasurvival_symphony_launch_show") || string.Equals(ri.Name, "round_kraken_attack") || string.Equals(ri.Name, "round_jump_showdown") || + string.Equals(ri.Name, "round_crown_maze") || string.Equals(ri.Name, "round_tunnel_final") || string.Equals(ri.Name, "round_fall_mountain_hub_complete") || + (!string.Equals(ri.Name, "knockout_fp10_final_8") && ri.Name.StartsWith("knockout_fp") && ri.Name.IndexOf("_final") != -1); + } + this.StatsDB.BeginTrans(); + this.RoundDetails.Update(roundInfoList2); + this.StatsDB.Commit(); + this.CurrentSettings.Version = 94; + this.SaveUserSettings(); + } } private UserSettings GetDefaultSettings() {