diff --git a/screenshots-wiki-en/desk-ach.png b/screenshots-wiki-en/desk-ach.png index 5c30c1f..1b005b8 100644 Binary files a/screenshots-wiki-en/desk-ach.png and b/screenshots-wiki-en/desk-ach.png differ diff --git a/screenshots-wiki-en/desk-card.png b/screenshots-wiki-en/desk-card.png index c93f658..0af794f 100644 Binary files a/screenshots-wiki-en/desk-card.png and b/screenshots-wiki-en/desk-card.png differ diff --git a/screenshots-wiki-en/desk-journal.png b/screenshots-wiki-en/desk-journal.png index 3ce287f..38a3c58 100644 Binary files a/screenshots-wiki-en/desk-journal.png and b/screenshots-wiki-en/desk-journal.png differ diff --git a/screenshots-wiki-en/desk-lake.png b/screenshots-wiki-en/desk-lake.png index 8bb594b..e8af47f 100644 Binary files a/screenshots-wiki-en/desk-lake.png and b/screenshots-wiki-en/desk-lake.png differ diff --git a/screenshots-wiki-en/desk-menu.png b/screenshots-wiki-en/desk-menu.png index 1d967bc..f68c796 100644 Binary files a/screenshots-wiki-en/desk-menu.png and b/screenshots-wiki-en/desk-menu.png differ diff --git a/screenshots-wiki-en/desk-night.png b/screenshots-wiki-en/desk-night.png index 88ac68b..fd24075 100644 Binary files a/screenshots-wiki-en/desk-night.png and b/screenshots-wiki-en/desk-night.png differ diff --git a/screenshots-wiki-en/desk-reel.png b/screenshots-wiki-en/desk-reel.png index 678cecf..25bd16d 100644 Binary files a/screenshots-wiki-en/desk-reel.png and b/screenshots-wiki-en/desk-reel.png differ diff --git a/screenshots-wiki-en/desk-shop.png b/screenshots-wiki-en/desk-shop.png index 71f2606..2540453 100644 Binary files a/screenshots-wiki-en/desk-shop.png and b/screenshots-wiki-en/desk-shop.png differ diff --git a/screenshots-wiki-en/desk-wait.png b/screenshots-wiki-en/desk-wait.png index 7e816eb..1bd07bf 100644 Binary files a/screenshots-wiki-en/desk-wait.png and b/screenshots-wiki-en/desk-wait.png differ diff --git a/screenshots-wiki-en/desk-weather-rain.png b/screenshots-wiki-en/desk-weather-rain.png index 4b6b922..7ee79cc 100644 Binary files a/screenshots-wiki-en/desk-weather-rain.png and b/screenshots-wiki-en/desk-weather-rain.png differ diff --git a/screenshots-wiki-en/mobl-ach.png b/screenshots-wiki-en/mobl-ach.png index e903e3c..d62a984 100644 Binary files a/screenshots-wiki-en/mobl-ach.png and b/screenshots-wiki-en/mobl-ach.png differ diff --git a/screenshots-wiki-en/mobl-card.png b/screenshots-wiki-en/mobl-card.png index 08fdc04..bd76213 100644 Binary files a/screenshots-wiki-en/mobl-card.png and b/screenshots-wiki-en/mobl-card.png differ diff --git a/screenshots-wiki-en/mobl-journal.png b/screenshots-wiki-en/mobl-journal.png index 58095f0..1483645 100644 Binary files a/screenshots-wiki-en/mobl-journal.png and b/screenshots-wiki-en/mobl-journal.png differ diff --git a/screenshots-wiki-en/mobl-lake.png b/screenshots-wiki-en/mobl-lake.png index 1f367e5..a224058 100644 Binary files a/screenshots-wiki-en/mobl-lake.png and b/screenshots-wiki-en/mobl-lake.png differ diff --git a/screenshots-wiki-en/mobl-menu.png b/screenshots-wiki-en/mobl-menu.png index c01253b..6565962 100644 Binary files a/screenshots-wiki-en/mobl-menu.png and b/screenshots-wiki-en/mobl-menu.png differ diff --git a/screenshots-wiki-en/mobl-night.png b/screenshots-wiki-en/mobl-night.png index 50665b3..87de219 100644 Binary files a/screenshots-wiki-en/mobl-night.png and b/screenshots-wiki-en/mobl-night.png differ diff --git a/screenshots-wiki-en/mobl-reel.png b/screenshots-wiki-en/mobl-reel.png index 994e481..a1676f8 100644 Binary files a/screenshots-wiki-en/mobl-reel.png and b/screenshots-wiki-en/mobl-reel.png differ diff --git a/screenshots-wiki-en/mobl-shop.png b/screenshots-wiki-en/mobl-shop.png index 4c82eac..ac8b080 100644 Binary files a/screenshots-wiki-en/mobl-shop.png and b/screenshots-wiki-en/mobl-shop.png differ diff --git a/screenshots-wiki-en/mobl-wait.png b/screenshots-wiki-en/mobl-wait.png index 77b0587..041898c 100644 Binary files a/screenshots-wiki-en/mobl-wait.png and b/screenshots-wiki-en/mobl-wait.png differ diff --git a/screenshots-wiki-en/mobl-weather-rain.png b/screenshots-wiki-en/mobl-weather-rain.png index 23a5999..aeb0606 100644 Binary files a/screenshots-wiki-en/mobl-weather-rain.png and b/screenshots-wiki-en/mobl-weather-rain.png differ diff --git a/screenshots-wiki-en/mobp-ach.png b/screenshots-wiki-en/mobp-ach.png index 11e95fd..a614176 100644 Binary files a/screenshots-wiki-en/mobp-ach.png and b/screenshots-wiki-en/mobp-ach.png differ diff --git a/screenshots-wiki-en/mobp-card.png b/screenshots-wiki-en/mobp-card.png index c821df4..b5fa7f3 100644 Binary files a/screenshots-wiki-en/mobp-card.png and b/screenshots-wiki-en/mobp-card.png differ diff --git a/screenshots-wiki-en/mobp-journal.png b/screenshots-wiki-en/mobp-journal.png index b9a1a77..43b8888 100644 Binary files a/screenshots-wiki-en/mobp-journal.png and b/screenshots-wiki-en/mobp-journal.png differ diff --git a/screenshots-wiki-en/mobp-lake.png b/screenshots-wiki-en/mobp-lake.png index 42d9072..8e35154 100644 Binary files a/screenshots-wiki-en/mobp-lake.png and b/screenshots-wiki-en/mobp-lake.png differ diff --git a/screenshots-wiki-en/mobp-menu.png b/screenshots-wiki-en/mobp-menu.png index 258514f..85fa579 100644 Binary files a/screenshots-wiki-en/mobp-menu.png and b/screenshots-wiki-en/mobp-menu.png differ diff --git a/screenshots-wiki-en/mobp-night.png b/screenshots-wiki-en/mobp-night.png index c6e4f7e..0b28315 100644 Binary files a/screenshots-wiki-en/mobp-night.png and b/screenshots-wiki-en/mobp-night.png differ diff --git a/screenshots-wiki-en/mobp-reel.png b/screenshots-wiki-en/mobp-reel.png index 9f1faee..b35ba34 100644 Binary files a/screenshots-wiki-en/mobp-reel.png and b/screenshots-wiki-en/mobp-reel.png differ diff --git a/screenshots-wiki-en/mobp-shop.png b/screenshots-wiki-en/mobp-shop.png index 15ffab3..2a61b63 100644 Binary files a/screenshots-wiki-en/mobp-shop.png and b/screenshots-wiki-en/mobp-shop.png differ diff --git a/screenshots-wiki-en/mobp-wait.png b/screenshots-wiki-en/mobp-wait.png index 263af0c..5874894 100644 Binary files a/screenshots-wiki-en/mobp-wait.png and b/screenshots-wiki-en/mobp-wait.png differ diff --git a/screenshots-wiki-en/mobp-weather-rain.png b/screenshots-wiki-en/mobp-weather-rain.png index 4f7b760..283bd3b 100644 Binary files a/screenshots-wiki-en/mobp-weather-rain.png and b/screenshots-wiki-en/mobp-weather-rain.png differ diff --git a/screenshots-wiki/desk-ach.png b/screenshots-wiki/desk-ach.png index bed29d5..63c19c1 100644 Binary files a/screenshots-wiki/desk-ach.png and b/screenshots-wiki/desk-ach.png differ diff --git a/screenshots-wiki/desk-card.png b/screenshots-wiki/desk-card.png index de4efab..a1ae7d2 100644 Binary files a/screenshots-wiki/desk-card.png and b/screenshots-wiki/desk-card.png differ diff --git a/screenshots-wiki/desk-journal.png b/screenshots-wiki/desk-journal.png index a2be85e..3fb4b4d 100644 Binary files a/screenshots-wiki/desk-journal.png and b/screenshots-wiki/desk-journal.png differ diff --git a/screenshots-wiki/desk-lake.png b/screenshots-wiki/desk-lake.png index e6ab7d0..9254e06 100644 Binary files a/screenshots-wiki/desk-lake.png and b/screenshots-wiki/desk-lake.png differ diff --git a/screenshots-wiki/desk-menu.png b/screenshots-wiki/desk-menu.png index 9d48f98..a2e9aa5 100644 Binary files a/screenshots-wiki/desk-menu.png and b/screenshots-wiki/desk-menu.png differ diff --git a/screenshots-wiki/desk-night.png b/screenshots-wiki/desk-night.png index b666970..55f88fd 100644 Binary files a/screenshots-wiki/desk-night.png and b/screenshots-wiki/desk-night.png differ diff --git a/screenshots-wiki/desk-reel.png b/screenshots-wiki/desk-reel.png index b8a0f08..1e2aabe 100644 Binary files a/screenshots-wiki/desk-reel.png and b/screenshots-wiki/desk-reel.png differ diff --git a/screenshots-wiki/desk-shop.png b/screenshots-wiki/desk-shop.png index 3067e84..3b64698 100644 Binary files a/screenshots-wiki/desk-shop.png and b/screenshots-wiki/desk-shop.png differ diff --git a/screenshots-wiki/desk-wait.png b/screenshots-wiki/desk-wait.png index a25b098..54223ac 100644 Binary files a/screenshots-wiki/desk-wait.png and b/screenshots-wiki/desk-wait.png differ diff --git a/screenshots-wiki/desk-weather-rain.png b/screenshots-wiki/desk-weather-rain.png index 9bb12e3..2d58665 100644 Binary files a/screenshots-wiki/desk-weather-rain.png and b/screenshots-wiki/desk-weather-rain.png differ diff --git a/screenshots-wiki/mobl-ach.png b/screenshots-wiki/mobl-ach.png index ed57717..21cbaad 100644 Binary files a/screenshots-wiki/mobl-ach.png and b/screenshots-wiki/mobl-ach.png differ diff --git a/screenshots-wiki/mobl-card.png b/screenshots-wiki/mobl-card.png index 807489a..e5e8748 100644 Binary files a/screenshots-wiki/mobl-card.png and b/screenshots-wiki/mobl-card.png differ diff --git a/screenshots-wiki/mobl-journal.png b/screenshots-wiki/mobl-journal.png index 70213a2..9605dcf 100644 Binary files a/screenshots-wiki/mobl-journal.png and b/screenshots-wiki/mobl-journal.png differ diff --git a/screenshots-wiki/mobl-lake.png b/screenshots-wiki/mobl-lake.png index 7db077a..a077deb 100644 Binary files a/screenshots-wiki/mobl-lake.png and b/screenshots-wiki/mobl-lake.png differ diff --git a/screenshots-wiki/mobl-menu.png b/screenshots-wiki/mobl-menu.png index 407263b..7a8f081 100644 Binary files a/screenshots-wiki/mobl-menu.png and b/screenshots-wiki/mobl-menu.png differ diff --git a/screenshots-wiki/mobl-night.png b/screenshots-wiki/mobl-night.png index f2e75a8..69b494a 100644 Binary files a/screenshots-wiki/mobl-night.png and b/screenshots-wiki/mobl-night.png differ diff --git a/screenshots-wiki/mobl-reel.png b/screenshots-wiki/mobl-reel.png index 71f9877..509f059 100644 Binary files a/screenshots-wiki/mobl-reel.png and b/screenshots-wiki/mobl-reel.png differ diff --git a/screenshots-wiki/mobl-shop.png b/screenshots-wiki/mobl-shop.png index e246087..9d5c707 100644 Binary files a/screenshots-wiki/mobl-shop.png and b/screenshots-wiki/mobl-shop.png differ diff --git a/screenshots-wiki/mobl-wait.png b/screenshots-wiki/mobl-wait.png index a949503..ece72fb 100644 Binary files a/screenshots-wiki/mobl-wait.png and b/screenshots-wiki/mobl-wait.png differ diff --git a/screenshots-wiki/mobl-weather-rain.png b/screenshots-wiki/mobl-weather-rain.png index a7064de..7b9b277 100644 Binary files a/screenshots-wiki/mobl-weather-rain.png and b/screenshots-wiki/mobl-weather-rain.png differ diff --git a/screenshots-wiki/mobp-ach.png b/screenshots-wiki/mobp-ach.png index fd1fb90..f059a0c 100644 Binary files a/screenshots-wiki/mobp-ach.png and b/screenshots-wiki/mobp-ach.png differ diff --git a/screenshots-wiki/mobp-card.png b/screenshots-wiki/mobp-card.png index fb7330a..0724ad9 100644 Binary files a/screenshots-wiki/mobp-card.png and b/screenshots-wiki/mobp-card.png differ diff --git a/screenshots-wiki/mobp-journal.png b/screenshots-wiki/mobp-journal.png index 1672dc5..574e595 100644 Binary files a/screenshots-wiki/mobp-journal.png and b/screenshots-wiki/mobp-journal.png differ diff --git a/screenshots-wiki/mobp-lake.png b/screenshots-wiki/mobp-lake.png index 3c2d0ce..cd03000 100644 Binary files a/screenshots-wiki/mobp-lake.png and b/screenshots-wiki/mobp-lake.png differ diff --git a/screenshots-wiki/mobp-menu.png b/screenshots-wiki/mobp-menu.png index 28a9412..8f491ac 100644 Binary files a/screenshots-wiki/mobp-menu.png and b/screenshots-wiki/mobp-menu.png differ diff --git a/screenshots-wiki/mobp-night.png b/screenshots-wiki/mobp-night.png index 47520cf..69d9e81 100644 Binary files a/screenshots-wiki/mobp-night.png and b/screenshots-wiki/mobp-night.png differ diff --git a/screenshots-wiki/mobp-reel.png b/screenshots-wiki/mobp-reel.png index 8f04bd7..d2ff169 100644 Binary files a/screenshots-wiki/mobp-reel.png and b/screenshots-wiki/mobp-reel.png differ diff --git a/screenshots-wiki/mobp-shop.png b/screenshots-wiki/mobp-shop.png index d6b3332..41fe305 100644 Binary files a/screenshots-wiki/mobp-shop.png and b/screenshots-wiki/mobp-shop.png differ diff --git a/screenshots-wiki/mobp-wait.png b/screenshots-wiki/mobp-wait.png index 098c073..a75b54a 100644 Binary files a/screenshots-wiki/mobp-wait.png and b/screenshots-wiki/mobp-wait.png differ diff --git a/screenshots-wiki/mobp-weather-rain.png b/screenshots-wiki/mobp-weather-rain.png index 2ace2f9..6510340 100644 Binary files a/screenshots-wiki/mobp-weather-rain.png and b/screenshots-wiki/mobp-weather-rain.png differ diff --git a/tests/gen-screenshots.js b/tests/gen-screenshots.js index 5abd9ea..dcac577 100644 --- a/tests/gen-screenshots.js +++ b/tests/gen-screenshots.js @@ -51,7 +51,7 @@ const GAME_DIR = process.argv[2] ? path.resolve(process.argv[2]) : path.resolve( const OUT = process.argv[3] ? path.resolve(process.argv[3]) : path.join(GAME_DIR, 'screenshots-wiki'); const GAME = 'file://' + path.join(GAME_DIR, 'index.html'); const CHROMIUM = process.env.CHROMIUM || '/usr/bin/chromium-browser'; -const LANG = (process.argv[4] === 'en') ? 'en' : 'ru'; +const SCRIPT_LANG = (process.argv[4] === 'en') ? 'en' : 'ru'; const VIEWPORTS = [ { key: 'desk', w: 1280, h: 720, dsf: 1 }, @@ -113,10 +113,12 @@ async function captureSet(browser, vp) { await page.setViewport({ width: vp.w, height: vp.h, deviceScaleFactor: vp.dsf }); await page.goto(GAME, { waitUntil: 'load' }); // язык: forceLang + setLang (обновляет UI на en/ru) - await page.evaluate(() => { forceLang = (LANG === 'en') ? 'en' : null; setLang(LANG); }); + await page.evaluate((lang) => { forceLang = (lang === 'en') ? 'en' : null; setLang(lang); }, SCRIPT_LANG); // чистый сейв на каждом вьюпорте: кадры согласованы, без переноса прогресса await page.evaluate(() => localStorage.clear()); await page.reload({ waitUntil: 'load' }); + // после reload forceLang/resolveLang сбрасываются на ru — ставим язык заново + await page.evaluate((lang) => setLang(lang), SCRIPT_LANG); await page.waitForFunction( () => !document.getElementById('menu').classList.contains('hidden'), { timeout: 8000, polling: 50 }); @@ -147,7 +149,11 @@ async function captureSet(browser, vp) { // дневник — вкладка #tabJournal await page.click('#tabJournal'); await page.waitForFunction( - () => document.getElementById('shopBody').textContent.indexOf('Бросков') >= 0, + () => { + const text = document.getElementById('shopBody').textContent; + if (LANG === 'en') return text.indexOf('Casts') >= 0; + return text.indexOf('Бросков') >= 0; + }, { timeout: 3000, polling: 50 }); await waitPaint(page); await shoot(page, `${vp.key}-journal.png`); @@ -245,7 +251,7 @@ async function captureSet(browser, vp) { }); let n = 0; for (const vp of VIEWPORTS) { - console.log('=== viewport', vp.key, vp.w + 'x' + vp.h + '@' + vp.dsf, '(lang=' + LANG + ')'); + console.log('=== viewport', vp.key, vp.w + 'x' + vp.h + '@' + vp.dsf, '(lang=' + SCRIPT_LANG + ')'); await captureSet(browser, vp); n += FRAMES.length; }