Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DB_Versions.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"success":true,"db_list":[{"name":"LevelTimeLimit","version":16},{"name":"UpcomingShow","version":2}]}
{"success":true,"db_list":[{"name":"LevelTimeLimit","version":17},{"name":"UpcomingShow","version":3}]}
4 changes: 4 additions & 0 deletions Entities/LogFileWatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ private bool IsModeException(string roundId, string showId) {
|| roundId.IndexOf("round_floor_fall_squads_survival", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_thin_ice_squads_survival", StringComparison.OrdinalIgnoreCase) != -1
|| string.Equals(showId, "event_blast_ball_banger_template")
|| string.Equals(showId, "event_only_finals_v3_ranked")
// || showId.StartsWith("knockout_")
|| showId.StartsWith("ranked_"); // "Ranked Knockout" Show
}
Expand Down Expand Up @@ -541,6 +542,9 @@ private bool IsModeFinalException(string roundId) {

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

|| roundId.EndsWith("_only_finals_final_ranked", StringComparison.OrdinalIgnoreCase)
|| roundId.EndsWith("_only_finals_ranked", StringComparison.OrdinalIgnoreCase)

/*
// "Knockout" Shows
*|| string.Equals(roundId, "round_fp17_knockout_castlesiege")
Expand Down
12 changes: 9 additions & 3 deletions Entities/Multilingual.cs
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ public static class Multilingual {
{ "message_execution_caption", "Running Fall Guys" },
{ "message_execution_question", "Do you want to run the Fall Guys client?" },
{ "message_update_question_caption", "Update Program" },
{ "message_update_question_prefix", "There is a new version of Fall Guy Stats available" },
{ "message_update_question_prefix", "There is a new version of Fall Guys Stats available" },
{ "message_update_question_suffix", "- Do you wish to update now?" },
{ "message_update_latest_version", "You are at the latest version." },
{ "message_update_not_determine_version", "Could not determine version." },
Expand Down Expand Up @@ -2572,7 +2572,7 @@ public static class Multilingual {
{ "message_execution_caption", "启动糖豆人" },
{ "message_execution_question", "确定要启动糖豆人吗?" },
{ "message_update_question_caption", "升级程序" },
{ "message_update_question_prefix", "Fall Guy Stats 有新版本。" },
{ "message_update_question_prefix", "Fall Guys Stats 有新版本。" },
{ "message_update_question_suffix", "是否要立刻升级?" },
{ "message_update_latest_version", "已更新至最新版本。" },
{ "message_update_not_determine_version", "无法检测版本号。" },
Expand Down Expand Up @@ -3138,7 +3138,7 @@ public static class Multilingual {
{ "message_execution_caption", "啟動糖豆人" },
{ "message_execution_question", "確定要啟動糖豆人嗎?" },
{ "message_update_question_caption", "升級程序" },
{ "message_update_question_prefix", "Fall Guy Stats 有新版本。" },
{ "message_update_question_prefix", "Fall Guys Stats 有新版本。" },
{ "message_update_question_suffix", "是否要立刻升級?" },
{ "message_update_latest_version", "已更新至最新版本。" },
{ "message_update_not_determine_version", "無法檢測版本號。" },
Expand Down Expand Up @@ -13406,6 +13406,7 @@ public static class Multilingual {
{ "event_only_finals_2904_to_0105_2022", "Finals Marathon" },
{ "event_only_finals_template", "Finals Marathon" },
{ "event_only_finals_v2_template", "Finals Marathon" },
{ "event_only_finals_v3_ranked", "Finals Marathon Ranked" },
{ "event_only_finals_v3_template", "Finals Marathon" },
{ "event_only_floor_fall_0510_to_0610_2022", "Hex-a-gone Trials" },
{ "event_only_floor_fall_2510_2610_2022", "Hex-a-gone Trials" },
Expand Down Expand Up @@ -14354,6 +14355,7 @@ public static class Multilingual {
{ "event_only_finals_2904_to_0105_2022", "Marathon de finales" },
{ "event_only_finals_template", "Marathon de finales" },
{ "event_only_finals_v2_template", "Marathon de finales" },
{ "event_only_finals_v3_ranked", "Marathon des finales - Classé" },
{ "event_only_finals_v3_template", "Marathon de finales" },
{ "event_only_floor_fall_0510_to_0610_2022", "Ronde hexagonale" },
{ "event_only_floor_fall_2510_2610_2022", "Ronde hexagonale" },
Expand Down Expand Up @@ -15302,6 +15304,7 @@ public static class Multilingual {
{ "event_only_finals_2904_to_0105_2022", "결승전 마라톤" },
{ "event_only_finals_template", "결승전 마라톤" },
{ "event_only_finals_v2_template", "결승전 마라톤" },
{ "event_only_finals_v3_ranked", "결승전 마라톤 랭크" },
{ "event_only_finals_v3_template", "결승전 마라톤" },
{ "event_only_floor_fall_0510_to_0610_2022", "바닥 떨어져유 트라이얼" },
{ "event_only_floor_fall_2510_2610_2022", "바닥 떨어져유 트라이얼" },
Expand Down Expand Up @@ -16250,6 +16253,7 @@ public static class Multilingual {
{ "event_only_finals_2904_to_0105_2022", "ファイナルマラソン" },
{ "event_only_finals_template", "ファイナルマラソン" },
{ "event_only_finals_v2_template", "ファイナルマラソン" },
{ "event_only_finals_v3_ranked", "ファイナルマラソン ランク戦" },
{ "event_only_finals_v3_template", "ファイナルマラソン" },
{ "event_only_floor_fall_0510_to_0610_2022", "止まるなキケン勝ち抜き戦" },
{ "event_only_floor_fall_2510_2610_2022", "止まるなキケン勝ち抜き戦" },
Expand Down Expand Up @@ -17198,6 +17202,7 @@ public static class Multilingual {
{ "event_only_finals_2904_to_0105_2022", "决赛马拉松" },
{ "event_only_finals_template", "决赛马拉松" },
{ "event_only_finals_v2_template", "决赛马拉松" },
{ "event_only_finals_v3_ranked", "决赛马拉松排位赛" },
{ "event_only_finals_v3_template", "决赛马拉松" },
{ "event_only_floor_fall_0510_to_0610_2022", "蜂窝迷图试炼" },
{ "event_only_floor_fall_2510_2610_2022", "蜂窝迷图试炼" },
Expand Down Expand Up @@ -18146,6 +18151,7 @@ public static class Multilingual {
{ "event_only_finals_2904_to_0105_2022", "決賽馬拉松" },
{ "event_only_finals_template", "決賽馬拉松" },
{ "event_only_finals_v2_template", "決賽馬拉松" },
{ "event_only_finals_v3_ranked", "決賽馬拉松排名戰" },
{ "event_only_finals_v3_template", "決賽馬拉松" },
{ "event_only_floor_fall_0510_to_0610_2022", "蜂窩迷圖試煉" },
{ "event_only_floor_fall_2510_2610_2022", "蜂窩迷圖試煉" },
Expand Down
10 changes: 5 additions & 5 deletions FallGuysStats.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@
</PackageReference>
<PackageReference Include="LiteDB" Version="5.0.21" />
<PackageReference Include="MetroModernUI" Version="1.4.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
Expand All @@ -1198,10 +1198,10 @@
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.10" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.1" />
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
<PackageReference Include="System.Globalization" Version="4.3.0" />
<PackageReference Include="System.Globalization.Calendars" Version="4.3.0" />
Expand Down Expand Up @@ -1235,8 +1235,8 @@
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="System.Text.Encoding" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.10" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />
<PackageReference Include="System.Text.Encodings.Web" Version="10.0.1" />
<PackageReference Include="System.Text.Json" Version="10.0.1" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Threading" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion LevelTimeLimitDB.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UpcomingShowDB.json

Large diffs are not rendered by default.

32 changes: 25 additions & 7 deletions Views/Stats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ private static bool IsAlreadyRunning() {
private readonly object dbTaskLock = new object();
public List<Task> dbTasks = new List<Task>();

private readonly int currentDbVersion = 133;
private readonly int currentDbVersion = 134;

public readonly string[] PublicShowIdList = {
"main_show",
Expand Down Expand Up @@ -349,6 +349,7 @@ private static bool IsAlreadyRunning() {
};

public readonly string[] PublicShowIdList2 = {
"event_only_finals_v3_ranked",
"xtreme_solos_template_ranked",
"ranked_show_knockout",
"knockout_mode",
Expand Down Expand Up @@ -2040,6 +2041,22 @@ private void UpdateDatabaseDateFormat() {
private void UpdateDatabaseVersion() {
for (int version = this.CurrentSettings.Version; version < currentDbVersion; version++) {
switch (version) {
case 133: {
List<RoundInfo> roundInfoList = (from ri in this.RoundDetails.FindAll()
where string.Equals(ri.ShowNameId, "event_only_finals_v3_ranked")
select ri).ToList();

Profiles profile = this.Profiles.FindOne(Query.EQ("LinkedShowId", "ranked_solo_show"));
int profileId = profile?.ProfileId ?? -1;
foreach (RoundInfo ri in roundInfoList) {
if (profileId != -1) ri.Profile = profileId;
ri.IsFinal = ri.Round == 5;
}
this.StatsDB.BeginTrans();
this.RoundDetails.Update(roundInfoList);
this.StatsDB.Commit();
break;
}
case 132: {
DateTime dateCond = new DateTime(2025, 10, 10, 12, 0, 0, DateTimeKind.Utc);
List<RoundInfo> roundInfoList = (from ri in this.RoundDetails.FindAll()
Expand Down Expand Up @@ -5161,16 +5178,16 @@ private void LogFile_OnError(string error) {
}
}

private void LogFile_OnPersonalBestNotification(string showNameId, string roundId, double currentPb, double currentRecord) {
private void LogFile_OnPersonalBestNotification(string showId, string roundId, double currentPb, double currentRecord) {
string timeDiffContent = string.Empty;
if (currentPb > 0) {
TimeSpan timeDiff = TimeSpan.FromMilliseconds(currentPb - currentRecord);
timeDiffContent = timeDiff.Minutes > 0 ? $" ⏱️{Multilingual.GetWord("message_new_personal_best_timediff_by_minute_prefix")}{timeDiff.Minutes}{Multilingual.GetWord("message_new_personal_best_timediff_by_minute_infix")} {timeDiff.Seconds}.{timeDiff.Milliseconds}{Multilingual.GetWord("message_new_personal_best_timediff_by_minute_suffix")}"
: $" ⏱️{timeDiff.Seconds}.{timeDiff.Milliseconds}{Multilingual.GetWord("message_new_personal_best_timediff_by_second")}";
timeDiffContent = timeDiff.Minutes > 0 ? $" ⏱️ {Multilingual.GetWord("message_new_personal_best_timediff_by_minute_prefix")}{timeDiff.Minutes}{Multilingual.GetWord("message_new_personal_best_timediff_by_minute_infix")} {timeDiff:s\\.fff}{Multilingual.GetWord("message_new_personal_best_timediff_by_minute_suffix")}"
: $" ⏱️ {timeDiff:s\\.fff}{Multilingual.GetWord("message_new_personal_best_timediff_by_second")}";
}
string levelName = this.StatLookup.TryGetValue(roundId, out LevelStats l1) ? l1.Name : roundId;
string showName = $"{(string.Equals(Multilingual.GetShowName(showNameId), levelName) ? $"({levelName})" : $"({Multilingual.GetShowName(showNameId)} • {levelName})")}";
string description = $"{Multilingual.GetWord("message_new_personal_best_prefix")}{showName}{Multilingual.GetWord("message_new_personal_best_suffix")}{timeDiffContent}";
string levelName = this.StatLookup.TryGetValue(roundId, out LevelStats l1) ? l1.Name : roundId.Substring(0, roundId.Length - 3);
string info = $"{(string.Equals(Multilingual.GetShowName(showId), levelName) ? $"({levelName})" : $"({Multilingual.GetShowName(showId)} • {levelName})")}";
string description = $"{Multilingual.GetWord("message_new_personal_best_prefix")}{info}{Multilingual.GetWord("message_new_personal_best_suffix")}{timeDiffContent}";
ToastPosition toastPosition = Enum.TryParse(this.CurrentSettings.NotificationWindowPosition.ToString(), out ToastPosition position) ? position : ToastPosition.BottomRight;
ToastTheme toastTheme = this.Theme == MetroThemeStyle.Light ? ToastTheme.Light : ToastTheme.Dark;
ToastAnimation toastAnimation = this.CurrentSettings.NotificationWindowAnimation == 0 ? ToastAnimation.FADE : ToastAnimation.SLIDE;
Expand Down Expand Up @@ -6052,6 +6069,7 @@ public string GetMainGroupShowId(string showId) {
switch (showId) {
case "ranked_show_knockout":
case "xtreme_solos_template_ranked":
case "event_only_finals_v3_ranked":
return "ranked_solo_show";
case "event_only_fall_ball_trios_ranked":
return "ranked_trios_show";
Expand Down