BlueGit

projects-timfalken-com meteors

feat: show the reward screen after solo, Offline rounds and online matches when logged in (t1173)

timfa Grok Bot · pushed by timfa

Authored 2026-11-14 · 3 days ago

Hash
37d2e07299179ca790248bead0b3c17d1b151d11
Parent
b11746f4
4 files changed +261 −20
build/index.html +10 −0
@@ -215,6 +215,16 @@
215 215 <p class="hint" id="podium-hint">Returning to the lobby in 5 seconds…</p>
216 216 </div>
217 217
218 <div id="reward" class="reward" hidden aria-live="polite">
219 <canvas id="reward-canvas" class="reward-canvas" aria-hidden="true"></canvas>
220 <h2 id="reward-title" class="reward-title">You won!</h2>
221 <div class="reward-counter" hidden>
222 <div id="reward-label" class="reward-label" data-i18n="reward.total">Total points</div>
223 <div id="reward-total" class="reward-total">0</div>
224 </div>
225 <p id="reward-hint" class="reward-hint" hidden data-i18n="reward.continue">Tap to continue</p>
226 </div>
227
218 228 <script src="framework.js"></script>
219 229 <script src="game.js"></script>
220 230 </body>
@@ -215,6 +215,16 @@
215 <p class="hint" id="podium-hint">Returning to the lobby in 5 seconds…</p>
215 <p class="hint" id="podium-hint">Returning to the lobby in 5 seconds…</p>
216 </div>
216 </div>
217
217
218 <div id="reward" class="reward" hidden aria-live="polite">
219 <canvas id="reward-canvas" class="reward-canvas" aria-hidden="true"></canvas>
220 <h2 id="reward-title" class="reward-title">You won!</h2>
221 <div class="reward-counter" hidden>
222 <div id="reward-label" class="reward-label" data-i18n="reward.total">Total points</div>
223 <div id="reward-total" class="reward-total">0</div>
224 </div>
225 <p id="reward-hint" class="reward-hint" hidden data-i18n="reward.continue">Tap to continue</p>
226 </div>
227
218 <script src="framework.js"></script>
228 <script src="framework.js"></script>
219 <script src="game.js"></script>
229 <script src="game.js"></script>
220</body>
230</body>
build/style.css +79 −1
@@ -46,7 +46,7 @@ html, body {
46 46 text-align: center;
47 47 }
48 48
49 .screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden] { display: none !important; }
49 .screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden] { display: none !important; }
50 50
51 51 h1 {
52 52 font-size: clamp(48px, 14vw, 96px);
@@ -985,3 +985,81 @@ html[lang="ja"], html[lang="zh-Hans"], html[lang="ko"] {
985 985 font-size: 0.95rem;
986 986 line-height: 1.45;
987 987 }
988
989 /* ---------- t1173 reward screen ---------- */
990 .reward {
991 position: fixed;
992 inset: 0;
993 z-index: 70;
994 background: rgba(8, 10, 22, 0.82);
995 overflow: hidden;
996 touch-action: none;
997 user-select: none;
998 -webkit-user-select: none;
999 }
1000 .reward-canvas {
1001 position: absolute;
1002 inset: 0;
1003 width: 100%;
1004 height: 100%;
1005 pointer-events: none;
1006 z-index: 1;
1007 }
1008 .reward-title {
1009 position: absolute;
1010 left: 0;
1011 right: 0;
1012 top: 50%;
1013 margin: 0;
1014 padding: 0 16px;
1015 text-align: center;
1016 font-size: clamp(36px, 11vw, 72px);
1017 font-weight: 800;
1018 transform: translateY(-50%);
1019 transition: top 0.6s cubic-bezier(0.22, 1, 0.36, 1), transform 0.6s cubic-bezier(0.22, 1, 0.36, 1), font-size 0.6s ease;
1020 z-index: 2;
1021 text-shadow: 0 2px 18px rgba(0, 0, 0, 0.6);
1022 }
1023 .reward-title.won { color: #ffe27a; }
1024 .reward-title.lost { color: #ffb0a0; }
1025 .reward.risen .reward-title {
1026 top: max(18px, env(safe-area-inset-top));
1027 transform: translateY(0);
1028 font-size: clamp(28px, 8vw, 52px);
1029 }
1030 .reward.reduced .reward-title { transition: none; }
1031 .reward-counter {
1032 position: absolute;
1033 left: 50%;
1034 bottom: max(28px, calc(env(safe-area-inset-bottom) + 20px));
1035 transform: translateX(-50%);
1036 text-align: center;
1037 z-index: 3;
1038 }
1039 .reward-counter[hidden] { display: none !important; }
1040 .reward-label {
1041 font-size: clamp(12px, 3.2vw, 15px);
1042 letter-spacing: 0.12em;
1043 text-transform: uppercase;
1044 color: #b7bdd4;
1045 }
1046 .reward-total {
1047 display: inline-block;
1048 font-size: clamp(40px, 12vw, 72px);
1049 font-weight: 800;
1050 color: #ffe27a;
1051 font-variant-numeric: tabular-nums;
1052 text-shadow: 0 0 18px rgba(255, 200, 80, 0.45);
1053 transform-origin: 50% 60%;
1054 will-change: transform;
1055 }
1056 .reward-hint {
1057 position: absolute;
1058 left: 0;
1059 right: 0;
1060 bottom: max(4px, env(safe-area-inset-bottom));
1061 margin: 0;
1062 font-size: 13px;
1063 color: #8f96b2;
1064 z-index: 3;
1065 }
@@ -46,7 +46,7 @@ html, body {
46 text-align: center;
46 text-align: center;
47}
47}
48
48
49.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden] { display: none !important; }
49.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden], #designer[hidden], #designer-edit[hidden], #reward[hidden] { display: none !important; }
50
50
51h1 {
51h1 {
52 font-size: clamp(48px, 14vw, 96px);
52 font-size: clamp(48px, 14vw, 96px);
@@ -985,3 +985,81 @@ html[lang="ja"], html[lang="zh-Hans"], html[lang="ko"] {
985 font-size: 0.95rem;
985 font-size: 0.95rem;
986 line-height: 1.45;
986 line-height: 1.45;
987}
987}
988
989/* ---------- t1173 reward screen ---------- */
990.reward {
991 position: fixed;
992 inset: 0;
993 z-index: 70;
994 background: rgba(8, 10, 22, 0.82);
995 overflow: hidden;
996 touch-action: none;
997 user-select: none;
998 -webkit-user-select: none;
999}
1000.reward-canvas {
1001 position: absolute;
1002 inset: 0;
1003 width: 100%;
1004 height: 100%;
1005 pointer-events: none;
1006 z-index: 1;
1007}
1008.reward-title {
1009 position: absolute;
1010 left: 0;
1011 right: 0;
1012 top: 50%;
1013 margin: 0;
1014 padding: 0 16px;
1015 text-align: center;
1016 font-size: clamp(36px, 11vw, 72px);
1017 font-weight: 800;
1018 transform: translateY(-50%);
1019 transition: top 0.6s cubic-bezier(0.22, 1, 0.36, 1), transform 0.6s cubic-bezier(0.22, 1, 0.36, 1), font-size 0.6s ease;
1020 z-index: 2;
1021 text-shadow: 0 2px 18px rgba(0, 0, 0, 0.6);
1022}
1023.reward-title.won { color: #ffe27a; }
1024.reward-title.lost { color: #ffb0a0; }
1025.reward.risen .reward-title {
1026 top: max(18px, env(safe-area-inset-top));
1027 transform: translateY(0);
1028 font-size: clamp(28px, 8vw, 52px);
1029}
1030.reward.reduced .reward-title { transition: none; }
1031.reward-counter {
1032 position: absolute;
1033 left: 50%;
1034 bottom: max(28px, calc(env(safe-area-inset-bottom) + 20px));
1035 transform: translateX(-50%);
1036 text-align: center;
1037 z-index: 3;
1038}
1039.reward-counter[hidden] { display: none !important; }
1040.reward-label {
1041 font-size: clamp(12px, 3.2vw, 15px);
1042 letter-spacing: 0.12em;
1043 text-transform: uppercase;
1044 color: #b7bdd4;
1045}
1046.reward-total {
1047 display: inline-block;
1048 font-size: clamp(40px, 12vw, 72px);
1049 font-weight: 800;
1050 color: #ffe27a;
1051 font-variant-numeric: tabular-nums;
1052 text-shadow: 0 0 18px rgba(255, 200, 80, 0.45);
1053 transform-origin: 50% 60%;
1054 will-change: transform;
1055}
1056.reward-hint {
1057 position: absolute;
1058 left: 0;
1059 right: 0;
1060 bottom: max(4px, env(safe-area-inset-bottom));
1061 margin: 0;
1062 font-size: 13px;
1063 color: #8f96b2;
1064 z-index: 3;
1065}
server/lib/i18n.json +50 −10
@@ -279,7 +279,11 @@
279 279 "block.forge-brass": "Forge brass",
280 280 "block.forge-soot": "Forge soot",
281 281 "error.webgl": "This game needs WebGL. Please try another browser, or turn on hardware acceleration.",
282 "error.startFailed": "Could not start the game."
282 "error.startFailed": "Could not start the game.",
283 "reward.won": "You won!",
284 "reward.lost": "You lost...",
285 "reward.total": "Total points",
286 "reward.continue": "Tap to continue"
283 287 },
284 288 "nl": {
285 289 "menu.tagline": "Drie op een rij, en je blokjes krijgen raketmotoren.",
@@ -560,7 +564,11 @@
560 564 "block.forge-brass": "Forge-messing",
561 565 "block.forge-soot": "Forge-roet",
562 566 "error.webgl": "Dit spel heeft WebGL nodig. Probeer een andere browser, of zet hardwareversnelling aan.",
563 "error.startFailed": "Het spel kon niet worden gestart."
567 "error.startFailed": "Het spel kon niet worden gestart.",
568 "reward.won": "Gewonnen!",
569 "reward.lost": "Verloren...",
570 "reward.total": "Totaal punten",
571 "reward.continue": "Tik om verder te gaan"
564 572 },
565 573 "de": {
566 574 "menu.tagline": "Drei in einer Reihe — und deine Blöcke bekommen Raketenantrieb.",
@@ -841,7 +849,11 @@
841 849 "block.forge-brass": "Forge-Messing",
842 850 "block.forge-soot": "Forge-Ruß",
843 851 "error.webgl": "Dieses Spiel benötigt WebGL. Bitte verwende einen anderen Browser oder aktiviere die Hardwarebeschleunigung.",
844 "error.startFailed": "Das Spiel konnte nicht gestartet werden."
852 "error.startFailed": "Das Spiel konnte nicht gestartet werden.",
853 "reward.won": "Gewonnen!",
854 "reward.lost": "Verloren...",
855 "reward.total": "Punkte gesamt",
856 "reward.continue": "Tippen zum Fortfahren"
845 857 },
846 858 "fr": {
847 859 "menu.tagline": "Trois d’affilée, et tes blocs s’équipent de propulseurs.",
@@ -1122,7 +1134,11 @@
1122 1134 "block.forge-brass": "Forge laiton",
1123 1135 "block.forge-soot": "Forge suie",
1124 1136 "error.webgl": "Ce jeu a besoin de WebGL. Essayez un autre navigateur, ou activez l’accélération matérielle.",
1125 "error.startFailed": "Impossible de lancer le jeu."
1137 "error.startFailed": "Impossible de lancer le jeu.",
1138 "reward.won": "Victoire !",
1139 "reward.lost": "Perdu...",
1140 "reward.total": "Total des points",
1141 "reward.continue": "Touchez pour continuer"
1126 1142 },
1127 1143 "ja": {
1128 1144 "menu.tagline": "三つ揃えると、ブロックにロケットが点火します。",
@@ -1403,7 +1419,11 @@
1403 1419 "block.forge-brass": "フォージの真鍮",
1404 1420 "block.forge-soot": "フォージの煤",
1405 1421 "error.webgl": "このゲームにはWebGLが必要です。別のブラウザを使うか、ハードウェアアクセラレーションを有効にしてください。",
1406 "error.startFailed": "ゲームを開始できませんでした。"
1422 "error.startFailed": "ゲームを開始できませんでした。",
1423 "reward.won": "勝利!",
1424 "reward.lost": "敗北...",
1425 "reward.total": "合計ポイント",
1426 "reward.continue": "タップして続ける"
1407 1427 },
1408 1428 "zh": {
1409 1429 "menu.tagline": "三个一排,你的方块就会装上火箭。",
@@ -1684,7 +1704,11 @@
1684 1704 "block.forge-brass": "Forge黄铜",
1685 1705 "block.forge-soot": "Forge煤烟",
1686 1706 "error.webgl": "本游戏需要 WebGL。请尝试其他浏览器,或开启硬件加速。",
1687 "error.startFailed": "无法开始游戏。"
1707 "error.startFailed": "无法开始游戏。",
1708 "reward.won": "你赢了!",
1709 "reward.lost": "你输了...",
1710 "reward.total": "总积分",
1711 "reward.continue": "点击继续"
1688 1712 },
1689 1713 "ko": {
1690 1714 "menu.tagline": "세 개를 나란히 맞추면 블록에 로켓이 점화됩니다.",
@@ -1965,7 +1989,11 @@
1965 1989 "block.forge-brass": "Forge 황동",
1966 1990 "block.forge-soot": "Forge 그을음",
1967 1991 "error.webgl": "이 게임은 WebGL이 필요합니다. 다른 브라우저를 사용하거나 하드웨어 가속을 켜 주세요.",
1968 "error.startFailed": "게임을 시작할 수 없습니다."
1992 "error.startFailed": "게임을 시작할 수 없습니다.",
1993 "reward.won": "승리!",
1994 "reward.lost": "패배...",
1995 "reward.total": "총 포인트",
1996 "reward.continue": "탭하여 계속"
1969 1997 },
1970 1998 "pl": {
1971 1999 "menu.tagline": "Trzy w rzędzie, a twoje klocki dostają napęd rakietowy.",
@@ -2246,7 +2274,11 @@
2246 2274 "block.forge-brass": "Forge mosiądz",
2247 2275 "block.forge-soot": "Forge sadza",
2248 2276 "error.webgl": "Ta gra wymaga WebGL. Spróbuj innej przeglądarki albo włącz akcelerację sprzętową.",
2249 "error.startFailed": "Nie udało się uruchomić gry."
2277 "error.startFailed": "Nie udało się uruchomić gry.",
2278 "reward.won": "Wygrana!",
2279 "reward.lost": "Przegrana...",
2280 "reward.total": "Suma punktów",
2281 "reward.continue": "Dotknij, aby kontynuować"
2250 2282 },
2251 2283 "ru": {
2252 2284 "menu.tagline": "Три в ряд — и твои блоки получают ракетные двигатели.",
@@ -2527,7 +2559,11 @@
2527 2559 "block.forge-brass": "Forge (латунь)",
2528 2560 "block.forge-soot": "Forge (сажа)",
2529 2561 "error.webgl": "Этой игре нужен WebGL. Попробуйте другой браузер или включите аппаратное ускорение.",
2530 "error.startFailed": "Не удалось начать игру."
2562 "error.startFailed": "Не удалось начать игру.",
2563 "reward.won": "Победа!",
2564 "reward.lost": "Поражение...",
2565 "reward.total": "Всего очков",
2566 "reward.continue": "Нажмите, чтобы продолжить"
2531 2567 },
2532 2568 "es": {
2533 2569 "menu.tagline": "Tres en raya, y tus bloques ganan motores cohete.",
@@ -2808,7 +2844,11 @@
2808 2844 "block.forge-brass": "Forge latón",
2809 2845 "block.forge-soot": "Forge hollín",
2810 2846 "error.webgl": "Este juego necesita WebGL. Prueba con otro navegador o activa la aceleración por hardware.",
2811 "error.startFailed": "No se pudo iniciar el juego."
2847 "error.startFailed": "No se pudo iniciar el juego.",
2848 "reward.won": "¡Has ganado!",
2849 "reward.lost": "Has perdido...",
2850 "reward.total": "Puntos totales",
2851 "reward.continue": "Toca para continuar"
2812 2852 }
2813 2853 },
2814 2854 "errors": {
@@ -279,7 +279,11 @@
279 "block.forge-brass": "Forge brass",
279 "block.forge-brass": "Forge brass",
280 "block.forge-soot": "Forge soot",
280 "block.forge-soot": "Forge soot",
281 "error.webgl": "This game needs WebGL. Please try another browser, or turn on hardware acceleration.",
281 "error.webgl": "This game needs WebGL. Please try another browser, or turn on hardware acceleration.",
282 "error.startFailed": "Could not start the game."
282 "error.startFailed": "Could not start the game.",
283 "reward.won": "You won!",
284 "reward.lost": "You lost...",
285 "reward.total": "Total points",
286 "reward.continue": "Tap to continue"
283 },
287 },
284 "nl": {
288 "nl": {
285 "menu.tagline": "Drie op een rij, en je blokjes krijgen raketmotoren.",
289 "menu.tagline": "Drie op een rij, en je blokjes krijgen raketmotoren.",
@@ -560,7 +564,11 @@
560 "block.forge-brass": "Forge-messing",
564 "block.forge-brass": "Forge-messing",
561 "block.forge-soot": "Forge-roet",
565 "block.forge-soot": "Forge-roet",
562 "error.webgl": "Dit spel heeft WebGL nodig. Probeer een andere browser, of zet hardwareversnelling aan.",
566 "error.webgl": "Dit spel heeft WebGL nodig. Probeer een andere browser, of zet hardwareversnelling aan.",
563 "error.startFailed": "Het spel kon niet worden gestart."
567 "error.startFailed": "Het spel kon niet worden gestart.",
568 "reward.won": "Gewonnen!",
569 "reward.lost": "Verloren...",
570 "reward.total": "Totaal punten",
571 "reward.continue": "Tik om verder te gaan"
564 },
572 },
565 "de": {
573 "de": {
566 "menu.tagline": "Drei in einer Reihe — und deine Blöcke bekommen Raketenantrieb.",
574 "menu.tagline": "Drei in einer Reihe — und deine Blöcke bekommen Raketenantrieb.",
@@ -841,7 +849,11 @@
841 "block.forge-brass": "Forge-Messing",
849 "block.forge-brass": "Forge-Messing",
842 "block.forge-soot": "Forge-Ruß",
850 "block.forge-soot": "Forge-Ruß",
843 "error.webgl": "Dieses Spiel benötigt WebGL. Bitte verwende einen anderen Browser oder aktiviere die Hardwarebeschleunigung.",
851 "error.webgl": "Dieses Spiel benötigt WebGL. Bitte verwende einen anderen Browser oder aktiviere die Hardwarebeschleunigung.",
844 "error.startFailed": "Das Spiel konnte nicht gestartet werden."
852 "error.startFailed": "Das Spiel konnte nicht gestartet werden.",
853 "reward.won": "Gewonnen!",
854 "reward.lost": "Verloren...",
855 "reward.total": "Punkte gesamt",
856 "reward.continue": "Tippen zum Fortfahren"
845 },
857 },
846 "fr": {
858 "fr": {
847 "menu.tagline": "Trois d’affilée, et tes blocs s’équipent de propulseurs.",
859 "menu.tagline": "Trois d’affilée, et tes blocs s’équipent de propulseurs.",
@@ -1122,7 +1134,11 @@
1122 "block.forge-brass": "Forge laiton",
1134 "block.forge-brass": "Forge laiton",
1123 "block.forge-soot": "Forge suie",
1135 "block.forge-soot": "Forge suie",
1124 "error.webgl": "Ce jeu a besoin de WebGL. Essayez un autre navigateur, ou activez l’accélération matérielle.",
1136 "error.webgl": "Ce jeu a besoin de WebGL. Essayez un autre navigateur, ou activez l’accélération matérielle.",
1125 "error.startFailed": "Impossible de lancer le jeu."
1137 "error.startFailed": "Impossible de lancer le jeu.",
1138 "reward.won": "Victoire !",
1139 "reward.lost": "Perdu...",
1140 "reward.total": "Total des points",
1141 "reward.continue": "Touchez pour continuer"
1126 },
1142 },
1127 "ja": {
1143 "ja": {
1128 "menu.tagline": "三つ揃えると、ブロックにロケットが点火します。",
1144 "menu.tagline": "三つ揃えると、ブロックにロケットが点火します。",
@@ -1403,7 +1419,11 @@
1403 "block.forge-brass": "フォージの真鍮",
1419 "block.forge-brass": "フォージの真鍮",
1404 "block.forge-soot": "フォージの煤",
1420 "block.forge-soot": "フォージの煤",
1405 "error.webgl": "このゲームにはWebGLが必要です。別のブラウザを使うか、ハードウェアアクセラレーションを有効にしてください。",
1421 "error.webgl": "このゲームにはWebGLが必要です。別のブラウザを使うか、ハードウェアアクセラレーションを有効にしてください。",
1406 "error.startFailed": "ゲームを開始できませんでした。"
1422 "error.startFailed": "ゲームを開始できませんでした。",
1423 "reward.won": "勝利!",
1424 "reward.lost": "敗北...",
1425 "reward.total": "合計ポイント",
1426 "reward.continue": "タップして続ける"
1407 },
1427 },
1408 "zh": {
1428 "zh": {
1409 "menu.tagline": "三个一排,你的方块就会装上火箭。",
1429 "menu.tagline": "三个一排,你的方块就会装上火箭。",
@@ -1684,7 +1704,11 @@
1684 "block.forge-brass": "Forge黄铜",
1704 "block.forge-brass": "Forge黄铜",
1685 "block.forge-soot": "Forge煤烟",
1705 "block.forge-soot": "Forge煤烟",
1686 "error.webgl": "本游戏需要 WebGL。请尝试其他浏览器,或开启硬件加速。",
1706 "error.webgl": "本游戏需要 WebGL。请尝试其他浏览器,或开启硬件加速。",
1687 "error.startFailed": "无法开始游戏。"
1707 "error.startFailed": "无法开始游戏。",
1708 "reward.won": "你赢了!",
1709 "reward.lost": "你输了...",
1710 "reward.total": "总积分",
1711 "reward.continue": "点击继续"
1688 },
1712 },
1689 "ko": {
1713 "ko": {
1690 "menu.tagline": "세 개를 나란히 맞추면 블록에 로켓이 점화됩니다.",
1714 "menu.tagline": "세 개를 나란히 맞추면 블록에 로켓이 점화됩니다.",
@@ -1965,7 +1989,11 @@
1965 "block.forge-brass": "Forge 황동",
1989 "block.forge-brass": "Forge 황동",
1966 "block.forge-soot": "Forge 그을음",
1990 "block.forge-soot": "Forge 그을음",
1967 "error.webgl": "이 게임은 WebGL이 필요합니다. 다른 브라우저를 사용하거나 하드웨어 가속을 켜 주세요.",
1991 "error.webgl": "이 게임은 WebGL이 필요합니다. 다른 브라우저를 사용하거나 하드웨어 가속을 켜 주세요.",
1968 "error.startFailed": "게임을 시작할 수 없습니다."
1992 "error.startFailed": "게임을 시작할 수 없습니다.",
1993 "reward.won": "승리!",
1994 "reward.lost": "패배...",
1995 "reward.total": "총 포인트",
1996 "reward.continue": "탭하여 계속"
1969 },
1997 },
1970 "pl": {
1998 "pl": {
1971 "menu.tagline": "Trzy w rzędzie, a twoje klocki dostają napęd rakietowy.",
1999 "menu.tagline": "Trzy w rzędzie, a twoje klocki dostają napęd rakietowy.",
@@ -2246,7 +2274,11 @@
2246 "block.forge-brass": "Forge mosiądz",
2274 "block.forge-brass": "Forge mosiądz",
2247 "block.forge-soot": "Forge sadza",
2275 "block.forge-soot": "Forge sadza",
2248 "error.webgl": "Ta gra wymaga WebGL. Spróbuj innej przeglądarki albo włącz akcelerację sprzętową.",
2276 "error.webgl": "Ta gra wymaga WebGL. Spróbuj innej przeglądarki albo włącz akcelerację sprzętową.",
2249 "error.startFailed": "Nie udało się uruchomić gry."
2277 "error.startFailed": "Nie udało się uruchomić gry.",
2278 "reward.won": "Wygrana!",
2279 "reward.lost": "Przegrana...",
2280 "reward.total": "Suma punktów",
2281 "reward.continue": "Dotknij, aby kontynuować"
2250 },
2282 },
2251 "ru": {
2283 "ru": {
2252 "menu.tagline": "Три в ряд — и твои блоки получают ракетные двигатели.",
2284 "menu.tagline": "Три в ряд — и твои блоки получают ракетные двигатели.",
@@ -2527,7 +2559,11 @@
2527 "block.forge-brass": "Forge (латунь)",
2559 "block.forge-brass": "Forge (латунь)",
2528 "block.forge-soot": "Forge (сажа)",
2560 "block.forge-soot": "Forge (сажа)",
2529 "error.webgl": "Этой игре нужен WebGL. Попробуйте другой браузер или включите аппаратное ускорение.",
2561 "error.webgl": "Этой игре нужен WebGL. Попробуйте другой браузер или включите аппаратное ускорение.",
2530 "error.startFailed": "Не удалось начать игру."
2562 "error.startFailed": "Не удалось начать игру.",
2563 "reward.won": "Победа!",
2564 "reward.lost": "Поражение...",
2565 "reward.total": "Всего очков",
2566 "reward.continue": "Нажмите, чтобы продолжить"
2531 },
2567 },
2532 "es": {
2568 "es": {
2533 "menu.tagline": "Tres en raya, y tus bloques ganan motores cohete.",
2569 "menu.tagline": "Tres en raya, y tus bloques ganan motores cohete.",
@@ -2808,7 +2844,11 @@
2808 "block.forge-brass": "Forge latón",
2844 "block.forge-brass": "Forge latón",
2809 "block.forge-soot": "Forge hollín",
2845 "block.forge-soot": "Forge hollín",
2810 "error.webgl": "Este juego necesita WebGL. Prueba con otro navegador o activa la aceleración por hardware.",
2846 "error.webgl": "Este juego necesita WebGL. Prueba con otro navegador o activa la aceleración por hardware.",
2811 "error.startFailed": "No se pudo iniciar el juego."
2847 "error.startFailed": "No se pudo iniciar el juego.",
2848 "reward.won": "¡Has ganado!",
2849 "reward.lost": "Has perdido...",
2850 "reward.total": "Puntos totales",
2851 "reward.continue": "Toca para continuar"
2812 }
2852 }
2813 },
2853 },
2814 "errors": {
2854 "errors": {
src/main.js +122 −9
@@ -86,7 +86,10 @@ var app = {
86 86 miniAcc: 0,
87 87 offlineResultShown: false,
88 88 roundWonDelay: 0,
89 roundWonHandled: false
89 roundWonHandled: false,
90 rewardActive: false,
91 onlineBefore: 0,
92 pendingLobbyReturn: null
90 93 };
91 94
92 95 window.onload = function ()
@@ -898,13 +901,15 @@ function tickView (dt)
898 901 { onOnlineEliminated(); }
899 902 else if (app.offline)
900 903 { /* Offline result is shown from tickOffline. */ }
904 else if (rewardEnabled())
905 { showReward(false, finishPlaySession(app.lastScore), returnToMenu); }
901 906 else
902 907 {
903 908 showEl('game-over');
904 909 finishPlaySession(app.lastScore);
905 910 }
906 911 }
907 if (!app.online && !app.offline && app.core.state === 'gameover'
912 if (!app.online && !app.offline && !app.rewardActive && app.core.state === 'gameover'
908 913 && app.core.gameOverTime >= GAME_OVER_DELAY)
909 914 { returnToMenu(); }
910 915 }
@@ -1458,6 +1463,13 @@ function tickOffline (dt)
1458 1463 {
1459 1464 app.roundWonHandled = true;
1460 1465 app.roundWonDelay = Offline.ROUND_WON_DELAY || 1.5;
1466 if (rewardEnabled())
1467 { showReward(true, finishPlaySession(app.core.score), startNextOfflineRound); }
1468 }
1469 if (app.rewardActive)
1470 {
1471 updateOfflineMinis(dt, true);
1472 return;
1461 1473 }
1462 1474 app.roundWonDelay -= dt;
1463 1475 if (app.roundWonDelay <= 0)
@@ -1499,7 +1511,17 @@ function tickOffline (dt)
1499 1511 updateOfflineMinis(dt, false);
1500 1512
1501 1513 if (app.battle.state === 'lost' && !app.offlineResultShown)
1502 { showOfflineResult(); }
1514 {
1515 if (rewardEnabled())
1516 {
1517 // Guard against starting the reward twice; showOfflineResult
1518 // sets the flag again when it runs afterwards.
1519 app.offlineResultShown = true;
1520 showReward(false, finishPlaySession(app.core ? app.core.score : 0), showOfflineResult);
1521 }
1522 else
1523 { showOfflineResult(); }
1524 }
1503 1525 }
1504 1526
1505 1527 function startNextOfflineRound ()
@@ -1850,6 +1872,8 @@ function onOnlineEliminated ()
1850 1872 app.spectating = true;
1851 1873 unbindPointer();
1852 1874 hideEl('game-over');
1875 if (app.rewardActive)
1876 { return; }
1853 1877 var lobby = typeof Online !== 'undefined' && Online.lobby;
1854 1878 if (lobby && lobby.status === 'finished')
1855 1879 {
@@ -1905,6 +1929,8 @@ function startOnlineMatch ()
1905 1929 if (typeof me.planet.miss_chance === 'number')
1906 1930 { miss = me.planet.miss_chance; }
1907 1931 }
1932 app.onlineBefore = (typeof Online !== 'undefined' && Online.lifetimePoints) || 0;
1933 app.pendingLobbyReturn = null;
1908 1934 startPlay({ online: true, planet: planet, missChance: miss });
1909 1935 if (typeof Online !== 'undefined')
1910 1936 { Online.startPolling(onlinePayload); }
@@ -2054,9 +2080,32 @@ function bindOnlineUi ()
2054 2080 }
2055 2081 };
2056 2082 Online.onFinished = function (lobby)
2057 { showPodium(lobby); };
2083 {
2084 if (app.mode === 'playing' && app.online && rewardEnabled() && !app.rewardActive)
2085 {
2086 // Lifetime points in this same poll already include the
2087 // server's online award (maybeAwardOnlineLobby).
2088 var result = { before: app.onlineBefore || 0, after: Online.lifetimePoints || 0 };
2089 showReward(myOnlinePlace(lobby) === 1, Promise.resolve(result), function ()
2090 {
2091 var pending = app.pendingLobbyReturn;
2092 app.pendingLobbyReturn = null;
2093 if (pending || !(Online.lobby && Online.lobby.status === 'finished'))
2094 { Online.onLobbyReturn(pending || Online.lobby); }
2095 else
2096 { showPodium(Online.lobby); }
2097 });
2098 return;
2099 }
2100 showPodium(lobby);
2101 };
2058 2102 Online.onLobbyReturn = function (lobby)
2059 2103 {
2104 if (app.rewardActive)
2105 {
2106 app.pendingLobbyReturn = lobby;
2107 return;
2108 }
2060 2109 teardownPlay();
2061 2110 app.online = false;
2062 2111 app.mode = 'online';
@@ -2145,7 +2194,7 @@ function renderOnline ()
2145 2194 if (app.mode === 'playing' && app.online)
2146 2195 {
2147 2196 Online.renderMinis(document.getElementById('minis'));
2148 if (Online.lobby && Online.lobby.status === 'finished')
2197 if (Online.lobby && Online.lobby.status === 'finished' && !app.rewardActive)
2149 2198 { showPodium(Online.lobby); }
2150 2199 return;
2151 2200 }
@@ -2435,14 +2484,78 @@ function beginPlaySession (mode)
2435 2484 });
2436 2485 }
2437 2486
2487 /**
2488 * Ends the solo/offline play session. Resolves to the server-confirmed
2489 * { before, after } profile totals (t1173), or null when there is no
2490 * logged-in user or the server did not confirm. Without a token (e.g.
2491 * play_begin failed) a logged-in player gets { before = after = current }.
2492 */
2438 2493 function finishPlaySession (score)
2439 2494 {
2440 2495 var token = app.playToken;
2441 2496 app.playToken = null;
2442 if (!token || typeof Online === 'undefined' || !Online.playFinish)
2443 { return; }
2444 Online.playFinish(token, score || 0).then(function ()
2445 { refreshMenuAccount(); });
2497 var hasOnline = typeof Online !== 'undefined';
2498 var current = hasOnline ? (Online.lifetimePoints || 0) : 0;
2499 if (!token || !hasOnline || !Online.playFinish)
2500 {
2501 return Promise.resolve(hasOnline && Online.me ? { before: current, after: current } : null);
2502 }
2503 return Promise.resolve(Online.playFinish(token, score || 0)).then(function (data)
2504 {
2505 refreshMenuAccount();
2506 if (data && data.ok !== false && typeof data.lifetime_points === 'number')
2507 {
2508 var awarded = Math.max(0, Number(data.awarded) || 0);
2509 return { before: data.lifetime_points - awarded, after: data.lifetime_points };
2510 }
2511 return null;
2512 }, function ()
2513 { return null; });
2514 }
2515
2516 /* ---------- t1173 reward screen (logged in only) ------------------- */
2517
2518 function rewardEnabled ()
2519 {
2520 return typeof Reward !== 'undefined' && typeof Online !== 'undefined' && !!Online.me;
2521 }
2522
2523 /**
2524 * Shows "You won!" / "You lost..." and the points fly-in, then calls
2525 * next() — the same destination the mode used before (menu, next
2526 * offline round, offline result, or the online lobby/podium).
2527 */
2528 function showReward (won, resultPromise, next)
2529 {
2530 app.rewardActive = true;
2531 hideEl('game-over');
2532 hideEl('spectator');
2533 hideEl('podium');
2534 var handle = Reward.play({
2535 won: won,
2536 planet: app.planet,
2537 result: resultPromise,
2538 onDone: function ()
2539 {
2540 app.rewardActive = false;
2541 if (next)
2542 { next(); }
2543 }
2544 });
2545 if (!handle)
2546 { app.rewardActive = false; }
2547 }
2548
2549 function myOnlinePlace (lobby)
2550 {
2551 var me = typeof Online !== 'undefined' ? Online.me : null;
2552 var ranks = (lobby && lobby.rankings) || [];
2553 for (var i = 0; i < ranks.length; i++)
2554 {
2555 if (me && ranks[i].id === me.id)
2556 { return ranks[i].place; }
2557 }
2558 return null;
2446 2559 }
2447 2560
2448 2561
@@ -86,7 +86,10 @@ var app = {
86 miniAcc: 0,
86 miniAcc: 0,
87 offlineResultShown: false,
87 offlineResultShown: false,
88 roundWonDelay: 0,
88 roundWonDelay: 0,
89 roundWonHandled: false
89 roundWonHandled: false,
90 rewardActive: false,
91 onlineBefore: 0,
92 pendingLobbyReturn: null
90};
93};
91
94
92window.onload = function ()
95window.onload = function ()
@@ -898,13 +901,15 @@ function tickView (dt)
898 { onOnlineEliminated(); }
901 { onOnlineEliminated(); }
899 else if (app.offline)
902 else if (app.offline)
900 { /* Offline result is shown from tickOffline. */ }
903 { /* Offline result is shown from tickOffline. */ }
904 else if (rewardEnabled())
905 { showReward(false, finishPlaySession(app.lastScore), returnToMenu); }
901 else
906 else
902 {
907 {
903 showEl('game-over');
908 showEl('game-over');
904 finishPlaySession(app.lastScore);
909 finishPlaySession(app.lastScore);
905 }
910 }
906 }
911 }
907 if (!app.online && !app.offline && app.core.state === 'gameover'
912 if (!app.online && !app.offline && !app.rewardActive && app.core.state === 'gameover'
908 && app.core.gameOverTime >= GAME_OVER_DELAY)
913 && app.core.gameOverTime >= GAME_OVER_DELAY)
909 { returnToMenu(); }
914 { returnToMenu(); }
910}
915}
@@ -1458,6 +1463,13 @@ function tickOffline (dt)
1458 {
1463 {
1459 app.roundWonHandled = true;
1464 app.roundWonHandled = true;
1460 app.roundWonDelay = Offline.ROUND_WON_DELAY || 1.5;
1465 app.roundWonDelay = Offline.ROUND_WON_DELAY || 1.5;
1466 if (rewardEnabled())
1467 { showReward(true, finishPlaySession(app.core.score), startNextOfflineRound); }
1468 }
1469 if (app.rewardActive)
1470 {
1471 updateOfflineMinis(dt, true);
1472 return;
1461 }
1473 }
1462 app.roundWonDelay -= dt;
1474 app.roundWonDelay -= dt;
1463 if (app.roundWonDelay <= 0)
1475 if (app.roundWonDelay <= 0)
@@ -1499,7 +1511,17 @@ function tickOffline (dt)
1499 updateOfflineMinis(dt, false);
1511 updateOfflineMinis(dt, false);
1500
1512
1501 if (app.battle.state === 'lost' && !app.offlineResultShown)
1513 if (app.battle.state === 'lost' && !app.offlineResultShown)
1502 { showOfflineResult(); }
1514 {
1515 if (rewardEnabled())
1516 {
1517 // Guard against starting the reward twice; showOfflineResult
1518 // sets the flag again when it runs afterwards.
1519 app.offlineResultShown = true;
1520 showReward(false, finishPlaySession(app.core ? app.core.score : 0), showOfflineResult);
1521 }
1522 else
1523 { showOfflineResult(); }
1524 }
1503}
1525}
1504
1526
1505function startNextOfflineRound ()
1527function startNextOfflineRound ()
@@ -1850,6 +1872,8 @@ function onOnlineEliminated ()
1850 app.spectating = true;
1872 app.spectating = true;
1851 unbindPointer();
1873 unbindPointer();
1852 hideEl('game-over');
1874 hideEl('game-over');
1875 if (app.rewardActive)
1876 { return; }
1853 var lobby = typeof Online !== 'undefined' && Online.lobby;
1877 var lobby = typeof Online !== 'undefined' && Online.lobby;
1854 if (lobby && lobby.status === 'finished')
1878 if (lobby && lobby.status === 'finished')
1855 {
1879 {
@@ -1905,6 +1929,8 @@ function startOnlineMatch ()
1905 if (typeof me.planet.miss_chance === 'number')
1929 if (typeof me.planet.miss_chance === 'number')
1906 { miss = me.planet.miss_chance; }
1930 { miss = me.planet.miss_chance; }
1907 }
1931 }
1932 app.onlineBefore = (typeof Online !== 'undefined' && Online.lifetimePoints) || 0;
1933 app.pendingLobbyReturn = null;
1908 startPlay({ online: true, planet: planet, missChance: miss });
1934 startPlay({ online: true, planet: planet, missChance: miss });
1909 if (typeof Online !== 'undefined')
1935 if (typeof Online !== 'undefined')
1910 { Online.startPolling(onlinePayload); }
1936 { Online.startPolling(onlinePayload); }
@@ -2054,9 +2080,32 @@ function bindOnlineUi ()
2054 }
2080 }
2055 };
2081 };
2056 Online.onFinished = function (lobby)
2082 Online.onFinished = function (lobby)
2057 { showPodium(lobby); };
2083 {
2084 if (app.mode === 'playing' && app.online && rewardEnabled() && !app.rewardActive)
2085 {
2086 // Lifetime points in this same poll already include the
2087 // server's online award (maybeAwardOnlineLobby).
2088 var result = { before: app.onlineBefore || 0, after: Online.lifetimePoints || 0 };
2089 showReward(myOnlinePlace(lobby) === 1, Promise.resolve(result), function ()
2090 {
2091 var pending = app.pendingLobbyReturn;
2092 app.pendingLobbyReturn = null;
2093 if (pending || !(Online.lobby && Online.lobby.status === 'finished'))
2094 { Online.onLobbyReturn(pending || Online.lobby); }
2095 else
2096 { showPodium(Online.lobby); }
2097 });
2098 return;
2099 }
2100 showPodium(lobby);
2101 };
2058 Online.onLobbyReturn = function (lobby)
2102 Online.onLobbyReturn = function (lobby)
2059 {
2103 {
2104 if (app.rewardActive)
2105 {
2106 app.pendingLobbyReturn = lobby;
2107 return;
2108 }
2060 teardownPlay();
2109 teardownPlay();
2061 app.online = false;
2110 app.online = false;
2062 app.mode = 'online';
2111 app.mode = 'online';
@@ -2145,7 +2194,7 @@ function renderOnline ()
2145 if (app.mode === 'playing' && app.online)
2194 if (app.mode === 'playing' && app.online)
2146 {
2195 {
2147 Online.renderMinis(document.getElementById('minis'));
2196 Online.renderMinis(document.getElementById('minis'));
2148 if (Online.lobby && Online.lobby.status === 'finished')
2197 if (Online.lobby && Online.lobby.status === 'finished' && !app.rewardActive)
2149 { showPodium(Online.lobby); }
2198 { showPodium(Online.lobby); }
2150 return;
2199 return;
2151 }
2200 }
@@ -2435,14 +2484,78 @@ function beginPlaySession (mode)
2435 });
2484 });
2436}
2485}
2437
2486
2487/**
2488 * Ends the solo/offline play session. Resolves to the server-confirmed
2489 * { before, after } profile totals (t1173), or null when there is no
2490 * logged-in user or the server did not confirm. Without a token (e.g.
2491 * play_begin failed) a logged-in player gets { before = after = current }.
2492 */
2438function finishPlaySession (score)
2493function finishPlaySession (score)
2439{
2494{
2440 var token = app.playToken;
2495 var token = app.playToken;
2441 app.playToken = null;
2496 app.playToken = null;
2442 if (!token || typeof Online === 'undefined' || !Online.playFinish)
2497 var hasOnline = typeof Online !== 'undefined';
2443 { return; }
2498 var current = hasOnline ? (Online.lifetimePoints || 0) : 0;
2444 Online.playFinish(token, score || 0).then(function ()
2499 if (!token || !hasOnline || !Online.playFinish)
2445 { refreshMenuAccount(); });
2500 {
2501 return Promise.resolve(hasOnline && Online.me ? { before: current, after: current } : null);
2502 }
2503 return Promise.resolve(Online.playFinish(token, score || 0)).then(function (data)
2504 {
2505 refreshMenuAccount();
2506 if (data && data.ok !== false && typeof data.lifetime_points === 'number')
2507 {
2508 var awarded = Math.max(0, Number(data.awarded) || 0);
2509 return { before: data.lifetime_points - awarded, after: data.lifetime_points };
2510 }
2511 return null;
2512 }, function ()
2513 { return null; });
2514}
2515
2516/* ---------- t1173 reward screen (logged in only) ------------------- */
2517
2518function rewardEnabled ()
2519{
2520 return typeof Reward !== 'undefined' && typeof Online !== 'undefined' && !!Online.me;
2521}
2522
2523/**
2524 * Shows "You won!" / "You lost..." and the points fly-in, then calls
2525 * next() — the same destination the mode used before (menu, next
2526 * offline round, offline result, or the online lobby/podium).
2527 */
2528function showReward (won, resultPromise, next)
2529{
2530 app.rewardActive = true;
2531 hideEl('game-over');
2532 hideEl('spectator');
2533 hideEl('podium');
2534 var handle = Reward.play({
2535 won: won,
2536 planet: app.planet,
2537 result: resultPromise,
2538 onDone: function ()
2539 {
2540 app.rewardActive = false;
2541 if (next)
2542 { next(); }
2543 }
2544 });
2545 if (!handle)
2546 { app.rewardActive = false; }
2547}
2548
2549function myOnlinePlace (lobby)
2550{
2551 var me = typeof Online !== 'undefined' ? Online.me : null;
2552 var ranks = (lobby && lobby.rankings) || [];
2553 for (var i = 0; i < ranks.length; i++)
2554 {
2555 if (me && ranks[i].id === me.id)
2556 { return ranks[i].place; }
2557 }
2558 return null;
2446}
2559}
2447
2560
2448
2561