feat: logs

*Total -- 1,028.23kb -> 900.50kb (12.42%)

/packages/website/public/assets/images/3d/grid.png -- 610.88kb -> 490.28kb (19.74%)
/packages/website/public/assets/images/icons/aim-caret.png -- 1.93kb -> 1.84kb (4.6%)
/packages/website/public/assets/images/icons/xp-multiplier.png -- 4.54kb -> 4.43kb (2.28%)
/packages/website/public/assets/images/third-party/wotb-news.png -- 404.33kb -> 397.41kb (1.71%)
/packages/website/public/assets/images/icons/custom-shell.png -- 6.55kb -> 6.54kb (0.18%)

Signed-off-by: ImgBotApp <[email protected]>
Co-authored-by: ImgBotApp <[email protected]>

.github/workflows/assets.yml

@@ -50,6 +50,7 @@ env:
   PATREON_CLIENT_SECRET: ${{ secrets.PATREON_CLIENT_SECRET }}
   PUBLIC_NITROPAY_ID: ${{ secrets.PUBLIC_NITROPAY_ID }}
   PUBLIC_DEBUG_MISSING_I18N: false
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
 
 jobs:
   download_client:

.github/workflows/website.yml

@@ -21,13 +21,14 @@ env:
   PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
   PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
   PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: true
+  ALLOW_ROBOTS: "true"
   WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
   PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
   PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
   GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
   WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
   WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
 
 jobs:
   build:

.gitignore

@@ -27,3 +27,5 @@ target
 /.vercel
 /.astro
 .vercel
+/src
+/packages/bot/src/prisma

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "submodules/blitzkit-closed"]
 	path = submodules/blitzkit-closed
 	url = https://github.com/tresabhi/blitzkit-closed
+[submodule "submodules/CUE4Parse"]
+	path = submodules/CUE4Parse
+	url = https://github.com/FabianFG/CUE4Parse
+[submodule "submodules/UAssetAPI"]
+	path = submodules/UAssetAPI
+	url = https://github.com/atenfyr/UAssetAPI

.vscode/settings.json

@@ -14,6 +14,7 @@
     "applypatches",
     "artefacts",
     "astrojs",
+    "astrolib",
     "atgm",
     "Autoloader",
     "Autoreloader",
@@ -35,6 +36,7 @@
     "cacheable",
     "Callouts",
     "Camo",
+    "Carro",
     "CCPAOPTOUT",
     "CDON",
     "classname",
@@ -42,6 +44,7 @@
     "closedkrieg",
     "cockroackdb",
     "Coef",
+    "Combattimento",
     "cooldown",
     "corelations",
     "corsproxy",
@@ -53,6 +56,7 @@
     "dbid",
     "Ddpf",
     "Ddsd",
+    "deadrail",
     "debugflags",
     "deburr",
     "decalmask",
@@ -130,9 +134,12 @@
     "outdir",
     "outfile",
     "ownedtanks",
+    "padder",
+    "partytown",
     "PIXELFORMAT",
     "playerachievements",
     "playerinfo",
+    "playform",
     "pngjs",
     "POSITIVEX",
     "POSITIVEY",
@@ -181,6 +188,7 @@
     "TEXCOORD",
     "tresabhi",
     "tungstentip",
+    "Turretless",
     "TYPELESS",
     "ubjson",
     "Unicum",

docs/changelogs/1.27.10.md

@@ -0,0 +1,23 @@
+# BlitzKit 1.27.10
+
+This update changes the URLs across the whole website, removing the "tools" prefix and simplifying other aspects too.
+
+## Changes
+
+- Removed "full" tank names
+  - For example, tanks like the "Carro 45t" had full names like "Carro Combattimento 45t" which remained pretty much unused, so they have been removed
+- Reduced the shadow below the navigation bar
+- Removed the "tools" prefix from the URLs; here are the paths:
+  - `/tools/tankopedia` -> `/tanks`
+  - `/tools/tankopedia/12345` -> `/tanks/tank-name`
+  - `/tools/compare` -> `/compare`
+  - `/tools/embed` -> `/embed`
+  - `/tools/embed/embed-name` -> `/embed/embed-name`
+  - `/tools/gallery` -> `/gallery`
+  - `/tools/performance` -> `/performance`
+  - `/tools/session` -> `/session`
+  - `/tools/tier-list` -> `/tier-list`
+
+## Technical Features
+
+- The asset mangler now uses http headers and even more heuristics to minimize re-creating unchanged assets

docs/changelogs/1.27.11.md

@@ -0,0 +1,7 @@
+# BlitzKit 1.27.11
+
+This update affects both the bot and the website.
+
+## Technical Changes
+
+- Added a proper CDN domain to avoid error 429s and any slowdowns

docs/changelogs/1.27.2.md

@@ -0,0 +1,7 @@
+# BlitzKit 1.27.2
+
+This update only affects the website.
+
+## Fixes
+
+- The new Improved Vertical Stabilizer equipment which only affects the gun depression found on the Type 63 now works

docs/changelogs/1.27.3.md

@@ -0,0 +1,9 @@
+# BlitzKit 1.27.3
+
+This update only affects the bot.
+
+## Fixes
+
+- Added support for 64-bit IDs allowing users with new accounts to link with BlitzKit
+  - This comes at the added cost of resetting the links of all other accounts
+  - Just re-link and you're good to go

docs/changelogs/1.27.4.md

@@ -0,0 +1,3 @@
+# FreakKit 1.27.4
+
+It has come to our attention that tanks are very harsh objects. To even it out, we made the website a pretty pretty princess <3

docs/changelogs/1.27.5.md

@@ -0,0 +1,11 @@
+# BlitzKit 1.27.5
+
+This update only affects the bot.
+
+## Changes
+
+- Removed `/auction`
+
+## Fixes
+
+- Fixed a bug that caused `/rating` to disappear

docs/changelogs/1.27.6.md

@@ -0,0 +1,23 @@
+# BlitzKit 1.27.6
+
+This update only affects the website.
+
+## Features
+
+- Added a promotional card for [the official Discord server](https://discord.gg/nDt7AjGJQH) to the homepage
+- Added a better navbar
+  - The added spaces and padding helps add more room for error when clicking, especially on mobile
+  - The dropdown menu is now a lost smaller, disposing of the need to scroll at all
+- Added shell filters to the tank search
+- Reworked the filter buttons and their positions to allow for more space
+
+## Fixes
+
+- Moved most images from imgur to BlitzKit allowing for users in certain countries to load BlitzKit without getting blocked
+
+## Technical Features
+
+- Added Partytown to offload some workload off the main thread, allowing for a more responsive experience
+- Reworked `robots.txt` to disallow indexing of BlitzKit variants
+- Improved the SEO further for most pages
+- Added a few compressor library to speed up load times

docs/changelogs/1.27.7.md

@@ -0,0 +1,25 @@
+# BlitzKit 1.27.7
+
+![](https://i.imgur.com/qFepOaT.png)
+
+This update only affects the website.
+
+## Features
+
+- Added a new foggy-wireframe transition between tabs to smooth out the jarring jumps
+- Added animations pop-in and out animations on a few elements
+  - The tank name title now shrinks in size as soon as a disturbance is caused
+  - The shell selector, antagonist switcher, and thicknesses range now ease into frame
+- The Tankopedia search page now loads as a skeleton by default before populating with tanks, allowing for the recently viewed tanks to load without cumulative shift
+  - Something similar was done to the Gallery tool
+- Gave the meta section of the website some zest with nation-based backdrops
+- The compare tabs in the Tankopedia are now centered
+
+## Fixes
+
+- The camera no longer snaps to the initial position when switching between tabs
+
+## Technical Changes
+
+- Backported some technologies from BlitzKit Reforged; you will not notice any differences in usage
+- The popular tanks and gallery indexings have been moved to the asynchronous cron job

docs/changelogs/1.27.8.md

@@ -0,0 +1,12 @@
+# BlitzKit 1.27.8
+
+![](https://i.imgur.com/WO5MS94.png)
+
+## Features
+
+- The website now uses Inter as the font
+- Added a cool new non-disturbed state for the Tankopedia because why not
+
+## Changes
+
+- Removed the Discord plug and language changer from the homepage

docs/changelogs/1.27.9.md

@@ -0,0 +1,27 @@
+# BlitzKit 1.27.9
+
+BlitzKit's great, but there's far too many numbers. This update adds a few visualizers to help new players understand how things relate numerically.
+
+![](https://i.imgur.com/OV5ak4T.png)
+
+## Features
+
+- Added the turret and hull traverse speed visualizer
+- Added the shell ricochet and normalization angles visualizer
+- Added the view-range visualizer
+- Added a search bar to the Tankopedia characteristics
+- Bumped the decimal places for vehicle dimensions and volume
+- Made tank ranks softer (the bars beneath the tank characteristics)
+- Gave the navigation bar better distinction from the rest of the page
+- Increased the number of characteristics rows to 3 on select devices
+- Switched to a more contrasting classic style of components across the website (it's subtle, but beautiful)
+
+## Changes
+
+- Removed units
+
+## Fixes
+
+- Clarified a few confusing row labels in the Compare tool
+- Made the Tankopedia hero section dynamically smaller on mobile phones to allow scrolling
+- Tank ranks no longer reach 0 or go above the number of vehicles in the comparison

package.json

@@ -1,7 +1,7 @@
 {
   "name": "blitzkit",
   "private": true,
-  "version": "1.27.1",
+  "version": "1.27.11",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "type": "module",
   "types": "./types.d.ts",
@@ -40,15 +40,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "sharp": "^0.33.5",
+    "googleapis": "^144.0.0",
-    "lodash-es": "^4.17.21"
+    "lodash-es": "^4.17.21",
+    "quicklime": "^1.2.0",
+    "sharp": "^0.33.5"
   },
   "devDependencies": {
     "@types/bun": "latest",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.5.4",
+    "@types/node": "^22.14.1",
-    "prettier": "^3.3.3",
+    "prettier": "^3.5.3",
-    "prisma": "^6.0.0",
+    "prisma": "^6.6.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.8.3"
   }
 }

packages/bot/src/commands/auction.ts

@@ -107,8 +107,8 @@ export const auctionCommand = new Promise<CommandRegistry>((resolve) => {
 
         if (!tank) return '';
 
-        const name = `[${tank.name}](<https://blitzkit.app/tools/tankopedia/${
+        const name = `[${tank.name}](<https://blitzkit.app/tanks/${
-          tank.id
+          tank.slug
         }>)`;
         const next =
           data.next_price === null

packages/bot/src/commands/debug.ts

@@ -17,7 +17,7 @@ export const debugCommand = new Promise<CommandRegistry>((resolve) => {
       const list = [
         [strings.bot.commands.debug.body.version, packageJSON.version],
         [
-          strings.bot.commands.debug.body.shard,
+          strings.bot.commands.debug.body.shard.label,
           client.shard?.ids[0] ?? strings.bot.commands.debug.body.shard.default,
         ],
         [

packages/bot/src/commands/link.tsx

@@ -1,11 +1,8 @@
-import {
+import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
-  getAccountInfo,
-  getClanAccountInfo,
-  linkBlitzAndDiscord,
-} from '@blitzkit/core';
 import { teal } from '@radix-ui/colors';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import { CommandWrapper } from '../components/CommandWrapper';
+import { linkBlitzAndDiscord } from '../core/db/linkBlitzAndDiscord';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteUsername } from '../core/discord/autocompleteUsername';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

packages/bot/src/commands/ownedTanks.tsx

@@ -78,7 +78,7 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
         )
         .map(
           (tank) =>
-            `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tools/tankopedia/${tank.id}>)`,
+            `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)`,
         );
       const lines = [title, ...tankList];
 

packages/bot/src/components/CommandWrapper.tsx

@@ -16,8 +16,8 @@ export function CommandWrapper({ children, fat }: CommandWrapperProps) {
         gap: 16,
         width: '100%',
         color: theme.colors.textHighContrast,
+        backgroundColor: theme.colors.appBackground1,
         position: 'relative',
-        background: theme.colors.appBackground1,
       }}
     >
       {children}

packages/bot/src/core/blitzkit/filtersToDescription.ts

@@ -8,12 +8,12 @@ export async function filtersToDescription(
   { nation, tier, type, class: tankClass, tank }: StatFilters,
   locale: Locale,
 ) {
-  const { strings } = translator(locale);
+  const { strings, bkLocale } = translator(locale);
   const awaitedTankDefinitions = await fetchTankDefinitions();
   const info: string[] = [];
 
   // TODO: somehow localize tank names?
-  if (tank) return awaitedTankDefinitions.tanks[tank].name;
+  if (tank) return awaitedTankDefinitions.tanks[tank].name.locales[bkLocale];
   if (nation)
     info.push((strings.common.nations as Record<string, string>)[nation]);
   if (tier) {

packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts

@@ -1,5 +1,6 @@
-import { idToRegion, usersDatabase } from '@blitzkit/core';
+import { idToRegion } from '@blitzkit/core';
-import { flagUserActivity } from '@blitzkit/core/src/blitzkit/flagUserActivity';
+import { flagUserActivity } from '../db/flagUserActivity';
+import { usersDatabase } from '../db/users';
 
 export async function getBlitzFromDiscord(discordId: bigint) {
   const unique = await usersDatabase.discordUser.findUnique({
@@ -8,6 +9,8 @@ export async function getBlitzFromDiscord(discordId: bigint) {
 
   if (unique === null) return null;
 
-  await flagUserActivity(unique.blitz_id);
+  const id = Number(unique.blitz_id);
-  return { id: unique.blitz_id, region: idToRegion(unique.blitz_id) };
+
+  await flagUserActivity(id);
+  return { id, region: idToRegion(id) };
 }

packages/bot/src/core/blitzkit/processes.ts

@@ -1,4 +1,4 @@
-import { usersDatabase } from '@blitzkit/core';
+import { usersDatabase } from '../db/users';
 import { client } from '../discord/client';
 
 const EXIT_EVENTS = [

packages/bot/src/core/db/flagUserActivity.ts

@@ -1,4 +1,4 @@
-import { usersDatabase } from '@blitzkit/core';
+import { usersDatabase } from './users';
 
 export async function flagUserActivity(blitzId: number) {
   await usersDatabase.user.upsert({

packages/bot/src/core/db/linkBlitzAndDiscord.ts

@@ -1,5 +1,5 @@
-import { usersDatabase } from '@blitzkit/core';
 import { flagUserActivity } from './flagUserActivity';
+import { usersDatabase } from './users';
 
 export async function linkBlitzAndDiscord(discordId: bigint, blitzId: number) {
   await usersDatabase.discordUser.upsert({

packages/bot/src/core/db/users.ts

@@ -1,3 +1,3 @@
-import { PrismaClient } from '@prisma/client';
+import { PrismaClient } from '../../prisma';
 
 export const usersDatabase = new PrismaClient();

packages/bot/src/core/discord/localizationObject.ts

@@ -3,7 +3,8 @@ import { Locale } from 'discord.js';
 import { SUPPORTED_LOCALES_DISCORD } from '../localization/strings/constants';
 import { translator } from '../localization/translator';
 
-const validNameRegex = /^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/u;
+const validNameRegex =
+  /^[\p{Ll}\p{Lm}\p{Lo}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+$/u;
 
 export function localizationObject(
   path: (strings: BlitzKitStrings) => string,
@@ -14,7 +15,8 @@ export function localizationObject(
     (localizations, locale) => {
       const { strings } = translator(locale);
       const translation = literalsFunc(path(strings), literals);
-      const isValid = !strict || validNameRegex.test(translation);
+      const isValid =
+        (!strict || validNameRegex.test(translation)) && translation.length > 0;
 
       if (!isValid) {
         console.warn(

packages/bot/src/core/localization/translator.ts

@@ -12,8 +12,9 @@ export function translator(localeRaw: Locale) {
     SUPPORTED_LOCALES_DISCORD.includes(localeRaw)
       ? localeRaw
       : DEFAULT_LOCALE_DISCORD;
-  const strings = STRINGS[SUPPORTED_LOCALES_DISCORD_MAP_INVERSE[locale]];
+  const bkLocale = SUPPORTED_LOCALES_DISCORD_MAP_INVERSE[locale];
-  const unwrap = unwrapper(SUPPORTED_LOCALES_DISCORD_MAP_INVERSE[locale]);
+  const strings = STRINGS[bkLocale];
+  const unwrap = unwrapper(bkLocale);
 
-  return { locale, strings, unwrap };
+  return { locale, strings, unwrap, bkLocale };
 }

packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts

@@ -19,11 +19,11 @@ import { Writeable } from '../../../types/writable';
 export async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,
 ) {
+  await interaction.deferReply();
+
   const awaitedCommands = await commands;
   const registry = awaitedCommands[interaction.commandName];
 
-  await interaction.deferReply();
-
   try {
     const returnable = await registry.handler(interaction);
 

packages/bot/src/events/interactionCreate/index.ts

@@ -15,7 +15,6 @@ import {
   SlashCommandSubcommandsOnlyBuilder,
 } from 'discord.js';
 import { aboutCommand } from '../../commands/about';
-import { auctionCommand } from '../../commands/auction';
 import { breakdownCommand } from '../../commands/breakdown';
 import { debugCommand } from '../../commands/debug';
 import { evolutionCommand } from '../../commands/evolution';
@@ -80,7 +79,7 @@ interface CommandRegistryExplicit extends CommandRegistryBase {
 export type CommandRegistry = CommandRegistryImplicit | CommandRegistryExplicit;
 
 export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
-  auctionCommand,
+  // auctionCommand,
   permissionsCommand,
   debugCommand,
   aboutCommand,

packages/bot/src/main.ts

@@ -45,7 +45,7 @@ const interval = setInterval(async () => {
     const usernames = awaitedDiscoveredIdsDefinitions.count;
 
     manager.broadcastEval(
-      (client, { servers, users, channels, tanks, usernames }) => {
+      async (client, { servers, users, channels, tanks, usernames }) => {
         const bios = [
           `Living in ${servers.toLocaleString()} servers`,
           `Serving ${users.toLocaleString()} users`,
@@ -62,6 +62,13 @@ const interval = setInterval(async () => {
             },
           ],
         });
+
+        for (const guild of client.guilds.cache.values()) {
+          try {
+            const botMember = await guild.members.fetch(client.user.id);
+            await botMember.setNickname('BlitzKit');
+          } catch {}
+        }
       },
       { context: { servers, channels, users, tanks, usernames } },
     );

packages/bot/src/stitches.config.ts

@@ -23,7 +23,7 @@ export const theme = {
   spaces: createSpaces(),
 
   colors: {
-    ...createColors(slateDark),
+    ...createColors(mauveDark),
     ...createColors(slateDarkA, 'alpha'),
     ...createColors(slate, 'light'),
 

packages/core/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@octokit/plugin-throttling": "^8.2.0",
     "@octokit/rest": "^20.1.1",
-    "@prisma/client": "^5.19.1",
+    "@prisma/client": "^6.6.0",
     "adm-zip": "^0.5.16",
     "crc": "^4.3.2",
     "dotenv": "^16.4.5",

packages/core/src/blitz/fetchGlossary.ts

@@ -1,4 +1,5 @@
-import { assertSecret, type BlitzGlossary } from '@blitzkit/core';
+import { assertSecret } from '../blitzkit';
+import { BlitzGlossary } from '../types';
 
 export async function fetchGlossary(locale: string) {
   const response = await fetch(

packages/core/src/blitz/index.ts

@@ -4,6 +4,7 @@ export * from './classes';
 export * from './constants';
 export * from './equipmentPrice';
 export * from './fetchBlitz';
+export * from './fetchGlossary';
 export * from './generateStats';
 export * from './getAccountAchievements';
 export * from './getAccountInfo';

packages/core/src/blitzkit/asset.ts

@@ -1,7 +1,12 @@
 import { assertSecret } from './assertSecret';
 
+const repo = assertSecret(import.meta.env.PUBLIC_ASSET_REPO);
+const branch = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH);
+const fastUser = assertSecret(import.meta.env.PUBLIC_ASSET_FAST_USER);
+const fastRepo = assertSecret(import.meta.env.PUBLIC_ASSET_FAST_REPO);
+
 export function asset(path: string) {
-  return `https://raw.githubusercontent.com/${assertSecret(
+  return branch === 'main'
-    import.meta.env.PUBLIC_ASSET_REPO,
+    ? `https://${fastUser}.github.io/${fastRepo}/${path}`
-  )}/${assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)}/${path}`;
+    : `https://raw.githubusercontent.com/${repo}/${branch}/${path}`;
 }

packages/core/src/blitzkit/gallery.ts

@@ -0,0 +1,7 @@
+import { fetchPB } from '../protobuf';
+import { Gallery } from '../protos';
+import { asset } from './asset';
+
+export function fetchGallery() {
+  return fetchPB(asset('definitions/gallery.pb'), Gallery);
+}

packages/core/src/blitzkit/index.ts

@@ -13,7 +13,6 @@ export * from './discoveredIdDefinitions';
 export * from './emblemURL';
 export * from './equipmentDefinitions';
 export * from './eventManager';
-// export * from './flagUserActivity';
 export * from './gameDefinitions';
 export * from './getArchivedLatestSeasonNumber';
 // export * from './getArchivedRatingInfo';
@@ -21,7 +20,6 @@ export * from './getArchivedRatingLeaderboard';
 // export * from './getArchivedRatingMidnightLeaderboard';
 export * from './getTimeDaysAgo';
 export * from './isExplosive';
-export * from './linkBlitzAndDiscord';
 export * from './mapDefinitions';
 export * from './modelDefinitions';
 export * from './normalizeBoundingBox';
@@ -44,6 +42,8 @@ export * from './unwrapBlitzkitResponse';
 export * from './votes';
 // export * from './withCORSProxy';
 export * from './createDefaultProvisions';
+export * from './gallery';
 export * from './metaSortTank';
+export * from './popularTanks';
 export * from './romanize';
 export * from './youtubers';

packages/core/src/blitzkit/popularTanks.ts

@@ -0,0 +1,7 @@
+import { fetchPB } from '../protobuf';
+import { PopularTanks } from '../protos';
+import { asset } from './asset';
+
+export function fetchPopularTanks() {
+  return fetchPB(asset('definitions/popular-tanks.pb'), PopularTanks);
+}

packages/core/src/blitzkit/tankNames.ts

@@ -15,19 +15,25 @@ export async function fetchTankNames() {
     tankDefinitionsArray.map(async (tank) => {
       const searchableNameDeburr: I18nString = { locales: {} };
 
-      Object.entries(tank.name_full ?? tank.name).forEach(([key, value]) => {
+      Object.entries(tank.name).forEach(([key, value]) => {
         searchableNameDeburr.locales[key] = deburr(value);
       });
 
       return {
         id: tank.id,
         name: tank.name,
-        nameFull: tank.name_full,
+        searchableName: tank.name,
-        searchableName: tank.name_full ?? tank.name,
         searchableNameDeburr,
         camouflages: tank.camouflages
-          ?.map((id) => camouflageDefinitions.camouflages[id]?.name)
+          ?.map((id) =>
+            SUPPORTED_LOCALES.map(
+              (locale) =>
+                camouflageDefinitions.camouflages[id]?.name.locales[locale],
+            ),
+          )
+          .flat()
           .filter(Boolean)
+          .map(deburr)
           .join(' '),
         treeType: tank.type,
       };

packages/core/src/databases/index.ts

@@ -1 +0,0 @@
-export * from './users';

packages/core/src/index.ts

@@ -1,6 +1,5 @@
 export * from './blitz';
 export * from './blitzkit';
-export * from './databases';
 export * from './imgur';
 export * from './math';
 export * from './patreon';

packages/core/src/protos/gallery.proto

@@ -0,0 +1,15 @@
+syntax = "proto2";
+
+package blitzkit;
+
+import "packages/core/src/protos/i18n.proto";
+
+message Gallery {
+  repeated Avatar avatars = 1;
+}
+
+message Avatar {
+  required string id = 1;
+  required I18nString name = 2;
+  required string extension = 3;
+}

packages/core/src/protos/gallery.ts

@@ -0,0 +1,237 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.2.2
+//   protoc               v5.28.2
+// source: packages/core/src/protos/gallery.proto
+
+/* eslint-disable */
+import { BinaryReader, BinaryWriter } from '@bufbuild/protobuf/wire';
+import { I18nString, createBaseI18nString } from './i18n';
+
+export const protobufPackage = 'blitzkit';
+
+export interface Gallery {
+  avatars: Avatar[];
+}
+
+export interface Avatar {
+  id: string;
+  name: I18nString;
+  extension: string;
+}
+
+function createBaseGallery(): Gallery {
+  return { avatars: [] };
+}
+
+export const Gallery: MessageFns<Gallery> = {
+  encode(
+    message: Gallery,
+    writer: BinaryWriter = new BinaryWriter(),
+  ): BinaryWriter {
+    for (const v of message.avatars) {
+      Avatar.encode(v!, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): Gallery {
+    const reader =
+      input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseGallery();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.avatars.push(Avatar.decode(reader, reader.uint32()));
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Gallery {
+    return {
+      avatars: globalThis.Array.isArray(object?.avatars)
+        ? object.avatars.map((e: any) => Avatar.fromJSON(e))
+        : [],
+    };
+  },
+
+  toJSON(message: Gallery): unknown {
+    const obj: any = {};
+    if (message.avatars?.length) {
+      obj.avatars = message.avatars.map((e) => Avatar.toJSON(e));
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<Gallery>, I>>(base?: I): Gallery {
+    return Gallery.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<Gallery>, I>>(object: I): Gallery {
+    const message = createBaseGallery();
+    message.avatars = object.avatars?.map((e) => Avatar.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBaseAvatar(): Avatar {
+  return { id: '', name: createBaseI18nString(), extension: '' };
+}
+
+export const Avatar: MessageFns<Avatar> = {
+  encode(
+    message: Avatar,
+    writer: BinaryWriter = new BinaryWriter(),
+  ): BinaryWriter {
+    if (message.id !== '') {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.name !== undefined) {
+      I18nString.encode(message.name, writer.uint32(18).fork()).join();
+    }
+    if (message.extension !== '') {
+      writer.uint32(26).string(message.extension);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): Avatar {
+    const reader =
+      input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseAvatar();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.id = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.name = I18nString.decode(reader, reader.uint32());
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+
+          message.extension = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Avatar {
+    return {
+      id: globalThis.String(assertSet('Avatar.id', object.id)),
+      name: I18nString.fromJSON(assertSet('Avatar.name', object.name)),
+      extension: globalThis.String(
+        assertSet('Avatar.extension', object.extension),
+      ),
+    };
+  },
+
+  toJSON(message: Avatar): unknown {
+    const obj: any = {};
+    if (message.id !== '') {
+      obj.id = message.id;
+    }
+    if (message.name !== undefined) {
+      obj.name = I18nString.toJSON(message.name);
+    }
+    if (message.extension !== '') {
+      obj.extension = message.extension;
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<Avatar>, I>>(base?: I): Avatar {
+    return Avatar.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<Avatar>, I>>(object: I): Avatar {
+    const message = createBaseAvatar();
+    message.id = object.id ?? '';
+    message.name =
+      object.name !== undefined && object.name !== null
+        ? I18nString.fromPartial(object.name)
+        : createBaseI18nString();
+    message.extension = object.extension ?? '';
+    return message;
+  },
+};
+
+type Builtin =
+  | Date
+  | Function
+  | Uint8Array
+  | string
+  | number
+  | boolean
+  | undefined;
+
+export type DeepPartial<T> = T extends Builtin
+  ? T
+  : T extends globalThis.Array<infer U>
+    ? globalThis.Array<DeepPartial<U>>
+    : T extends ReadonlyArray<infer U>
+      ? ReadonlyArray<DeepPartial<U>>
+      : T extends { $case: string; value: unknown }
+        ? { $case: T['$case']; value?: DeepPartial<T['value']> }
+        : T extends {}
+          ? { [K in keyof T]?: DeepPartial<T[K]> }
+          : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin
+  ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & {
+      [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+    };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
+
+function assertSet<T>(field: string, value: T | undefined): T {
+  if (!isSet(value)) {
+    throw new TypeError(`Required field ${field} is not set`);
+  }
+
+  return value as T;
+}
+
+export interface MessageFns<T> {
+  encode(message: T, writer?: BinaryWriter): BinaryWriter;
+  decode(input: BinaryReader | Uint8Array, length?: number): T;
+  fromJSON(object: any): T;
+  toJSON(message: T): unknown;
+  create<I extends Exact<DeepPartial<T>, I>>(base?: I): T;
+  fromPartial<I extends Exact<DeepPartial<T>, I>>(object: I): T;
+}

packages/core/src/protos/index.ts

@@ -3,10 +3,12 @@ export * from './average_definitions.ts';
 export * from './camouflage_definitions.ts';
 export * from './consumable_definitions.ts';
 export * from './equipment_definitions.ts';
+export * from './gallery.ts';
 export * from './game_definitions.ts';
 export * from './i18n.ts';
 export * from './map_definitions.ts';
 export * from './model_definitions.ts';
+export * from './popular_tanks.ts';
 export * from './provision_definitions.ts';
 export * from './rating_leaderboard.ts';
 export * from './reviews.ts';

packages/core/src/protos/popular_tanks.proto

@@ -0,0 +1,12 @@
+syntax = "proto2";
+
+package blitzkit;
+
+message PopularTanks {
+  repeated PopularTank tanks = 1;
+}
+
+message PopularTank {
+  required uint32 id = 1;
+  required uint32 views = 2; // views in the last 7 days
+}

packages/core/src/protos/popular_tanks.ts

@@ -0,0 +1,190 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.2.2
+//   protoc               v5.28.2
+// source: packages/core/src/protos/popular_tanks.proto
+
+/* eslint-disable */
+import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
+
+export const protobufPackage = "blitzkit";
+
+export interface PopularTanks {
+  tanks: PopularTank[];
+}
+
+export interface PopularTank {
+  id: number;
+  /** views in the last 7 days */
+  views: number;
+}
+
+function createBasePopularTanks(): PopularTanks {
+  return { tanks: [] };
+}
+
+export const PopularTanks: MessageFns<PopularTanks> = {
+  encode(message: PopularTanks, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    for (const v of message.tanks) {
+      PopularTank.encode(v!, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): PopularTanks {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBasePopularTanks();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.tanks.push(PopularTank.decode(reader, reader.uint32()));
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): PopularTanks {
+    return {
+      tanks: globalThis.Array.isArray(object?.tanks) ? object.tanks.map((e: any) => PopularTank.fromJSON(e)) : [],
+    };
+  },
+
+  toJSON(message: PopularTanks): unknown {
+    const obj: any = {};
+    if (message.tanks?.length) {
+      obj.tanks = message.tanks.map((e) => PopularTank.toJSON(e));
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<PopularTanks>, I>>(base?: I): PopularTanks {
+    return PopularTanks.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<PopularTanks>, I>>(object: I): PopularTanks {
+    const message = createBasePopularTanks();
+    message.tanks = object.tanks?.map((e) => PopularTank.fromPartial(e)) || [];
+    return message;
+  },
+};
+
+function createBasePopularTank(): PopularTank {
+  return { id: 0, views: 0 };
+}
+
+export const PopularTank: MessageFns<PopularTank> = {
+  encode(message: PopularTank, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.id !== 0) {
+      writer.uint32(8).uint32(message.id);
+    }
+    if (message.views !== 0) {
+      writer.uint32(16).uint32(message.views);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): PopularTank {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBasePopularTank();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+
+          message.id = reader.uint32();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+
+          message.views = reader.uint32();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): PopularTank {
+    return {
+      id: globalThis.Number(assertSet("PopularTank.id", object.id)),
+      views: globalThis.Number(assertSet("PopularTank.views", object.views)),
+    };
+  },
+
+  toJSON(message: PopularTank): unknown {
+    const obj: any = {};
+    if (message.id !== 0) {
+      obj.id = Math.round(message.id);
+    }
+    if (message.views !== 0) {
+      obj.views = Math.round(message.views);
+    }
+    return obj;
+  },
+
+  create<I extends Exact<DeepPartial<PopularTank>, I>>(base?: I): PopularTank {
+    return PopularTank.fromPartial(base ?? ({} as any));
+  },
+  fromPartial<I extends Exact<DeepPartial<PopularTank>, I>>(object: I): PopularTank {
+    const message = createBasePopularTank();
+    message.id = object.id ?? 0;
+    message.views = object.views ?? 0;
+    return message;
+  },
+};
+
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends { $case: string; value: unknown } ? { $case: T["$case"]; value?: DeepPartial<T["value"]> }
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
+
+function assertSet<T>(field: string, value: T | undefined): T {
+  if (!isSet(value)) {
+    throw new TypeError(`Required field ${field} is not set`);
+  }
+
+  return value as T;
+}
+
+export interface MessageFns<T> {
+  encode(message: T, writer?: BinaryWriter): BinaryWriter;
+  decode(input: BinaryReader | Uint8Array, length?: number): T;
+  fromJSON(object: any): T;
+  toJSON(message: T): unknown;
+  create<I extends Exact<DeepPartial<T>, I>>(base?: I): T;
+  fromPartial<I extends Exact<DeepPartial<T>, I>>(object: I): T;
+}

packages/core/src/protos/tank_definitions.proto

@@ -10,16 +10,16 @@ message TankDefinitions {
 
 message TankDefinition {
   required uint32 id = 1;
-  map<uint32, uint32> roles = 2;
+  required string slug = 2;
-  required bool fixed_camouflage = 4;
+  map<uint32, uint32> roles = 3;
-  repeated int32 camouflages = 5;
+  required bool fixed_camouflage = 5;
-  repeated int32 ancestors = 6;
+  repeated int32 camouflages = 6;
-  repeated int32 successors = 7;
+  repeated int32 ancestors = 7;
-  repeated Crew crew = 8;
+  repeated int32 successors = 8;
-  required uint32 health = 9;
+  repeated Crew crew = 9;
-  required string nation = 10;
+  required uint32 health = 10;
-  required I18nString name = 11;
+  required string nation = 11;
-  optional I18nString name_full = 12;
+  required I18nString name = 12;
   required TankType type = 13;
   required uint32 max_consumables = 14;
   required uint32 max_provisions = 15;

packages/i18n/locales.json

@@ -0,0 +1,14 @@
+{
+  "default": "en",
+  "supported": [
+    { "locale": "en" },
+    { "locale": "es" },
+    { "locale": "fr" },
+    { "locale": "ja" },
+    { "locale": "pl" },
+    { "locale": "pt" },
+    { "locale": "ru" },
+    { "locale": "uk" },
+    { "locale": "zh", "blitz": "zh_Hans_SG" }
+  ]
+}

packages/i18n/strings/en.json

@@ -11,7 +11,9 @@
       "mm": "%s1mm",
       "deg": "%s1°",
       "hp": "%s1hp",
-      "x": "x%s1"
+      "x": "x%s1",
+      "percentage": "%s1%",
+      "deg_s": "%s1°/s"
     },
 
     "gun_types": {
@@ -739,6 +741,11 @@
   },
 
   "website": {
+    "redirect": {
+      "title": "301: moved permanently",
+      "body": "This page has moved. Redirecting..."
+    },
+
     "settings": {
       "dev_mode": "Development mode",
       "language": "Language"
@@ -756,6 +763,7 @@
       },
 
       "tank_search": {
+        "clear_filters": "Clear filters",
         "search_bar_hint": "Search tanks...",
         "recent": "Recently viewed",
         "select_all": "Select all",
@@ -824,6 +832,12 @@
     },
 
     "home": {
+      "discord": {
+        "join_short": "Join cool people!",
+        "join_long": "Join super duper cool people!",
+        "action": "Discord"
+      },
+
       "hero": {
         "credit": "By %s1 ❤️"
       },
@@ -838,8 +852,32 @@
       "seo_description": "Tools for everything World of Tanks Blitz"
     },
 
+    "docs": {
+      "patches": {
+        "name": "BlitzKit Changelogs",
+        "seo_description": "Changelogs for BlitzKit Discord bot and website"
+      }
+    },
+
     "tools": {
+      "guess": {
+        "name": "Guess the tank",
+        "button": "Guess away",
+        "description": "Silhouette mini-game",
+        "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
+        "search": {
+          "placeholder": "Type to guess...",
+          "skip": "Skip",
+          "guess": "Guess",
+          "next": "Next",
+          "no_results": "No results"
+        },
+        "stats": "%s1 / %s2 guessed correctly"
+      },
+
       "tankopedia": {
+        "search": "Search a stat...",
+
         "name": "Tankopedia",
         "button": "Find tanks",
         "description": "Blitz tank encyclopedia",
@@ -847,6 +885,32 @@
         "tank_seo_title": "%s1 - Tier %s2 %s3 %s4 | %s5 Tankopedia | World of Tanks Blitz (WoTB)",
         "tank_seo_description": "%s1 armor, statistics, equipment, provisions, and more. %s2 DPM, %s3hp alpha, %s4mm penetration, %s5kph top speed, %s6hp health.",
 
+        "visualizers": {
+          "rotator": {
+            "hull": "Hull",
+            "turret": "Turret",
+            "hard": "Hard",
+            "medium": "Medium",
+            "soft": "Soft",
+            "effective": "Effective"
+          },
+
+          "ricochet": {
+            "angle": "Angle",
+            "normalization": "Normalization",
+            "effective_angle": "Effective angle",
+            "armor": "Armor",
+            "no_ricochet": "Explosive shells don't ricochet"
+          },
+
+          "view_range": {
+            "camo": "Camo",
+            "percentage": "%s1%",
+            "ghost_factory": "Ghost Factory",
+            "dead_rail": "Dead Rail"
+          }
+        },
+
         "sandbox": {
           "poses": {
             "hull_down": "Hull down",
@@ -996,7 +1060,7 @@
         "characteristics": {
           "title": "Characteristics",
           "compare": {
-            "label": "Compare against",
+            "label": "Compare",
             "class": "Tier %s1 %s2",
             "tier": "All of tier %s1",
             "all": "All tanks"
@@ -1033,7 +1097,7 @@
             "explosionRadius": "Explosion radius",
             "shellVelocity": "Shell velocity",
             "aimTime": "Aim time",
-            "dispersion": "Still",
+            "dispersion": "Dispersion still",
             "dispersionMoving": "Moving",
             "dispersionHullTraversing": "Hull traversing",
             "dispersionTurretTraversing": "Turret traversing",
@@ -1047,28 +1111,28 @@
             "gunRearElevation": "Rear elevation",
             "azimuthLeft": "Azimuth left",
             "azimuthRight": "Azimuth right",
-            "speedForwards": "Forwards",
+            "speedForwards": "Speed forwards",
             "speedBackwards": "Backwards",
-            "hardTerrainCoefficient": "Hard",
+            "hardTerrainCoefficient": "Terrain coefficient hard",
-            "hardTerrainCoefficientRaw": "Hard",
+            "hardTerrainCoefficientRaw": "Raw terrain coefficient hard",
             "mediumTerrainCoefficient": "Medium",
             "mediumTerrainCoefficientRaw": "Medium",
             "softTerrainCoefficient": "Soft",
             "softTerrainCoefficientRaw": "Soft",
             "enginePower": "Engine power",
-            "powerToWeightRatioHardTerrain": "Hard",
+            "powerToWeightRatioHardTerrain": "Power to weight ratio hard",
             "powerToWeightRatioMediumTerrain": "Medium",
             "powerToWeightRatioSoftTerrain": "Soft",
             "weight": "Weight",
             "turretTraverseSpeed": "Turret traverse speed",
             "gunTraverseSpeed": "Gun traverse speed",
-            "hullTraverseHardTerrain": "Hard",
+            "hullTraverseHardTerrain": "Hull traverse hard",
             "hullTraverseMediumTerrain": "Medium",
             "hullTraverseSoftTerrain": "Soft",
             "health": "Health",
             "fireChance": "Fire chance",
             "viewRange": "View range",
-            "camouflageStill": "Still",
+            "camouflageStill": "Camouflage still",
             "camouflageMoving": "Moving",
             "camouflageShootingStill": "Still",
             "camouflageShootingMoving": "Moving",

packages/scripts/src/applyPatches.ts

@@ -1,5 +1,4 @@
 import { assertSecret } from '@blitzkit/core';
-import { existsSync } from 'fs';
 import { mkdir, writeFile } from 'fs/promises';
 import { parse as parsePath } from 'path';
 import ProgressBar from 'progress';
@@ -57,9 +56,12 @@ while (true) {
         console.warn(`Failed to make directory "${dir}"`);
       }
 
+      const isDvpl = path.endsWith('.dvpl');
+      const buffer = Buffer.from(data);
+
       await writeFile(
-        `${DATA}/${path}`,
+        `${DATA}/${path}${isDvpl ? '' : '.dvpl'}`,
-        new Uint8Array(writeDVPL(Buffer.from(data))),
+        new Uint8Array(isDvpl ? buffer : writeDVPL(buffer)),
       );
 
       bar.tick();

packages/scripts/src/buildAssets/definitions.ts

@@ -37,6 +37,7 @@ import {
   SUPPORTED_LOCALES,
 } from '@blitzkit/i18n';
 import { readdir } from 'fs/promises';
+import { deburr } from 'lodash-es';
 import { parse as parsePath } from 'path';
 import { Vector3Tuple } from 'three';
 import { parse as parseYaml } from 'yaml';
@@ -48,6 +49,23 @@ import { DATA } from './constants';
 import { Avatar } from './skillIcons';
 import { TankParameters } from './tankIcons';
 
+const nonAlphanumericRegex = /[^a-z0-9]/g;
+const multipleDashesRegex = /--+/g;
+const trailingDashRegex = /-$/g;
+const leadingDashRegex = /^-/g;
+
+const nationSlugDiscriminators = {
+  china: 'cn',
+  european: 'eu',
+  france: 'fr',
+  germany: 'de',
+  japan: 'jp',
+  other: 'ot',
+  uk: 'gb',
+  usa: 'us',
+  ussr: 'ru',
+};
+
 function parseResearchCost(raw: number | string) {
   if (typeof raw === 'number') {
     return {
@@ -502,7 +520,7 @@ const blitzShellKindToBlitzkit: Record<ShellKind, ShellType> = {
   HIGH_EXPLOSIVE: ShellType.HE,
   HOLLOW_CHARGE: ShellType.HEAT,
 };
-export const botPattern = /^.+((tutorial_bot(\d+)?)|(TU(R?)))$/;
+export const botPattern = /^.+((tutorial_bot(\d+)?)|(TU))$/;
 const blitzModuleTypeToBlitzkit: Record<keyof BlitzModuleType, ModuleType> = {
   chassis: ModuleType.TRACKS,
   engine: ModuleType.ENGINE,
@@ -703,6 +721,93 @@ export async function definitions() {
     };
   });
 
+  const slugRequesters = new Map<string, { id: number; key: string }[]>();
+  const idToNation: Record<number, string> = {};
+
+  await Promise.all(
+    nations.map(async (nation) => {
+      const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
+        `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`,
+      );
+
+      for (const tankKey in tankList.root) {
+        if (botPattern.test(tankKey)) continue;
+
+        const tank = tankList.root[tankKey];
+        const tankId = toUniqueId(nation, tank.id);
+        const name = (
+          (tank.shortUserString
+            ? getString(tank.shortUserString)
+            : undefined) ?? getString(tank.userString)
+        ).locales.en;
+
+        let slug = deburr(name).toLowerCase();
+        slug = slug.replaceAll(nonAlphanumericRegex, '-');
+        slug = slug.replaceAll(multipleDashesRegex, '-');
+        slug = slug.replaceAll(trailingDashRegex, '');
+        slug = slug.replaceAll(leadingDashRegex, '');
+
+        idToNation[tankId] = nation;
+
+        if (slugRequesters.has(slug)) {
+          slugRequesters.get(slug)!.push({ id: tankId, key: tankKey });
+        } else {
+          slugRequesters.set(slug, [{ id: tankId, key: tankKey }]);
+        }
+      }
+    }),
+  );
+
+  const slugs = new Map<number, string>();
+
+  slugRequesters.forEach((requesters, slug) => {
+    if (requesters.length === 1) {
+      slugs.set(requesters[0].id, slug);
+      return;
+    }
+
+    console.warn(
+      `Multiple tanks share slug ${slug}: ${requesters.map(({ key }) => key).join(', ')}`,
+    );
+
+    if (requesters.length !== 2) {
+      throw new Error('Unresolvable number of duplicates :(');
+    }
+
+    const nonCanonical = requesters.find(({ key }) => key.endsWith('TUR'));
+
+    if (nonCanonical === undefined) {
+      console.log('Using nations to discriminate');
+      // both are non-tutorial tanks, will have to discriminate using nation
+
+      requesters.forEach(({ id, key }) => {
+        const nation = idToNation[id];
+        const discriminator =
+          nationSlugDiscriminators[
+            nation as keyof typeof nationSlugDiscriminators
+          ];
+
+        console.log(`Solution: ${key} -> ${slug}-${discriminator}`);
+        slugs.set(id, `${slug}-${discriminator}`);
+      });
+    } else {
+      console.log('Using tutorial bot suffix to discriminate');
+
+      const canonical = requesters.find(({ key }) => !key.endsWith('TUR'));
+
+      if (canonical === undefined) {
+        throw new Error(
+          'Two tutorial bots share the same slug? The world is truly broken.',
+        );
+      }
+
+      console.log(`Solution: ${canonical.key} -> ${slug}`);
+      slugs.set(canonical.id, slug);
+      console.log(`Solution: ${nonCanonical.key} -> ${slug}-tur`);
+      slugs.set(nonCanonical.id, `${slug}-tur`);
+    }
+  });
+
   await Promise.all(
     nations.map(async (nation) => {
       const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
@@ -787,6 +892,13 @@ export async function definitions() {
         const hullArmor: Armor = { spaced: [], thickness: {} };
         const equipment = tankDefinition.root.optDevicePreset;
         tankStringIdMap[`${nation}:${tankKey}`] = tankId;
+        const slug = slugs.get(tankId);
+
+        if (slug === undefined) {
+          throw new Error(
+            `Could not find slug for ${nation}/${tankKey} (${tankId})`,
+          );
+        }
 
         if (tank.sellPrice) {
           tankPrice = {
@@ -903,7 +1015,7 @@ export async function definitions() {
             (tank.shortUserString
               ? getString(tank.shortUserString)
               : undefined) ?? getString(tank.userString),
-          name_full: getString(tank.userString),
+          slug,
           nation,
           type: tankTags.includes('collectible')
             ? TankType.COLLECTOR
@@ -939,13 +1051,6 @@ export async function definitions() {
           });
         }
 
-        if (
-          tankDefinitions.tanks[tankId].name ===
-          tankDefinitions.tanks[tankId].name_full
-        ) {
-          delete tankDefinitions.tanks[tankId].name_full;
-        }
-
         modelDefinitions.models[tankId] = {
           armor: hullArmor,
           turret_origin: vector3TupleToBlitzkit(turretOrigin),

packages/scripts/src/buildAssets/glossary.ts

@@ -0,0 +1,90 @@
+import { Avatar, encodePBBuffer, fetchGlossary, Gallery } from '@blitzkit/core';
+import locales from '@blitzkit/i18n/locales.json';
+import { extname } from 'path';
+import ProgressBar from 'progress';
+import { commitAssets } from '../core/github/commitAssets';
+import { FileChange } from '../core/github/commitMultipleFiles';
+
+export async function glossary() {
+  console.log('Building glossary...');
+
+  const avatars: Record<string, { avatar: Avatar; url: string }> = {};
+
+  await Promise.all(
+    locales.supported.map(async (supported) => {
+      const glossary = await fetchGlossary(supported.blitz ?? supported.locale);
+
+      console.log(
+        `Found ${Object.keys(glossary).length} things for ${supported.locale}`,
+      );
+
+      for (const key in glossary) {
+        const glossaryEntry = glossary[key];
+
+        if (
+          !key.startsWith('avatar') ||
+          key.endsWith('_part') ||
+          glossaryEntry.image_url === null
+        ) {
+          continue;
+        }
+
+        if (key in avatars) {
+          avatars[key].avatar.name.locales[supported.locale] =
+            glossaryEntry.title;
+        } else {
+          const extension = extname(glossaryEntry.image_url);
+
+          avatars[key] = {
+            url: glossaryEntry.image_url,
+            avatar: {
+              id: key,
+              name: { locales: { [supported.locale]: glossaryEntry.title } },
+              extension,
+            },
+          };
+        }
+      }
+    }),
+  );
+
+  const changes: FileChange[] = [];
+  const gallery: Gallery = { avatars: [] };
+  const totalCount = Object.keys(avatars).length;
+
+  const bar = new ProgressBar(
+    `Fetching avatars of ${totalCount} things :bar`,
+    totalCount,
+  );
+
+  await Promise.all(
+    Object.entries(avatars).map(async ([key, { url, avatar }]) => {
+      if (!(locales.default in avatars[key].avatar.name.locales)) {
+        console.warn(`Avatar ${key} has no ${locales.default} name`);
+        bar.tick();
+
+        return;
+      }
+
+      gallery.avatars.push(avatar);
+
+      const content = await fetch(url).then((response) =>
+        response.arrayBuffer(),
+      );
+
+      changes.push({
+        path: `gallery/avatars/${key}${avatar.extension}`,
+        content: Buffer.from(content),
+      });
+
+      bar.tick();
+    }),
+  );
+
+  changes.push({
+    path: 'definitions/gallery.pb',
+    content: encodePBBuffer(Gallery, gallery),
+  });
+
+  await commitAssets('glossary', changes);
+}

packages/scripts/src/buildAssets/index.ts

@@ -18,7 +18,10 @@ import { definitions } from './definitions';
 import { equipmentIcons } from './equipmentIcons';
 import { flags } from './flags';
 import { gameModeBanners } from './gameModeBanners';
+import { glossary } from './glossary';
+import { migration } from './migration';
 import { moduleIcons } from './moduleIcons';
+import { popularTanks } from './popularTanks';
 import { shellIcons } from './shellIcons';
 import { skillIcons } from './skillIcons';
 import { tankArmors } from './tankArmors';
@@ -28,6 +31,7 @@ import { tankModels } from './tankModels';
 if (!targets && !allTargets) throw new Error('No target(s) specified');
 
 const methods = [
+  migration,
   definitions,
   tankModels,
   tankArmors,
@@ -43,6 +47,8 @@ const methods = [
   boosterIcons,
   tankIcons,
   blitzkitTankIcons,
+  popularTanks,
+  glossary,
 ];
 
 for (const method of methods) {

packages/scripts/src/buildAssets/migration.ts

@@ -0,0 +1,38 @@
+import { toUniqueId } from '@blitzkit/core';
+import { readdir } from 'fs/promises';
+import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
+import { commitAssets } from '../core/github/commitAssets';
+import { DATA } from './constants';
+import { VehicleDefinitionList } from './definitions';
+
+export async function migration() {
+  console.log('Building migration map...');
+
+  const map: Record<string, number> = {};
+  const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
+    (nations) => nations.filter((nation) => nation !== 'common'),
+  );
+
+  await Promise.all(
+    nations.map(async (nation) => {
+      const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
+        `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`,
+      );
+
+      for (const tankKey in tankList.root) {
+        const tank = tankList.root[tankKey];
+        const tankId = toUniqueId(nation, tank.id);
+        const davaKey = `${nation}:${tankKey}`;
+
+        map[davaKey] = tankId;
+      }
+    }),
+  );
+
+  await commitAssets('migration', [
+    {
+      path: 'definitions/migration.json',
+      content: Buffer.from(JSON.stringify(map)),
+    },
+  ]);
+}

packages/scripts/src/buildAssets/popularTanks.ts

@@ -0,0 +1,76 @@
+import {
+  assertSecret,
+  encodePBBuffer,
+  fetchTankDefinitions,
+  PopularTanks,
+} from '@blitzkit/core';
+import { google } from 'googleapis';
+import { commitAssets } from '../core/github/commitAssets';
+
+export async function popularTanks() {
+  const tankDefinitions = await fetchTankDefinitions();
+
+  const auth = await google.auth.getClient({
+    keyFile: import.meta.env.GOOGLE_APPLICATION_CREDENTIALS,
+    scopes: ['https://www.googleapis.com/auth/analytics.readonly'],
+  });
+  const analytics = google.analyticsdata({ version: 'v1beta', auth });
+  const report = await analytics.properties.runReport({
+    property: `properties/${assertSecret(import.meta.env.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID)}`,
+    requestBody: {
+      dateRanges: [{ startDate: '7daysAgo', endDate: 'today' }],
+      dimensions: [{ name: 'pagePath' }],
+      metrics: [{ name: 'screenPageViews' }],
+      orderBys: [{ metric: { metricName: 'screenPageViews' }, desc: true }],
+      dimensionFilter: {
+        filter: {
+          fieldName: 'pagePath',
+          stringFilter: {
+            matchType: 'BEGINS_WITH',
+            value: '/tanks/',
+          },
+        },
+      },
+    },
+  });
+
+  if (!report.data.rows) {
+    throw new Error('No rows in report');
+  }
+
+  const tanks = report.data.rows
+    .filter(
+      (row) =>
+        row.dimensionValues &&
+        row.dimensionValues[0].value &&
+        row.dimensionValues[0].value !== '/tanks/' &&
+        row.metricValues &&
+        row.metricValues[0].value,
+    )
+    .map((row) => ({
+      id: Number(
+        row.dimensionValues![0].value!.match(
+          /\/tools\/tankopedia\/(\d+)\/?/,
+        )?.[1],
+      ),
+      views: Number(row.metricValues![0].value!),
+    }))
+    .filter((row) => {
+      if (!(row.id in tankDefinitions.tanks)) {
+        console.warn('Skipping unknown popular tank', row.id);
+        return false;
+      }
+
+      return row.id in tankDefinitions.tanks;
+    })
+    .slice(0, 8)
+    .map(({ id, views }) => ({ id, views }));
+  const popularTanks: PopularTanks = { tanks };
+
+  await commitAssets('popular tanks', [
+    {
+      path: 'definitions/popular-tanks.pb',
+      content: encodePBBuffer(PopularTanks, popularTanks),
+    },
+  ]);
+}

packages/scripts/src/core/blitz/extractModel/index.ts

@@ -166,28 +166,9 @@ export async function extractModel(data: string, path: string) {
             break;
 
           case 'TransformComponent': {
-            const translation = new Vector3();
+            node.setTranslation(component['tc.localTranslation']);
-            const rotation = new Quaternion();
+            node.setRotation(component['tc.localRotation']);
-            const scale = new Vector3();
+            node.setScale(component['tc.localScale']);
-
-            new Matrix4()
-              .multiplyMatrices(
-                new Matrix4().compose(
-                  new Vector3().fromArray(component['tc.worldTranslation']),
-                  new Quaternion().fromArray(component['tc.worldRotation']),
-                  new Vector3().fromArray(component['tc.worldScale']),
-                ),
-                new Matrix4().compose(
-                  new Vector3().fromArray(component['tc.localTranslation']),
-                  new Quaternion().fromArray(component['tc.localRotation']),
-                  new Vector3().fromArray(component['tc.localScale']),
-                ),
-              )
-              .decompose(translation, rotation, scale);
-
-            node.setTranslation(translation.toArray());
-            node.setRotation(rotation.toArray() as Vector4Tuple);
-            node.setScale(scale.toArray());
 
             break;
           }

packages/scripts/src/core/blitz/readTexture/index.ts

@@ -6,7 +6,7 @@ import { TextureMutation } from './constants';
 
 export async function readTexture(path: string, mutation?: TextureMutation) {
   const ddsTexturePath = path.replace('.tex', '.dx11.dds');
-  const isDds = existsSync(ddsTexturePath);
+  const isDds = existsSync(`${ddsTexturePath}.dvpl`);
   const resolvedTexturePath = isDds
     ? ddsTexturePath
     : ddsTexturePath.replace('.dds', '.pvr');

packages/scripts/src/core/github/commitAssets.ts

@@ -1,4 +1,5 @@
 import { assertSecret } from '@blitzkit/core';
+import { chunk } from 'lodash-es';
 import { commitMultipleFiles, FileChange } from './commitMultipleFiles';
 
 export async function commitAssets(message: string, changes: FileChange[]) {
@@ -6,10 +7,19 @@ export async function commitAssets(message: string, changes: FileChange[]) {
 
   if (changes.length === 0) return;
 
+  const chunks = chunk(changes, 64);
+  let chunkIndex = 0;
+
+  for (const chunk of chunks) {
+    console.log(`Committing chunk ${chunkIndex + 1}/${chunks.length}`);
+
     await commitMultipleFiles(
       assertSecret(import.meta.env.PUBLIC_ASSET_REPO),
       assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH),
-    `${message} - ${new Date().toDateString()}`,
+      `${message} - ${new Date().toDateString()} (${chunkIndex + 1}/${chunks.length})`,
-    changes,
+      chunk,
     );
+
+    chunkIndex++;
+  }
 }

packages/scripts/src/core/github/commitMultipleFiles.ts

@@ -7,6 +7,8 @@ export interface FileChange {
   content: Buffer;
 }
 
+const heuristicFormats = ['glb', 'webp', 'jpg', 'png'];
+
 export async function commitMultipleFiles(
   repoRaw: string,
   branch: string,
@@ -21,32 +23,69 @@ export async function commitMultipleFiles(
       const response = await fetch(
         `https://raw.githubusercontent.com/${blobPath}`,
       );
+      let isNew: boolean;
+      let isDifferent: boolean;
+      let diff: number;
 
       if (response.status === 404) {
-        console.log(
+        isNew = true;
-          `🟢 (+${change.content.length.toLocaleString()}B) ${blobPath}`,
+        diff = change.content.length;
-        );
+        isDifferent = true;
-        changes.push(change);
+      } else if (
+        response.headers.has('Content-Length') &&
+        parseInt(response.headers.get('Content-Length')!) !==
+          change.content.length
+      ) {
+        isNew = false;
+        diff =
+          change.content.length -
+          parseInt(response.headers.get('Content-Length')!);
+        isDifferent = true;
       } else if (response.status === 200) {
+        isNew = false;
         const buffer = Buffer.from(await response.arrayBuffer());
 
-        // we discard blob if they're the same size; it's unlikely their
+        if (buffer.equals(change.content)) {
-        // contents will be different; I love playing russian roulette!
+          diff = 0;
-        const equal = buffer.length === change.content.length || buffer.equals(change.content);
+          isDifferent = false;
-        if (!equal) {
+        } else {
-          const diff = change.content.length - buffer.length;
+          diff = change.content.length - buffer.length;
-
+          isDifferent = true;
-          console.log(
-            `🟡 (${diff > 0 ? '+' : ''}${diff.toLocaleString()}B) ${blobPath}`,
-          );
-
-          changes.push(change);
         }
       } else {
         throw new Error(
           `Unexpected status code ${response.status} for ${blobPath}`,
         );
       }
+
+      /**
+       * Heuristic: if it's a large blob like a .glb, a diff = 0 might end up
+       * being a false positive with isDifferent = true. So, it's okay to
+       * assume it's unchanged.
+       */
+      if (
+        diff === 0 &&
+        heuristicFormats.some((format) => change.path.endsWith(`.${format}`))
+      ) {
+        isDifferent = false;
+        isNew = false;
+      }
+
+      if (isNew) {
+        console.log(
+          `🟢 (+${change.content.length.toLocaleString()}B) ${blobPath}`,
+        );
+        changes.push(change);
+      } else if (isDifferent) {
+        console.log(
+          `🟡 (${diff > 0 ? '+' : ''}${diff.toLocaleString()}B) ${blobPath}`,
+        );
+        changes.push(change);
+      } else {
+        console.log(
+          `🔵 (${change.content.length.toLocaleString()}B) ${blobPath}`,
+        );
+      }
     }),
   );
 

packages/scripts/src/pruneStrings.ts

@@ -8,7 +8,7 @@ import { writeFile } from 'fs/promises';
 const ROOT = '@blitzkit/i18n/strings';
 const WORKING_ROOT = '../../packages/i18n/strings';
 
-const defaultStrings = await import(`${ROOT}/${DEFAULT_LOCALE}.json`);
+const defaultStrings = require(`${ROOT}/${DEFAULT_LOCALE}.json`).default;
 const nonDefaultLocales = SUPPORTED_LOCALES.filter(
   (locale) => locale !== DEFAULT_LOCALE,
 );
@@ -19,9 +19,13 @@ function prune(defaultStrings: TranslationTree, strings: TranslationTree) {
       if (typeof defaultStrings[key] === typeof strings[key]) {
         if (typeof strings[key] === 'string') {
           if (
+            // are equivalent regardless of %s flavor
             (defaultStrings[key] as string).replaceAll(/%s\d/g, '%s') ===
               (strings[key] as string).replaceAll(/%s\d/g, '%s') ||
-            strings[key] === ''
+            // string is empty
+            strings[key] === '' ||
+            // string has old flavor of %s
+            strings[key].match(/%s([^\d]|$)/g) !== null
           ) {
             delete strings[key];
           }
@@ -42,7 +46,7 @@ function prune(defaultStrings: TranslationTree, strings: TranslationTree) {
 for (const locale of nonDefaultLocales) {
   console.log(`Pruning ${locale}...`);
 
-  const strings = await import(`${ROOT}/${locale}.json`);
+  const strings = require(`${ROOT}/${locale}.json`).default;
   const pruned = prune(defaultStrings, strings);
 
   writeFile(`${WORKING_ROOT}/${locale}.json`, JSON.stringify(pruned, null, 2));

packages/website/astro.config.mjs

@@ -1,5 +1,6 @@
 // @ts-check
 
+import partytown from '@astrojs/partytown';
 import react from '@astrojs/react';
 import sitemap from '@astrojs/sitemap';
 import { SUPPORTED_LOCALES } from '@blitzkit/i18n';
@@ -20,7 +21,7 @@ export default defineConfig({
   outDir: '../../dist/website',
   prefetch: true,
 
-  integrations: [react(), sitemap()],
+  integrations: [react(), sitemap(), partytown()],
   vite: {
     resolve: {
       alias: {

packages/website/package.json

@@ -10,8 +10,11 @@
     "astro": "astro"
   },
   "dependencies": {
+    "@astrojs/partytown": "^2.1.4",
+    "@astrolib/seo": "^1.0.0-beta.8",
     "@blitzkit/core": "workspace:*",
     "@blitzkit/i18n": "workspace:*",
+    "@fontsource/inter": "^5.2.5",
     "@nanostores/persistent": "^0.10.2",
     "@nanostores/react": "^0.7.3",
     "@nivo/bar": "^0.87.0",
@@ -23,11 +26,11 @@
     "@react-three/fiber": "^8.17.10",
     "compare-versions": "^6.1.1",
     "echarts": "^5.5.1",
-    "googleapis": "^144.0.0",
     "immer": "^10.1.1",
     "js-cookie": "^3.0.5",
     "markdown-to-jsx": "^7.5.0",
     "nanostores": "^0.11.3",
+    "quicklime": "^1.2.0",
     "react": "^18.3.1",
     "react-device-detect": "^2.2.3",
     "react-dom": "^18.3.1",
@@ -40,10 +43,13 @@
     "@astrojs/check": "^0.9.4",
     "@astrojs/react": "^3.6.2",
     "@astrojs/sitemap": "^3.2.1",
+    "@playform/compress": "^0.1.9",
+    "@playform/inline": "^0.1.2",
     "@types/js-cookie": "^3.0.6",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@types/three": "^0.160.0",
-    "astro": "^4.16.7"
+    "astro": "^4.16.7",
+    "astro-compressor": "^1.0.0"
   }
 }