mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-26 03:59:53 +01:00
Merge branch 'main' into data-driven
This commit is contained in:
commit
d8f6a55ee4
2 files changed
+19
-13
No files matched your search
@@ -13,7 +13,7 @@
|
|||||||
"hp": "{value}од",
|
"hp": "{value}од",
|
||||||
"x": "x{value}",
|
"x": "x{value}",
|
||||||
"percentage": "{value}%",
|
"percentage": "{value}%",
|
||||||
"deg_s": "{value}град/c",
|
"deg_s": "{value}°/c",
|
||||||
"plus": "+{value}"
|
"plus": "+{value}"
|
||||||
},
|
},
|
||||||
"gun_types": {
|
"gun_types": {
|
||||||
@@ -37,8 +37,8 @@
|
|||||||
"d_1": "Вчора"
|
"d_1": "Вчора"
|
||||||
},
|
},
|
||||||
"branches": {
|
"branches": {
|
||||||
"beta": "Beta",
|
"beta": "Бета",
|
||||||
"development": "Development",
|
"development": "Розробка",
|
||||||
"opentest": "Відкритий тест",
|
"opentest": "Відкритий тест",
|
||||||
"preview": "Preview",
|
"preview": "Preview",
|
||||||
"production": "Production"
|
"production": "Production"
|
||||||
@@ -340,8 +340,8 @@
|
|||||||
},
|
},
|
||||||
"mixer": {
|
"mixer": {
|
||||||
"name": "Mixer",
|
"name": "Mixer",
|
||||||
"button": "Mix and match",
|
"button": "Змішувати та поєднувати",
|
||||||
"description": "Mix tank modules",
|
"description": "Змішані танкові модулі",
|
||||||
"seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
|
"seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
|
||||||
"screenshot": "Знімок екрану",
|
"screenshot": "Знімок екрану",
|
||||||
"randomize": "Рандомізувати"
|
"randomize": "Рандомізувати"
|
||||||
@@ -501,11 +501,11 @@
|
|||||||
"tech_tree": {
|
"tech_tree": {
|
||||||
"title": "Звичайний",
|
"title": "Звичайний",
|
||||||
"battle": "1 бій",
|
"battle": "1 бій",
|
||||||
"battles": "{count} battles",
|
"battles": "{count} битви",
|
||||||
"route": "Route {index} of {count}"
|
"route": "Route {index} of {count}"
|
||||||
},
|
},
|
||||||
"game_modes": {
|
"game_modes": {
|
||||||
"title": "Game mode abilities"
|
"title": "Здібності ігрового режиму"
|
||||||
},
|
},
|
||||||
"review": {
|
"review": {
|
||||||
"title": "Review videos",
|
"title": "Review videos",
|
||||||
@@ -626,7 +626,7 @@
|
|||||||
"camouflageShootingStill": "Нерухомо",
|
"camouflageShootingStill": "Нерухомо",
|
||||||
"camouflageShootingMoving": "У русі",
|
"camouflageShootingMoving": "У русі",
|
||||||
"camouflageCaughtOnFire": "Caught on fire",
|
"camouflageCaughtOnFire": "Caught on fire",
|
||||||
"width": "Width",
|
"width": "Ширина",
|
||||||
"height": "Height",
|
"height": "Height",
|
||||||
"length": "Length",
|
"length": "Length",
|
||||||
"volume": "Volume",
|
"volume": "Volume",
|
||||||
@@ -740,7 +740,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gallery": {
|
"gallery": {
|
||||||
"name": "Gallery",
|
"name": "Галерея",
|
||||||
"button": "Browse all",
|
"button": "Browse all",
|
||||||
"description": "Blitz player avatars",
|
"description": "Blitz player avatars",
|
||||||
"seo_description": "Усі World of Tanks Blitz аватари гравців",
|
"seo_description": "Усі World of Tanks Blitz аватари гравців",
|
||||||
@@ -843,7 +843,7 @@
|
|||||||
"breakdown": {
|
"breakdown": {
|
||||||
"name": "Breakdown",
|
"name": "Breakdown",
|
||||||
"options": {
|
"options": {
|
||||||
"width": "Width",
|
"width": "Ширина",
|
||||||
"height": "Height",
|
"height": "Height",
|
||||||
"showTotal": "Show total",
|
"showTotal": "Show total",
|
||||||
"listGap": "List gap",
|
"listGap": "List gap",
|
||||||
|
|||||||
@@ -90,15 +90,21 @@ function Content() {
|
|||||||
session.tracking && tankStatsB
|
session.tracking && tankStatsB
|
||||||
? deltaTankStats(session.player.stats, tankStatsB)
|
? deltaTankStats(session.player.stats, tankStatsB)
|
||||||
.sort((a, b) => b.last_battle_time - a.last_battle_time)
|
.sort((a, b) => b.last_battle_time - a.last_battle_time)
|
||||||
.map((entry) => {
|
.flatMap((entry) => {
|
||||||
|
if (!(entry.tank_id in tankDefinitions.tanks)) return [];
|
||||||
|
|
||||||
const tank = tankDefinitions.tanks[entry.tank_id];
|
const tank = tankDefinitions.tanks[entry.tank_id];
|
||||||
|
|
||||||
|
if (!(tank.id in averageDefinitions.averages)) return [];
|
||||||
|
|
||||||
const average = averageDefinitions.averages[tank.id];
|
const average = averageDefinitions.averages[tank.id];
|
||||||
|
|
||||||
const composite = compositeStats(
|
const composite = compositeStats(
|
||||||
{ ...entry.all, battle_life_time: entry.battle_life_time },
|
{ ...entry.all, battle_life_time: entry.battle_life_time },
|
||||||
average?.mu!,
|
average.mu!,
|
||||||
);
|
);
|
||||||
|
|
||||||
return { tank, composite };
|
return [{ tank, composite }];
|
||||||
})
|
})
|
||||||
: undefined,
|
: undefined,
|
||||||
[session.tracking && session.player, tankStatsB],
|
[session.tracking && session.player, tankStatsB],
|
||||||
|
|||||||
Reference in new issue
Block a user