BlueGit

projects-timfalken-com meteors

t1198: Offline Strijd result shows opponents defeated over all rounds

timfa Grok Bot · pushed by timfa

Authored 2026-11-15 · 2 days ago

Hash
10b53e2c9bf2d1f28601f4475c74fdcf22687900
Parent
67e019fe
4 files changed +127 −43
server/lib/i18n.json +50 −20
@@ -90,7 +90,6 @@
90 90 "offline.reachedBefore": "You reached round",
91 91 "offline.reachedAfter": ".",
92 92 "offline.reached": "You reached round {n}.",
93 "offline.detail": "You played against {n} {opponents} at skill {skill}%.",
94 93 "offline.backMenu": "Back to the menu",
95 94 "gameover.title": "You lost",
96 95 "gameover.detail": "Every column is locked.",
@@ -284,7 +283,11 @@
284 283 "game.paused": "Paused",
285 284 "game.resume": "Resume",
286 285 "game.backToMenu": "Back to main menu",
287 "reward.ended": "Game ended"
286 "reward.ended": "Game ended",
287 "offline.defeated.one": "{n} opponent defeated",
288 "offline.defeated.few": "{n} opponents defeated",
289 "offline.defeated.many": "{n} opponents defeated",
290 "offline.defeated.other": "{n} opponents defeated"
288 291 },
289 292 "nl": {
290 293 "menu.play": "Spelen",
@@ -376,7 +379,6 @@
376 379 "offline.reachedBefore": "Je hebt ronde",
377 380 "offline.reachedAfter": " bereikt.",
378 381 "offline.reached": "Je hebt ronde {n} bereikt.",
379 "offline.detail": "Je speelde tegen {n} {opponents} met skill {skill}%.",
380 382 "offline.backMenu": "Terug naar het menu",
381 383 "gameover.title": "Je hebt verloren",
382 384 "gameover.detail": "Alle kolommen zitten vast.",
@@ -570,7 +572,11 @@
570 572 "game.paused": "Gepauzeerd",
571 573 "game.resume": "Verder spelen",
572 574 "game.backToMenu": "Terug naar hoofdmenu",
573 "reward.ended": "Spel gestopt"
575 "reward.ended": "Spel gestopt",
576 "offline.defeated.one": "{n} tegenstander verslagen",
577 "offline.defeated.few": "{n} tegenstanders verslagen",
578 "offline.defeated.many": "{n} tegenstanders verslagen",
579 "offline.defeated.other": "{n} tegenstanders verslagen"
574 580 },
575 581 "de": {
576 582 "menu.play": "Spielen",
@@ -662,7 +668,6 @@
662 668 "offline.reachedBefore": "Du hast Runde",
663 669 "offline.reachedAfter": " erreicht.",
664 670 "offline.reached": "Du hast Runde {n} erreicht.",
665 "offline.detail": "Du hast gegen {n} {opponents} mit Können {skill} % gespielt.",
666 671 "offline.backMenu": "Zurück zum Menü",
667 672 "gameover.title": "Du hast verloren",
668 673 "gameover.detail": "Alle Spalten sind festgesetzt.",
@@ -856,7 +861,11 @@
856 861 "game.paused": "Pausiert",
857 862 "game.resume": "Weiterspielen",
858 863 "game.backToMenu": "Zurück zum Hauptmenü",
859 "reward.ended": "Spiel beendet"
864 "reward.ended": "Spiel beendet",
865 "offline.defeated.one": "{n} Gegner besiegt",
866 "offline.defeated.few": "{n} Gegner besiegt",
867 "offline.defeated.many": "{n} Gegner besiegt",
868 "offline.defeated.other": "{n} Gegner besiegt"
860 869 },
861 870 "fr": {
862 871 "menu.play": "Jouer",
@@ -948,7 +957,6 @@
948 957 "offline.reachedBefore": "Tu as atteint la manche",
949 958 "offline.reachedAfter": ".",
950 959 "offline.reached": "Tu as atteint la manche {n}.",
951 "offline.detail": "Tu as joué contre {n} {opponents} au niveau {skill} %.",
952 960 "offline.backMenu": "Retour au menu",
953 961 "gameover.title": "Tu as perdu",
954 962 "gameover.detail": "Toutes les colonnes sont bloquées.",
@@ -1142,7 +1150,11 @@
1142 1150 "game.paused": "En pause",
1143 1151 "game.resume": "Reprendre",
1144 1152 "game.backToMenu": "Retour au menu principal",
1145 "reward.ended": "Partie terminée"
1153 "reward.ended": "Partie terminée",
1154 "offline.defeated.one": "{n} adversaire vaincu",
1155 "offline.defeated.few": "{n} adversaires vaincus",
1156 "offline.defeated.many": "{n} adversaires vaincus",
1157 "offline.defeated.other": "{n} adversaires vaincus"
1146 1158 },
1147 1159 "ja": {
1148 1160 "menu.play": "プレイ",
@@ -1234,7 +1246,6 @@
1234 1246 "offline.reachedBefore": "到達ラウンド:",
1235 1247 "offline.reachedAfter": "。",
1236 1248 "offline.reached": "ラウンド {n} まで到達しました。",
1237 "offline.detail": "スキル {skill}% の{opponents}{n}人と対戦しました。",
1238 1249 "offline.backMenu": "メニューに戻る",
1239 1250 "gameover.title": "負けました",
1240 1251 "gameover.detail": "すべての列がロックされました。",
@@ -1428,7 +1439,11 @@
1428 1439 "game.paused": "一時停止中",
1429 1440 "game.resume": "再開",
1430 1441 "game.backToMenu": "メインメニューに戻る",
1431 "reward.ended": "ゲーム終了"
1442 "reward.ended": "ゲーム終了",
1443 "offline.defeated.one": "{n}人の相手を倒した",
1444 "offline.defeated.few": "{n}人の相手を倒した",
1445 "offline.defeated.many": "{n}人の相手を倒した",
1446 "offline.defeated.other": "{n}人の相手を倒した"
1432 1447 },
1433 1448 "zh": {
1434 1449 "menu.play": "开始游戏",
@@ -1520,7 +1535,6 @@
1520 1535 "offline.reachedBefore": "你到达了第",
1521 1536 "offline.reachedAfter": " 轮。",
1522 1537 "offline.reached": "你到达了第 {n} 轮。",
1523 "offline.detail": "你以 {skill}% 的水平对战了 {n} 名{opponents}。",
1524 1538 "offline.backMenu": "返回菜单",
1525 1539 "gameover.title": "你输了",
1526 1540 "gameover.detail": "所有列都已锁定。",
@@ -1714,7 +1728,11 @@
1714 1728 "game.paused": "已暂停",
1715 1729 "game.resume": "继续游戏",
1716 1730 "game.backToMenu": "返回主菜单",
1717 "reward.ended": "游戏结束"
1731 "reward.ended": "游戏结束",
1732 "offline.defeated.one": "击败了 {n} 名对手",
1733 "offline.defeated.few": "击败了 {n} 名对手",
1734 "offline.defeated.many": "击败了 {n} 名对手",
1735 "offline.defeated.other": "击败了 {n} 名对手"
1718 1736 },
1719 1737 "ko": {
1720 1738 "menu.play": "플레이",
@@ -1806,7 +1824,6 @@
1806 1824 "offline.reachedBefore": "도달한 라운드:",
1807 1825 "offline.reachedAfter": ".",
1808 1826 "offline.reached": "{n}라운드까지 도달했습니다.",
1809 "offline.detail": "숙련도 {skill}%의 {opponents} {n}명과 대결했습니다.",
1810 1827 "offline.backMenu": "메뉴로 돌아가기",
1811 1828 "gameover.title": "패배했습니다",
1812 1829 "gameover.detail": "모든 열이 잠겼습니다.",
@@ -2000,7 +2017,11 @@
2000 2017 "game.paused": "일시정지",
2001 2018 "game.resume": "계속하기",
2002 2019 "game.backToMenu": "메인 메뉴로 돌아가기",
2003 "reward.ended": "게임 종료"
2020 "reward.ended": "게임 종료",
2021 "offline.defeated.one": "상대 {n}명 격파",
2022 "offline.defeated.few": "상대 {n}명 격파",
2023 "offline.defeated.many": "상대 {n}명 격파",
2024 "offline.defeated.other": "상대 {n}명 격파"
2004 2025 },
2005 2026 "pl": {
2006 2027 "menu.play": "Graj",
@@ -2092,7 +2113,6 @@
2092 2113 "offline.reachedBefore": "Dotarłeś do rundy",
2093 2114 "offline.reachedAfter": ".",
2094 2115 "offline.reached": "Dotarłeś do rundy {n}.",
2095 "offline.detail": "Grałeś przeciwko {n} {opponents} przy umiejętności {skill}%.",
2096 2116 "offline.backMenu": "Powrót do menu",
2097 2117 "gameover.title": "Przegrałeś",
2098 2118 "gameover.detail": "Wszystkie kolumny są zablokowane.",
@@ -2286,7 +2306,11 @@
2286 2306 "game.paused": "Pauza",
2287 2307 "game.resume": "Wznów",
2288 2308 "game.backToMenu": "Powrót do menu głównego",
2289 "reward.ended": "Gra zakończona"
2309 "reward.ended": "Gra zakończona",
2310 "offline.defeated.one": "{n} pokonany przeciwnik",
2311 "offline.defeated.few": "{n} pokonanych przeciwników",
2312 "offline.defeated.many": "{n} pokonanych przeciwników",
2313 "offline.defeated.other": "{n} pokonanych przeciwników"
2290 2314 },
2291 2315 "ru": {
2292 2316 "menu.play": "Играть",
@@ -2378,7 +2402,6 @@
2378 2402 "offline.reachedBefore": "Ты дошёл до раунда",
2379 2403 "offline.reachedAfter": ".",
2380 2404 "offline.reached": "Ты дошёл до раунда {n}.",
2381 "offline.detail": "Ты играл против {n} {opponents} с мастерством {skill} %.",
2382 2405 "offline.backMenu": "Вернуться в меню",
2383 2406 "gameover.title": "Ты проиграл",
2384 2407 "gameover.detail": "Все столбцы заблокированы.",
@@ -2572,7 +2595,11 @@
2572 2595 "game.paused": "Пауза",
2573 2596 "game.resume": "Продолжить",
2574 2597 "game.backToMenu": "В главное меню",
2575 "reward.ended": "Игра окончена"
2598 "reward.ended": "Игра окончена",
2599 "offline.defeated.one": "{n} противник побеждён",
2600 "offline.defeated.few": "{n} противника побеждено",
2601 "offline.defeated.many": "{n} противников побеждено",
2602 "offline.defeated.other": "{n} противников побеждено"
2576 2603 },
2577 2604 "es": {
2578 2605 "menu.play": "Jugar",
@@ -2664,7 +2691,6 @@
2664 2691 "offline.reachedBefore": "Has llegado a la ronda",
2665 2692 "offline.reachedAfter": ".",
2666 2693 "offline.reached": "Has llegado a la ronda {n}.",
2667 "offline.detail": "Jugaste contra {n} {opponents} con un nivel del {skill} %.",
2668 2694 "offline.backMenu": "Volver al menú",
2669 2695 "gameover.title": "Has perdido",
2670 2696 "gameover.detail": "Todas las columnas están bloqueadas.",
@@ -2858,7 +2884,11 @@
2858 2884 "game.paused": "En pausa",
2859 2885 "game.resume": "Continuar",
2860 2886 "game.backToMenu": "Volver al menú principal",
2861 "reward.ended": "Partida terminada"
2887 "reward.ended": "Partida terminada",
2888 "offline.defeated.one": "{n} rival derrotado",
2889 "offline.defeated.few": "{n} rivales derrotados",
2890 "offline.defeated.many": "{n} rivales derrotados",
2891 "offline.defeated.other": "{n} rivales derrotados"
2862 2892 }
2863 2893 },
2864 2894 "errors": {
@@ -90,7 +90,6 @@
90 "offline.reachedBefore": "You reached round",
90 "offline.reachedBefore": "You reached round",
91 "offline.reachedAfter": ".",
91 "offline.reachedAfter": ".",
92 "offline.reached": "You reached round {n}.",
92 "offline.reached": "You reached round {n}.",
93 "offline.detail": "You played against {n} {opponents} at skill {skill}%.",
94 "offline.backMenu": "Back to the menu",
93 "offline.backMenu": "Back to the menu",
95 "gameover.title": "You lost",
94 "gameover.title": "You lost",
96 "gameover.detail": "Every column is locked.",
95 "gameover.detail": "Every column is locked.",
@@ -284,7 +283,11 @@
284 "game.paused": "Paused",
283 "game.paused": "Paused",
285 "game.resume": "Resume",
284 "game.resume": "Resume",
286 "game.backToMenu": "Back to main menu",
285 "game.backToMenu": "Back to main menu",
287 "reward.ended": "Game ended"
286 "reward.ended": "Game ended",
287 "offline.defeated.one": "{n} opponent defeated",
288 "offline.defeated.few": "{n} opponents defeated",
289 "offline.defeated.many": "{n} opponents defeated",
290 "offline.defeated.other": "{n} opponents defeated"
288 },
291 },
289 "nl": {
292 "nl": {
290 "menu.play": "Spelen",
293 "menu.play": "Spelen",
@@ -376,7 +379,6 @@
376 "offline.reachedBefore": "Je hebt ronde",
379 "offline.reachedBefore": "Je hebt ronde",
377 "offline.reachedAfter": " bereikt.",
380 "offline.reachedAfter": " bereikt.",
378 "offline.reached": "Je hebt ronde {n} bereikt.",
381 "offline.reached": "Je hebt ronde {n} bereikt.",
379 "offline.detail": "Je speelde tegen {n} {opponents} met skill {skill}%.",
380 "offline.backMenu": "Terug naar het menu",
382 "offline.backMenu": "Terug naar het menu",
381 "gameover.title": "Je hebt verloren",
383 "gameover.title": "Je hebt verloren",
382 "gameover.detail": "Alle kolommen zitten vast.",
384 "gameover.detail": "Alle kolommen zitten vast.",
@@ -570,7 +572,11 @@
570 "game.paused": "Gepauzeerd",
572 "game.paused": "Gepauzeerd",
571 "game.resume": "Verder spelen",
573 "game.resume": "Verder spelen",
572 "game.backToMenu": "Terug naar hoofdmenu",
574 "game.backToMenu": "Terug naar hoofdmenu",
573 "reward.ended": "Spel gestopt"
575 "reward.ended": "Spel gestopt",
576 "offline.defeated.one": "{n} tegenstander verslagen",
577 "offline.defeated.few": "{n} tegenstanders verslagen",
578 "offline.defeated.many": "{n} tegenstanders verslagen",
579 "offline.defeated.other": "{n} tegenstanders verslagen"
574 },
580 },
575 "de": {
581 "de": {
576 "menu.play": "Spielen",
582 "menu.play": "Spielen",
@@ -662,7 +668,6 @@
662 "offline.reachedBefore": "Du hast Runde",
668 "offline.reachedBefore": "Du hast Runde",
663 "offline.reachedAfter": " erreicht.",
669 "offline.reachedAfter": " erreicht.",
664 "offline.reached": "Du hast Runde {n} erreicht.",
670 "offline.reached": "Du hast Runde {n} erreicht.",
665 "offline.detail": "Du hast gegen {n} {opponents} mit Können {skill} % gespielt.",
666 "offline.backMenu": "Zurück zum Menü",
671 "offline.backMenu": "Zurück zum Menü",
667 "gameover.title": "Du hast verloren",
672 "gameover.title": "Du hast verloren",
668 "gameover.detail": "Alle Spalten sind festgesetzt.",
673 "gameover.detail": "Alle Spalten sind festgesetzt.",
@@ -856,7 +861,11 @@
856 "game.paused": "Pausiert",
861 "game.paused": "Pausiert",
857 "game.resume": "Weiterspielen",
862 "game.resume": "Weiterspielen",
858 "game.backToMenu": "Zurück zum Hauptmenü",
863 "game.backToMenu": "Zurück zum Hauptmenü",
859 "reward.ended": "Spiel beendet"
864 "reward.ended": "Spiel beendet",
865 "offline.defeated.one": "{n} Gegner besiegt",
866 "offline.defeated.few": "{n} Gegner besiegt",
867 "offline.defeated.many": "{n} Gegner besiegt",
868 "offline.defeated.other": "{n} Gegner besiegt"
860 },
869 },
861 "fr": {
870 "fr": {
862 "menu.play": "Jouer",
871 "menu.play": "Jouer",
@@ -948,7 +957,6 @@
948 "offline.reachedBefore": "Tu as atteint la manche",
957 "offline.reachedBefore": "Tu as atteint la manche",
949 "offline.reachedAfter": ".",
958 "offline.reachedAfter": ".",
950 "offline.reached": "Tu as atteint la manche {n}.",
959 "offline.reached": "Tu as atteint la manche {n}.",
951 "offline.detail": "Tu as joué contre {n} {opponents} au niveau {skill} %.",
952 "offline.backMenu": "Retour au menu",
960 "offline.backMenu": "Retour au menu",
953 "gameover.title": "Tu as perdu",
961 "gameover.title": "Tu as perdu",
954 "gameover.detail": "Toutes les colonnes sont bloquées.",
962 "gameover.detail": "Toutes les colonnes sont bloquées.",
@@ -1142,7 +1150,11 @@
1142 "game.paused": "En pause",
1150 "game.paused": "En pause",
1143 "game.resume": "Reprendre",
1151 "game.resume": "Reprendre",
1144 "game.backToMenu": "Retour au menu principal",
1152 "game.backToMenu": "Retour au menu principal",
1145 "reward.ended": "Partie terminée"
1153 "reward.ended": "Partie terminée",
1154 "offline.defeated.one": "{n} adversaire vaincu",
1155 "offline.defeated.few": "{n} adversaires vaincus",
1156 "offline.defeated.many": "{n} adversaires vaincus",
1157 "offline.defeated.other": "{n} adversaires vaincus"
1146 },
1158 },
1147 "ja": {
1159 "ja": {
1148 "menu.play": "プレイ",
1160 "menu.play": "プレイ",
@@ -1234,7 +1246,6 @@
1234 "offline.reachedBefore": "到達ラウンド:",
1246 "offline.reachedBefore": "到達ラウンド:",
1235 "offline.reachedAfter": "。",
1247 "offline.reachedAfter": "。",
1236 "offline.reached": "ラウンド {n} まで到達しました。",
1248 "offline.reached": "ラウンド {n} まで到達しました。",
1237 "offline.detail": "スキル {skill}% の{opponents}{n}人と対戦しました。",
1238 "offline.backMenu": "メニューに戻る",
1249 "offline.backMenu": "メニューに戻る",
1239 "gameover.title": "負けました",
1250 "gameover.title": "負けました",
1240 "gameover.detail": "すべての列がロックされました。",
1251 "gameover.detail": "すべての列がロックされました。",
@@ -1428,7 +1439,11 @@
1428 "game.paused": "一時停止中",
1439 "game.paused": "一時停止中",
1429 "game.resume": "再開",
1440 "game.resume": "再開",
1430 "game.backToMenu": "メインメニューに戻る",
1441 "game.backToMenu": "メインメニューに戻る",
1431 "reward.ended": "ゲーム終了"
1442 "reward.ended": "ゲーム終了",
1443 "offline.defeated.one": "{n}人の相手を倒した",
1444 "offline.defeated.few": "{n}人の相手を倒した",
1445 "offline.defeated.many": "{n}人の相手を倒した",
1446 "offline.defeated.other": "{n}人の相手を倒した"
1432 },
1447 },
1433 "zh": {
1448 "zh": {
1434 "menu.play": "开始游戏",
1449 "menu.play": "开始游戏",
@@ -1520,7 +1535,6 @@
1520 "offline.reachedBefore": "你到达了第",
1535 "offline.reachedBefore": "你到达了第",
1521 "offline.reachedAfter": " 轮。",
1536 "offline.reachedAfter": " 轮。",
1522 "offline.reached": "你到达了第 {n} 轮。",
1537 "offline.reached": "你到达了第 {n} 轮。",
1523 "offline.detail": "你以 {skill}% 的水平对战了 {n} 名{opponents}。",
1524 "offline.backMenu": "返回菜单",
1538 "offline.backMenu": "返回菜单",
1525 "gameover.title": "你输了",
1539 "gameover.title": "你输了",
1526 "gameover.detail": "所有列都已锁定。",
1540 "gameover.detail": "所有列都已锁定。",
@@ -1714,7 +1728,11 @@
1714 "game.paused": "已暂停",
1728 "game.paused": "已暂停",
1715 "game.resume": "继续游戏",
1729 "game.resume": "继续游戏",
1716 "game.backToMenu": "返回主菜单",
1730 "game.backToMenu": "返回主菜单",
1717 "reward.ended": "游戏结束"
1731 "reward.ended": "游戏结束",
1732 "offline.defeated.one": "击败了 {n} 名对手",
1733 "offline.defeated.few": "击败了 {n} 名对手",
1734 "offline.defeated.many": "击败了 {n} 名对手",
1735 "offline.defeated.other": "击败了 {n} 名对手"
1718 },
1736 },
1719 "ko": {
1737 "ko": {
1720 "menu.play": "플레이",
1738 "menu.play": "플레이",
@@ -1806,7 +1824,6 @@
1806 "offline.reachedBefore": "도달한 라운드:",
1824 "offline.reachedBefore": "도달한 라운드:",
1807 "offline.reachedAfter": ".",
1825 "offline.reachedAfter": ".",
1808 "offline.reached": "{n}라운드까지 도달했습니다.",
1826 "offline.reached": "{n}라운드까지 도달했습니다.",
1809 "offline.detail": "숙련도 {skill}%의 {opponents} {n}명과 대결했습니다.",
1810 "offline.backMenu": "메뉴로 돌아가기",
1827 "offline.backMenu": "메뉴로 돌아가기",
1811 "gameover.title": "패배했습니다",
1828 "gameover.title": "패배했습니다",
1812 "gameover.detail": "모든 열이 잠겼습니다.",
1829 "gameover.detail": "모든 열이 잠겼습니다.",
@@ -2000,7 +2017,11 @@
2000 "game.paused": "일시정지",
2017 "game.paused": "일시정지",
2001 "game.resume": "계속하기",
2018 "game.resume": "계속하기",
2002 "game.backToMenu": "메인 메뉴로 돌아가기",
2019 "game.backToMenu": "메인 메뉴로 돌아가기",
2003 "reward.ended": "게임 종료"
2020 "reward.ended": "게임 종료",
2021 "offline.defeated.one": "상대 {n}명 격파",
2022 "offline.defeated.few": "상대 {n}명 격파",
2023 "offline.defeated.many": "상대 {n}명 격파",
2024 "offline.defeated.other": "상대 {n}명 격파"
2004 },
2025 },
2005 "pl": {
2026 "pl": {
2006 "menu.play": "Graj",
2027 "menu.play": "Graj",
@@ -2092,7 +2113,6 @@
2092 "offline.reachedBefore": "Dotarłeś do rundy",
2113 "offline.reachedBefore": "Dotarłeś do rundy",
2093 "offline.reachedAfter": ".",
2114 "offline.reachedAfter": ".",
2094 "offline.reached": "Dotarłeś do rundy {n}.",
2115 "offline.reached": "Dotarłeś do rundy {n}.",
2095 "offline.detail": "Grałeś przeciwko {n} {opponents} przy umiejętności {skill}%.",
2096 "offline.backMenu": "Powrót do menu",
2116 "offline.backMenu": "Powrót do menu",
2097 "gameover.title": "Przegrałeś",
2117 "gameover.title": "Przegrałeś",
2098 "gameover.detail": "Wszystkie kolumny są zablokowane.",
2118 "gameover.detail": "Wszystkie kolumny są zablokowane.",
@@ -2286,7 +2306,11 @@
2286 "game.paused": "Pauza",
2306 "game.paused": "Pauza",
2287 "game.resume": "Wznów",
2307 "game.resume": "Wznów",
2288 "game.backToMenu": "Powrót do menu głównego",
2308 "game.backToMenu": "Powrót do menu głównego",
2289 "reward.ended": "Gra zakończona"
2309 "reward.ended": "Gra zakończona",
2310 "offline.defeated.one": "{n} pokonany przeciwnik",
2311 "offline.defeated.few": "{n} pokonanych przeciwników",
2312 "offline.defeated.many": "{n} pokonanych przeciwników",
2313 "offline.defeated.other": "{n} pokonanych przeciwników"
2290 },
2314 },
2291 "ru": {
2315 "ru": {
2292 "menu.play": "Играть",
2316 "menu.play": "Играть",
@@ -2378,7 +2402,6 @@
2378 "offline.reachedBefore": "Ты дошёл до раунда",
2402 "offline.reachedBefore": "Ты дошёл до раунда",
2379 "offline.reachedAfter": ".",
2403 "offline.reachedAfter": ".",
2380 "offline.reached": "Ты дошёл до раунда {n}.",
2404 "offline.reached": "Ты дошёл до раунда {n}.",
2381 "offline.detail": "Ты играл против {n} {opponents} с мастерством {skill} %.",
2382 "offline.backMenu": "Вернуться в меню",
2405 "offline.backMenu": "Вернуться в меню",
2383 "gameover.title": "Ты проиграл",
2406 "gameover.title": "Ты проиграл",
2384 "gameover.detail": "Все столбцы заблокированы.",
2407 "gameover.detail": "Все столбцы заблокированы.",
@@ -2572,7 +2595,11 @@
2572 "game.paused": "Пауза",
2595 "game.paused": "Пауза",
2573 "game.resume": "Продолжить",
2596 "game.resume": "Продолжить",
2574 "game.backToMenu": "В главное меню",
2597 "game.backToMenu": "В главное меню",
2575 "reward.ended": "Игра окончена"
2598 "reward.ended": "Игра окончена",
2599 "offline.defeated.one": "{n} противник побеждён",
2600 "offline.defeated.few": "{n} противника побеждено",
2601 "offline.defeated.many": "{n} противников побеждено",
2602 "offline.defeated.other": "{n} противников побеждено"
2576 },
2603 },
2577 "es": {
2604 "es": {
2578 "menu.play": "Jugar",
2605 "menu.play": "Jugar",
@@ -2664,7 +2691,6 @@
2664 "offline.reachedBefore": "Has llegado a la ronda",
2691 "offline.reachedBefore": "Has llegado a la ronda",
2665 "offline.reachedAfter": ".",
2692 "offline.reachedAfter": ".",
2666 "offline.reached": "Has llegado a la ronda {n}.",
2693 "offline.reached": "Has llegado a la ronda {n}.",
2667 "offline.detail": "Jugaste contra {n} {opponents} con un nivel del {skill} %.",
2668 "offline.backMenu": "Volver al menú",
2694 "offline.backMenu": "Volver al menú",
2669 "gameover.title": "Has perdido",
2695 "gameover.title": "Has perdido",
2670 "gameover.detail": "Todas las columnas están bloqueadas.",
2696 "gameover.detail": "Todas las columnas están bloqueadas.",
@@ -2858,7 +2884,11 @@
2858 "game.paused": "En pausa",
2884 "game.paused": "En pausa",
2859 "game.resume": "Continuar",
2885 "game.resume": "Continuar",
2860 "game.backToMenu": "Volver al menú principal",
2886 "game.backToMenu": "Volver al menú principal",
2861 "reward.ended": "Partida terminada"
2887 "reward.ended": "Partida terminada",
2888 "offline.defeated.one": "{n} rival derrotado",
2889 "offline.defeated.few": "{n} rivales derrotados",
2890 "offline.defeated.many": "{n} rivales derrotados",
2891 "offline.defeated.other": "{n} rivales derrotados"
2862 }
2892 }
2863 },
2893 },
2864 "errors": {
2894 "errors": {
src/main.js +6 −17
@@ -1595,31 +1595,20 @@ function showOfflineResult ()
1595 1595 app.offlineResultShown = true;
1596 1596 var battle = app.battle;
1597 1597 var reached = document.getElementById('offline-reached');
1598 var sch = battle.schedule;
1599 var n = sch.opponents;
1600 var skill = Math.round(sch.skill * 100);
1601 1598 var line = document.getElementById('offline-reached-line');
1602 1599 if (line && typeof I18n !== 'undefined')
1603 1600 { line.textContent = I18n.t('offline.reached', { n: battle.round }); }
1604 1601 else if (reached)
1605 1602 { reached.textContent = String(battle.round); }
1603 // t1198: "X opponents defeated" over all rounds (replaces the
1604 // opponents / skill line).
1606 1605 var detail = document.getElementById('offline-result-detail');
1607 1606 if (detail)
1608 1607 {
1609 if (typeof I18n !== 'undefined')
1610 {
1611 detail.textContent = I18n.t('offline.detail', {
1612 n: n,
1613 opponents: I18n.plural('hud.opponent', n),
1614 skill: skill
1615 });
1616 }
1617 else
1618 {
1619 var noun = n === 1 ? 'opponent' : 'opponents';
1620 detail.textContent = 'You played against ' + n + ' ' + noun
1621 + ' at skill ' + skill + '%.';
1622 }
1608 var beaten = battle.defeated || 0;
1609 detail.textContent = (typeof I18n !== 'undefined')
1610 ? I18n.plural('offline.defeated', beaten, { n: beaten })
1611 : beaten + (beaten === 1 ? ' opponent defeated' : ' opponents defeated');
1623 1612 }
1624 1613 hideEl('game-over');
1625 1614 showEl('offline-result');
@@ -1595,31 +1595,20 @@ function showOfflineResult ()
1595 app.offlineResultShown = true;
1595 app.offlineResultShown = true;
1596 var battle = app.battle;
1596 var battle = app.battle;
1597 var reached = document.getElementById('offline-reached');
1597 var reached = document.getElementById('offline-reached');
1598 var sch = battle.schedule;
1599 var n = sch.opponents;
1600 var skill = Math.round(sch.skill * 100);
1601 var line = document.getElementById('offline-reached-line');
1598 var line = document.getElementById('offline-reached-line');
1602 if (line && typeof I18n !== 'undefined')
1599 if (line && typeof I18n !== 'undefined')
1603 { line.textContent = I18n.t('offline.reached', { n: battle.round }); }
1600 { line.textContent = I18n.t('offline.reached', { n: battle.round }); }
1604 else if (reached)
1601 else if (reached)
1605 { reached.textContent = String(battle.round); }
1602 { reached.textContent = String(battle.round); }
1603 // t1198: "X opponents defeated" over all rounds (replaces the
1604 // opponents / skill line).
1606 var detail = document.getElementById('offline-result-detail');
1605 var detail = document.getElementById('offline-result-detail');
1607 if (detail)
1606 if (detail)
1608 {
1607 {
1609 if (typeof I18n !== 'undefined')
1608 var beaten = battle.defeated || 0;
1610 {
1609 detail.textContent = (typeof I18n !== 'undefined')
1611 detail.textContent = I18n.t('offline.detail', {
1610 ? I18n.plural('offline.defeated', beaten, { n: beaten })
1612 n: n,
1611 : beaten + (beaten === 1 ? ' opponent defeated' : ' opponents defeated');
1613 opponents: I18n.plural('hud.opponent', n),
1614 skill: skill
1615 });
1616 }
1617 else
1618 {
1619 var noun = n === 1 ? 'opponent' : 'opponents';
1620 detail.textContent = 'You played against ' + n + ' ' + noun
1621 + ' at skill ' + skill + '%.';
1622 }
1623 }
1612 }
1624 hideEl('game-over');
1613 hideEl('game-over');
1625 showEl('offline-result');
1614 showEl('offline-result');
src/offline.js +14 −6
@@ -666,9 +666,21 @@ function OfflineBattle (opts)
666 666 this.shotLocals = [];
667 667 this.bots = [];
668 668 this.playerId = 'player';
669 /** Opponents knocked out over all rounds of this battle (t1198). */
670 this.defeated = 0;
669 671 this._initBots();
670 672 }
671 673
674 /** Mark a bot as out once; counts towards `defeated` (t1198). */
675 OfflineBattle.prototype._eliminate = function (bot)
676 {
677 if (bot.eliminated)
678 { return; }
679 bot.eliminated = true;
680 bot.score = bot.core ? bot.core.score : bot.score;
681 this.defeated += 1;
682 };
683
672 684 OfflineBattle.prototype._initBots = function ()
673 685 {
674 686 var P = PlanetMod();
@@ -826,8 +838,7 @@ OfflineBattle.prototype.tick = function (dt, playerCore)
826 838 { continue; }
827 839 if (bot.core.state === 'gameover')
828 840 {
829 bot.eliminated = true;
830 bot.score = bot.core.score;
841 this._eliminate(bot);
831 842 continue;
832 843 }
833 844 bot.core.tick(dt);
@@ -854,10 +865,7 @@ OfflineBattle.prototype.tick = function (dt, playerCore)
854 865 for (var i = 0; i < this.bots.length; i++)
855 866 {
856 867 if (this.bots[i].core && this.bots[i].core.state === 'gameover')
857 {
858 this.bots[i].eliminated = true;
859 this.bots[i].score = this.bots[i].core.score;
860 }
868 { this._eliminate(this.bots[i]); }
861 869 }
862 870
863 871 if (playerCore && playerCore.state === 'gameover')
@@ -666,9 +666,21 @@ function OfflineBattle (opts)
666 this.shotLocals = [];
666 this.shotLocals = [];
667 this.bots = [];
667 this.bots = [];
668 this.playerId = 'player';
668 this.playerId = 'player';
669 /** Opponents knocked out over all rounds of this battle (t1198). */
670 this.defeated = 0;
669 this._initBots();
671 this._initBots();
670}
672}
671
673
674/** Mark a bot as out once; counts towards `defeated` (t1198). */
675OfflineBattle.prototype._eliminate = function (bot)
676{
677 if (bot.eliminated)
678 { return; }
679 bot.eliminated = true;
680 bot.score = bot.core ? bot.core.score : bot.score;
681 this.defeated += 1;
682};
683
672OfflineBattle.prototype._initBots = function ()
684OfflineBattle.prototype._initBots = function ()
673{
685{
674 var P = PlanetMod();
686 var P = PlanetMod();
@@ -826,8 +838,7 @@ OfflineBattle.prototype.tick = function (dt, playerCore)
826 { continue; }
838 { continue; }
827 if (bot.core.state === 'gameover')
839 if (bot.core.state === 'gameover')
828 {
840 {
829 bot.eliminated = true;
841 this._eliminate(bot);
830 bot.score = bot.core.score;
831 continue;
842 continue;
832 }
843 }
833 bot.core.tick(dt);
844 bot.core.tick(dt);
@@ -854,10 +865,7 @@ OfflineBattle.prototype.tick = function (dt, playerCore)
854 for (var i = 0; i < this.bots.length; i++)
865 for (var i = 0; i < this.bots.length; i++)
855 {
866 {
856 if (this.bots[i].core && this.bots[i].core.state === 'gameover')
867 if (this.bots[i].core && this.bots[i].core.state === 'gameover')
857 {
868 { this._eliminate(this.bots[i]); }
858 this.bots[i].eliminated = true;
859 this.bots[i].score = this.bots[i].core.score;
860 }
861 }
869 }
862
870
863 if (playerCore && playerCore.state === 'gameover')
871 if (playerCore && playerCore.state === 'gameover')
test/offline-defeated.test.js added +57 −0
@@ -0,0 +1,57 @@
1 'use strict';
2
3 // t1198: Offline Strijd result shows "X opponents defeated" over all rounds.
4
5 const { describe, it } = require('node:test');
6 const assert = require('node:assert/strict');
7 const { makeGame, Planet, Rng } = require('./helpers.js');
8 const Offline = require('../src/offline.js');
9 const I18n = require('../src/i18n.js');
10
11 function knockOutAll (battle, player)
12 {
13 for (const b of battle.bots) b.core.state = 'gameover';
14 battle.tick(0.016, player);
15 }
16
17 describe('Offline defeated counter (t1198)', () =>
18 {
19 it('counts every opponent knocked out, across rounds, once each', () =>
20 {
21 const battle = Offline.createBattle({ playerPlanet: Planet.defaultPlanet(), rng: Rng.create(3), round: 1 });
22 const player = makeGame({ noSpawn: true });
23 assert.equal(battle.defeated, 0);
24 knockOutAll(battle, player); // round 1: 1 bot
25 assert.equal(battle.state, 'round_won');
26 assert.equal(battle.defeated, 1);
27 battle.tick(0.016, player); // no double count
28 assert.equal(battle.defeated, 1);
29 battle.advanceRound(); // round 2: 2 bots
30 const n2 = battle.bots.length;
31 battle.bots[0].core.state = 'gameover';
32 battle.tick(0.016, player);
33 assert.equal(battle.defeated, 2, 'one of round 2 out');
34 player.state = 'gameover'; // player loses round 2
35 battle.tick(0.016, player);
36 assert.equal(battle.state, 'lost');
37 assert.equal(battle.defeated, 2, 'remaining bots of the lost round are not counted');
38 assert.ok(n2 >= 2);
39 });
40
41 it('i18n: singular / plural in every language, no skill line left', () =>
42 {
43 const cat = require('../server/lib/i18n.json');
44 for (const loc of cat.localeIds)
45 {
46 I18n.setLocale ? I18n.setLocale(loc) : (I18n.locale = loc);
47 const one = I18n.plural('offline.defeated', 1, { n: 1 });
48 const many = I18n.plural('offline.defeated', 7, { n: 7 });
49 assert.ok(one.includes('1') && many.includes('7'), loc + ': ' + one + ' / ' + many);
50 assert.equal(cat.locales[loc]['offline.detail'], undefined, loc + ' old detail removed');
51 }
52 I18n.setLocale ? I18n.setLocale('nl') : (I18n.locale = 'nl');
53 assert.equal(I18n.plural('offline.defeated', 1, { n: 1 }), '1 tegenstander verslagen');
54 assert.equal(I18n.plural('offline.defeated', 3, { n: 3 }), '3 tegenstanders verslagen');
55 I18n.setLocale ? I18n.setLocale('en') : (I18n.locale = 'en');
56 });
57 });
@@ -0,0 +1,57 @@
1'use strict';
2
3// t1198: Offline Strijd result shows "X opponents defeated" over all rounds.
4
5const { describe, it } = require('node:test');
6const assert = require('node:assert/strict');
7const { makeGame, Planet, Rng } = require('./helpers.js');
8const Offline = require('../src/offline.js');
9const I18n = require('../src/i18n.js');
10
11function knockOutAll (battle, player)
12{
13 for (const b of battle.bots) b.core.state = 'gameover';
14 battle.tick(0.016, player);
15}
16
17describe('Offline defeated counter (t1198)', () =>
18{
19 it('counts every opponent knocked out, across rounds, once each', () =>
20 {
21 const battle = Offline.createBattle({ playerPlanet: Planet.defaultPlanet(), rng: Rng.create(3), round: 1 });
22 const player = makeGame({ noSpawn: true });
23 assert.equal(battle.defeated, 0);
24 knockOutAll(battle, player); // round 1: 1 bot
25 assert.equal(battle.state, 'round_won');
26 assert.equal(battle.defeated, 1);
27 battle.tick(0.016, player); // no double count
28 assert.equal(battle.defeated, 1);
29 battle.advanceRound(); // round 2: 2 bots
30 const n2 = battle.bots.length;
31 battle.bots[0].core.state = 'gameover';
32 battle.tick(0.016, player);
33 assert.equal(battle.defeated, 2, 'one of round 2 out');
34 player.state = 'gameover'; // player loses round 2
35 battle.tick(0.016, player);
36 assert.equal(battle.state, 'lost');
37 assert.equal(battle.defeated, 2, 'remaining bots of the lost round are not counted');
38 assert.ok(n2 >= 2);
39 });
40
41 it('i18n: singular / plural in every language, no skill line left', () =>
42 {
43 const cat = require('../server/lib/i18n.json');
44 for (const loc of cat.localeIds)
45 {
46 I18n.setLocale ? I18n.setLocale(loc) : (I18n.locale = loc);
47 const one = I18n.plural('offline.defeated', 1, { n: 1 });
48 const many = I18n.plural('offline.defeated', 7, { n: 7 });
49 assert.ok(one.includes('1') && many.includes('7'), loc + ': ' + one + ' / ' + many);
50 assert.equal(cat.locales[loc]['offline.detail'], undefined, loc + ' old detail removed');
51 }
52 I18n.setLocale ? I18n.setLocale('nl') : (I18n.locale = 'nl');
53 assert.equal(I18n.plural('offline.defeated', 1, { n: 1 }), '1 tegenstander verslagen');
54 assert.equal(I18n.plural('offline.defeated', 3, { n: 3 }), '3 tegenstanders verslagen');
55 I18n.setLocale ? I18n.setLocale('en') : (I18n.locale = 'en');
56 });
57});