Skip to content

Commit a3e405f

Browse files
qubqubqubqub
authored
Merge pull request #498 from Micdu70/dev-1
Bug fix
2 parents 02386cb + 4bfa94f commit a3e405f

File tree

3 files changed

+245
-51
lines changed

3 files changed

+245
-51
lines changed

‎Entities/LogFileWatcher.cs‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -400,28 +400,22 @@ private bool IsRealFinalRound(int roundNum, string roundId, string showId) {
400400
&& roundId.EndsWith("_final", StringComparison.OrdinalIgnoreCase))
401401

402402
|| (string.Equals(showId, "event_animals_template")
403-
&& string.Equals(roundId, "round_drumtop_final_animals"))
403+
&& roundNum == 4)
404404

405405
|| (string.Equals(showId, "event_yeetus_template")
406-
&& roundId.IndexOf("_final", StringComparison.OrdinalIgnoreCase) != -1)
407-
408-
|| (string.Equals(showId, "event_only_button_bashers_template")
409-
&& roundNum == 4)
406+
&& roundNum == 3)
410407

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

414411
|| (string.Equals(showId, "event_only_hoverboard_template")
415-
&& string.Equals(roundId, "round_hoverboardsurvival_final"))
416-
417-
|| (string.Equals(showId, "event_only_slime_climb_2_template")
418412
&& roundNum == 3)
419413

420414
|| (string.Equals(showId, "event_snowday_stumble")
421-
&& (string.Equals(roundId, "round_cloudyteacups_final_sds") || string.Equals(roundId, "round_goopropegrandslam_final_sds")))
415+
&& roundNum == 4)
422416

423417
|| (string.Equals(showId, "fp16_ski_fall_high_scorers")
424-
&& string.Equals(roundId, "round_event_only_skeefall_timetrial_s6_1"))
418+
&& roundNum == 1)
425419

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

457451
|| (string.Equals(showId, "wle_mrs_bouncy_bean_time")
458-
&& string.Equals(roundId, "showcase_rollinruins"))
452+
&& roundNum == 3)
459453

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

481475
private bool IsModeException(string roundId, string showId) {
482-
return roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
476+
return roundId.IndexOf("round_1v1_button_basher_event_only", StringComparison.OrdinalIgnoreCase) != -1
477+
|| roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
478+
|| roundId.IndexOf("round_slimeclimb_2_event_only", StringComparison.OrdinalIgnoreCase) != -1
479+
|| roundId.IndexOf("round_tip_toe_event_only", StringComparison.OrdinalIgnoreCase) != -1
483480
|| roundId.IndexOf("round_kraken_attack_only_finals", StringComparison.OrdinalIgnoreCase) != -1
484481
|| roundId.IndexOf("round_blastball_only_finals", StringComparison.OrdinalIgnoreCase) != -1
485482
|| roundId.IndexOf("round_floor_fall_only_finals", StringComparison.OrdinalIgnoreCase) != -1
@@ -499,14 +496,20 @@ private bool IsModeException(string roundId, string showId) {
499496
|| roundId.IndexOf("round_thin_ice_event_only", StringComparison.OrdinalIgnoreCase) != -1
500497
|| roundId.IndexOf("round_fall_ball_cup_only_trios", StringComparison.OrdinalIgnoreCase) != -1
501498
|| roundId.IndexOf("round_blastball_arenasurvival_blast_ball_trials", StringComparison.OrdinalIgnoreCase) != -1
499+
|| roundId.IndexOf("round_sports_suddendeath_fall_ball", StringComparison.OrdinalIgnoreCase) != -1
502500
|| roundId.IndexOf("round_robotrampage_arena_2_ss2_show1", StringComparison.OrdinalIgnoreCase) != -1
501+
|| roundId.IndexOf("round_floor_fall_squads_survival", StringComparison.OrdinalIgnoreCase) != -1
502+
|| roundId.IndexOf("round_thin_ice_squads_survival", StringComparison.OrdinalIgnoreCase) != -1
503503
|| string.Equals(showId, "event_blast_ball_banger_template")
504504
// || showId.StartsWith("knockout_")
505505
|| showId.StartsWith("ranked_"); // "Ranked Knockout" Show
506506
}
507507

508508
private bool IsModeFinalException(string roundId) {
509-
return ((roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
509+
return ((roundId.IndexOf("round_1v1_button_basher_event_only", StringComparison.OrdinalIgnoreCase) != -1
510+
|| roundId.IndexOf("round_lava_event_only_slime_climb", StringComparison.OrdinalIgnoreCase) != -1
511+
|| roundId.IndexOf("round_slimeclimb_2_event_only", StringComparison.OrdinalIgnoreCase) != -1
512+
|| roundId.IndexOf("round_tip_toe_event_only", StringComparison.OrdinalIgnoreCase) != -1
510513
|| roundId.IndexOf("round_kraken_attack_only_finals", StringComparison.OrdinalIgnoreCase) != -1
511514
|| roundId.IndexOf("round_blastball_only_finals", StringComparison.OrdinalIgnoreCase) != -1
512515
|| roundId.IndexOf("round_floor_fall_only_finals", StringComparison.OrdinalIgnoreCase) != -1
@@ -530,6 +533,9 @@ private bool IsModeFinalException(string roundId) {
530533
|| (roundId.IndexOf("round_blastball_arenasurvival_blast_ball_trials", StringComparison.OrdinalIgnoreCase) != -1
531534
&& roundId.EndsWith("_fn", StringComparison.OrdinalIgnoreCase))
532535

536+
|| (roundId.IndexOf("round_sports_suddendeath_fall_ball", StringComparison.OrdinalIgnoreCase) != -1
537+
&& roundId.EndsWith("_02", StringComparison.OrdinalIgnoreCase))
538+
533539
|| (roundId.IndexOf("round_robotrampage_arena_2_ss2_show1", StringComparison.OrdinalIgnoreCase) != -1
534540
&& roundId.EndsWith("_03", StringComparison.OrdinalIgnoreCase))
535541

‎Entities/Multilingual.cs‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6777,12 +6777,12 @@ public static class Multilingual {
67776777
{ "round_hexaring_symphony_launch_show", "육각링" },
67786778
{ "round_hexsnake_almond", "육각형 바닥" },
67796779
{ "round_jump_showdown", "점프 쇼다운" },
6780+
{ "round_kraken_attack", "크라켄 슬램" },
67806781
{ "round_crown_maze", "버려진 사원" },
67816782
{ "round_tunnel_final", "롤 오프" },
67826783
{ "round_royal_rumble", "꼬리 쟁탈전" },
67836784
{ "round_thin_ice", "살얼음판" },
67846785
{ "round_tiptoefinale_almond", "살금 살금 피날레" },
6785-
{ "round_kraken_attack", "크라켄 슬램" },
67866786

67876787
{ "user_creative_race_round", "사용자 폴크리 레이스 라운드" },
67886788
{ "user_creative_survival_round", "사용자 폴크리 생존 라운드" },
@@ -13604,6 +13604,21 @@ public static class Multilingual {
1360413604
{ "only_1v1_volleyfall", "Volleyfall Tournament" },
1360513605
{ "only_1v1_volleyfall_191022_211022", "Volleyfall Tournament" },
1360613606
{ "only_solo_ss2_rounds_show", "3,2,1, SPACE!" },
13607+
{ "pl_blastball", "Blast Ball" },
13608+
{ "pl_duos_show", "Duos" },
13609+
{ "pl_fallmountain", "Fall Mountain" },
13610+
{ "pl_hexagone", "Hex-A-Gone" },
13611+
{ "pl_hexaring", "Hex-A-Ring" },
13612+
{ "pl_hexaterrestrial", "Hex-A-Terrestrial" },
13613+
{ "pl_jumpshowdown", "Jump Showdown" },
13614+
{ "pl_krakenslam", "Kraken Slam" },
13615+
{ "pl_losttemple", "Lost Temple" },
13616+
{ "pl_rolloff", "Roll Off" },
13617+
{ "pl_royal_fumble", "Royal Fumble" },
13618+
{ "pl_solo_main_show", "Solos" },
13619+
{ "pl_squads_show", "Squads" },
13620+
{ "pl_thin_ice", "Thin Ice" },
13621+
{ "pl_tiptoefinale", "Tip Toe Finale" },
1360713622
{ "pl_vaulted_show", "The Vault" },
1360813623
{ "placeholder", ""},
1360913624
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
@@ -14537,6 +14552,21 @@ public static class Multilingual {
1453714552
{ "only_1v1_volleyfall", "Tournoi de volleyfall" },
1453814553
{ "only_1v1_volleyfall_191022_211022", "Tournoi de volleyfall" },
1453914554
{ "only_solo_ss2_rounds_show", "1, 2, 3, VERS LES ÉTOILES !" },
14555+
{ "pl_blastball", "Balle Rebondissante" },
14556+
{ "pl_duos_show", "Duos" },
14557+
{ "pl_fallmountain", "La Grimpette" },
14558+
{ "pl_hexagone", "Hexagone Infernal" },
14559+
{ "pl_hexaring", "Hex-Anneau" },
14560+
{ "pl_hexaterrestrial", "Hexa-Terrestre" },
14561+
{ "pl_jumpshowdown", "Les Rois du Saut" },
14562+
{ "pl_krakenslam", "Valse du Kraken" },
14563+
{ "pl_losttemple", "Temple Perdu" },
14564+
{ "pl_rolloff", "Ça Coule" },
14565+
{ "pl_royal_fumble", "Bazar Royal" },
14566+
{ "pl_solo_main_show", "Solo" },
14567+
{ "pl_squads_show", "Groupes" },
14568+
{ "pl_thin_ice", "Fonte des Glaces" },
14569+
{ "pl_tiptoefinale", "Finale sur la Pointe des Pieds" },
1454014570
{ "pl_vaulted_show", "Le Coffre fort" },
1454114571
{ "placeholder", ""},
1454214572
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
@@ -15470,6 +15500,21 @@ public static class Multilingual {
1547015500
{ "only_1v1_volleyfall", "배구 토너먼트" },
1547115501
{ "only_1v1_volleyfall_191022_211022", "배구 토너먼트" },
1547215502
{ "only_solo_ss2_rounds_show", "3,2,1, 우주로!" },
15503+
{ "pl_blastball", "블라스트 공" },
15504+
{ "pl_duos_show", "듀오" },
15505+
{ "pl_fallmountain", "산 무너져유" },
15506+
{ "pl_hexagone", "바닥 떨어져유" },
15507+
{ "pl_hexaring", "육각링" },
15508+
{ "pl_hexaterrestrial", "육각형 바닥" },
15509+
{ "pl_jumpshowdown", "점프 쇼다운" },
15510+
{ "pl_krakenslam", "크라켄 슬램" },
15511+
{ "pl_losttemple", "버려진 사원" },
15512+
{ "pl_rolloff", "롤 오프" },
15513+
{ "pl_royal_fumble", "꼬리 쟁탈전" },
15514+
{ "pl_solo_main_show", "솔로" },
15515+
{ "pl_squads_show", "스쿼드" },
15516+
{ "pl_thin_ice", "살얼음판" },
15517+
{ "pl_tiptoefinale", "살금 살금 피날레" },
1547315518
{ "pl_vaulted_show", "볼트" },
1547415519
{ "placeholder", ""},
1547515520
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
@@ -16403,6 +16448,21 @@ public static class Multilingual {
1640316448
{ "only_1v1_volleyfall", "バレーフォールトーナメント" },
1640416449
{ "only_1v1_volleyfall_191022_211022", "バレーフォールトーナメント" },
1640516450
{ "only_solo_ss2_rounds_show", "3、2、1、宇宙！" },
16451+
{ "pl_blastball", "ブラストボール" },
16452+
{ "pl_duos_show", "デュオ" },
16453+
{ "pl_fallmountain", "クラウンマウンテン" },
16454+
{ "pl_hexagone", "止まるなキケン" },
16455+
{ "pl_hexaring", "リングのノロイ" },
16456+
{ "pl_hexaterrestrial", "止まるなキケンスペース" },
16457+
{ "pl_jumpshowdown", "ジャンプ・ショーダウン" },
16458+
{ "pl_krakenslam", "クラーケンスラム" },
16459+
{ "pl_losttemple", "ロストテンプル" },
16460+
{ "pl_rolloff", "ロールオフ" },
16461+
{ "pl_royal_fumble", "ロイヤルファンブル" },
16462+
{ "pl_solo_main_show", "ソロ" },
16463+
{ "pl_squads_show", "スクワッド" },
16464+
{ "pl_thin_ice", "パキパキアイス" },
16465+
{ "pl_tiptoefinale", "ヒヤヒヤロードファイナル" },
1640616466
{ "pl_vaulted_show", "保管庫" },
1640716467
{ "placeholder", ""},
1640816468
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
@@ -17336,6 +17396,21 @@ public static class Multilingual {
1733617396
{ "only_1v1_volleyfall", "糖豆排球锦标赛" },
1733717397
{ "only_1v1_volleyfall_191022_211022", "糖豆排球锦标赛" },
1733817398
{ "only_solo_ss2_rounds_show", "3、2、1，宇宙！" },
17399+
{ "pl_blastball", "震荡球" },
17400+
{ "pl_duos_show", "双人" },
17401+
{ "pl_fallmountain", "登山比拼" },
17402+
{ "pl_hexagone", "蜂窝迷图" },
17403+
{ "pl_hexaring", "蜂窝迷环" },
17404+
{ "pl_hexaterrestrial", "深空蜂窝" },
17405+
{ "pl_jumpshowdown", "巅峰对决" },
17406+
{ "pl_krakenslam", "海怪重击" },
17407+
{ "pl_losttemple", "失落神庙" },
17408+
{ "pl_rolloff", "滚轮行动" },
17409+
{ "pl_royal_fumble", "盛装团团转" },
17410+
{ "pl_solo_main_show", "单人" },
17411+
{ "pl_squads_show", "小队" },
17412+
{ "pl_thin_ice", "如履薄冰" },
17413+
{ "pl_tiptoefinale", "决胜之踮" },
1733917414
{ "pl_vaulted_show", "归档库" },
1734017415
{ "placeholder", ""},
1734117416
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },
@@ -18269,6 +18344,21 @@ public static class Multilingual {
1826918344
{ "only_1v1_volleyfall", "糖豆排球錦標賽" },
1827018345
{ "only_1v1_volleyfall_191022_211022", "糖豆排球錦標賽" },
1827118346
{ "only_solo_ss2_rounds_show", "3、2、1，宇宙！" },
18347+
{ "pl_blastball", "震盪球" },
18348+
{ "pl_duos_show", "雙人" },
18349+
{ "pl_fallmountain", "登山比拼" },
18350+
{ "pl_hexagone", "蜂窩迷圖" },
18351+
{ "pl_hexaring", "蜂窩迷環" },
18352+
{ "pl_hexaterrestrial", "深空蜂窩" },
18353+
{ "pl_jumpshowdown", "巔峰對決" },
18354+
{ "pl_krakenslam", "海怪重擊" },
18355+
{ "pl_losttemple", "失落神廟" },
18356+
{ "pl_rolloff", "滾輪行動" },
18357+
{ "pl_royal_fumble", "盛裝團團轉" },
18358+
{ "pl_solo_main_show", "單人" },
18359+
{ "pl_squads_show", "小隊" },
18360+
{ "pl_thin_ice", "如履薄冰" },
18361+
{ "pl_tiptoefinale", "決勝之踮" },
1827218362
{ "pl_vaulted_show", "歸檔庫" },
1827318363
{ "placeholder", ""},
1827418364
{ "playlist_fallguys_skill", "playlist_fallguys_skill" },

0 commit comments

Comments
 (0)