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
32 changes: 19 additions & 13 deletions Entities/LogFileWatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,28 +400,22 @@ private bool IsRealFinalRound(int roundNum, string roundId, string showId) {
&& roundId.EndsWith("_final", StringComparison.OrdinalIgnoreCase))

|| (string.Equals(showId, "event_animals_template")
&& string.Equals(roundId, "round_drumtop_final_animals"))
&& roundNum == 4)

|| (string.Equals(showId, "event_yeetus_template")
&& roundId.IndexOf("_final", StringComparison.OrdinalIgnoreCase) != -1)

|| (string.Equals(showId, "event_only_button_bashers_template")
&& roundNum == 4)
&& roundNum == 3)

|| (string.Equals(showId, "event_only_finals_v3_template")
&& roundId.EndsWith("_final", StringComparison.OrdinalIgnoreCase))

|| (string.Equals(showId, "event_only_hoverboard_template")
&& string.Equals(roundId, "round_hoverboardsurvival_final"))

|| (string.Equals(showId, "event_only_slime_climb_2_template")
&& roundNum == 3)

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

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

|| (string.Equals(showId, "ftue_uk_show")
&& string.Equals(roundId, "round_snowballsurvival_noelim_ftue_s2"))
Expand Down Expand Up @@ -455,7 +449,7 @@ private bool IsRealFinalRound(int roundNum, string roundId, string showId) {
&& (roundNum == 3 || string.Equals(roundId, "showcase_boats")))

|| (string.Equals(showId, "wle_mrs_bouncy_bean_time")
&& string.Equals(roundId, "showcase_rollinruins"))
&& roundNum == 3)

|| (string.Equals(showId, "wle_nature_ltm")
&& (roundNum == 3 || string.Equals(roundId, "logroll_nature_ltm")))
Expand All @@ -479,7 +473,10 @@ private bool IsRealFinalRound(int roundNum, string roundId, string showId) {
}

private bool IsModeException(string roundId, string showId) {
return roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
return roundId.IndexOf("round_1v1_button_basher_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_slimeclimb_2_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_tip_toe_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_kraken_attack_only_finals", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_blastball_only_finals", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_floor_fall_only_finals", StringComparison.OrdinalIgnoreCase) != -1
Expand All @@ -499,14 +496,20 @@ private bool IsModeException(string roundId, string showId) {
|| roundId.IndexOf("round_thin_ice_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_fall_ball_cup_only_trios", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_blastball_arenasurvival_blast_ball_trials", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_sports_suddendeath_fall_ball", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_robotrampage_arena_2_ss2_show1", StringComparison.OrdinalIgnoreCase) != -1
|| 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")
// || showId.StartsWith("knockout_")
|| showId.StartsWith("ranked_"); // "Ranked Knockout" Show
}

private bool IsModeFinalException(string roundId) {
return ((roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
return ((roundId.IndexOf("round_1v1_button_basher_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_slimeclimb_2_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_tip_toe_event_only", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_kraken_attack_only_finals", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_blastball_only_finals", StringComparison.OrdinalIgnoreCase) != -1
|| roundId.IndexOf("round_floor_fall_only_finals", StringComparison.OrdinalIgnoreCase) != -1
Expand All @@ -530,6 +533,9 @@ private bool IsModeFinalException(string roundId) {
|| (roundId.IndexOf("round_blastball_arenasurvival_blast_ball_trials", StringComparison.OrdinalIgnoreCase) != -1
&& roundId.EndsWith("_fn", StringComparison.OrdinalIgnoreCase))

|| (roundId.IndexOf("round_sports_suddendeath_fall_ball", StringComparison.OrdinalIgnoreCase) != -1
&& roundId.EndsWith("_02", StringComparison.OrdinalIgnoreCase))

|| (roundId.IndexOf("round_robotrampage_arena_2_ss2_show1", StringComparison.OrdinalIgnoreCase) != -1
&& roundId.EndsWith("_03", StringComparison.OrdinalIgnoreCase))

Expand Down
92 changes: 91 additions & 1 deletion Entities/Multilingual.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6777,12 +6777,12 @@ public static class Multilingual {
{ "round_hexaring_symphony_launch_show", "육각링" },
{ "round_hexsnake_almond", "육각형 바닥" },
{ "round_jump_showdown", "점프 쇼다운" },
{ "round_kraken_attack", "크라켄 슬램" },
{ "round_crown_maze", "버려진 사원" },
{ "round_tunnel_final", "롤 오프" },
{ "round_royal_rumble", "꼬리 쟁탈전" },
{ "round_thin_ice", "살얼음판" },
{ "round_tiptoefinale_almond", "살금 살금 피날레" },
{ "round_kraken_attack", "크라켄 슬램" },

{ "user_creative_race_round", "사용자 폴크리 레이스 라운드" },
{ "user_creative_survival_round", "사용자 폴크리 생존 라운드" },
Expand Down Expand Up @@ -13604,6 +13604,21 @@ public static class Multilingual {
{ "only_1v1_volleyfall", "Volleyfall Tournament" },
{ "only_1v1_volleyfall_191022_211022", "Volleyfall Tournament" },
{ "only_solo_ss2_rounds_show", "3,2,1, SPACE!" },
{ "pl_blastball", "Blast Ball" },
{ "pl_duos_show", "Duos" },
{ "pl_fallmountain", "Fall Mountain" },
{ "pl_hexagone", "Hex-A-Gone" },
{ "pl_hexaring", "Hex-A-Ring" },
{ "pl_hexaterrestrial", "Hex-A-Terrestrial" },
{ "pl_jumpshowdown", "Jump Showdown" },
{ "pl_krakenslam", "Kraken Slam" },
{ "pl_losttemple", "Lost Temple" },
{ "pl_rolloff", "Roll Off" },
{ "pl_royal_fumble", "Royal Fumble" },
{ "pl_solo_main_show", "Solos" },
{ "pl_squads_show", "Squads" },
{ "pl_thin_ice", "Thin Ice" },
{ "pl_tiptoefinale", "Tip Toe Finale" },
{ "pl_vaulted_show", "The Vault" },
{ "placeholder", ""},
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
Expand Down Expand Up @@ -14537,6 +14552,21 @@ public static class Multilingual {
{ "only_1v1_volleyfall", "Tournoi de volleyfall" },
{ "only_1v1_volleyfall_191022_211022", "Tournoi de volleyfall" },
{ "only_solo_ss2_rounds_show", "1, 2, 3, VERS LES ÉTOILES !" },
{ "pl_blastball", "Balle Rebondissante" },
{ "pl_duos_show", "Duos" },
{ "pl_fallmountain", "La Grimpette" },
{ "pl_hexagone", "Hexagone Infernal" },
{ "pl_hexaring", "Hex-Anneau" },
{ "pl_hexaterrestrial", "Hexa-Terrestre" },
{ "pl_jumpshowdown", "Les Rois du Saut" },
{ "pl_krakenslam", "Valse du Kraken" },
{ "pl_losttemple", "Temple Perdu" },
{ "pl_rolloff", "Ça Coule" },
{ "pl_royal_fumble", "Bazar Royal" },
{ "pl_solo_main_show", "Solo" },
{ "pl_squads_show", "Groupes" },
{ "pl_thin_ice", "Fonte des Glaces" },
{ "pl_tiptoefinale", "Finale sur la Pointe des Pieds" },
{ "pl_vaulted_show", "Le Coffre fort" },
{ "placeholder", ""},
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
Expand Down Expand Up @@ -15470,6 +15500,21 @@ public static class Multilingual {
{ "only_1v1_volleyfall", "배구 토너먼트" },
{ "only_1v1_volleyfall_191022_211022", "배구 토너먼트" },
{ "only_solo_ss2_rounds_show", "3,2,1, 우주로!" },
{ "pl_blastball", "블라스트 공" },
{ "pl_duos_show", "듀오" },
{ "pl_fallmountain", "산 무너져유" },
{ "pl_hexagone", "바닥 떨어져유" },
{ "pl_hexaring", "육각링" },
{ "pl_hexaterrestrial", "육각형 바닥" },
{ "pl_jumpshowdown", "점프 쇼다운" },
{ "pl_krakenslam", "크라켄 슬램" },
{ "pl_losttemple", "버려진 사원" },
{ "pl_rolloff", "롤 오프" },
{ "pl_royal_fumble", "꼬리 쟁탈전" },
{ "pl_solo_main_show", "솔로" },
{ "pl_squads_show", "스쿼드" },
{ "pl_thin_ice", "살얼음판" },
{ "pl_tiptoefinale", "살금 살금 피날레" },
{ "pl_vaulted_show", "볼트" },
{ "placeholder", ""},
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
Expand Down Expand Up @@ -16403,6 +16448,21 @@ public static class Multilingual {
{ "only_1v1_volleyfall", "バレーフォールトーナメント" },
{ "only_1v1_volleyfall_191022_211022", "バレーフォールトーナメント" },
{ "only_solo_ss2_rounds_show", "3、2、1、宇宙!" },
{ "pl_blastball", "ブラストボール" },
{ "pl_duos_show", "デュオ" },
{ "pl_fallmountain", "クラウンマウンテン" },
{ "pl_hexagone", "止まるなキケン" },
{ "pl_hexaring", "リングのノロイ" },
{ "pl_hexaterrestrial", "止まるなキケンスペース" },
{ "pl_jumpshowdown", "ジャンプ・ショーダウン" },
{ "pl_krakenslam", "クラーケンスラム" },
{ "pl_losttemple", "ロストテンプル" },
{ "pl_rolloff", "ロールオフ" },
{ "pl_royal_fumble", "ロイヤルファンブル" },
{ "pl_solo_main_show", "ソロ" },
{ "pl_squads_show", "スクワッド" },
{ "pl_thin_ice", "パキパキアイス" },
{ "pl_tiptoefinale", "ヒヤヒヤロードファイナル" },
{ "pl_vaulted_show", "保管庫" },
{ "placeholder", ""},
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
Expand Down Expand Up @@ -17336,6 +17396,21 @@ public static class Multilingual {
{ "only_1v1_volleyfall", "糖豆排球锦标赛" },
{ "only_1v1_volleyfall_191022_211022", "糖豆排球锦标赛" },
{ "only_solo_ss2_rounds_show", "3、2、1,宇宙!" },
{ "pl_blastball", "震荡球" },
{ "pl_duos_show", "双人" },
{ "pl_fallmountain", "登山比拼" },
{ "pl_hexagone", "蜂窝迷图" },
{ "pl_hexaring", "蜂窝迷环" },
{ "pl_hexaterrestrial", "深空蜂窝" },
{ "pl_jumpshowdown", "巅峰对决" },
{ "pl_krakenslam", "海怪重击" },
{ "pl_losttemple", "失落神庙" },
{ "pl_rolloff", "滚轮行动" },
{ "pl_royal_fumble", "盛装团团转" },
{ "pl_solo_main_show", "单人" },
{ "pl_squads_show", "小队" },
{ "pl_thin_ice", "如履薄冰" },
{ "pl_tiptoefinale", "决胜之踮" },
{ "pl_vaulted_show", "归档库" },
{ "placeholder", ""},
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
Expand Down Expand Up @@ -18269,6 +18344,21 @@ public static class Multilingual {
{ "only_1v1_volleyfall", "糖豆排球錦標賽" },
{ "only_1v1_volleyfall_191022_211022", "糖豆排球錦標賽" },
{ "only_solo_ss2_rounds_show", "3、2、1,宇宙!" },
{ "pl_blastball", "震盪球" },
{ "pl_duos_show", "雙人" },
{ "pl_fallmountain", "登山比拼" },
{ "pl_hexagone", "蜂窩迷圖" },
{ "pl_hexaring", "蜂窩迷環" },
{ "pl_hexaterrestrial", "深空蜂窩" },
{ "pl_jumpshowdown", "巔峰對決" },
{ "pl_krakenslam", "海怪重擊" },
{ "pl_losttemple", "失落神廟" },
{ "pl_rolloff", "滾輪行動" },
{ "pl_royal_fumble", "盛裝團團轉" },
{ "pl_solo_main_show", "單人" },
{ "pl_squads_show", "小隊" },
{ "pl_thin_ice", "如履薄冰" },
{ "pl_tiptoefinale", "決勝之踮" },
{ "pl_vaulted_show", "歸檔庫" },
{ "placeholder", ""},
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
Expand Down
Loading