Skip to content

Commit

Permalink
Merge pull request #406 from Micdu70/patch-1
Browse files Browse the repository at this point in the history 
Bug fix
  • Loading branch information
@qubqub
qubqub authored Feb 11, 2025
2 parents 93f07a7 + 6e2eba7 commit 54b107d
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 13 deletions.
15 changes: 7 additions & 8 deletions Entities/LogFileWatcher.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,18 +402,14 @@ private bool IsRealFinalRound(int roundNum, string roundId, string showId) {
|| (string.Equals(showId, "event_only_button_bashers_template")
&& roundNum == 4)

|| (string.Equals(showId, "event_snowday_stumble")
&& (string.Equals(roundId, "round_cloudyteacups_final_sds") || string.Equals(roundId, "round_goopropegrandslam_final_sds")))

|| (string.Equals(showId, "fp16_ski_fall_high_scorers")
&& string.Equals(roundId, "round_event_only_skeefall_timetrial_s6_1"))

|| (string.Equals(showId, "ftue_uk_show")
&& (string.Equals(roundId, "round_snowballsurvival_noelim_ftue_s2")
|| string.Equals(roundId, "round_fp17_knockout_castlesiege")
|| string.Equals(roundId, "knockout_circleoslime_final_survival")
|| string.Equals(roundId, "knockout_goopropegrandslamgoldrush_final_survival")
|| string.Equals(roundId, "knockout_rollerderby_final")
|| string.Equals(roundId, "knockout_mode_cloudyteacupsgoldrush_final")
|| string.Equals(roundId, "round_fp17_knockout_gardenpardon")
|| string.Equals(roundId, "knockout_trickortrapeze_final_points")))
&& string.Equals(roundId, "round_snowballsurvival_noelim_ftue_s2"))

|| (string.Equals(showId, "no_elimination_show")
&& (string.Equals(roundId, "round_snowballsurvival_final_noelim") || string.Equals(roundId, "round_robotrampage_arena_2_final_noelim")))
Expand Down Expand Up @@ -484,6 +480,9 @@ private bool IsModeFinalException(string roundId) {

|| string.Equals(roundId, "round_blastball_arenasurvival_blast_ball_banger")

// "Knockout" Shows
|| string.Equals(roundId, "round_fp17_knockout_castlesiege")
|| string.Equals(roundId, "round_fp17_knockout_gardenpardon")
|| (!string.Equals(roundId, "knockout_fp10_final_8")
&& roundId.StartsWith("knockout_", StringComparison.OrdinalIgnoreCase)
&& (roundId.EndsWith("_opener_4", StringComparison.OrdinalIgnoreCase)
Expand Down
12 changes: 9 additions & 3 deletions Entities/Multilingual.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13425,6 +13425,7 @@ public static class Multilingual {
{ "event_season_3_highlight_0306_to_0506_2022", "Snow Day Stumble" },
{ "event_season_3_highlight_2607_to_2707_2022", "Snow Day Stumble" },
{ "event_season_3_highlight_template", "Snow Day Stumble" },
{ "event_snowday_stumble", "Snow Day Stumble" },
{ "event_sports_suddendeath_squads", "Golden Goal Challenge" },
{ "event_sports_suddendeath_squads_0208_to_0308_2022", "Golden Goal Challenge" },
{ "event_sports_suddendeath_squads_0407_to_0507_2022", "Golden Goal Challenge" },
Expand Down Expand Up @@ -14338,6 +14339,7 @@ public static class Multilingual {
{ "event_season_3_highlight_0306_to_0506_2022", "Batailles hivernales" },
{ "event_season_3_highlight_2607_to_2707_2022", "Batailles hivernales" },
{ "event_season_3_highlight_template", "Batailles hivernales" },
{ "event_snowday_stumble", "Batailles hivernales" },
{ "event_sports_suddendeath_squads", "Défi de but doré" },
{ "event_sports_suddendeath_squads_0208_to_0308_2022", "Défi de but doré" },
{ "event_sports_suddendeath_squads_0407_to_0507_2022", "Défi de but doré" },
Expand Down Expand Up @@ -15251,6 +15253,7 @@ public static class Multilingual {
{ "event_season_3_highlight_0306_to_0506_2022", "눈 오는 날 스텀블" },
{ "event_season_3_highlight_2607_to_2707_2022", "눈 오는 날 스텀블" },
{ "event_season_3_highlight_template", "눈 오는 날 스텀블" },
{ "event_snowday_stumble", "눈 오는 날 스텀블" },
{ "event_sports_suddendeath_squads", "골든 골 도전" },
{ "event_sports_suddendeath_squads_0208_to_0308_2022", "골든 골 도전" },
{ "event_sports_suddendeath_squads_0407_to_0507_2022", "골든 골 도전" },
Expand Down Expand Up @@ -16164,6 +16167,7 @@ public static class Multilingual {
{ "event_season_3_highlight_0306_to_0506_2022", "雪日和スタンブル" },
{ "event_season_3_highlight_2607_to_2707_2022", "雪日和スタンブル" },
{ "event_season_3_highlight_template", "雪日和スタンブル" },
{ "event_snowday_stumble", "雪日和スタンブル" },
{ "event_sports_suddendeath_squads", "ゴールデンゴール・チャレンジ" },
{ "event_sports_suddendeath_squads_0208_to_0308_2022", "ゴールデンゴール・チャレンジ" },
{ "event_sports_suddendeath_squads_0407_to_0507_2022", "ゴールデンゴール・チャレンジ" },
Expand Down Expand Up @@ -17077,6 +17081,7 @@ public static class Multilingual {
{ "event_season_3_highlight_0306_to_0506_2022", "冰雪大比拼" },
{ "event_season_3_highlight_2607_to_2707_2022", "冰雪大比拼" },
{ "event_season_3_highlight_template", "冰雪大比拼" },
{ "event_snowday_stumble", "冰雪大比拼" },
{ "event_sports_suddendeath_squads", "黄金进球挑战" },
{ "event_sports_suddendeath_squads_0208_to_0308_2022", "黄金进球挑战" },
{ "event_sports_suddendeath_squads_0407_to_0507_2022", "黄金进球挑战" },
Expand Down Expand Up @@ -17987,9 +17992,10 @@ public static class Multilingual {
{ "event_season_2_highlight_1006_to_1206_2022", "混戰中世紀" },
{ "event_season_2_highlight_2907_to_3107_2022", "混戰中世紀" },
{ "event_season_2_highlight_template", "混戰中世紀" },
{ "event_season_3_highlight_0306_to_0506_2022", "冰雪大比拼" },
{ "event_season_3_highlight_2607_to_2707_2022", "冰雪大比拼" },
{ "event_season_3_highlight_template", "冰雪大比拼" },
{ "event_season_3_highlight_0306_to_0506_2022", "跌撞雪原" },
{ "event_season_3_highlight_2607_to_2707_2022", "跌撞雪原" },
{ "event_season_3_highlight_template", "跌撞雪原" },
{ "event_snowday_stumble", "跌撞雪原" },
{ "event_sports_suddendeath_squads", "黃金進球挑戰" },
{ "event_sports_suddendeath_squads_0208_to_0308_2022", "黃金進球挑戰" },
{ "event_sports_suddendeath_squads_0407_to_0507_2022", "黃金進球挑戰" },
Expand Down
34 changes: 32 additions & 2 deletions Views/Stats.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ private static bool IsAlreadyRunning() {
"show_robotrampage_ss2_show1_template",
"event_le_anchovy_template",
"event_pixel_palooza_template",
"event_snowday_stumble",
"mrs_pegwin_winter_2teamsfinal",
"xtreme_party",
"invisibeans_mode",
Expand Down Expand Up @@ -565,10 +566,9 @@ private void UpdateUpcomingShow() {
if (string.Equals(upcomingShow.xstatus, "success")) {
var selectedShows = new List<FGA_UpcomingShowInfo.ShowData.LiveShow.Show>();
foreach (var liveShow in upcomingShow.shows.live_shows) {
if (string.Equals(liveShow.section_name, "CLASSIC GAMES")) { continue; }
foreach (var showDetails in liveShow.showInfo.Values) {
var show = showDetails.Deserialize<FGA_UpcomingShowInfo.ShowData.LiveShow.Show>();
if (string.Equals(show.id, "ftue_uk_show") || show.victory_rewards.Count == 0) { continue; }
if ((string.Equals(liveShow.section_name, "CLASSIC GAMES") && !string.Equals(show.id, "event_snowday_stumble")) || string.Equals(show.id, "ftue_uk_show") || show.victory_rewards.Count == 0) { continue; }
selectedShows.Add(show);
}
}
Expand Down Expand Up @@ -3697,6 +3697,36 @@ where string.Equals(ri.ShowNameId, "ftue_uk_show")
this.CurrentSettings.Version = 112;
this.SaveUserSettings();
}

if (this.CurrentSettings.Version == 112) {
List<RoundInfo> roundInfoList = (from ri in this.RoundDetails.FindAll()
where string.Equals(ri.ShowNameId, "knockout_mode")
select ri).ToList();

foreach (RoundInfo ri in roundInfoList) {
if (string.Equals(ri.Name, "round_fp17_knockout_castlesiege") || string.Equals(ri.Name, "round_fp17_knockout_gardenpardon")) {
ri.IsFinal = true;
}
}
this.StatsDB.BeginTrans();
this.RoundDetails.Update(roundInfoList);
this.StatsDB.Commit();

List<RoundInfo> roundInfoList2 = (from ri in this.RoundDetails.FindAll()
where string.Equals(ri.ShowNameId, "event_snowday_stumble")
select ri).ToList();

foreach (RoundInfo ri in roundInfoList2) {
if (string.Equals(ri.Name, "round_cloudyteacups_final_sds") || string.Equals(ri.Name, "round_goopropegrandslam_final_sds")) {
ri.IsFinal = true;
}
}
this.StatsDB.BeginTrans();
this.RoundDetails.Update(roundInfoList2);
this.StatsDB.Commit();
this.CurrentSettings.Version = 113;
this.SaveUserSettings();
}
}

private UserSettings GetDefaultSettings() {
Expand Down

0 comments on commit 54b107d

Please sign in to comment.