Skip to content

Commit fe5e106

Browse files
qubqubqubqub
authored
Merge pull request #513 from Micdu70/patch-1
Bug fix
2 parents a3b2817 + 2004583 commit fe5e106

4 files changed

Lines changed: 69 additions & 37 deletions

File tree

‎Entities/LogFileWatcher.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,11 @@ private bool IsModeException(string roundId, string showId) {
503503
|| string.Equals(showId, "event_blast_ball_banger_template")
504504
|| string.Equals(showId, "event_only_finals_v3_ranked")
505505
// || showId.StartsWith("knockout_")
506+
|| string.Equals(showId, "reversed_knockout_show") // "Tuokconk" Show
506507
|| showId.StartsWith("ranked_"); // "Ranked Knockout" Show
507508
}
508509

509-
private bool IsModeFinalException(string roundId) {
510+
private bool IsModeFinalException(int roundNum, string roundId) {
510511
return ((roundId.IndexOf("round_1v1_button_basher_event_only", StringComparison.OrdinalIgnoreCase) != -1
511512
|| roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
512513
|| roundId.IndexOf("round_slimeclimb_2_event_only", StringComparison.OrdinalIgnoreCase) != -1
@@ -555,6 +556,10 @@ private bool IsModeFinalException(string roundId) {
555556
* || roundId.IndexOf("_final", StringComparison.OrdinalIgnoreCase) != -1))
556557
*/
557558

559+
// "Tuokconk" Show
560+
|| (roundId.StartsWith("reversed_knockout_", StringComparison.OrdinalIgnoreCase)
561+
&& (roundNum == 3 || string.Equals(roundId, "reversed_knockout_door_dash")))
562+
558563
// "Ranked Knockout" Show
559564
|| (roundId.StartsWith("ranked_", StringComparison.OrdinalIgnoreCase)
560565
&& roundId.EndsWith("_final", StringComparison.OrdinalIgnoreCase));
@@ -1033,7 +1038,7 @@ private bool ParseLine(LogLine line, List<RoundInfo> round, LogRound logRound) {
10331038
} else if (logRound.Info.UseShareCode || this.IsRealFinalRound(logRound.Info.Round, logRound.Info.Name, logRound.Info.ShowNameId)) {
10341039
logRound.Info.IsFinal = true;
10351040
} else if (this.IsModeException(logRound.Info.Name, logRound.Info.ShowNameId)) {
1036-
logRound.Info.IsFinal = this.IsModeFinalException(logRound.Info.Name);
1041+
logRound.Info.IsFinal = this.IsModeFinalException(logRound.Info.Round, logRound.Info.Name);
10371042
} else if (logRound.Info.Name.StartsWith("wle_s10_") || logRound.Info.Name.StartsWith("wle_mrs_")) {
10381043
logRound.Info.IsFinal = this.StatsForm.StatLookup.TryGetValue(logRound.Info.Name, out LevelStats levelStats) && levelStats.IsFinal;
10391044
} else {

‎Entities/Multilingual.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13631,6 +13631,7 @@ public static class Multilingual {
1363113631
{ "ranked_solo_show", "Ranked Solos" },
1363213632
{ "ranked_squads_show", "Ranked Squads" },
1363313633
{ "ranked_trios_show", "Ranked Trios" },
13634+
{ "reversed_knockout_show", "Tuokconk" },
1363413635
{ "showcase_fp13", "Scrapyard Stumble" },
1363513636
{ "showcase_fp16", "Frosty Frolics" },
1363613637
{ "showcase_fp17", "Fallentines Festival" },
@@ -14580,6 +14581,7 @@ public static class Multilingual {
1458014581
{ "ranked_solo_show", "Solo classé" },
1458114582
{ "ranked_squads_show", "Groupe classé" },
1458214583
{ "ranked_trios_show", "Trio classé" },
14584+
{ "reversed_knockout_show", "Sionruot" },
1458314585
{ "showcase_fp13", "Férus de ferraille" },
1458414586
{ "showcase_fp16", "Folie givrée" },
1458514587
{ "showcase_fp17", "Festival haricœur à prendre" },
@@ -15529,6 +15531,7 @@ public static class Multilingual {
1552915531
{ "ranked_solo_show", "랭크 솔로" },
1553015532
{ "ranked_squads_show", "랭크 스쿼드" },
1553115533
{ "ranked_trios_show", "랭크 트리오" },
15534+
{ "reversed_knockout_show", "웃아넉" },
1553215535
{ "showcase_fp13", "고철 스텀블" },
1553315536
{ "showcase_fp16", "프로스티 뜀박질" },
1553415537
{ "showcase_fp17", "폴렌타인 페스티벌" },
@@ -16478,6 +16481,7 @@ public static class Multilingual {
1647816481
{ "ranked_solo_show", "ランク戦ソロ" },
1647916482
{ "ranked_squads_show", "ランク戦スクワッド" },
1648016483
{ "ranked_trios_show", "ランク戦トリオ" },
16484+
{ "reversed_knockout_show", "トウアクッノ" },
1648116485
{ "showcase_fp13", "つまずきスクラップ置き場" },
1648216486
{ "showcase_fp16", "冬景色のお祭り騒ぎ" },
1648316487
{ "showcase_fp17", "フォールレンタインフェスティバル" },
@@ -17427,6 +17431,7 @@ public static class Multilingual {
1742717431
{ "ranked_solo_show", "排位单人" },
1742817432
{ "ranked_squads_show", "排位小队" },
1742917433
{ "ranked_trios_show", "排位三人" },
17434+
{ "reversed_knockout_show", "反淘汰赛" },
1743017435
{ "showcase_fp13", "废料场翻腾" },
1743117436
{ "showcase_fp16", "冰雪欢闹" },
1743217437
{ "showcase_fp17", "糖豆情人节" },
@@ -18376,6 +18381,7 @@ public static class Multilingual {
1837618381
{ "ranked_solo_show", "單人排名戰" },
1837718382
{ "ranked_squads_show", "小隊排名戰" },
1837818383
{ "ranked_trios_show", "三人排名戰" },
18384+
{ "reversed_knockout_show", "重拳手？" },
1837918385
{ "showcase_fp13", "跌絆回收場" },
1838018386
{ "showcase_fp16", "戲雪之樂" },
1838118387
{ "showcase_fp17", "跌撞情人節" },

‎FallGuysStats.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@
11851185
</PackageReference>
11861186
<PackageReference Include="LiteDB" Version="5.0.21" />
11871187
<PackageReference Include="MetroModernUI" Version="1.4.0" />
1188-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.2" />
1188+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.5" />
11891189
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
11901190
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
11911191
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
@@ -1198,10 +1198,10 @@
11981198
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
11991199
<PackageReference Include="System.Console" Version="4.3.1" />
12001200
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
1201-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.2" />
1201+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.5" />
12021202
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
12031203
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
1204-
<PackageReference Include="System.Drawing.Common" Version="10.0.2" />
1204+
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
12051205
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
12061206
<PackageReference Include="System.Globalization" Version="4.3.0" />
12071207
<PackageReference Include="System.Globalization.Calendars" Version="4.3.0" />
@@ -1235,14 +1235,14 @@
12351235
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
12361236
<PackageReference Include="System.Text.Encoding" Version="4.3.0" />
12371237
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
1238-
<PackageReference Include="System.Text.Encodings.Web" Version="10.0.2" />
1239-
<PackageReference Include="System.Text.Json" Version="10.0.2" />
1238+
<PackageReference Include="System.Text.Encodings.Web" Version="10.0.5" />
1239+
<PackageReference Include="System.Text.Json" Version="10.0.5" />
12401240
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
12411241
<PackageReference Include="System.Threading" Version="4.3.0" />
12421242
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
12431243
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
12441244
<PackageReference Include="System.Threading.Timer" Version="4.3.0" />
1245-
<PackageReference Include="System.ValueTuple" Version="4.6.1" />
1245+
<PackageReference Include="System.ValueTuple" Version="4.6.2" />
12461246
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
12471247
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
12481248
</ItemGroup>

‎Views/Stats.cs‎

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,34 +107,37 @@ private static bool IsAlreadyRunning() {
107107
private static readonly string LOGFILENAME = "Player.log";
108108

109109
public static readonly (string Name, DateTime StartDate)[] Seasons = new (string Name, DateTime StartDate)[] {
110-
("S1", new DateTime(2020, 8, 4, 0, 0, 0, DateTimeKind.Utc)), // Season 1 (Ultimate Knockout)
111-
("S2", new DateTime(2020, 10, 8, 0, 0, 0, DateTimeKind.Utc)), // Season 2 (Medieval Knockout)
112-
("S3", new DateTime(2020, 12, 15, 0, 0, 0, DateTimeKind.Utc)), // Season 3 (Winter Knockout)
113-
("S4", new DateTime(2021, 3, 22, 0, 0, 0, DateTimeKind.Utc)), // Season 4 (Fall Guys 4041)
114-
("S5", new DateTime(2021, 7, 20, 0, 0, 0, DateTimeKind.Utc)), // Season 5 (Jungle Adventure)
115-
("S6", new DateTime(2021, 11, 30, 0, 0, 0, DateTimeKind.Utc)), // Season 6 (Party Spectacular)
116-
("SS1", new DateTime(2022, 6, 21, 0, 0, 0, DateTimeKind.Utc)), // Season 1 (Free For All)
117-
("SS2", new DateTime(2022, 9, 15, 0, 0, 0, DateTimeKind.Utc)), // Season 2 (Satellite Scramble)
118-
("SS3", new DateTime(2022, 11, 22, 0, 0, 0, DateTimeKind.Utc)), // Season 3 (Sunken Secrets)
119-
("SS4", new DateTime(2023, 5, 10, 0, 0, 0, DateTimeKind.Utc)), // Season 4 (Creative Construction)
120-
("10.3", new DateTime(2023, 8, 16, 0, 0, 0, DateTimeKind.Utc)), // Summer Breeze Update
121-
("10.4", new DateTime(2023, 9, 27, 0, 0, 0, DateTimeKind.Utc)), // Fall Force Update
122-
("10.5", new DateTime(2023, 11, 7, 0, 0, 0, DateTimeKind.Utc)), // Tool Up Update
123-
("10.6", new DateTime(2023, 12, 6, 0, 0, 0, DateTimeKind.Utc)), // Power Party Update
124-
("10.7", new DateTime(2024, 1, 23, 0, 0, 0, DateTimeKind.Utc)), // Shapes and Stickers Update
125-
("10.8", new DateTime(2024, 2, 28, 0, 0, 0, DateTimeKind.Utc)), // Survival Update
126-
("10.9", new DateTime(2024, 5, 4, 0, 0, 0, DateTimeKind.Utc)), // Fall Forever Update
127-
("11.0", new DateTime(2024, 6, 11, 0, 0, 0, DateTimeKind.Utc)), // June '24 Update
128-
("11.1", new DateTime(2024, 7, 23, 0, 0, 0, DateTimeKind.Utc)), // July '24 Update
129-
("11.2", new DateTime(2024, 9, 3, 0, 0, 0, DateTimeKind.Utc)), // Scrapyard Stumble Update
130-
("11.3", new DateTime(2024, 10, 8, 0, 0, 0, DateTimeKind.Utc)), // Falloween 2024 Update
131-
("11.4", new DateTime(2024, 11, 7, 0, 0, 0, DateTimeKind.Utc)), // November '24 Update
132-
("11.5", new DateTime(2024, 12, 10, 0, 0, 0, DateTimeKind.Utc)), // Winter Update
133-
("11.6", new DateTime(2025, 2, 4, 0, 0, 0, DateTimeKind.Utc)), // Fall and Fantasy Update
134-
("18.0", new DateTime(2025, 4, 1, 0, 0, 0, DateTimeKind.Utc)), // Ranked Knockout Update
135-
("19.0", new DateTime(2025, 5, 27, 0, 0, 0, DateTimeKind.Utc)), // Yeetropolis Update
136-
("20.0", new DateTime(2025, 7, 29, 0, 0, 0, DateTimeKind.Utc)), // Tropical Tides Update
137-
("21.0", new DateTime(2025, 9, 16, 0, 0, 0, DateTimeKind.Utc)), // Slime Factory Update
110+
("S1", new DateTime(2020, 8, 4, 0, 0, 0, DateTimeKind.Utc)), // Season 1 (Ultimate Knockout)
111+
("S2", new DateTime(2020, 10, 8, 0, 0, 0, DateTimeKind.Utc)), // Season 2 (Medieval Knockout)
112+
("S3", new DateTime(2020, 12, 15, 0, 0, 0, DateTimeKind.Utc)), // Season 3 (Winter Knockout)
113+
("S4", new DateTime(2021, 3, 22, 0, 0, 0, DateTimeKind.Utc)), // Season 4 (Fall Guys 4041)
114+
("S5", new DateTime(2021, 7, 20, 0, 0, 0, DateTimeKind.Utc)), // Season 5 (Jungle Adventure)
115+
("S6", new DateTime(2021, 11, 30, 0, 0, 0, DateTimeKind.Utc)), // Season 6 (Party Spectacular)
116+
("SS1", new DateTime(2022, 6, 21, 0, 0, 0, DateTimeKind.Utc)), // Season 1 (Free For All)
117+
("SS2", new DateTime(2022, 9, 15, 0, 0, 0, DateTimeKind.Utc)), // Season 2 (Satellite Scramble)
118+
("SS3", new DateTime(2022, 11, 22, 0, 0, 0, DateTimeKind.Utc)), // Season 3 (Sunken Secrets)
119+
("SS4", new DateTime(2023, 5, 10, 0, 0, 0, DateTimeKind.Utc)), // Season 4 (Creative Construction)
120+
("10.3", new DateTime(2023, 8, 16, 0, 0, 0, DateTimeKind.Utc)), // Summer Breeze Update
121+
("10.4", new DateTime(2023, 9, 27, 0, 0, 0, DateTimeKind.Utc)), // Fall Force Update
122+
("10.5", new DateTime(2023, 11, 7, 0, 0, 0, DateTimeKind.Utc)), // Tool Up Update
123+
("10.6", new DateTime(2023, 12, 6, 0, 0, 0, DateTimeKind.Utc)), // Power Party Update
124+
("10.7", new DateTime(2024, 1, 23, 0, 0, 0, DateTimeKind.Utc)), // Shapes and Stickers Update
125+
("10.8", new DateTime(2024, 2, 28, 0, 0, 0, DateTimeKind.Utc)), // Survival Update
126+
("10.9", new DateTime(2024, 5, 4, 0, 0, 0, DateTimeKind.Utc)), // Fall Forever Update
127+
("11.0", new DateTime(2024, 6, 11, 0, 0, 0, DateTimeKind.Utc)), // June '24 Update
128+
("11.1", new DateTime(2024, 7, 23, 0, 0, 0, DateTimeKind.Utc)), // July '24 Update
129+
("11.2", new DateTime(2024, 9, 3, 0, 0, 0, DateTimeKind.Utc)), // Scrapyard Stumble Update
130+
("11.3", new DateTime(2024, 10, 8, 0, 0, 0, DateTimeKind.Utc)), // Falloween 2024 Update
131+
("11.4", new DateTime(2024, 11, 7, 0, 0, 0, DateTimeKind.Utc)), // November '24 Update
132+
("11.5", new DateTime(2024, 12, 10, 0, 0, 0, DateTimeKind.Utc)), // Winter Update
133+
("11.6", new DateTime(2025, 2, 4, 0, 0, 0, DateTimeKind.Utc)), // Fall and Fantasy Update
134+
("18.0", new DateTime(2025, 4, 1, 0, 0, 0, DateTimeKind.Utc)), // Ranked Knockout Update
135+
("19.0", new DateTime(2025, 5, 27, 0, 0, 0, DateTimeKind.Utc)), // Yeetropolis Update
136+
("20.0", new DateTime(2025, 7, 29, 0, 0, 0, DateTimeKind.Utc)), // Tropical Tides Update
137+
("21.0", new DateTime(2025, 9, 16, 0, 0, 0, DateTimeKind.Utc)), // Slime Factory Update
138+
("21.0.1", new DateTime(2025, 11, 11, 0, 0, 0, DateTimeKind.Utc)), // Arctic Adventures Update
139+
("21.1", new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc)), // Myths and Legends Update
140+
("21.2", new DateTime(2026, 3, 1, 0, 0, 0, DateTimeKind.Utc)), // Fools Folly Update
138141
};
139142
private static DateTime SeasonStart, WeekStart, DayStart;
140143
private static DateTime SessionStart = DateTime.UtcNow;
@@ -301,7 +304,7 @@ private static bool IsAlreadyRunning() {
301304
private readonly object dbTaskLock = new object();
302305
public List<Task> dbTasks = new List<Task>();
303306

304-
private readonly int currentDbVersion = 134;
307+
private readonly int currentDbVersion = 135;
305308

306309
public readonly string[] PublicShowIdList = {
307310
"main_show",
@@ -355,6 +358,7 @@ private static bool IsAlreadyRunning() {
355358
"knockout_mode",
356359
// "knockout_duos",
357360
// "knockout_squads",
361+
"reversed_knockout_show",
358362
"no_elimination_explore",
359363
"event_only_races_any_final_template",
360364
"event_only_fall_ball_trios_ranked",
@@ -2041,6 +2045,22 @@ private void UpdateDatabaseDateFormat() {
20412045
private void UpdateDatabaseVersion() {
20422046
for (int version = this.CurrentSettings.Version; version < currentDbVersion; version++) {
20432047
switch (version) {
2048+
case 134: {
2049+
List<RoundInfo> roundInfoList = (from ri in this.RoundDetails.FindAll()
2050+
where string.Equals(ri.ShowNameId, "reversed_knockout_show")
2051+
select ri).ToList();
2052+
2053+
Profiles profile = this.Profiles.FindOne(Query.EQ("LinkedShowId", "main_show"));
2054+
int profileId = profile?.ProfileId ?? -1;
2055+
foreach (RoundInfo ri in roundInfoList) {
2056+
if (profileId != -1) ri.Profile = profileId;
2057+
ri.IsFinal = ri.Round == 3 || string.Equals(ri.Name, "round_door_dash");
2058+
}
2059+
this.StatsDB.BeginTrans();
2060+
this.RoundDetails.Update(roundInfoList);
2061+
this.StatsDB.Commit();
2062+
break;
2063+
}
20442064
case 133: {
20452065
List<RoundInfo> roundInfoList = (from ri in this.RoundDetails.FindAll()
20462066
where string.Equals(ri.ShowNameId, "event_only_finals_v3_ranked")
@@ -6079,6 +6099,7 @@ public string GetMainGroupShowId(string showId) {
60796099
case "classic_solo_main_show":
60806100
case "ftue_uk_show":
60816101
case "knockout_mode":
6102+
case "reversed_knockout_show":
60826103
case "no_elimination_explore":
60836104
case "event_only_races_any_final_template":
60846105
case "turbo_2_show":

0 commit comments

Comments
 (0)