feat: logs

Bumps [bytes](https://github.com/tokio-rs/bytes) from 1.10.1 to 1.11.1.
- [Release notes](https://github.com/tokio-rs/bytes/releases)
- [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/bytes/compare/v1.10.1...v1.11.1)

---
updated-dependencies:
- dependency-name: bytes
  dependency-version: 1.11.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/assets.yml

@@ -16,10 +16,11 @@ on:
           - blitzkit/assets-dev
         default: blitzkit/assets
 
-      archive_url:
+      asset_source:
         type: string
         required: false
-        description: Archive URL to download instead of Steam client
+        description: "Archive URL or Steam to download (example: steam:APP_ID/DEPOT_ID or zip:URL_TO_ZIP)"
+        default: "steam:444200/444202"
 
   schedule:
     - cron: "0 2 * * *"
@@ -37,8 +38,8 @@ env:
   WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
   WOTB_DLC_CDN: ${{ secrets.WOTB_DLC_CDN }}
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_REPO: ${{ github.event.inputs.asset_repo }}
-  PUBLIC_ASSET_BRANCH: main
+  PUBLIC_ASSET_REPO: ${{ github.event.inputs.asset_repo != '' && github.event.inputs.asset_repo || secrets.PUBLIC_ASSET_REPO }}
+  PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
   WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
   WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
   PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
@@ -55,134 +56,27 @@ env:
   PUBLIC_ASSET_FAST_REPO: assets
   PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+  STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
 
 jobs:
-  download_client:
-    name: Download client
-    runs-on: ubuntu-latest
-
-    steps:
-      - if: github.event.inputs.archive_url != ''
-        uses: easimon/maximize-build-space@master
-        with:
-          root-reserve-mb: 512
-          swap-size-mb: 1024
-          remove-dotnet: "true"
-          remove-haskell: "true"
-          remove-android: "true"
-          remove-codeql: "true"
-          remove-docker-images: "true"
-
-      - if: github.event.inputs.archive_url != '' && endsWith(github.event.inputs.archive_url, '.wgpkg')
-        run: |
-          sudo apt update
-          sudo apt install -y p7zip-full
-
-      - uses: actions/checkout@v4
-        if: github.event.inputs.archive_url == ''
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-
-      - uses: arduino/setup-protoc@v3
-        if: github.event.inputs.archive_url == ''
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-
-      - uses: oven-sh/setup-bun@v1
-        if: github.event.inputs.archive_url == ''
-
-      - run: bun run setup
-        if: github.event.inputs.archive_url == ''
-
-      - name: (Steam) Setup DepotDownloader
-        if: github.event.inputs.archive_url == ''
-        run: bun run setup:depotdownloader
-
-      - name: (Steam) Download client
-        if: github.event.inputs.archive_url == ''
-        run: |
-          chmod +x ./temp/depotDownloader/DepotDownloader
-          ./temp/depotDownloader/DepotDownloader -q -os windows -app 444200 -username ${{ secrets.DEPOT_DOWNLOADER_USERNAME }} -password "${{ secrets.DEPOT_DOWNLOADER_PASSWORD }}"
-
-      - name: (Steam) Apply patches
-        if: github.event.inputs.archive_url == ''
-        run: bun setup:patches --depot
-
-      - name: (ZIP) Download client
-        if: github.event.inputs.archive_url != '' && endsWith(github.event.inputs.archive_url, '.zip')
-        env:
-          ARCHIVE_URL: ${{ github.event.inputs.archive_url }}
-        run: |
-          wget -q -O temp/archive.zip $ARCHIVE_URL
-          unzip -q temp/archive.zip -d temp/archive
-          rm temp/archive.zip
-          mkdir -p temp/game
-          mv temp/archive/app/* temp/game
-
-      - name: (WGPKG) Download client
-        if: github.event.inputs.archive_url != '' && endsWith(github.event.inputs.archive_url, '.wgpkg')
-        env:
-          ARCHIVE_URL: ${{ github.event.inputs.archive_url }}
-        run: |
-          mkdir -p temp/archives
-          mkdir -p temp/game
-
-          i=1
-          urls=()
-
-          while :; do
-            part=$(printf "%03d" $i)
-            url="${ARCHIVE_URL}.${part}"
-            if wget --spider -q "$url"; then
-              urls+=("$url")
-              ((i++))
-            else
-              break
-            fi
-          done
-
-          for url in "${urls[@]}"; do
-            dest="temp/archives/$(basename "$url")"
-            wget -q -O "$dest" "$url" &
-          done
-          wait
-
-          first=$(ls temp/archives/*.001 | head -n 1)
-          7z x "$first" -otemp/game
-
-          rm -rf temp/archives
-
-      - name: Archive game
-        uses: actions/upload-artifact@v4
-        with:
-          name: game
-          path: temp/game
-
   build_assets:
     name: Build assets
     runs-on: ubuntu-latest
-    needs: download_client
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - run: bun run setup
 
-      - name: Download game
-        uses: actions/download-artifact@v4
-        with:
-          name: game
-          path: temp/game
-
       - name: AppArmor hack
         run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
 
-      - name: Start server and build assets
-        run: bun run build:assets --all-targets --manual
+      - name: Build assets
+        run: bun run build:assets --all-targets --source=${{ github.event.inputs.asset_source || 'steam:444200/444202' }}

.github/workflows/averages.yml

@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}

.github/workflows/build-bot.yml

@@ -10,15 +10,15 @@ concurrency:
 
 jobs:
   build:
-    name: Build
+    name: Build bot
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
         run: bun run build:bot
 
       - name: Archive build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: bot
           path: dist/bot

.github/workflows/discover-ids.yml

@@ -22,11 +22,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}

.github/workflows/host-bot.yml

@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}

.github/workflows/rating-asia.yml

@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}

.github/workflows/rating-eu.yml

@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}

.github/workflows/rating-na.yml

@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}

.github/workflows/reviews.yml

@@ -17,21 +17,22 @@ env:
   GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
       - run: bun run setup
 
       - name: Find reviews
-        run: bun packages/scripts/src/reviews.ts
+        run: bun run build:reviews

.github/workflows/website.yml

@@ -35,14 +35,14 @@ env:
 
 jobs:
   build:
-    name: Build
+    name: Build website
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
@@ -53,7 +53,7 @@ jobs:
         run: bun run build:website
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: dist/website
 

.gitmodules

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

.vscode/settings.json

@@ -11,11 +11,13 @@
     "analyticsreporting",
     "APAC",
     "apcr",
+    "appinfo",
     "applypatches",
     "artefacts",
     "astrojs",
     "astrolib",
     "atgm",
+    "autocrop",
     "Autoloader",
     "Autoreloader",
     "AYUV",
@@ -64,6 +66,8 @@
     "deburr",
     "decalmask",
     "decompressor",
+    "décor",
+    "dedup",
     "defence",
     "degressive",
     "depotdownloader",
@@ -72,6 +76,7 @@
     "DIDS",
     "donotremove",
     "drei",
+    "Droodles",
     "dvpd",
     "dvpl",
     "DVPLCRC",
@@ -94,9 +99,11 @@
     "gameplay",
     "glsl",
     "GLTF",
+    "GSOR",
     "gtag",
     "haha",
     "Herdbreaker",
+    "Hetz",
     "highp",
     "iife",
     "imgur",
@@ -110,6 +117,7 @@
     "leaderboards",
     "lerp",
     "LINEARSIZE",
+    "linktarget",
     "lmao",
     "loadouts",
     "loddist",
@@ -149,6 +157,7 @@
     "ownedtanks",
     "padder",
     "partytown",
+    "patchnotes",
     "PIXELFORMAT",
     "playerachievements",
     "playerinfo",
@@ -163,10 +172,13 @@
     "protobuf",
     "protoc",
     "protos",
+    "proxyclient",
+    "prunestrings",
     "Pyogenics",
     "ratingleaderboard",
     "raycaster",
     "Redirector",
+    "Relogin",
     "researchable",
     "Resvg",
     "rizz",

README.md

@@ -16,22 +16,20 @@ If you intend to contribute to the code, note that you may need to check out sen
 | [packages/i18n](packages/i18n)       |                      | [Crowdin](https://crowdin.com/project/blitzkrieg)                                                                                                                                          | Translations served as JSON shared across all other packages, including some utility code.                               |
 | [packages/scripts](packages/scripts) |                      |                                                                                                                                                                                            | CLI utilities for the development and deployment of BlitzKit services.                                                   |
 | [packages/varuna](packages/varuna)   | Varuna               | [NPM](https://www.npmjs.com/package/varuna)                                                                                                                                                | React and Astro-oriented state management library, awaiting separation from BlitzKit. Unavailable from NPM at this time. |
-| [packages/website](packages/website) | BlitzKit | https://blitzkit.app | The BlitzKit website provides a wide range of tools, APIs, and interconnects all other services.                      |
+| [packages/website](packages/website) | BlitzKit             | https://blitzkit.app                                                                                                                                                                       | The BlitzKit website provides a wide range of tools, APIs, and interconnects all other services.                         |
 
 ## Submodules
 
-| Submodule                                                    | Title       | Source                                                      | Memo                                                                                                                                                                        |
-| ------------------------------------------------------------ | ----------- | ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [submodules/blitzkit-closed](submodules/blitzkit-closed)     | ClosedKit   | [blitzkit/closed](https://github.com/blitzkit/closed)       | Closed source, sensitive code hidden from the public to prevent bad actors from abusing the game. Discuss with `@tresabhi` on Discord for **special permission** to access. |
-| [submodules/blitzkit-internal](submodules/blitzkit-internal) | InternalKit | [blitzkit/internal](https://github.com/blitzkit/internal)   | Closed source, sensitive internal documentation hidden from the public to prevent bad actors from abusing the game. Access to this submodule is **not negotiable**.         |
-| [submodules/CUE4Parse](submodules/CUE4Parse)                 | CUE4Parse   | [FabianFG/CUE4Parse](https://github.com/FabianFG/CUE4Parse) | An Unreal Engine archives and packages parsing library in C#.                                                                                                               |
+| Submodule                                              | Title     | Source                                                | Memo                                                                                                                                                                        |
+| ------------------------------------------------------ | --------- | ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [submodules/blitzkit-closed](packages/blitzkit-closed) | ClosedKit | [blitzkit/closed](https://github.com/blitzkit/closed) | Closed source, sensitive code hidden from the public to prevent bad actors from abusing the game. Discuss with `@tresabhi` on Discord for **special permission** to access. |
 
 ## Environment Variables
 
 | Name                                                          | Source                                                                           | BlitzKit Default                    | Memo                                                                                                                                |
 | ------------------------------------------------------------- | -------------------------------------------------------------------------------- | ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
 | `PUBLIC_WARGAMING_APPLICATION_ID`                             | [Wargaming Developer's Room](https://developers.wargaming.net/)                  |                                     | Application ID needed to communicate with Wargaming APIs.                                                                           |
-| `PUBLIC_PROMOTE_OPENTEST`                                     |                                                                                  | `false`                             | Optional boolean dictating whether the website advertises [the opentest subdomain of BlitzKit](https://opentest.blitzkit.app/).      |
+| `PUBLIC_PROMOTE_OPENTEST`                                     |                                                                                  | `false`                             | Optional boolean dictating whether the website advertises [the opentest subdomain of BlitzKit](https://opentest.blitzkit.app/).     |
 | `ALLOW_ROBOTS`                                                |                                                                                  | `true`                              | Toggles between `Allow: /` and `Disallow: /` in the website's `/robots.txt`. This is usually `false` for all BlitzKit's subdomains. |
 | `WOTB_GLOSSARY`, `WOTB_GLOSSARY_DOMAIN`, `WOTB_GLOSSARY_PATH` |                                                                                  |                                     |                                                                                                                                     |
 | `PUBLIC_GOOGLE_TAG_MANAGER_ID`                                | [Google Tag Manager](https://tagmanager.google.com/)                             | `G-GL2JVHCGPQ`                      | Google Tag Manager's unique identifier for analytical purposes.                                                                     |

docs/about/credits.md

@@ -1,19 +1,47 @@
 # BlitzKit Credits
 
-BlitzKit is a one man band **TrèsAbhi** but I am far from solo.
+BlitzKit is a one man band **TrèsAbhi** but I am far from solo. Helpers, in the order of contribution over time:
 
-| Role                           | People                         |
-| ------------------------------ | ------------------------------ |
-| Bot verification               | S0AP                           |
-| General testing | Prince_NA |
-| Bot advertisement platform     | S0AP                           |
-| Bot rendering pipeline         | Vovko                          |
-| Game asset decompression       | Maddox                         |
-| Game 3D model parsing          | Pyogenics                      |
-| Game file layout               | Aeson                          |
-| 3-caliber rule edge cases      | Minitelrose, ChickenMan7777    |
-| Embed UX                       | \_34, HisRoyalFatness, Synx    |
-| Tankopedia pre-release testing | [OPTML], Aeson, \_34, xkdkw |
-| Website advertisement platform | Aeson                |
-| Compare pre-release testing    | [OPTML]              |
-| Redacted                       | GonnaHetzMe                    |
+### S0AP
+
+BlitzKit Discord bot verification, testing, advertisement, and the initial encouragement to create BlitzKit.
+
+### Prince_NA
+
+BlitzKit Discord bot and website testing and general advise.
+
+### Vovko
+
+BlitzKit Discord bot and website rendering pipeline.
+
+### Maddox
+
+Game file decompression.
+
+### Pyogenics
+
+Game 3D model parsing.
+
+### Aeson
+
+Game file layout, general advise, advertisement, and Tankopedia pre-release testing.
+
+### Minitelrose, ChickenMan7777
+
+3-caliber rule edge cases.
+
+### HisRoyalFatness, Synx
+
+Embed UX.
+
+### [OPTML] clan, \_34, xkdkw, Droodles Blitz
+
+Tankopedia pre-release testing.
+
+### GonnaHetzMe
+
+Redacted by request.
+
+### Mark Greene
+
+GitHub contributor on bug fixes and feature additions.

docs/changelogs/1.29.10.md

@@ -0,0 +1,14 @@
+# BlitzKit 1.29.10
+
+Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update.
+
+## Features
+
+- Combined game mode passive and active abilities into a single dropdown
+- [Mark Greene] Added tier filters to the Guess game
+  - Changing tiers will break your streak
+
+## Fixes
+
+- [Mark Greene] module damage is now properly shown when sorting with it in the tank search
+- Duplicate abilities in the tank filters are now removed

docs/changelogs/1.29.11.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.11
+
+## Fixes
+
+- The Guesser game's toolbar now scales properly with screen size

docs/changelogs/1.29.12.md

@@ -0,0 +1,14 @@
+# BlitzKit 1.29.12
+
+## Fixes
+
+- BlitzKit no longer uses BlitzStars for tank averages for some commands
+  - BlitzKit Performance was created to completely replace BlitzStars but BlitzStars was still used for some older commands
+  - But since BlitzStars keeps having downtime, it has been completely removed
+- Upgraded all dependencies to the latest versions
+- The replay command is now properly localized across all languages
+- Special Chinese characters are now properly handled
+- Commands are now registered synchronously, allowing errors to reveal their exact origins
+- Error handling now properly exists the process after logging the error
+- The bot now uses Discord's new `clientReady` instead of the ambiguous `ready` event
+- Both the armor and model extractors now use the new BlitzKit `SteamVFS`

docs/changelogs/1.29.13.md

@@ -0,0 +1,20 @@
+# BlitzKit 1.29.13
+
+## Features
+
+- The screenshot button now automatically crops your image so you don't have excessive blank space all around
+- Increased the max zoom out distance in Tankopedia to 50m
+
+## Fixes
+
+- Turrets in Tankopedia now stay within a range of -180 and +180 degrees
+- Tanks with transparency like the T34 and Herdbreaker are now properly rendered
+  - This will take a few days to roll out for all tanks (see screenshots below for the fixed models)
+- High End Consumables now give a 33% boost instead of 70%
+- Static Armor now properly deselects all irrelevant armor plates
+- Removed a few debug loggers left behind
+- Static Armor now properly rerenders armor plates when their thicknesses are changed
+- The Ricochet Visualizer now stays in place when dragging around on mobile
+- Reduced the text in the Tankopedia Compare segmented display to fit on smaller screens
+- Sorting by tertiary shells no longer crashes for some tanks
+- The Tank Filters are now left aligned on smaller screens for readability

docs/changelogs/1.29.14.md

@@ -0,0 +1,11 @@
+# BlitzKit 1.29.14
+
+## Changes
+
+- BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API
+- Disabled the following commands:
+  - `/stats`
+  - `/today`
+  - `/breakdown`
+  - `/evolution`
+  - `/full-stats`

docs/changelogs/1.29.3.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.3
+
+## Technical Changes
+
+- Added a significantly more memory and network efficient AssetUploader abstraction

docs/changelogs/1.29.4.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.4
+
+## Technical Changes
+
+- BlitzKit now partially downloads game files instead of the entire game, allowing for faster updates

docs/changelogs/1.29.5.md

@@ -0,0 +1,11 @@
+# BlitzKit 1.29.5
+
+## Features
+
+- Added new lighting to be a bit softer on tanks
+- Added a button with the sun icon to toggle high graphics
+- Added a new reveal and transition animation between tabs
+
+## Fixes
+
+- Track wheels on some tanks no longer look translucent

docs/changelogs/1.29.6.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.29.6
+
+## Features
+
+- Simplified the ownership and test tank filters in the tank search
+- Renamed "Guess the tank" to simply "Guess"
+- The player count value in the Performance tool is now set to Total by default
+- Added Compare-like red/green highlighting to the Performance tool
+
+## Changes
+
+- Removed the last updated info bar in Performance for some more screen real estate
+
+## Fixes
+
+- The remove played tanks in the Playlist tool now shows even when logged out
+- The Guess game now has a page title
+- The compare table now occupies the minimum width possible instead of expanding all columns excessively

docs/changelogs/1.29.7.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.7
+
+## Features
+
+- Re-introduced the ability to deploy BlitzKit OpenTests

docs/changelogs/1.29.8.md

@@ -0,0 +1,19 @@
+# BlitzKit 1.29.8
+
+Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update.
+
+## Features
+
+- Added an option to clear provisions and consumables from all tanks in Compare
+- Added the ability to choose stock turrets and guns in Mixer if a tank has any
+- Added streaks to Guesser
+- Introduced an option to partially reveal tanks in Guesser
+  - This removes the darkness effect but keeps the name hidden
+  - This will reset your streak to 0
+  - Regardless of getting the right guess on the tank's name, your response will be counted as incorrect if partially revealed
+
+## Fixes
+
+- The Tankopedia now smoothly resizes when enlarging on interaction
+- [Mark Greene] Stock turrets now correctly mount the corresponding stock gun
+- The consumable and provision buttons in Compare are no longer tiny

docs/changelogs/1.29.9.md

@@ -0,0 +1,14 @@
+# BlitzKit 1.29.9
+
+Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update.
+
+## Features
+
+- Reworked tank search filters to be far more compact to make way for new filters
+- [Mark Greene] Added the ability to filter tanks by consumables
+- Added the ability to filter tanks by provisions and game-mode abilities and powers
+
+## Fixes
+
+- Consumable and provision icons in Compare are now properly sized
+- [Mark Greene] Provisions now properly affect terrain resistances

docs/guides/christmas-2025.md

@@ -0,0 +1,57 @@
+# Christmas Garage Guide 2025
+
+This content was pre-recorded on a test server and the version you may see may not be the same. Please see [the official WoTB portal](https://wotblitz.com/) for the most up-to-date information.
+
+The holiday season has arrived, and this year the celebrations spill directly into your garage, transforming the familiar space into a festive hub filled with activities, rewards, and seasonal flair. Instead of just offering decorations or a visual makeover, this event brings a full set of mechanics that turn everyday battles into a steady stream of progress. Whether you’re aiming for bonuses, collectibles, or new tanks, the garage is designed to make every match feel like part of a larger holiday journey.
+
+![](https://i.imgur.com/HmbDw0x.jpeg)
+
+## The Music Box
+
+The familiar Snow Globes are absent this year, replaced entirely by **Music Boxes**, which act as the new way to try your luck for seasonal rewards. They behave similarly to the Snow Globes and give you a chance to obtain various items, including a shot at the brand-new **[GSOR the TANK](https://blitzkit.app/tanks/gsor-the-tank/)**. But this time around, **they do not guarantee a tank every single time.** But as a bonus, the Music Box guarantees you will not receive duplicate tanks. Once you have a tank, the Music Box will try its best to give you a different one each time.
+
+![](https://i.imgur.com/sxYV77L.jpeg)
+
+## Win Battles, Earn Rewards
+
+Each victory during the event rewards you with **3 Hot Coffees**, a seasonal currency that serves as the backbone of the progression system. These coffees can be exchanged for a variety of Festive Town rewards, giving you reasons to keep pushing through battles even if you’re just casually playing.
+
+![](https://i.imgur.com/MXGxejz.jpeg)
+
+With the coffees, you’ll also be able to claim **2 tank certificates**, one for **tier VII** vehicles and another covering **tier IX–X** options.
+
+The tier VII pool includes the [E 25](https://blitzkit.app/tanks/e-25), [CS-52 LIS](https://blitzkit.app/tanks/cs-52-lis), [AMX 13 57](https://blitzkit.app/tanks/amx-13-57), [Steyr WT](https://blitzkit.app/tanks/steyr-wt), [Kunze Panzer](https://blitzkit.app/tanks/kunze-panzer), and [Super Hellcat](https://blitzkit.app/tanks/super-hellcat). Meanwhile, the tier IX–X certificate gives access to higher-tier picks like the [121B](https://blitzkit.app/tanks/121b), [AMX 30 B](https://blitzkit.app/tanks/amx-30-b), [Obj. 260](https://blitzkit.app/tanks/obj-260), [Char Futur 4](https://blitzkit.app/tanks/char-futur-4), [TL-7-120](https://blitzkit.app/tanks/tl-7-120), and [Object 452K](https://blitzkit.app/tanks/object-452k).
+
+![](https://i.imgur.com/lxr7PE9.png)
+
+## Upgrade Your Christmas Tree
+
+Golden tokens allow you to upgrade your Christmas Tree through **four distinct stages**, each bringing your garage closer to its fully decorated holiday form.
+
+![](https://i.imgur.com/bcmQE8T.jpeg)
+
+As the tree grows, additional ornament slots open up, eight in total, which appear on the left side of your screen. These slots give you more room to customize the look of your garage and make the tree feel like something you’ve built up piece by piece over the course of the event. Each new ornament adds to the atmosphere, making the progression feel both cosmetic and rewarding.
+
+A fully decorated tree grants up to **+25% silver** per battle, turning your regular gameplay into a more profitable experience without requiring extra effort. Ensure all your ornaments come from the same set to unlock the full potential of the tree (all left, all middle, or all right).
+
+![](https://i.imgur.com/MMbyYLn.jpeg)
+
+## Upgrade Your Yuletide Stall
+
+Your golden tokens can also be invested into upgrading the **Yuletide Stall**, another element of the garage that evolves as you level it up. Each upgrade unlocks new rewards, giving you incentives to distribute your tokens across different attractions instead of focusing on only one. The stall begins in a simple state, but after upgrades it transforms visually and functionally, becoming a more vibrant part of your garage.
+
+![](https://i.imgur.com/AONZN5O.jpeg)
+
+Each upgrade unlocks a tier worth of rewards that you can claim in exchange for Free XP, Gold, Silver, and more Hot Coffees!
+
+![](https://i.imgur.com/8fNy0Yj.png)
+
+## Upgrade Your Shooting Gallery
+
+Another upgradeable area is the **Shooting Gallery**, which contributes its own set of rewards as it levels up. Enhancing the gallery expands your options for exchanging mastery badges, making those badges more useful during the event than they usually are.
+
+![](https://i.imgur.com/Rj1WNCE.jpeg)
+
+![](https://i.imgur.com/GAUd2uR.png)
+
+Consider yourselves debriefed. Happy holidays!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.29.2",
+  "version": "1.29.14",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {
@@ -10,9 +10,10 @@
     "build:website": "cd packages/website && bun run build",
     "build:prisma": "prisma generate",
     "build:proxyclient": "cd packages/scripts && bun run build:proxyclient",
+    "build:catalogitemaccesssor": "cd packages/scripts && bun run build:catalogitemaccesssor",
     "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
     "build:app": "cd packages/app && bun run build",
-    "dev:bot": "bun run build:bot --dev && bun start:bot",
+    "dev:bot": "bun run build:bot --dev && bun start:bot --dev",
     "start:bot": "bun dist/bot/main.js",
     "dev:docs": "vitepress dev docs",
     "dev:website": "cd packages/website && bun run dev",
@@ -34,7 +35,8 @@
     "build:reviews": "cd packages/scripts && bun build:reviews",
     "build:ids": "cd packages/scripts && bun build:ids",
     "prunestrings": "cd packages/scripts && bun prunestrings",
-    "setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient"
+    "setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient",
+    "patchnotes": "cd packages/scripts && bun run patchnotes"
   },
   "type": "module",
   "workspaces": [
@@ -43,6 +45,7 @@
   "dependencies": {
     "@prisma/client": "^6.18.0",
     "prisma": "^6.18.0",
+    "sharp": "^0.34.5",
     "typescript": "^5.9.3"
   }
 }

packages/app/src-tauri/Cargo.lock

@@ -356,9 +356,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 dependencies = [
  "serde",
 ]
@@ -2105,9 +2105,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-traits"
@@ -3907,30 +3907,30 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
  "num-conv",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",

packages/bot/package.json

@@ -4,25 +4,26 @@
     "@blitzkit/core": "workspace:*",
     "@blitzkit/i18n": "workspace:*",
     "@radix-ui/colors": "^3.0.0",
-    "@radix-ui/themes": "^3.2.1",
+    "@radix-ui/themes": "^3.3.0",
     "@resvg/resvg-js": "^2.6.2",
     "@types/adm-zip": "^0.5.7",
+    "@types/bun": "^1.3.9",
     "@types/lodash-es": "^4.17.12",
     "@types/markdown-escape": "^1.1.3",
-    "@types/react": "^19.2.2",
+    "@types/react": "^19.2.14",
     "adm-zip": "^0.5.16",
     "bepaint": "^0.1.0-beta.3",
-    "discord.js": "^14.22.1",
-    "dotenv": "^17.2.2",
+    "discord.js": "^14.25.1",
+    "dotenv": "^17.3.1",
     "fuzzysort": "^3.1.0",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "^4.17.23",
     "markdown-escape": "^2.0.0",
     "pickleparser": "^0.2.1",
-    "prisma": "^6.17.1",
+    "prisma": "^6.19.2",
     "protobufjs": "^7.5.4",
-    "react": "^19.2.0",
-    "satori": "^0.18.3",
-    "sharp": "^0.34.4"
+    "react": "^19.2.4",
+    "satori": "^0.18.4",
+    "sharp": "^0.34.5"
   },
   "private": true,
   "scripts": {

packages/bot/src/commands/about.ts

@@ -1,7 +1,7 @@
 import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
 import { translator } from "../core/localization/translator";
 import {
-  COMMANDS_RAW,
+  commandsArray,
   type CommandRegistry,
 } from "../events/interactionCreate";
 
@@ -35,7 +35,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
 
       if (subcommand === "commands") {
         return `${strings.bot.commands.about.subcommands.commands.body}${(
-          await Promise.all(COMMANDS_RAW)
+          await Promise.all(commandsArray)
         )
           .sort((a, b) =>
             (a.command.name_localizations?.[interaction.locale] ??
@@ -43,7 +43,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
             (b.command.name_localizations?.[interaction.locale] ??
               b.command.name)
               ? -1
-              : 1
+              : 1,
           )
           .map(
             (registry) =>
@@ -54,7 +54,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
                 registry.command.description_localizations?.[
                   interaction.locale
                 ] ?? registry.command.description
-              }`
+              }`,
           )
           .join("\n")}`;
       }

packages/bot/src/commands/breakdown/index.tsx

@@ -1,49 +1,46 @@
-import { getBlitzStarsLinkButton } from '../../core/blitzstars/getBlitzStarsLinkButton';
-import { addPeriodicFilterOptions } from '../../core/discord/addPeriodicFilterOptions';
-import { addUsernameChoices } from '../../core/discord/addUsernameChoices';
-import { autocompleteTanks } from '../../core/discord/autocompleteTanks';
-import { autocompleteUsername } from '../../core/discord/autocompleteUsername';
-import { buttonRefresh } from '../../core/discord/buttonRefresh';
-import { commandToURL } from '../../core/discord/commandToURL';
-import { createLocalizedCommand } from '../../core/discord/createLocalizedCommand';
-import { getCustomPeriodParams } from '../../core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../../core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../../core/discord/getFiltersFromCommand';
-import { resolvePeriodFromButton } from '../../core/discord/resolvePeriodFromButton';
-import { resolvePeriodFromCommand } from '../../core/discord/resolvePeriodFromCommand';
-import { resolvePlayerFromButton } from '../../core/discord/resolvePlayerFromButton';
-import { resolvePlayerFromCommand } from '../../core/discord/resolvePlayerFromCommand';
-import type { CommandRegistry } from '../../events/interactionCreate';
-import { renderBreakdown } from './render';
+import { addPeriodicFilterOptions } from "../../core/discord/addPeriodicFilterOptions";
+import { addUsernameChoices } from "../../core/discord/addUsernameChoices";
+import { autocompleteTanks } from "../../core/discord/autocompleteTanks";
+import { autocompleteUsername } from "../../core/discord/autocompleteUsername";
+import { createLocalizedCommand } from "../../core/discord/createLocalizedCommand";
+import { getFiltersFromButton } from "../../core/discord/getFiltersFromButton";
+import { resolvePeriodFromButton } from "../../core/discord/resolvePeriodFromButton";
+import { resolvePlayerFromButton } from "../../core/discord/resolvePlayerFromButton";
+import { translator } from "../../core/localization/translator";
+import type { CommandRegistry } from "../../events/interactionCreate";
+import { renderBreakdown } from "./render";
 
 export const breakdownCommand = new Promise<CommandRegistry>(
   async (resolve) => {
     resolve({
       command: await addPeriodicFilterOptions(
-        createLocalizedCommand('breakdown'),
+        createLocalizedCommand("breakdown"),
         (option) => option.addStringOption(addUsernameChoices),
       ),
 
       async handler(interaction) {
-        const player = await resolvePlayerFromCommand(interaction);
-        const period = resolvePeriodFromCommand(player.region, interaction);
-        const filters = await getFiltersFromCommand(interaction);
-        const path = commandToURL(interaction, {
-          ...player,
-          ...getCustomPeriodParams(interaction),
-          ...filters,
-        });
+        const { strings } = translator(interaction.locale);
+        return strings.bot.commands.dead;
 
-        return [
-          ...(await renderBreakdown(
-            player,
-            period,
-            filters,
-            interaction.locale,
-          )),
-          buttonRefresh(interaction, path),
-          await getBlitzStarsLinkButton(player.region, player.id),
-        ];
+        // const player = await resolvePlayerFromCommand(interaction);
+        // const period = resolvePeriodFromCommand(player.region, interaction);
+        // const filters = await getFiltersFromCommand(interaction);
+        // const path = commandToURL(interaction, {
+        //   ...player,
+        //   ...getCustomPeriodParams(interaction),
+        //   ...filters,
+        // });
+
+        // return [
+        //   ...(await renderBreakdown(
+        //     player,
+        //     period,
+        //     filters,
+        //     interaction.locale,
+        //   )),
+        //   buttonRefresh(interaction, path),
+        //   await getBlitzStarsLinkButton(player.region, player.id),
+        // ];
       },
 
       autocomplete: (interaction) => {

packages/bot/src/commands/breakdown/render.tsx

@@ -15,11 +15,16 @@ import { CommandWrapper } from "../../components/CommandWrapper";
 import { NoData } from "../../components/NoData";
 import { TitleBar } from "../../components/TitleBar";
 import { filtersToDescription } from "../../core/blitzkit/filtersToDescription";
-import { tankDefinitions } from "../../core/blitzkit/nonBlockingPromises";
+import {
+  averageDefinitions,
+  tankDefinitions,
+} from "../../core/blitzkit/nonBlockingPromises";
 import { UserError } from "../../core/blitzkit/userError";
-import { filterStats, type StatFilters } from "../../core/blitzstars/filterStats";
+import {
+  filterStats,
+  type StatFilters,
+} from "../../core/blitzstars/filterStats";
 import { getStatsInPeriod } from "../../core/blitzstars/getStatsInPeriod";
-import { blitzStarsTankAverages } from "../../core/blitzstars/tankAverages";
 import type { ResolvedPeriod } from "../../core/discord/resolvePeriodFromCommand";
 import type { ResolvedPlayer } from "../../core/discord/resolvePlayerFromCommand";
 import { translator } from "../../core/localization/translator";
@@ -31,11 +36,11 @@ export async function renderBreakdown(
   { region, id }: ResolvedPlayer,
   { start, end, name }: ResolvedPeriod,
   filters: StatFilters,
-  locale: Locale
+  locale: Locale,
 ) {
   const { strings, unwrap } = translator(locale);
   const awaitedTankDefinitions = await tankDefinitions;
-  const awaitedTankAverages = await blitzStarsTankAverages;
+  const awaitedTankAverages = await averageDefinitions;
   const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale);
   const { filteredOrder } = await filterStats(statsInPeriod, filters);
   const accountInfo = await getAccountInfo(region, id);
@@ -53,14 +58,14 @@ export async function renderBreakdown(
   }
 
   filteredOrder.forEach((id) => {
-    const tankAveragesEntry = awaitedTankAverages[id];
+    const tankAveragesEntry = awaitedTankAverages.averages[id];
     const current = statsInPeriod.diff[id];
     const career = tankStats.find((tank) => tank.tank_id === id)!.all;
     const currentWN8 = tankAveragesEntry
-      ? calculateWN8(tankAveragesEntry.all, current)
+      ? calculateWN8(tankAveragesEntry.mu, current)
       : undefined;
     const careerWN8 = tankAveragesEntry
-      ? calculateWN8(tankAveragesEntry.all, career)
+      ? calculateWN8(tankAveragesEntry.mu, career)
       : undefined;
 
     orderedCurrentStats.push(current);
@@ -69,65 +74,65 @@ export async function renderBreakdown(
     orderedCareerWN8.push(careerWN8);
   });
   tankStats.forEach((tank) => {
-    const tankAveragesEntry = awaitedTankAverages[tank.tank_id];
+    const tankAveragesEntry = awaitedTankAverages.averages[tank.tank_id];
 
     orderedCareerWN8Full.push(
       tankAveragesEntry
-        ? calculateWN8(tankAveragesEntry.all, tank.all)
-        : undefined
+        ? calculateWN8(tankAveragesEntry.mu, tank.all)
+        : undefined,
     );
   });
 
   const currentBattles = orderedCurrentStats.reduce(
     (accumulator, current) => accumulator + current.battles,
-    0
+    0,
   );
   const careerBattles = tankStats.reduce(
     (accumulator, current) => accumulator + current.all.battles,
-    0
+    0,
   );
   const currentWinrate =
     orderedCurrentStats.reduce(
       (accumulator, current) => accumulator + current.wins,
-      0
+      0,
     ) / currentBattles;
   const careerWinrate =
     tankStats.reduce(
       (accumulator, current) => accumulator + current.all.wins,
-      0
+      0,
     ) / careerBattles;
   const currentWN8 =
     orderedCurrentWN8.reduce<number>(
       (accumulator, current, index) =>
         accumulator + (current ?? 0) * orderedCurrentStats[index].battles,
-      0
+      0,
     ) /
     orderedCurrentStats.reduce(
       (accumulator, current, index) =>
         accumulator +
         (orderedCurrentWN8[index] === undefined ? 0 : current.battles),
-      0
+      0,
     );
   const careerWN8 =
     orderedCareerWN8Full.reduce<number>(
       (accumulator, current) => accumulator + (current ?? 0),
-      0
+      0,
     ) /
     tankStats.reduce(
       (accumulator, current, index) =>
         accumulator +
         (orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles),
-      0
+      0,
     );
   const currentDamage =
     orderedCurrentStats.reduce(
       (accumulator, current) => accumulator + current.damage_dealt,
-      0
+      0,
     ) / currentBattles;
   const careerDamage =
     tankStats.reduce(
       (accumulator, current) => accumulator + current.all.damage_dealt,
-      0
+      0,
     ) / careerBattles;
 
   const children: React.JSX.Element[] = [];
@@ -172,7 +177,7 @@ export async function renderBreakdown(
             delta: currentDamage - careerDamage,
           },
         ]}
-      />
+      />,
     );
 
     filteredOrder.forEach((id, index) => {
@@ -206,7 +211,7 @@ export async function renderBreakdown(
             {
               title: strings.bot.commands.breakdown.body.winrate,
               current: `${(100 * (current.wins / current.battles)).toFixed(
-                2
+                2,
               )}%`,
               career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`,
               delta:
@@ -230,24 +235,24 @@ export async function renderBreakdown(
             {
               title: strings.bot.commands.breakdown.body.damage,
               current: Math.round(
-                current.damage_dealt / current.battles
+                current.damage_dealt / current.battles,
               ).toLocaleString(),
               career: Math.round(
-                career.damage_dealt / career.battles
+                career.damage_dealt / career.battles,
               ).toLocaleString(),
               delta:
                 current.damage_dealt / current.battles -
                 career.damage_dealt / career.battles,
             },
           ]}
-        />
+        />,
       );
     });
   }
 
   const pages = chunk(
     children,
-    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE)
+    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE),
   );
 
   if (filteredOrder.length > 0) {

packages/bot/src/commands/evolution.tsx

@@ -5,8 +5,6 @@ import * as Graph from "../components/Graph";
 import { LineColor } from "../components/Graph/components/Line/constants";
 import { NoData } from "../components/NoData";
 import { TitleBar } from "../components/TitleBar";
-import { resolveTankId } from "../core/blitz/resolveTankId";
-import { getBlitzStarsLinkButton } from "../core/blitzstars/getBlitzStarsLinkButton";
 import { getPlayerHistories } from "../core/blitzstars/getPlayerHistories";
 import { getTankHistories } from "../core/blitzstars/getTankHistories";
 import { addPeriodSubCommands } from "../core/discord/addPeriodSubCommands";
@@ -14,20 +12,12 @@ import { addTankChoices } from "../core/discord/addTankChoices";
 import { addUsernameChoices } from "../core/discord/addUsernameChoices";
 import { autocompleteTanks } from "../core/discord/autocompleteTanks";
 import { autocompleteUsername } from "../core/discord/autocompleteUsername";
-import { buttonRefresh } from "../core/discord/buttonRefresh";
-import { commandToURL } from "../core/discord/commandToURL";
 import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
-import { getCustomPeriodParams } from "../core/discord/getCustomPeriodParams";
 import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
-import {
-  type ResolvedPeriod,
-  resolvePeriodFromCommand,
-} from "../core/discord/resolvePeriodFromCommand";
+import { type ResolvedPeriod } from "../core/discord/resolvePeriodFromCommand";
 import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
-import {
-  type ResolvedPlayer,
-  resolvePlayerFromCommand,
-} from "../core/discord/resolvePlayerFromCommand";
+import { type ResolvedPlayer } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
 import type { CommandRegistry } from "../events/interactionCreate";
 
 type EvolutionStatType = "player" | "tank";
@@ -37,7 +27,7 @@ async function render(
   { start, end, name }: ResolvedPeriod,
   type: "player" | "tank",
   tankId: number | null,
-  locale: Locale
+  locale: Locale,
 ) {
   const accountInfo = await getAccountInfo(region, id);
   const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
@@ -61,7 +51,7 @@ async function render(
       [
         history.all.battles,
         (history.all.wins / history.all.battles) * 100,
-      ] as Graph.PlotItem
+      ] as Graph.PlotItem,
   );
   const times = histories.map((history) => history.last_battle_time);
   const minTime = Math.min(...times);
@@ -115,7 +105,7 @@ export const evolutionCommand = new Promise<CommandRegistry>(
           group: "player",
           modify(option: SlashCommandSubcommandGroupBuilder) {
             addPeriodSubCommands(option, (option) =>
-              option.addStringOption(addUsernameChoices)
+              option.addStringOption(addUsernameChoices),
             );
           },
         },
@@ -125,43 +115,46 @@ export const evolutionCommand = new Promise<CommandRegistry>(
             addPeriodSubCommands(option, (option) =>
               option
                 .addStringOption(addTankChoices)
-                .addStringOption(addUsernameChoices)
+                .addStringOption(addUsernameChoices),
             );
           },
         },
       ]),
 
       async handler(interaction) {
-        const commandGroup =
-          interaction.options.getSubcommandGroup() as EvolutionStatType;
-        const player = await resolvePlayerFromCommand(interaction);
-        const period = resolvePeriodFromCommand(player.region, interaction);
-        const tankIdRaw = interaction.options.getString("tank")!;
-        const tankId =
-          commandGroup === "tank"
-            ? await resolveTankId(tankIdRaw, interaction.locale)
-            : null;
-        const path = commandToURL(interaction, {
-          ...player,
-          ...getCustomPeriodParams(interaction),
-          tankId,
-        });
+        const { strings } = translator(interaction.locale);
+        return strings.bot.commands.dead;
 
-        return [
-          await render(
-            player,
-            period,
-            commandGroup,
-            tankId,
-            interaction.locale
-          ),
-          buttonRefresh(interaction, path),
-          await getBlitzStarsLinkButton(
-            player.region,
-            player.id,
-            tankId ?? undefined
-          ),
-        ];
+        // const commandGroup =
+        //   interaction.options.getSubcommandGroup() as EvolutionStatType;
+        // const player = await resolvePlayerFromCommand(interaction);
+        // const period = resolvePeriodFromCommand(player.region, interaction);
+        // const tankIdRaw = interaction.options.getString("tank")!;
+        // const tankId =
+        //   commandGroup === "tank"
+        //     ? await resolveTankId(tankIdRaw, interaction.locale)
+        //     : null;
+        // const path = commandToURL(interaction, {
+        //   ...player,
+        //   ...getCustomPeriodParams(interaction),
+        //   tankId,
+        // });
+
+        // return [
+        //   await render(
+        //     player,
+        //     period,
+        //     commandGroup,
+        //     tankId,
+        //     interaction.locale
+        //   ),
+        //   buttonRefresh(interaction, path),
+        //   await getBlitzStarsLinkButton(
+        //     player.region,
+        //     player.id,
+        //     tankId ?? undefined
+        //   ),
+        // ];
       },
 
       autocomplete: (interaction) => {
@@ -181,9 +174,9 @@ export const evolutionCommand = new Promise<CommandRegistry>(
           period,
           commandGroup,
           parseInt(url.searchParams.get("tankId") ?? "0") || null,
-          interaction.locale
+          interaction.locale,
         );
       },
     });
-  }
+  },
 );

packages/bot/src/commands/fullStats.tsx

@@ -3,38 +3,28 @@ import {
   getAccountInfo,
   getClanAccountInfo,
   getTierWeights,
-} from '@blitzkit/core';
-import { Locale } from 'discord.js';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { GenericAllStats } from '../components/GenericAllStats';
-import { NoData } from '../components/NoData';
-import { TierWeights } from '../components/TierWeights';
-import { TitleBar } from '../components/TitleBar';
-import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
-import { filterStats, type StatFilters } from '../core/blitzstars/filterStats';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
-import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod';
-import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { buttonRefresh } from '../core/discord/buttonRefresh';
-import { commandToURL } from '../core/discord/commandToURL';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
-import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
-import {
-  type ResolvedPeriod,
-  resolvePeriodFromCommand,
-} from '../core/discord/resolvePeriodFromCommand';
-import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
-import {
-  type ResolvedPlayer,
-  resolvePlayerFromCommand,
-} from '../core/discord/resolvePlayerFromCommand';
-import type { CommandRegistry } from '../events/interactionCreate';
+} from "@blitzkit/core";
+import { Locale } from "discord.js";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { GenericAllStats } from "../components/GenericAllStats";
+import { NoData } from "../components/NoData";
+import { TierWeights } from "../components/TierWeights";
+import { TitleBar } from "../components/TitleBar";
+import { filtersToDescription } from "../core/blitzkit/filtersToDescription";
+import { filterStats, type StatFilters } from "../core/blitzstars/filterStats";
+import { getStatsInPeriod } from "../core/blitzstars/getStatsInPeriod";
+import { addPeriodicFilterOptions } from "../core/discord/addPeriodicFilterOptions";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { getFiltersFromButton } from "../core/discord/getFiltersFromButton";
+import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
+import { type ResolvedPeriod } from "../core/discord/resolvePeriodFromCommand";
+import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
+import { type ResolvedPlayer } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import type { CommandRegistry } from "../events/interactionCreate";
 
 async function render(
   { region, id }: ResolvedPlayer,
@@ -43,7 +33,7 @@ async function render(
   locale: Locale,
 ) {
   const { nickname } = await getAccountInfo(region, id);
-  const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+  const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
   const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
   const diffedTankStats = await getStatsInPeriod(
     region,
@@ -86,25 +76,28 @@ export const fullStatsCommand = new Promise<CommandRegistry>(
   async (resolve) => {
     resolve({
       command: await addPeriodicFilterOptions(
-        createLocalizedCommand('full-stats'),
+        createLocalizedCommand("full-stats"),
         (option) => option.addStringOption(addUsernameChoices),
       ),
 
       async handler(interaction) {
-        const player = await resolvePlayerFromCommand(interaction);
-        const period = resolvePeriodFromCommand(player.region, interaction);
-        const filters = await getFiltersFromCommand(interaction);
-        const path = commandToURL(interaction, {
-          ...player,
-          ...getCustomPeriodParams(interaction),
-          ...filters,
-        });
+        const { strings } = translator(interaction.locale);
+        return strings.bot.commands.dead;
 
-        return Promise.all([
-          render(player, period, filters, interaction.locale),
-          buttonRefresh(interaction, path),
-          getBlitzStarsLinkButton(player.region, player.id),
-        ]);
+        // const player = await resolvePlayerFromCommand(interaction);
+        // const period = resolvePeriodFromCommand(player.region, interaction);
+        // const filters = await getFiltersFromCommand(interaction);
+        // const path = commandToURL(interaction, {
+        //   ...player,
+        //   ...getCustomPeriodParams(interaction),
+        //   ...filters,
+        // });
+
+        // return Promise.all([
+        //   render(player, period, filters, interaction.locale),
+        //   buttonRefresh(interaction, path),
+        //   getBlitzStarsLinkButton(player.region, player.id),
+        // ]);
       },
 
       autocomplete: (interaction) => {

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -52,7 +52,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
     const seasonNumbers = range(
       FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
       latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1
-    );
+    ).slice(-25);
 
     function addOptions(option: SlashCommandSubcommandBuilder) {
       const { strings } = translator(Locale.EnglishUS);
@@ -196,7 +196,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                                 strings.common.leagues as Record<string, string>
                               )[name]
                           ),
-                        }) satisfies APIApplicationCommandOptionChoice<string>
+                        } satisfies APIApplicationCommandOptionChoice<string>)
                     )
                   )
                   .setRequired(true);
@@ -219,8 +219,8 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         const season = seasonOption
           ? parseInt(seasonOption)
           : onGoingSeason
-            ? latestArchivedSeasonNumber + 1
-            : latestArchivedSeasonNumber;
+          ? latestArchivedSeasonNumber + 1
+          : latestArchivedSeasonNumber;
         const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
         let titleName: string;
         let titleImage: string | undefined;
@@ -258,7 +258,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       position: player.number,
                       clan: player.clan_tag,
                       nickname: player.nickname,
-                    }) satisfies SimplifiedPlayer
+                    } satisfies SimplifiedPlayer)
                 )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
@@ -295,7 +295,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                               .deleted_player,
                             { id: player.id }
                           ),
-                      }) satisfies SimplifiedPlayer
+                      } satisfies SimplifiedPlayer)
                   );
                 }
               );
@@ -349,7 +349,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         score: player.score,
                         clan: player.clan_tag,
                         nickname: player.nickname,
-                      }) satisfies SimplifiedPlayer
+                      } satisfies SimplifiedPlayer)
                   )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(

packages/bot/src/commands/replay.tsx

@@ -5,28 +5,29 @@ import {
   idToRegion,
   tankIcon,
   TIER_ROMAN_NUMERALS,
-} from '@blitzkit/core';
-import { Locale } from 'discord.js';
-import { clamp } from 'lodash-es';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { TitleBar } from '../components/TitleBar';
-import { iconPng } from '../core/blitzkit/iconPng';
+} from "@blitzkit/core";
+import { Locale } from "discord.js";
+import { clamp } from "lodash-es";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { TitleBar } from "../components/TitleBar";
+import { iconPng } from "../core/blitzkit/iconPng";
 import {
+  averageDefinitions,
   mapDefinitions,
   tankDefinitions,
-} from '../core/blitzkit/nonBlockingPromises';
-import { RenderConfiguration } from '../core/blitzkit/renderConfiguration';
-import { blitzStarsTankAverages } from '../core/blitzstars/tankAverages';
-import { buttonLink } from '../core/discord/buttonLink';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { type CommandRegistry } from '../events/interactionCreate';
-import { theme } from '../stitches.config';
+} from "../core/blitzkit/nonBlockingPromises";
+import { RenderConfiguration } from "../core/blitzkit/renderConfiguration";
+import { buttonLink } from "../core/discord/buttonLink";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { localizationObject } from "../core/discord/localizationObject";
+import { translator } from "../core/localization/translator";
+import { type CommandRegistry } from "../events/interactionCreate";
+import { theme } from "../stitches.config";
 
 type WotInspectorReplaySubmission =
-  | { status: 'error'; data: unknown; error: { message: string } }
+  | { status: "error"; data: unknown; error: { message: string } }
   | {
-      status: 'ok';
+      status: "ok";
       data: {
         download_url: string;
         view_url: string;
@@ -209,9 +210,9 @@ function stat(value: string | number, flex = 2) {
     <div
       style={{
         flex,
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
       }}
     >
       <span style={{ fontSize: 16 }}>{value}</span>
@@ -227,15 +228,15 @@ async function playerListing(
   recordingPlayer = false,
 ) {
   const { unwrap } = translator(locale);
-  const awaitedTankAverages = await blitzStarsTankAverages;
+  const awaitedTankAverages = await averageDefinitions;
   const awaitedTankDefinitions = await tankDefinitions;
   const tank = awaitedTankDefinitions.tanks[player.vehicle_descr];
-  const blockAccent = recordingPlayer ? '_amber' : '';
+  const blockAccent = recordingPlayer ? "_amber" : "";
   const healthAccent = protagonistTeam
     ? recordingPlayer
-      ? '_amber'
-      : '_green'
-    : '_red';
+      ? "_amber"
+      : "_green"
+    : "_red";
 
   // our turret ids are always off by 1 or 2 lol so imma just grab the closest
   // TODO: 💀
@@ -245,11 +246,11 @@ async function playerListing(
   )[0];
   const totalHealth = turret.health + tank.health;
   const healthLeft = clamp(player.hitpoints_left / totalHealth, 0, 1);
-  const tankAveragesEntry = awaitedTankAverages[player.vehicle_descr];
+  const tankAveragesEntry = awaitedTankAverages.averages[player.vehicle_descr];
   const wn8 =
     tankAveragesEntry === undefined
       ? -1
-      : calculateWN8(tankAveragesEntry.all, {
+      : calculateWN8(tankAveragesEntry.mu, {
           battles: 1,
           damage_dealt: player.damage_made,
           dropped_capture_points: player.base_defend_points,
@@ -262,8 +263,8 @@ async function playerListing(
     <div
       key={player.entity_id}
       style={{
-        display: 'flex',
-        alignItems: 'center',
+        display: "flex",
+        alignItems: "center",
         gap: 8,
         backgroundColor: theme.colors[`appBackground2${blockAccent}`],
         padding: 8,
@@ -271,11 +272,11 @@ async function playerListing(
     >
       <div
         style={{
-          display: 'flex',
+          display: "flex",
           gap: 8,
           flex: 1,
-          overflow: 'hidden',
-          alignItems: 'center',
+          overflow: "hidden",
+          alignItems: "center",
         }}
       >
         <img
@@ -284,22 +285,22 @@ async function playerListing(
           style={{
             width: 32,
             height: 32,
-            objectFit: 'contain',
+            objectFit: "contain",
           }}
         />
 
         <div
           style={{
-            display: 'flex',
-            flexDirection: 'column',
+            display: "flex",
+            flexDirection: "column",
             // align
           }}
         >
           <div
             style={{
-              display: 'flex',
+              display: "flex",
               gap: 4,
-              alignItems: 'center',
+              alignItems: "center",
             }}
           >
             <span
@@ -324,23 +325,23 @@ async function playerListing(
             style={{
               fontSize: 16,
               color: theme.colors[`textLowContrast${blockAccent}`],
-              whiteSpace: 'nowrap',
+              whiteSpace: "nowrap",
             }}
           >
             {player.name}
-            {player.clan_tag ? ` [${player.clan_tag}]` : ''}
+            {player.clan_tag ? ` [${player.clan_tag}]` : ""}
           </span>
         </div>
       </div>
 
       <div
         style={{
-          display: 'flex',
+          display: "flex",
           flex: 1,
         }}
       >
         {stat(player.damage_made.toLocaleString())}
-        {stat(wn8 === -1 ? '--' : Math.round(wn8).toLocaleString())}
+        {stat(wn8 === -1 ? "--" : Math.round(wn8).toLocaleString())}
         {stat(player.exp.toLocaleString())}
         {stat(player.enemies_destroyed, 1)}
       </div>
@@ -349,15 +350,15 @@ async function playerListing(
         style={{
           borderRadius: 2,
           backgroundColor: theme.colors[`componentInteractive${healthAccent}`],
-          display: 'flex',
+          display: "flex",
           width: 4,
-          height: '100%',
-          transform: 'scaleY(-1)',
+          height: "100%",
+          transform: "scaleY(-1)",
         }}
       >
         <div
           style={{
-            width: '100%',
+            width: "100%",
             height: `${healthLeft * 100}%`,
             borderRadius: 2,
             backgroundColor: theme.colors[`solidBackground${healthAccent}`],
@@ -373,8 +374,8 @@ function Header() {
     <div
       style={{
         padding: 8,
-        display: 'flex',
-        alignItems: 'center',
+        display: "flex",
+        alignItems: "center",
         gap: 8,
       }}
     >
@@ -382,16 +383,16 @@ function Header() {
 
       <div
         style={{
-          display: 'flex',
+          display: "flex",
           flex: 1,
         }}
       >
         <div
           style={{
             flex: 2,
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
           }}
         >
           <span
@@ -406,9 +407,9 @@ function Header() {
         <div
           style={{
             flex: 2,
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
           }}
         >
           <span
@@ -423,9 +424,9 @@ function Header() {
         <div
           style={{
             flex: 2,
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
           }}
         >
           <span
@@ -440,9 +441,9 @@ function Header() {
         <div
           style={{
             flex: 1,
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
           }}
         >
           <span
@@ -460,28 +461,42 @@ function Header() {
 }
 
 export const replayCommand = new Promise<CommandRegistry>((resolve) => {
+  const { strings } = translator(Locale.EnglishUS);
+
   resolve({
-    command: createLocalizedCommand('replay').addAttachmentOption((option) =>
-      option.setName('file').setDescription('Replay file').setRequired(true),
+    command: createLocalizedCommand("replay").addAttachmentOption((option) =>
+      option
+        .setName(strings.bot.commands.replay.options.file.name)
+        .setNameLocalizations(
+          localizationObject(
+            (strings) => strings.bot.commands.replay.options.file.name,
+            undefined,
+            true,
+          ),
+        )
+        .setDescription(strings.bot.commands.replay.options.file.description)
+        .setDescriptionLocalizations(
+          localizationObject(
+            (strings) => strings.bot.commands.replay.options.file.description,
+          ),
+        )
+        .setRequired(true),
     ),
 
     async handler(interaction) {
       const awaitedMapDefinitions = await mapDefinitions;
-      const file = interaction.options.getAttachment('file')!;
-      // const file = {
-      //   url: 'https://cdn.discordapp.com/ephemeral-attachments/1232434891652861972/1232781496016834581/20240328_1530__TresAbhi_M60_1157057448155406708.wotbreplay?ex=662ab4bc&is=6629633c&hm=c784cd10e80232350ddaf291fa987b879c4d0a8083b78298c9eee4fa0d507f6c&',
-      // };
+      const file = interaction.options.getAttachment("file")!;
       const submissionData = (await fetch(
         `https://wotinspector.com/api/replay/upload/?url=${encodeURIComponent(
           file.url,
         )}`,
       ).then((response) => response.json())) as WotInspectorReplaySubmission;
 
-      if (submissionData.status === 'error') {
+      if (submissionData.status === "error") {
         return `# Uh oh! WoT Inspector didn't like that.\n\nThere was an error processing your replay. Get help on [the official Discord server](https://discord.gg/nDt7AjGJQH).`;
       }
 
-      const replayId = submissionData.data.download_url.split('/').at(-1)!;
+      const replayId = submissionData.data.download_url.split("/").at(-1)!;
       const replayData = (await fetch(
         `https://api.wotinspector.com/v2/blitz/replays/${replayId}/`,
       ).then((response) => response.json())) as WotInspectorReplay;
@@ -493,7 +508,7 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
         await getClanAccountInfo(
           idToRegion(replayData.protagonist),
           replayData.protagonist,
-          ['clan'],
+          ["clan"],
         )
       )?.clan;
       const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
@@ -506,22 +521,22 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
             image={clanImage}
             description={`${
               replayData.protagonist_team === replayData.winner_team
-                ? 'Victory'
-                : 'Defeat'
+                ? "Victory"
+                : "Defeat"
             } • ${awaitedMapDefinitions.maps[replayData.map_id].name}`}
           />
 
           <div
             style={{
-              display: 'flex',
+              display: "flex",
               gap: 8,
             }}
           >
             <div
               style={{
                 flex: 1,
-                display: 'flex',
-                flexDirection: 'column',
+                display: "flex",
+                flexDirection: "column",
                 gap: 4,
               }}
             >
@@ -547,8 +562,8 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
             <div
               style={{
                 flex: 1,
-                display: 'flex',
-                flexDirection: 'column',
+                display: "flex",
+                flexDirection: "column",
                 gap: 4,
               }}
             >
@@ -569,8 +584,8 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
             </div>
           </div>
         </CommandWrapper>,
-        buttonLink(submissionData.data.view_url, 'WoT Inspector'),
-        buttonLink(submissionData.data.download_url, 'Download'),
+        buttonLink(submissionData.data.view_url, "WoT Inspector"),
+        buttonLink(submissionData.data.download_url, "Download"),
       ];
     },
   });

packages/bot/src/commands/stats.tsx

@@ -6,35 +6,25 @@ import { NoData } from "../components/NoData";
 import { TitleBar } from "../components/TitleBar";
 import { filtersToDescription } from "../core/blitzkit/filtersToDescription";
 import { filterStats, type StatFilters } from "../core/blitzstars/filterStats";
-import { getBlitzStarsLinkButton } from "../core/blitzstars/getBlitzStarsLinkButton";
 import { getStatsInPeriod } from "../core/blitzstars/getStatsInPeriod";
 import { addPeriodicFilterOptions } from "../core/discord/addPeriodicFilterOptions";
 import { addUsernameChoices } from "../core/discord/addUsernameChoices";
 import { autocompleteTanks } from "../core/discord/autocompleteTanks";
 import { autocompleteUsername } from "../core/discord/autocompleteUsername";
-import { buttonRefresh } from "../core/discord/buttonRefresh";
-import { commandToURL } from "../core/discord/commandToURL";
 import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
-import { getCustomPeriodParams } from "../core/discord/getCustomPeriodParams";
 import { getFiltersFromButton } from "../core/discord/getFiltersFromButton";
-import { getFiltersFromCommand } from "../core/discord/getFiltersFromCommand";
 import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
-import {
-  type ResolvedPeriod,
-  resolvePeriodFromCommand,
-} from "../core/discord/resolvePeriodFromCommand";
+import { type ResolvedPeriod } from "../core/discord/resolvePeriodFromCommand";
 import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
-import {
-  type ResolvedPlayer,
-  resolvePlayerFromCommand,
-} from "../core/discord/resolvePlayerFromCommand";
+import { type ResolvedPlayer } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
 import type { CommandRegistry } from "../events/interactionCreate";
 
 async function render(
   { region, id }: ResolvedPlayer,
   { start, end, name }: ResolvedPeriod,
   filters: StatFilters,
-  locale: Locale
+  locale: Locale,
 ) {
   const { nickname } = await getAccountInfo(region, id);
   const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
@@ -44,7 +34,7 @@ async function render(
     id,
     start,
     end,
-    locale
+    locale,
   );
   const { stats, supplementary } = await filterStats(diffedTankStats, filters);
   const filterDescriptions = await filtersToDescription(filters, locale);
@@ -73,24 +63,27 @@ export const statsCommand = new Promise<CommandRegistry>(async (resolve) => {
   resolve({
     command: await addPeriodicFilterOptions(
       createLocalizedCommand("stats"),
-      (option) => option.addStringOption(addUsernameChoices)
+      (option) => option.addStringOption(addUsernameChoices),
     ),
 
     async handler(interaction) {
-      const player = await resolvePlayerFromCommand(interaction);
-      const period = resolvePeriodFromCommand(player.region, interaction);
-      const filters = await getFiltersFromCommand(interaction);
-      const path = commandToURL(interaction, {
-        ...player,
-        ...getCustomPeriodParams(interaction),
-        ...filters,
-      });
+      const { strings } = translator(interaction.locale);
+      return strings.bot.commands.dead;
 
-      return Promise.all([
-        render(player, period, filters, interaction.locale),
-        buttonRefresh(interaction, path),
-        getBlitzStarsLinkButton(player.region, player.id),
-      ]);
+      // const player = await resolvePlayerFromCommand(interaction);
+      // const period = resolvePeriodFromCommand(player.region, interaction);
+      // const filters = await getFiltersFromCommand(interaction);
+      // const path = commandToURL(interaction, {
+      //   ...player,
+      //   ...getCustomPeriodParams(interaction),
+      //   ...filters,
+      // });
+
+      // return Promise.all([
+      //   render(player, period, filters, interaction.locale),
+      //   buttonRefresh(interaction, path),
+      //   getBlitzStarsLinkButton(player.region, player.id),
+      // ]);
     },
 
     autocomplete: (interaction) => {

packages/bot/src/commands/today.ts

@@ -1,50 +1,47 @@
-import { gameDefinitions } from '../core/blitzkit/nonBlockingPromises';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
-import { addFilterOptions } from '../core/discord/addFilterOptions';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { buttonRefresh } from '../core/discord/buttonRefresh';
-import { commandToURL } from '../core/discord/commandToURL';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
-import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
-import { resolvePeriodFromCommand } from '../core/discord/resolvePeriodFromCommand';
-import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { type CommandRegistry } from '../events/interactionCreate';
-import { renderBreakdown } from './breakdown/render';
+import { gameDefinitions } from "../core/blitzkit/nonBlockingPromises";
+import { addFilterOptions } from "../core/discord/addFilterOptions";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { getFiltersFromButton } from "../core/discord/getFiltersFromButton";
+import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
+import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
+import { translator } from "../core/localization/translator";
+import { type CommandRegistry } from "../events/interactionCreate";
+import { renderBreakdown } from "./breakdown/render";
 
 export const todayCommand = new Promise<CommandRegistry>(async (resolve) => {
   const awaitedGameDefinitions = await gameDefinitions;
 
   resolve({
     command: addFilterOptions(
-      createLocalizedCommand('today'),
+      createLocalizedCommand("today"),
       awaitedGameDefinitions.nations,
     ).addStringOption(addUsernameChoices),
 
     async handler(interaction) {
-      const player = await resolvePlayerFromCommand(interaction);
-      const period = resolvePeriodFromCommand(
-        player.region,
-        interaction,
-        'today',
-      );
-      const filters = await getFiltersFromCommand(interaction);
-      const path = commandToURL(interaction, {
-        ...player,
-        ...getCustomPeriodParams(interaction, true),
-        ...filters,
-      });
+      const { strings } = translator(interaction.locale);
+      return strings.bot.commands.dead;
 
-      return [
-        ...(await renderBreakdown(player, period, filters, interaction.locale)),
-        buttonRefresh(interaction, path),
-        await getBlitzStarsLinkButton(player.region, player.id),
-      ];
+      // const player = await resolvePlayerFromCommand(interaction);
+      // const period = resolvePeriodFromCommand(
+      //   player.region,
+      //   interaction,
+      //   'today',
+      // );
+      // const filters = await getFiltersFromCommand(interaction);
+      // const path = commandToURL(interaction, {
+      //   ...player,
+      //   ...getCustomPeriodParams(interaction, true),
+      //   ...filters,
+      // });
+
+      // return [
+      //   ...(await renderBreakdown(player, period, filters, interaction.locale)),
+      //   buttonRefresh(interaction, path),
+      //   await getBlitzStarsLinkButton(player.region, player.id),
+      // ];
     },
 
     autocomplete: (interaction) => {

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

@@ -1,11 +1,13 @@
 import {
+  fetchAverageDefinitions,
   fetchDiscoveredIdsDefinitions,
   fetchGameDefinitions,
   fetchMapDefinitions,
   fetchTankDefinitions,
   fetchTankNames,
-} from '@blitzkit/core';
+} from "@blitzkit/core";
 
+export const averageDefinitions = fetchAverageDefinitions();
 export const tankDefinitions = fetchTankDefinitions();
 export const gameDefinitions = fetchGameDefinitions();
 export const tankNames = fetchTankNames();

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

@@ -1,29 +1,37 @@
-import { usersDatabase } from '../db/users';
-import { client } from '../discord/client';
+import { usersDatabase } from "../db/users";
+import { client } from "../discord/client";
 
-const EXIT_EVENTS = [
-  'beforeExit',
-  'exit',
-  'SIGINT',
-  'SIGTERM',
-  'SIGUSR1',
-  'SIGUSR2',
-];
+const EXIT_EVENTS = ["SIGINT", "SIGTERM", "SIGUSR1", "SIGUSR2"];
 
-async function cleanup() {
-  console.log('Cleaning up...');
+let cleaningUp = false;
 
-  await Promise.all([usersDatabase.$disconnect(), client.destroy()]);
+async function cleanup(signal: string) {
+  if (cleaningUp) return;
+  cleaningUp = true;
 
-  console.log('Gracefully exiting...');
+  console.log(`Cleaning up... (${signal})`);
+
+  try {
+    await Promise.all([usersDatabase.$disconnect(), client.destroy()]);
+  } catch (err) {
+    console.error("Cleanup error:", err);
+  }
+
+  console.log("Gracefully exiting...");
 
-  EXIT_EVENTS.forEach((event) => process.off(event, cleanup));
   process.exit(0);
 }
 
 export function registerProcesses() {
-  process.on('uncaughtException', console.error);
-  client.on('error', console.error);
+  process.on("uncaughtException", (err) => {
+    console.error("uncaughtException:", err);
+  });
 
-  EXIT_EVENTS.forEach((event) => process.on(event, cleanup));
+  process.on("unhandledRejection", (err) => {
+    console.error("unhandledRejection:", err);
+  });
+
+  client.on("error", console.error);
+
+  EXIT_EVENTS.forEach((event) => process.on(event, () => cleanup(event)));
 }

packages/bot/src/core/blitzstars/filterStats.ts

@@ -3,8 +3,10 @@ import type { SupplementaryStats } from "@blitzkit/core/src/blitz/getAccountInfo
 import { calculateWN8 } from "@blitzkit/core/src/statistics/calculateWN8";
 import type { BlitzStats } from "@blitzkit/core/src/statistics/compositeStats";
 import { sumAllStats } from "@blitzkit/core/src/statistics/sumAllStats";
-import { tankDefinitions } from "../blitzkit/nonBlockingPromises";
-import { blitzStarsTankAverages } from "./tankAverages";
+import {
+  averageDefinitions,
+  tankDefinitions,
+} from "../blitzkit/nonBlockingPromises";
 
 export interface StatFilters {
   nation?: string;
@@ -16,13 +18,13 @@ export interface StatFilters {
 
 export async function filterStats(
   { diff, order }: DiffedTankStats,
-  filters: StatFilters
+  filters: StatFilters,
 ) {
   // tank, if provided, takes priority over all other filters
   if (filters.tank) filters = { tank: filters.tank };
 
   const awaitedTankDefinitions = await tankDefinitions;
-  const awaitedTankAverages = await blitzStarsTankAverages;
+  const awaitedTankAverages = await averageDefinitions;
   const filteredOrder = order.filter((id) => {
     const entry = awaitedTankDefinitions.tanks[id];
 
@@ -44,26 +46,28 @@ export async function filterStats(
   const stats = sumAllStats(filteredOrder.map((id) => diff[id]));
   const battlesOfTanksWithAverages = filteredOrder.reduce<number>(
     (accumulator, id) =>
-      awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator,
-    0
+      awaitedTankAverages.averages[id]
+        ? accumulator + diff[id].battles
+        : accumulator,
+    0,
   );
   const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>(
     (accumulator, id) =>
       awaitedTankDefinitions.tanks[id]
         ? accumulator + diff[id].battles
         : accumulator,
-    0
+    0,
   );
   const supplementary = {
     WN8:
       filteredOrder.reduce<number>(
         (accumulator, id) =>
-          awaitedTankAverages[id]
+          awaitedTankAverages.averages[id]
             ? accumulator +
-              calculateWN8(awaitedTankAverages[id].all, diff[id]) *
+              calculateWN8(awaitedTankAverages.averages[id].mu, diff[id]) *
                 diff[id].battles
             : accumulator,
-        0
+        0,
       ) / battlesOfTanksWithAverages,
     tier:
       filteredOrder.reduce<number>(
@@ -72,7 +76,7 @@ export async function filterStats(
             ? accumulator +
               awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles
             : accumulator,
-        0
+        0,
       ) / battlesOfTanksWithTankDefinition,
   } satisfies SupplementaryStats;
 

packages/bot/src/core/blitzstars/tankAverages.ts

@@ -1,101 +0,0 @@
-import { BlitzStats } from '@blitzkit/core';
-import { context } from '@blitzkit/core/src/blitzkit/context';
-
-interface SpecialStats {
-  winrate: number;
-  damageRatio: number;
-  kdr: number;
-  damagePerBattle: number;
-  killsPerBattle: number;
-  hitsPerBattle: number;
-  spotsPerBattle: number;
-  wpm: number;
-  dpm: number;
-  kpm: number;
-  hitRate: number;
-  survivalRate: number;
-}
-
-export type Percentiles = [
-  number,
-  number,
-  number,
-  number,
-  number,
-  number,
-  number,
-  number,
-  number,
-];
-
-export interface SpecialPercentiles {
-  winRate: Percentiles;
-  damageRatio: Percentiles;
-  kdr: Percentiles;
-  damagePerBattle: Percentiles;
-  killsPerBattle: Percentiles;
-  hitsPerBattle: Percentiles;
-  spotsPerBattle: Percentiles;
-  wpm: Percentiles;
-  dpm: Percentiles;
-  kpm: Percentiles;
-  hitRate: Percentiles;
-  survivalRate: Percentiles;
-}
-
-export interface MeanSd {
-  winrateMean: number;
-  winrateSd: number;
-  hitRateMean: number;
-  hitRateSd: number;
-  survivalRateMean: number;
-  survivalRateSd: number;
-  damageRatioMean: number;
-  damageRatioSd: number;
-  kdrMean: number;
-  kdrSd: number;
-  dpbMean: number;
-  dpbSd: number;
-  kpbMean: number;
-  kpbSd: number;
-  hpbMean: number;
-  hpbSd: number;
-  spbMean: number;
-  spbSd: number;
-}
-
-export interface IndividualTankAverage {
-  _id: number;
-  battle_life_time: number;
-  total_battle_life_time: number;
-  number_of_players: number;
-  tank_id: number;
-  all: BlitzStats;
-  special: SpecialStats;
-  percentiles: SpecialPercentiles;
-  percentiles_player_count: number;
-  meanSd: MeanSd;
-  shotEff: number;
-  last_update: number;
-}
-
-export type BlitzStarsTankAverages = Record<number, IndividualTankAverage>;
-
-export const blitzStarsTankAverages = fetch(
-  'https://www.blitzstars.com/api/tankaverages.json',
-)
-  .then((response) => response.json())
-  .then((json) => {
-    if (context === 'server') {
-      const partialTankAverages: BlitzStarsTankAverages = {};
-
-      (json as IndividualTankAverage[]).forEach((individualTankAverage) => {
-        partialTankAverages[individualTankAverage.tank_id] =
-          individualTankAverage;
-      });
-
-      return partialTankAverages;
-    } else {
-      return json as BlitzStarsTankAverages;
-    }
-  });

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

@@ -1,9 +1,9 @@
-import { Client, GatewayIntentBits } from 'discord.js';
-import { interactionCreate } from '../../events/interactionCreate';
-import { ready } from '../../events/ready';
+import { Client, GatewayIntentBits } from "discord.js";
+import { interactionCreate } from "../../events/interactionCreate";
+import { ready } from "../../events/ready";
 
 export const client = new Client({
   intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
 })
-  .on('ready', ready)
-  .on('interactionCreate', interactionCreate);
+  .on("clientReady", ready)
+  .on("interactionCreate", interactionCreate);

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

@@ -22,11 +22,11 @@ export function createLocalizedCommand(
   command: string,
   sub?:
     | CreateLocalizedCommandSubcommand[]
-    | CreateLocalizedCommandSubcommandGroup[]
+    | CreateLocalizedCommandSubcommandGroup[],
 ) {
   const commandPathItem = command.replaceAll(
     "-",
-    "_"
+    "_",
   ) as keyof BlitzKitStrings["bot"]["commands"];
   const { strings } = translator(Locale.EnglishUS);
   const slashCommand = new SlashCommandBuilder()
@@ -35,14 +35,14 @@ export function createLocalizedCommand(
       localizationObject(
         (strings) => strings.bot.commands[commandPathItem].name,
         undefined,
-        true
-      )
+        true,
+      ),
     )
     .setDescription(strings.bot.commands[commandPathItem].description)
     .setDescriptionLocalizations(
       localizationObject(
-        (strings) => strings.bot.commands[commandPathItem].description
-      )
+        (strings) => strings.bot.commands[commandPathItem].description,
+      ),
     );
 
   if (sub) {
@@ -56,7 +56,7 @@ export function createLocalizedCommand(
               }
             ).subcommands[subItem.subcommand].name,
           undefined,
-          true
+          true,
         );
         const subcommandDescriptionLocalizations = localizationObject(
           (strings) =>
@@ -64,7 +64,7 @@ export function createLocalizedCommand(
               strings.bot.commands[commandPathItem] as unknown as {
                 subcommands: Record<string, { description: string }>;
               }
-            ).subcommands[subItem.subcommand].description
+            ).subcommands[subItem.subcommand].description,
         );
 
         slashCommand.addSubcommand((option) => {
@@ -78,7 +78,7 @@ export function createLocalizedCommand(
                 strings.bot.commands[commandPathItem] as unknown as {
                   subcommands: Record<string, { description: string }>;
                 }
-              ).subcommands[subItem.subcommand].description
+              ).subcommands[subItem.subcommand].description,
             )
             .setDescriptionLocalizations(subcommandDescriptionLocalizations);
         });
@@ -91,7 +91,7 @@ export function createLocalizedCommand(
               }
             ).groups[subItem.group].name,
           undefined,
-          true
+          true,
         );
         const subcommandDescriptionLocalizations = localizationObject(
           (strings) =>
@@ -99,7 +99,7 @@ export function createLocalizedCommand(
               strings.bot.commands[commandPathItem] as unknown as {
                 groups: Record<string, { description: string }>;
               }
-            ).groups[subItem.group].description
+            ).groups[subItem.group].description,
         );
 
         slashCommand.addSubcommandGroup((option) => {
@@ -113,7 +113,7 @@ export function createLocalizedCommand(
                 strings.bot.commands[commandPathItem] as unknown as {
                   groups: Record<string, { description: string }>;
                 }
-              ).groups[subItem.group].description
+              ).groups[subItem.group].description,
             )
             .setDescriptionLocalizations(subcommandDescriptionLocalizations);
         });

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

@@ -19,9 +19,9 @@ export function localizationObject(
         (!strict || validNameRegex.test(translation)) && translation.length > 0;
 
       if (!isValid) {
-        console.warn(
-          `Invalid localization for ${locale} (${path}): ${translation}; skipping...`
-        );
+        // console.warn(
+        //   `Invalid localization for ${locale} (${path}): ${translation}; skipping...`
+        // );
         return localizations;
       }
 

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

@@ -1,10 +1,10 @@
-import { AutocompleteInteraction, CacheType } from 'discord.js';
-import { commands } from '..';
+import { AutocompleteInteraction, CacheType } from "discord.js";
+import { commands } from "..";
 
 export async function handleAutocomplete(
   interaction: AutocompleteInteraction<CacheType>,
 ) {
-  const command = (await commands)[interaction.commandName];
+  const command = commands[interaction.commandName];
 
   if (!command) {
     console.error(`No command matching ${interaction.commandName} was found.`);

packages/bot/src/events/interactionCreate/handlers/button.tsx

@@ -1,13 +1,13 @@
-import { ButtonInteraction, CacheType } from 'discord.js';
-import { commands } from '..';
-import { normalizeInteractionReturnable } from '../../../core/discord/normalizeInteractionReturnable';
+import { ButtonInteraction, CacheType } from "discord.js";
+import { commands } from "..";
+import { normalizeInteractionReturnable } from "../../../core/discord/normalizeInteractionReturnable";
 
 export async function handleButton(interaction: ButtonInteraction<CacheType>) {
   await interaction.deferUpdate();
 
   const url = new URL(`https://example.com/${interaction.customId}`);
-  const commandName = url.pathname.split('/')[1];
-  const button = (await commands)[commandName]?.button;
+  const commandName = url.pathname.split("/")[1];
+  const button = commands[commandName]?.button;
 
   if (!button) {
     throw new Error(`Button handler not found for "${commandName}"`);
@@ -16,7 +16,7 @@ export async function handleButton(interaction: ButtonInteraction<CacheType>) {
   if (interaction.message.interaction?.user.id !== interaction.user.id) {
     interaction.followUp({
       ephemeral: true,
-      content: 'You are not the author of this command.',
+      content: "You are not the author of this command.",
     });
     return;
   }

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

@@ -17,12 +17,11 @@ import { translator } from "../../../core/localization/translator";
 import type { Writeable } from "../../../types/writable";
 
 export async function handleChatInputCommand(
-  interaction: ChatInputCommandInteraction<CacheType>
+  interaction: ChatInputCommandInteraction<CacheType>,
 ) {
   await interaction.deferReply();
 
-  const awaitedCommands = await commands;
-  const registry = awaitedCommands[interaction.commandName];
+  const registry = commands[interaction.commandName];
 
   try {
     const returnable = await registry.handler(interaction);
@@ -36,7 +35,7 @@ export async function handleChatInputCommand(
         if (typeof object === "string") {
           chunks.push([object]);
         } else chunks.at(-1)?.push(object!);
-      }
+      },
     );
 
     let index = 0;
@@ -59,7 +58,7 @@ export async function handleChatInputCommand(
         } else if (psa.data.type === "image") {
           if (!reply.files) reply.files = [];
           (reply.files as Writeable<typeof reply.files>).push(
-            new AttachmentBuilder(psa.data.image)
+            new AttachmentBuilder(psa.data.image),
           );
           reply.content = reply.content ?? psa.data.title;
         }
@@ -72,7 +71,7 @@ export async function handleChatInputCommand(
           (
             reply.components[0] as ActionRowBuilder<ButtonBuilder>
           ).addComponents(
-            psa.data.links.map(({ title, url }) => buttonLink(url, title))
+            psa.data.links.map(({ title, url }) => buttonLink(url, title)),
           );
         }
       }
@@ -103,7 +102,7 @@ export async function handleChatInputCommand(
         } else if (psa.data.type === "image") {
           if (!followUp.files) followUp.files = [];
           (followUp.files as Writeable<typeof followUp.files>).push(
-            new AttachmentBuilder(psa.data.image)
+            new AttachmentBuilder(psa.data.image),
           );
           followUp.content = followUp.content ?? psa.data.title;
         }
@@ -116,7 +115,7 @@ export async function handleChatInputCommand(
           (
             followUp.components[0] as ActionRowBuilder<ButtonBuilder>
           ).addComponents(
-            psa.data.links.map(({ title, url }) => buttonLink(url, title))
+            psa.data.links.map(({ title, url }) => buttonLink(url, title)),
           );
         }
 
@@ -133,7 +132,7 @@ export async function handleChatInputCommand(
         new ButtonBuilder()
           .setLabel(strings.bot.common.errors.get_help)
           .setURL("https://discord.gg/nDt7AjGJQH")
-          .setStyle(ButtonStyle.Link)
+          .setStyle(ButtonStyle.Link),
       ),
     ];
     if (error instanceof UserError) {

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

@@ -72,13 +72,13 @@ interface CommandRegistryImplicit extends CommandRegistryBase {
 interface CommandRegistryExplicit extends CommandRegistryBase {
   handlesInteraction?: false;
   handler: (
-    interaction: ChatInputCommandInteraction<CacheType>
+    interaction: ChatInputCommandInteraction<CacheType>,
   ) => InteractionReturnable;
 }
 
 export type CommandRegistry = CommandRegistryImplicit | CommandRegistryExplicit;
 
-export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
+export const commandsArray: Promise<CommandRegistry>[] = [
   // auctionCommand,
   permissionsCommand,
   debugCommand,
@@ -101,34 +101,28 @@ export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
   replayCommand,
 ];
 
-export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => {
-  return rawCommands.reduce<Record<string, CommandRegistry>>(
-    (commands, registry, index) => {
-      if (registry.status === "rejected") {
-        console.warn(
-          `Command ${index} failed to load; skipping...`,
-          registry.reason
-        );
-        return commands;
-      }
-      return { ...commands, [registry.value.command.name]: registry.value };
-    },
-    {}
-  );
-});
+export const commands: Record<string, CommandRegistry> = {};
+const commandsFulfilled: CommandRegistry[] = [];
+
+let index = 0;
+for (const registry of await Promise.allSettled(commandsArray)) {
+  if (registry.status === "rejected") {
+    console.warn(`Command ${index} rejected`, registry.reason);
+    continue;
+  }
+
+  commandsFulfilled.push(registry.value);
+  commands[registry.value.command.name] = registry.value;
+  index++;
+}
 
 const rest = new REST().setToken(assertSecret(import.meta.env.DISCORD_TOKEN));
+const body = commandsFulfilled.map((registry) => registry.command.toJSON());
+const applicationCommandsRoute = Routes.applicationCommands(
+  assertSecret(import.meta.env.DISCORD_CLIENT_ID),
+);
 
-commands.then((awaitedCommands) => {
-  const body = Object.values(awaitedCommands).map((registry) =>
-    registry.command.toJSON()
-  );
-
-  rest.put(
-    Routes.applicationCommands(assertSecret(import.meta.env.DISCORD_CLIENT_ID)),
-    { body }
-  );
-});
+await rest.put(applicationCommandsRoute, { body });
 
 export async function interactionCreate(interaction: Interaction<CacheType>) {
   if (interaction.isAutocomplete()) {

packages/bot/src/main.ts

@@ -1,27 +1,27 @@
-import { assertSecret } from '@blitzkit/core';
-import { ActivityType, ShardingManager } from 'discord.js';
+import { assertSecret } from "@blitzkit/core";
+import { ActivityType, ShardingManager } from "discord.js";
 import {
   discoveredIdsDefinitions,
   tankDefinitions,
-} from './core/blitzkit/nonBlockingPromises';
+} from "./core/blitzkit/nonBlockingPromises";
 
+let manager: ShardingManager;
 let iteration = 0;
 const interval = setInterval(async () => {
-  iteration++;
+  console.log(`Attempting launch on iteration ${++iteration}`);
 
-  console.log(`Attempting launch on iteration ${iteration}`);
-
-  const manager = new ShardingManager('dist/bot/workers/bot.js', {
+  manager?.respawnAll();
+  manager = new ShardingManager("dist/bot/workers/bot.js", {
     token: assertSecret(import.meta.env.DISCORD_TOKEN),
   });
 
   const shards = await manager
-    .on('shardCreate', (shard) => {
+    .on("shardCreate", (shard) => {
       clearInterval(interval);
       console.log(`🟡 Launching shard ${shard.id}`);
-      shard.on('ready', () => console.log(`🟢 Launched shard ${shard.id}`));
+      shard.on("ready", () => console.log(`🟢 Launched shard ${shard.id}`));
     })
-    .spawn();
+    .spawn({ timeout: 60000 });
 
   try {
     let servers = 0;
@@ -29,7 +29,7 @@ const interval = setInterval(async () => {
     let users = 0;
 
     for (const [, shard] of shards) {
-      const guilds = (await shard.fetchClientValue('guilds.cache')) as any;
+      const guilds = (await shard.fetchClientValue("guilds.cache")) as any;
 
       servers += guilds.length;
 
@@ -66,7 +66,7 @@ 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');
+            await botMember.setNickname("BlitzKit");
           } catch {}
         }
       },
@@ -74,8 +74,8 @@ const interval = setInterval(async () => {
     );
   } catch (error) {
     console.warn(
-      'An error occurred when setting up presence, ignoring to keep the process alive',
+      "An error occurred when setting up presence, ignoring to keep the process alive",
       error,
     );
   }
-}, 5000);
+}, 15000);

packages/bot/src/workers/bot.ts

@@ -1,6 +1,6 @@
-import { assertSecret } from '@blitzkit/core';
-import { registerProcesses } from '../core/blitzkit/processes';
-import { client } from '../core/discord/client';
+import { assertSecret } from "@blitzkit/core";
+import { registerProcesses } from "../core/blitzkit/processes";
+import { client } from "../core/discord/client";
 
 console.log(`🟡 Launching bot ${client.shard?.ids[0]}`);
 

packages/core/package.json

@@ -10,12 +10,14 @@
     "@octokit/rest": "^22.0.0",
     "@prisma/client": "^6.16.2",
     "@types/adm-zip": "^0.5.7",
+    "@types/bun": "^1.3.1",
     "@types/lodash-es": "^4.17.12",
     "@types/lz4js": "^0.2.1",
     "@types/three": "^0.180.0",
     "adm-zip": "^0.5.16",
     "crc": "^4.3.2",
     "dotenv": "^17.2.2",
+    "fast-xml-parser": "^5.3.2",
     "lodash-es": "^4.17.21",
     "lz4js": "^0.2.0",
     "pickleparser": "^0.2.1",

packages/core/src/blitz/index.ts

@@ -1,32 +1,33 @@
-export * from './canSplash';
-export * from './clans';
-export * from './classes';
-export * from './constants';
-export * from './equipmentPrice';
-export * from './fetchBlitz';
-export * from './fetchGlossary';
-export * from './generateStats';
-export * from './getAccountAchievements';
-export * from './getAccountInfo';
-export * from './getClanAccountInfo';
-export * from './getClanInfo';
-export * from './getLeagueFromScore';
-export * from './getRatingInfo';
-export * from './getRatingLeague';
-export * from './getRatingNeighbors';
-export * from './getTankStats';
-export * from './idToRegion';
-export * from './isOnGoingRatingSeason';
-export * from './isValidBlitzId';
-export * from './nations';
-export * from './normalizeExtra';
-export * from './normalizeIds';
-export * from './permanentSkills';
-export * from './rating';
-export * from './regions';
-export * from './regionSubdomainToRegion';
-export * from './regionToRegionSubdomain';
-export * from './searchClansAcrossRegions';
-export * from './searchCurrentRatingPlayers';
-export * from './searchPlayersAcrossRegions';
-export * from './toUniqueId';
+export * from "./canSplash";
+export * from "./clans";
+export * from "./classes";
+export * from "./constants";
+export * from "./equipmentPrice";
+export * from "./fetchBlitz";
+export * from "./fetchGlossary";
+export * from "./generateStats";
+export * from "./getAccountAchievements";
+export * from "./getAccountInfo";
+export * from "./getClanAccountInfo";
+export * from "./getClanInfo";
+export * from "./getLeagueFromScore";
+export * from "./getRatingInfo";
+export * from "./getRatingLeague";
+export * from "./getRatingNeighbors";
+export * from "./getTankStats";
+export * from "./idToRegion";
+export * from "./isOnGoingRatingSeason";
+export * from "./isValidBlitzId";
+export * from "./nations";
+export * from "./normalizeExtra";
+export * from "./normalizeIds";
+export * from "./permanentSkills";
+export * from "./rating";
+export * from "./readDVPL";
+export * from "./regions";
+export * from "./regionSubdomainToRegion";
+export * from "./regionToRegionSubdomain";
+export * from "./searchClansAcrossRegions";
+export * from "./searchCurrentRatingPlayers";
+export * from "./searchPlayersAcrossRegions";
+export * from "./toUniqueId";

packages/core/src/blitz/readDVPL.ts

@@ -1,5 +1,5 @@
-import { crc32 } from 'crc';
-import { decompressBlock } from 'lz4js';
+import { crc32 } from "crc";
+import { decompressBlock } from "lz4js";
 
 /**
  * Thanks Maddoxkkm! Modified heavily to be modern.
@@ -9,10 +9,10 @@ export function readDVPL(buffer: Buffer) {
   const footerBuffer = buffer.subarray(buffer.length - 20, buffer.length);
 
   if (
-    footerBuffer.toString('utf8', 16, 20) !== 'DVPL' ||
+    footerBuffer.toString("utf8", 16, 20) !== "DVPL" ||
     footerBuffer.length !== 20
   ) {
-    throw new SyntaxError('Invalid DVPL footer');
+    throw new SyntaxError("Invalid DVPL footer");
   }
 
   const footerData = {
@@ -24,15 +24,15 @@ export function readDVPL(buffer: Buffer) {
   const targetBlock = buffer.subarray(0, buffer.length - 20);
 
   if (targetBlock.length !== footerData.cSize) {
-    throw new RangeError('DVPL size mismatch');
+    throw new RangeError("DVPL size mismatch");
   }
   if (crc32(targetBlock) !== footerData.crc32) {
-    throw new TypeError('DVPL CRC32 mismatch');
+    throw new TypeError("DVPL CRC32 mismatch");
   }
 
   if (footerData.type === 0) {
     if (!(footerData.oSize === footerData.cSize && footerData.type === 0)) {
-      throw new RangeError('DVPL type and size mismatch');
+      throw new RangeError("DVPL type and size mismatch");
     }
 
     return targetBlock;
@@ -44,17 +44,17 @@ export function readDVPL(buffer: Buffer) {
       destination,
       0,
       source.length,
-      0,
+      0
     );
-    
+
     if (decompressedSize !== footerData.oSize) {
       throw new RangeError(
-        `Decompressed DVPL size mismatch (${decompressedSize} vs ${footerData.oSize})`,
+        `Decompressed DVPL size mismatch (${decompressedSize} vs ${footerData.oSize})`
       );
     }
-    
+
     return Buffer.from(destination);
   } else {
-    throw new SyntaxError('Unknown DVPL format');
+    throw new SyntaxError("Unknown DVPL format");
   }
 }

packages/core/src/blitzkit/asset.ts

@@ -1,4 +1,4 @@
-import { assertSecret } from './assertSecret';
+import { assertSecret } from "./assertSecret";
 
 export function asset(path: string) {
   return `${assertSecret(import.meta.env.PUBLIC_ASSET_BASE)}/${path}`;

packages/core/src/blitzkit/checkConsumableProvisionInclusivity.ts

@@ -4,63 +4,54 @@ import {
   GunDefinition,
   Provision,
   TankDefinition,
-} from '../protos';
+} from "../protos";
 
 export function checkConsumableProvisionInclusivity(
   consumableProvision: Consumable | Provision,
   tank: TankDefinition,
-  gun: GunDefinition,
+  gun: GunDefinition
 ) {
-  const included =
-    !consumableProvision.game_mode_exclusive &&
-    consumableProvision.include?.every((rule) => {
-      switch (rule.filter_type!.$case) {
-        case 'tiers':
-          return (
-            rule.filter_type!.value.min <= tank.tier &&
-            tank.tier <= rule.filter_type!.value.max
-          );
+  const included = consumableProvision.include?.every((rule) => {
+    switch (rule.filter_type!.$case) {
+      case "tiers":
+        return (
+          rule.filter_type!.value.min <= tank.tier &&
+          tank.tier <= rule.filter_type!.value.max
+        );
 
-        case 'ids':
-          return rule.filter_type!.value.ids.includes(tank.id);
+      case "ids":
+        return rule.filter_type!.value.ids.includes(tank.id);
 
-        case 'nations':
-          return rule.filter_type!.value.nations.includes(tank.nation);
+      case "nations":
+        return rule.filter_type!.value.nations.includes(tank.nation);
 
-        case 'categories':
-          throw new SyntaxError('Category filtering found in include rule');
-      }
-    });
-  const excluded =
-    consumableProvision.game_mode_exclusive ||
-    consumableProvision.exclude?.some((rule) => {
-      switch (rule.filter_type!.$case) {
-        case 'tiers':
-          return (
-            rule.filter_type!.value.min <= tank.tier &&
-            tank.tier <= rule.filter_type!.value.max
-          );
+      case "categories":
+        throw new SyntaxError("Category filtering found in include rule");
+    }
+  });
+  const excluded = consumableProvision.exclude?.some((rule) => {
+    switch (rule.filter_type!.$case) {
+      case "tiers":
+        return (
+          rule.filter_type!.value.min <= tank.tier &&
+          tank.tier <= rule.filter_type!.value.max
+        );
 
-        case 'ids':
-          return rule.filter_type!.value.ids.includes(tank.id);
+      case "ids":
+        return rule.filter_type!.value.ids.includes(tank.id);
 
-        case 'nations':
-          return rule.filter_type!.value.nations.includes(tank.nation);
+      case "nations":
+        return rule.filter_type!.value.nations.includes(tank.nation);
 
-        case 'categories':
-          return rule.filter_type!.value.categories.some((category) => {
-            switch (category) {
-              case ConsumableTankCategoryFilterCategory.CLIP:
-                return gun.gun_type!.$case !== 'regular';
-            }
-          });
-      }
-    });
+      case "categories":
+        return rule.filter_type!.value.categories.some((category) => {
+          switch (category) {
+            case ConsumableTankCategoryFilterCategory.CLIP:
+              return gun.gun_type!.$case !== "regular";
+          }
+        });
+    }
+  });
 
-  return (
-    !consumableProvision.game_mode_exclusive &&
-    consumableProvision.include?.length > 0 &&
-    included &&
-    !excluded
-  );
+  return consumableProvision.include?.length > 0 && included && !excluded;
 }

packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts

@@ -17,7 +17,7 @@ export async function getArchivedLatestSeasonNumber() {
   if (ratingInfo.detail) {
     const regionsURL = (
       (await fetch(
-        `https://api.github.com/repos/tresabhi/${assertSecret(
+        `https://api.github.com/repos/${assertSecret(
           import.meta.env.PUBLIC_ASSET_REPO
         )}/git/trees/main`
       ).then((response) => response.json())) as GitHubTrees

packages/core/src/blitzkit/youtubers.ts

@@ -6,4 +6,5 @@ export const youtubers = [
   { id: 'UCLMEfqtlwLDN-UXX21RiEww', name: 'WoT Blitz Best Replays' },
   { id: 'UC3fZbetRUFoJL0IEN7IhG0Q', name: 'EconomicsMate' },
   { id: 'UCtsUVwBlhEnUunAKLn2dtsg', name: 'Megalion69' },
+  { id: 'UCJjATWiGfOHoQYfutEwAIIg', name: 'WoTB Joe' },
 ];

packages/core/src/index.ts

@@ -1,10 +1,10 @@
-export * from './blitz';
-export * from './blitzkit';
-export * from './imgur';
-export * from './math';
-export * from './patreon';
-export * from './protobuf';
-export * from './protos';
-export * from './statistics';
-export * from './streams';
-export * from './types';
+export * from "./blitz";
+export * from "./blitzkit";
+export * from "./imgur";
+export * from "./math";
+export * from "./patreon";
+export * from "./protobuf";
+export * from "./protos";
+export * from "./statistics";
+export * from "./streams";
+export * from "./types";

packages/i18n/src/strings.ts

@@ -35,7 +35,7 @@ for (const locale in stringsRaw) {
   const localeStrings = stringsRaw[locale];
   STRINGS[locale] = merge(
     stringsRaw[locales.default],
-    localeStrings
+    localeStrings,
   ) as BlitzKitStrings;
 }
 

packages/i18n/strings/en.json

@@ -15,7 +15,8 @@
       "hp": "{value}hp",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}°/s",
+      "plus": "+{value}"
     },
 
     "gun_types": {
@@ -26,8 +27,8 @@
 
     "shells": {
       "ap": "AP",
-      "apcr": "APCR",
-      "heat": "HEAT",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "HE"
     },
 
@@ -356,9 +357,18 @@
     },
 
     "commands": {
+      "dead": "# Stat Commands Are Dead\n\nThe BlitzKit Discord bot used to use BlitzStars to fetch periodic statistics. BlitzStars has enabled aggressive Cloudflare protections; hence, disabling BlitzKit from using BlitzStar's API. This has impacted the following commands:\n\n- `/stats`\n- `/today`\n- `/breakdown`\n- `/evolution`\n- `/full-stats`\n\nPlease use [Aftermath](<https://amth.one/invite>) as an alternative which is completely independent of BlitzStars. BlitzKit-hosted stat commands will return in the near future.",
+
       "replay": {
         "name": "replay",
-        "description": "Display replay results"
+        "description": "Display replay results",
+
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
 
       "research": {
@@ -759,11 +769,17 @@
         "count_singular": "1 tank",
         "count_plural": "{count} tanks",
         "sorting_by": "Sorting by {name}",
+        "clear": "Clear",
+        "tier": "Tier {tier}",
+        "passive": "{name} (Passive)",
+        "active": "{name} (Active)",
+
         "no_tanks_found": {
           "body": "No tanks found.",
           "search_again": "Try searching again.",
           "clear_filters": "Try clearing filters."
         },
+
         "sort": {
           "meta.none": "none",
           "survivability.health": "health",
@@ -906,8 +922,8 @@
       },
 
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -917,7 +933,16 @@
           "next": "Next",
           "no_results": "No results"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} correct, {streak} streak",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancel",
+          "reveal": "Reveal"
+        },
+        "clear": "Clear",
+        "select_all": "Select all",
+        "tier": "Tier {tier}"
       },
 
       "tankopedia": {
@@ -1116,8 +1141,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
+            "class": "{tier} {class}",
+            "tier": "All tier {tier}",
             "all": "All tanks"
           },
           "values": {
@@ -1267,10 +1292,12 @@
             "upgrade": "Upgrade"
           },
           "provisions": {
-            "clear": "Clear"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "Clear"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           }
         }
       },

packages/i18n/strings/es.json

@@ -13,7 +13,8 @@
       "hp": "{value}hp",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}°/s",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Auto cargador",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "AP",
-      "apcr": "APCR",
-      "heat": "AEAC",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "AE"
     },
     "player_count_period": {
@@ -668,6 +669,10 @@
         "count_singular": "1 tanque",
         "count_plural": "{count} tanks",
         "sorting_by": "Sorting by {name}",
+        "clear": "Limpiar",
+        "tier": "Tier {tier}",
+        "passive": "{name} (Passive)",
+        "active": "{name} (Active)",
         "no_tanks_found": {
           "body": "No se encontraron tanques.",
           "search_again": "Intenta buscar de nuevo.",
@@ -803,8 +808,8 @@
         "randomize": "Randomize"
       },
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -814,7 +819,16 @@
           "next": "Next",
           "no_results": "Sin resultados"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} correct, {streak} streak",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancelar",
+          "reveal": "Reveal"
+        },
+        "clear": "Limpiar",
+        "select_all": "Seleccionar todo",
+        "tier": "Tier {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -1135,10 +1149,12 @@
             "upgrade": "Mejorar"
           },
           "provisions": {
-            "clear": "Limpiar"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "Limpiar"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           }
         }
       },

packages/i18n/strings/fr.json

@@ -1,7 +1,7 @@
 {
   "test": {
     "default": "teste",
-    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
+    "long": "Ceci est une longue chaîne de test. Vous ne DEVEZ JAMAIS le voir dans l'interface utilisateur. Mon fruit préféré est {fruit}, car il a la couleur {color}. Je l'aime tellement que je vais dire son nom 3 fois ! {fruit}! {fruit}! {fruit} ! Encore une fois, c'est {color}, pas {not_color}.",
     "fox": "Le renard brun et rapide saute par-dessus le chien paresseux."
   },
   "common": {
@@ -10,10 +10,11 @@
       "m": "{value}m",
       "mm": "{value}mm",
       "deg": "{value}°",
-      "hp": "{value}hp",
+      "hp": "{value}pv",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}°/s",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Chargement auto",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "AP",
-      "apcr": "APCR",
-      "heat": "HEAT",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "HE"
     },
     "player_count_period": {
@@ -186,11 +187,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
-        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
+        "clan_not_found": "# Impossible de trouver le clan\nImpossible de trouver «{search} ». Essayez de sélectionner un clan dans le résultat de la recherche.",
+        "player_not_found": "# Impossible de trouver l'utilisateur\nJe n'ai pas pu trouver l'utilisateur \"{search}\". Essayez de choisir un utilisateur dans le résultat de la recherche, en tapant un nom d'utilisateur valide, ou en utilisant la commande `/link`.",
         "player_not_linked": "# Utilisez `/link` pour commencer\nJe ne sais pas qui vous êtes, mais vous pouvez me le dire aujourd'hui !",
-        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
-        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
+        "tank_name_not_found": "# Char introuvable\nImpossible de trouver le char sous le nom \"{search}\".",
+        "tank_id_not_found": "# Char introuvable\nImpossible de trouver le char avec l'ID \"{search}\". Essayez de taper le nom du char au lieu d'un nombre.",
         "no_tank_stats": "# Aucune statistique de tank disponible\nCe joueur n'a pas de statistiques disponibles. Ce n'est peut-être pas le joueur que vous cherchez.",
         "get_help": "Aidez le serveur Discord",
         "uncaught_error": "# Blitzkit a rencontré une erreur !\nNous sommes désolés de cela. N'hésitez pas à [rejoindre le serveur officiel Discord](https://discord.gg/nDt7AjGJQH) pour obtenir de l'aide.",
@@ -284,19 +285,19 @@
           "name": "rang",
           "description": "Rang",
           "choices": {
-            "tier": "Tier {tier_1} - {tier_2}"
+            "tier": "Rang {tier_}1 - {tier_}2"
           }
         }
       },
       "periods": {
         "career": "Carrière",
         "today": "Aujourd'hui",
-        "days": "{days} days",
-        "custom": "{day_1} - {day_2} days"
+        "days": "{days} jours",
+        "custom": "{day_1} - {day_2} jours"
       },
       "filters": {
         "none": "Aucun filtre",
-        "tier": "Tier {tier}"
+        "tier": "Rang {tier}"
       },
       "no_data": {
         "battles_in_period": "",
@@ -339,19 +340,19 @@
         "body": {
           "subtitle": "Recherche",
           "total": "Total",
-          "research": "Research: {cost}",
-          "upgrades": "Upgrades: {cost}",
-          "purchase": "Purchase: {cost}",
-          "equipment": "Equipment: {cost}",
+          "research": "Recherche : {cost}",
+          "upgrades": "Améliorations : {cost}",
+          "purchase": "Achat : {cost}",
+          "equipment": "Équipement : {cost}",
           "estimation": "# Ceci est une estimation !\n\nCette liste peut inclure des chars déjà recherchés en raison de l'information inexacte fournie par Wargaming. Essayez de fournir un `char de départ` depuis la ligne lorsque vous utilisez la commande si vous le pouvez."
         },
         "errors": {
-          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
-          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
-          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
-          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
-          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
-          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
+          "non_tech_tree": "# {tank} n'est pas dans l'arbre technologique\n\nVous ne pouvez pas rechercher un char premium/de collection.",
+          "tier_1": "# {tank} est un char de rang I\n\nLe char de rang 1 sont déverrouillé gratuitement pour tous les joueurs.",
+          "already_researched": "# {tank} est déjà recherché\n\nEssayez de fournir un `char de départ` en utilisant la commande pour voir la progression d'une lignée.",
+          "start_end_equal": "# {tank} a été fourni deux fois\n\nAssurez-vous que `starting-tank` et `target-tank` sont différents.",
+          "tanks_not_on_line": "{tank_}1 et {tank_}2 ne sont pas sur la même ligne \n\nAssurez-vous que `starting-tank` et `target-tank` sont sur la même ligne d'arbre technologique.",
+          "unordered": "# {tank_1} niveau supérieur à {tank_2}\n\nAssurez-vous de fournir {tank_2} comme le `starting-tank` à la place car c'est le char de niveau inférieur."
         }
       },
       "about": {
@@ -394,7 +395,7 @@
           "wn8": "WN8",
           "winrate": "Taux de victoires",
           "damage": "Dégâts",
-          "unknown_tank": "Unknown tank {id}"
+          "unknown_tank": "Char {id} inconnu"
         }
       },
       "debug": {
@@ -430,12 +431,12 @@
         "options": {
           "threshold": {
             "name": "seuil",
-            "description": "The number of days inactive (default: {days} days)"
+            "description": "Le nombre de jours inactifs (par défaut: {days} jours)"
           }
         },
         "body": {
-          "subtitle": "Inactive for {days}+ days",
-          "listing": "{days} days"
+          "subtitle": "Inactif depuis plus de {days} jours",
+          "listing": "{days} jours"
         }
       },
       "full_stats": {
@@ -478,7 +479,7 @@
         "body": {
           "accounts_linked": "Comptes liés",
           "no_role_permissions": {
-            "title": "{name} failed to verify",
+            "title": "La vérification de {name} a échouée",
             "description": "Je n'ai pas l'autorisation de gérer les rôles."
           }
         },
@@ -493,11 +494,11 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "The max number of clan results (default: {limit})"
+            "description": "Nombre maximum de résultats du clan (par défaut: {limit})"
           }
         },
         "body": {
-          "title": "Clan search for {search} in region {region}",
+          "title": "Recherche de clan {search} dans la région {region}",
           "no_results": "Pas de clan trouvé"
         }
       },
@@ -507,11 +508,11 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "The max number of player results (default: {limit})"
+            "description": "Le nombre maximum de résultats de joueur (par défaut: {limit})"
           }
         },
         "body": {
-          "title": "Player search for {search} in region {region}",
+          "title": "Recherche de {search} dans la région {region}",
           "no_results": "Pas de joueur de trouvé"
         }
       },
@@ -531,13 +532,13 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "How many neighbors to display (default: {count})"
+            "description": "Combien de voisins afficher (par défaut : {count})"
           },
           "season": {
             "name": "saison",
             "description": "Numéro de saison (défaut : courant)",
             "choices": {
-              "current": "{season} (current)"
+              "current": "{season} (actuel)"
             }
           },
           "league": {
@@ -546,12 +547,12 @@
           }
         },
         "body": {
-          "top_players": "Top {count} players",
-          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
+          "top_players": "Top {count} joueurs",
+          "no_participation": "# {player} n'a pas joué de cotées dans la saison {season}\n\nCe joueur n'a pas participé à cette saison ou n'a pas dépassé l'étalonnage.",
           "no_ongoing_season": "Pas de saison en cours\n\nIl n'y a pas de saison de notation en cours actuellement.",
-          "deleted_player": "Deleted {id}",
+          "deleted_player": "{id} supprimé",
           "neighbors": "évaluer les voisins",
-          "more": "+ {count} more"
+          "more": "+ {count} plus"
         }
       },
       "today": {
@@ -566,7 +567,7 @@
         "name": "chars possédés",
         "description": "Affiche tous les chars d'un niveau",
         "body": {
-          "title": "# {name}'s owned tier {tier} tanks\n\n"
+          "title": "# Les chars du palier {tier} possédés par {name}"
         }
       },
       "permissions": {
@@ -602,92 +603,96 @@
         "name": "info-joueur",
         "description": "Informations de base sur un joueur",
         "body": {
-          "title": "{name}'s information",
-          "nickname": "Nickname",
+          "title": "Informations de {name}",
+          "nickname": "Pseudo",
           "battles": "Batailles",
           "winrate": "Taux de victoires",
           "account_id": "Account ID",
-          "created": "Created",
-          "last_battle": "Last battle"
+          "created": "Créé",
+          "last_battle": "Dernière bataille"
         }
       },
       "rating": {
-        "name": "rating",
-        "description": "Rating player's statistics",
+        "name": "côtée",
+        "description": "Statistiques des batailles cotées du joueur",
         "subcommands": {
           "today": {
             "name": "aujourd'hui",
-            "description": "Today's rating statistics"
+            "description": "Statistiques des batailles cotées d'aujourd'hui"
           },
           "season": {
             "name": "saison",
-            "description": "This season's rating statistics"
+            "description": "Statistiques des batailles cotées de cette saison"
           }
         },
         "body": {
           "subtitle": {
-            "today": "Today's rating statistics",
-            "season": "This season's rating statistics"
+            "today": "Statistiques de batailles cotées d'aujourd'hui",
+            "season": "Statistiques de batailles cotées cette saison"
           }
         },
         "errors": {
-          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
-          "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
+          "no_participation": "# {name} n’a pas joué en cotée\n\nCe joueur n’a pas participé au mode cotée cette saison.",
+          "unrecorded_stats": "# Statistiques actuellement indisponibles\n\nWargaming rencontre peut-être une interruption de service.\nSi une saison est en cours, les statistiques devraient être disponibles sous 24 heures."
         }
       }
     }
   },
   "website": {
     "redirect": {
-      "title": "301: moved permanently",
-      "body": "This page has moved. Redirecting..."
+      "title": "301 : déplacé définitivement",
+      "body": "Cette page a été déplacée. Redirection en cours…"
     },
     "settings": {
-      "title": "Settings",
-      "description": "Change BlitzKit settings",
-      "dev_mode": "Development mode",
-      "language": "Language"
+      "title": "Paramètres",
+      "description": "Modifier les paramètres de BlitzKit",
+      "dev_mode": "Mode développement",
+      "language": "Langue"
     },
     "common": {
       "player_search": {
-        "hint": "Search players...",
-        "no_results": "No results",
-        "searching": "Searching..."
+        "hint": "Recherche de joueurs...",
+        "no_results": "Aucun résultat",
+        "searching": "Recherche..."
       },
       "copy_button": {
-        "copied": "Copied!"
+        "copied": "Copié !"
       },
       "tank_search": {
-        "select_dialog_title": "Search for tanks",
-        "swap_dialog_title": "Swap tank",
-        "clear_filters": "Clear filters",
-        "login": "Login to use this",
-        "search_bar_hint": "Search tanks...",
-        "recent": "Recently viewed",
-        "select_all": "Select all",
-        "count_singular": "1 tank",
-        "count_plural": "{count} tanks",
-        "sorting_by": "Sorting by {name}",
+        "select_dialog_title": "Recherche de chars",
+        "swap_dialog_title": "Échanger le char",
+        "clear_filters": "Supprimer les filtres",
+        "login": "Connectez-vous pour utiliser ceci",
+        "search_bar_hint": "Recherche des tanks...",
+        "recent": "Vu récemment",
+        "select_all": "Sélectionner tout",
+        "count_singular": "1 char",
+        "count_plural": "{count} chars",
+        "sorting_by": "Trier par {name}",
+        "clear": "Effacer",
+        "tier": "Rang {tier}",
+        "passive": "{name} (Passif)",
+        "active": "{name} (actif)",
         "no_tanks_found": {
-          "body": "No tanks found.",
-          "search_again": "Try searching again.",
-          "clear_filters": "Try clearing filters."
+          "body": "Aucun tank trouvé.",
+          "search_again": "Essayez de chercher à nouveau.",
+          "clear_filters": "Essayez de supprimer les filtres."
         },
         "sort": {
-          "meta.none": "none",
-          "survivability.health": "health",
-          "survivability.viewRange": "view range",
-          "survivability.camouflageStill": "camouflage still",
-          "survivability.camouflageMoving": "camouflage moving",
-          "survivability.camouflageShooting": "camouflage shooting",
+          "meta.none": "aucun",
+          "survivability.health": "santé",
+          "survivability.viewRange": "portée de vue",
+          "survivability.camouflageStill": "camouflage à l’arrêt",
+          "survivability.camouflageMoving": "camouflage en movement",
+          "survivability.camouflageShooting": "camouflage en tirant",
           "survivability.volume": "volume",
-          "survivability.length": "length",
-          "fire.dpm": "standard DPM",
-          "fire.dpmPremium": "premium DPM",
-          "fire.reload": "reload",
-          "fire.caliber": "caliber",
-          "fire.standardPenetration": "standard penetration",
-          "fire.premiumPenetration": "premium penetration",
+          "survivability.length": "longueur",
+          "fire.dpm": "DPM standard",
+          "fire.dpmPremium": "DPM premium",
+          "fire.reload": "rechargement",
+          "fire.caliber": "calibration",
+          "fire.standardPenetration": "pénétration standard",
+          "fire.premiumPenetration": "pénétration premium",
           "fire.tertiaryPenetration": "tertiary penetration",
           "fire.damage": "damage",
           "fire.moduleDamage": "module damage",
@@ -803,8 +808,8 @@
         "randomize": "Randomize"
       },
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -812,9 +817,18 @@
           "skip": "Skip",
           "guess": "Guess",
           "next": "Next",
-          "no_results": "No results"
+          "no_results": "Aucun résultat"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} guessed correctly",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancel",
+          "reveal": "Reveal"
+        },
+        "clear": "Clear",
+        "select_all": "Sélectionner tout",
+        "tier": "Rang {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -1135,10 +1149,12 @@
             "upgrade": "Upgrade"
           },
           "provisions": {
-            "clear": "Clear"
+            "clear": "Clear",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "Clear"
+            "clear": "Clear",
+            "clear_all": "Clear all tanks"
           }
         }
       },
@@ -1195,8 +1211,8 @@
         "seo_description": "Track your stats in real time as you play World of Tanks Blitz",
         "search": {
           "lookup": "Look up a player to get started",
-          "hint": "Search players...",
-          "searching": "Searching...",
+          "hint": "Recherche de joueurs...",
+          "searching": "Recherche...",
           "no_results": "Pas de joueur de trouvé"
         },
         "controls": {

packages/i18n/strings/ja.json

@@ -13,7 +13,8 @@
       "hp": "{value}hp",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}°/s",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "自動装填砲",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "AP",
-      "apcr": "APCR",
-      "heat": "HEAT",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "HE"
     },
     "player_count_period": {
@@ -186,11 +187,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
-        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
+        "clan_not_found": "",
+        "player_not_found": "# ユーザーが見つかりませんでした\nユーザー「{search}」が見つかりませんでした。検索結果からユーザーを選択するか、有効なユーザー名を入力するか、/link コマンドを使用してください。",
         "player_not_linked": "# `/link`を使用して始めましょう\nはじめまして！あなたが誰か、私に教えてください。",
         "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
-        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
+        "tank_id_not_found": "# 車両が見つかりません\nID「{search}」の戦車が見つかりませんでした。数字ではなく戦車の名前を入力してみてください。",
         "no_tank_stats": "# 利用可能な車輌統計がありません\nこのプレイヤーには利用可能な統計がありません。あなたが探しているプレイヤーではない可能性があります。",
         "get_help": "Discordサーバーに参加する",
         "uncaught_error": "# BlitzKitがエラーに遭遇しました！\n申し訳ありません。お気軽に[公式Discordサーバー](https://discord.gg/nDt7AjGJQH)にお問い合わせください。",
@@ -394,7 +395,7 @@
           "wn8": "WN8",
           "winrate": "勝率",
           "damage": "ダメージ",
-          "unknown_tank": "Unknown tank {id}"
+          "unknown_tank": "不明な車両{id}"
         }
       },
       "debug": {
@@ -559,7 +560,7 @@
         "description": "Today's played tanks and statistics"
       },
       "stats": {
-        "name": "stats",
+        "name": "",
         "description": "Quick statistics for a period"
       },
       "owned_tanks": {
@@ -668,6 +669,10 @@
         "count_singular": "1 輌",
         "count_plural": "{count} tanks",
         "sorting_by": "Sorting by {name}",
+        "clear": "クリア",
+        "tier": "Tier {tier}",
+        "passive": "{name} (Passive)",
+        "active": "{name} (Active)",
         "no_tanks_found": {
           "body": "該当する車輌が存在しません。",
           "search_again": "もう一度検索してください。",
@@ -778,7 +783,7 @@
           "tank": "車輌名",
           "last_played": "Last played",
           "battles": "Career battles",
-          "unrecorded": "--",
+          "unrecorded": "",
           "wins": "勝利"
         },
         "large_warning": {
@@ -803,8 +808,8 @@
         "randomize": "Randomize"
       },
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -814,7 +819,16 @@
           "next": "Next",
           "no_results": "該当なし"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} correct, {streak} streak",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancel",
+          "reveal": "Reveal"
+        },
+        "clear": "クリア",
+        "select_all": "全て選択",
+        "tier": "Tier {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -1135,10 +1149,12 @@
             "upgrade": "最終装備"
           },
           "provisions": {
-            "clear": "クリア"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "クリア"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           }
         }
       },

packages/i18n/strings/pl.json

@@ -13,7 +13,8 @@
       "hp": "{value}hp",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}°/s",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Auto loader",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "AP",
-      "apcr": "APCR",
-      "heat": "HEAT",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "OB"
     },
     "player_count_period": {
@@ -492,7 +493,7 @@
         "description": "Search clans",
         "options": {
           "limit": {
-            "name": "limit",
+            "name": "",
             "description": "The max number of clan results (default: {limit})"
           }
         },
@@ -506,7 +507,7 @@
         "description": "Search players",
         "options": {
           "limit": {
-            "name": "limit",
+            "name": "",
             "description": "The max number of player results (default: {limit})"
           }
         },
@@ -530,7 +531,7 @@
         },
         "options": {
           "limit": {
-            "name": "limit",
+            "name": "",
             "description": "How many neighbors to display (default: {count})"
           },
           "season": {
@@ -668,9 +669,13 @@
         "count_singular": "1 tank",
         "count_plural": "{count} tanks",
         "sorting_by": "Sorting by {name}",
+        "clear": "Clear",
+        "tier": "Tier {tier}",
+        "passive": "{name} (Passive)",
+        "active": "{name} (Active)",
         "no_tanks_found": {
           "body": "No tanks found.",
-          "search_again": "Try searching again.",
+          "search_again": "",
           "clear_filters": "Try clearing filters."
         },
         "sort": {
@@ -803,8 +808,8 @@
         "randomize": "Randomize"
       },
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -814,7 +819,16 @@
           "next": "Next",
           "no_results": "Brak wyników"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} correct, {streak} streak",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancel",
+          "reveal": "Reveal"
+        },
+        "clear": "Clear",
+        "select_all": "Select all",
+        "tier": "Tier {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -1135,10 +1149,12 @@
             "upgrade": "Upgrade"
           },
           "provisions": {
-            "clear": "Clear"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "Clear"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           }
         }
       },

packages/i18n/strings/pt.json

@@ -13,7 +13,8 @@
       "hp": "{value}hp",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}°/s",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Autocarregador",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "AP",
-      "apcr": "APCR",
-      "heat": "HEAT",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "HE"
     },
     "player_count_period": {
@@ -668,6 +669,10 @@
         "count_singular": "1 tanque",
         "count_plural": "{count} tanks",
         "sorting_by": "Sorting by {name}",
+        "clear": "Limpar",
+        "tier": "Tier {tier}",
+        "passive": "{name} (Passive)",
+        "active": "{name} (Active)",
         "no_tanks_found": {
           "body": "Nenhum tanque encontrado.",
           "search_again": "Tente pesquisar novamente.",
@@ -803,8 +808,8 @@
         "randomize": "Randomize"
       },
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -814,7 +819,16 @@
           "next": "Next",
           "no_results": "Sem resultados"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} correct, {streak} streak",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancelar",
+          "reveal": "Reveal"
+        },
+        "clear": "Limpar",
+        "select_all": "Selecionar todos",
+        "tier": "Tier {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -1135,10 +1149,12 @@
             "upgrade": "Melhorar"
           },
           "provisions": {
-            "clear": "Limpar"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "Limpar"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           }
         }
       },

packages/i18n/strings/ru.json

@@ -13,7 +13,8 @@
       "hp": "{value}оп",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/с"
+      "deg_s": "{value}°/с",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Барабан",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "ББ",
-      "apcr": "БП",
-      "heat": "КС",
+      "ap_cr": "БП",
+      "hc": "КС",
       "he": "ОФ"
     },
     "player_count_period": {
@@ -38,7 +39,7 @@
     "branches": {
       "local": "dev",
       "dev": "бета",
-      "opentest": "открытый тест",
+      "opentest": "общий тест",
       "preview": "превью"
     },
     "locales": {
@@ -296,7 +297,7 @@
       },
       "filters": {
         "none": "Без фильтров",
-        "tier": " {tier} уровня"
+        "tier": "{tier} уровень"
       },
       "no_data": {
         "battles_in_period": "За этот период боёв не было",
@@ -661,13 +662,17 @@
         "select_dialog_title": "Поиск танка",
         "swap_dialog_title": "Заменить танк",
         "clear_filters": "Сбросить фильтры",
-        "login": "Войти, чтобы воспользоваться",
+        "login": "Войдите, чтобы воспользоваться",
         "search_bar_hint": "Поиск танков...",
         "recent": "Недавние",
         "select_all": "Выбрать всё",
         "count_singular": "1 танк",
         "count_plural": "Танков: {count}",
         "sorting_by": "Сортировать по {name}",
+        "clear": "Очистить",
+        "tier": "{tier} уровень",
+        "passive": "{name} (Пассивный)",
+        "active": "{name} (Активный)",
         "no_tanks_found": {
           "body": "Танков не найдено.",
           "search_again": "Попробуйте повторить поиск.",
@@ -803,8 +808,8 @@
         "randomize": "Случайно"
       },
       "guess": {
-        "name": "Угадай танк",
-        "button": "Угадать",
+        "name": "Угадать",
+        "button": "Что это за танк?",
         "description": "Мини-игра «Силуэт»",
         "seo_description": "Играйте угадывая силуэт танка из World of Tanks Blitz",
         "search": {
@@ -814,7 +819,16 @@
           "next": "Следующий",
           "no_results": "Ничего не найденo"
         },
-        "stats": "{correct} / {total} угадано верно"
+        "stats": "{correct} / {total} правильно, серия: {streak}",
+        "help": {
+          "title": "Частично раскрыть танк?",
+          "description": "Показывает танк не показывая название. Этот раунд будет считаться проигранным и прекратит серию!",
+          "cancel": "Отмена",
+          "reveal": "Раскрыть"
+        },
+        "clear": "Очистить",
+        "select_all": "Выбрать всё",
+        "tier": "{tier} уровень"
       },
       "tankopedia": {
         "search": "Поиск характеристик...",
@@ -908,7 +922,7 @@
               },
               "stats": {
                 "thickness_and_angle": "{thickness}мм {angle}°",
-                "nominal": "{thickness}1мм номинала",
+                "nominal": "{thickness}мм номинала",
                 "ricochet_loss": "{loss}% пробития"
               }
             }
@@ -1135,10 +1149,12 @@
             "upgrade": "Топ"
           },
           "provisions": {
-            "clear": "Очистить"
+            "clear": "Убрать",
+            "clear_all": "Убрать со всех"
           },
           "consumables": {
-            "clear": "Очистить"
+            "clear": "Убрать",
+            "clear_all": "Убрать со всех"
           }
         }
       },

packages/i18n/strings/uk.json

@@ -1,19 +1,20 @@
 {
   "test": {
     "default": "тест",
-    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
+    "long": "{fruit}",
     "fox": "Швидка бура лисиця перестрибує через лінивого собаку."
   },
   "common": {
     "name": "BlitzKit",
     "units": {
-      "m": "{value}m",
-      "mm": "{value}mm",
+      "m": "{value}м",
+      "mm": "{value}мм",
       "deg": "{value}°",
-      "hp": "{value}hp",
+      "hp": "{value}од",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}град/c",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Магазинна система заряджання",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "ББ",
-      "apcr": "БП",
-      "heat": "КС",
+      "ap_cr": "APCR",
+      "hc": "HEAT",
       "he": "ОФ"
     },
     "player_count_period": {
@@ -78,11 +79,11 @@
       "10": "Супер винятковий"
     },
     "nations": {
-      "ussr": "СРСР",
+      "ussr": "С.Р.С.Р.",
       "germany": "Німеччина",
-      "usa": "США",
+      "usa": "С.Ш.А.",
       "china": "Китай",
-      "uk": "Велика Британія",
+      "uk": "Сполучене Королівство ",
       "france": "Франція",
       "japan": "Японія",
       "european": "Європейська нація",
@@ -120,7 +121,7 @@
       "3": "ПТ-САУ"
     },
     "tree_type": {
-      "-1": "не розпізнано",
+      "-1": "не розпізнаний",
       "0": "Звичайний",
       "1": "Преміум",
       "2": "Колекційний"
@@ -186,11 +187,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
-        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
+        "clan_not_found": "# Не вдалося знайти клан\nНе вдалося знайти \"{search}\". Спробуйте обрати клан з результату пошуку.",
+        "player_not_found": "# Не вдалося знайти користувача\nНе вдалося знайти користувача \"{search}\". Спробуйте вибрати користувача із результатів пошуку, ввівши правильне ім'я користувача, або скористайтеся командою  `/link`.",
         "player_not_linked": "# Використайте команду \"/link\" щоб почати\nЯ не знаю, хто ви, але ви можете сказати мені сьогодні!",
-        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
-        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
+        "tank_name_not_found": "# Танк не знайдено\nНе вдалося знайти танк із назвою «{search}».",
+        "tank_id_not_found": "# Танк не знайдено\nНе вдалося знайти танк з ID «{search}». Спробуйте ввести назву танка замість номера.",
         "no_tank_stats": "# Немає статистики для танка\nЦей гравець не має статистики.\nМожливо, це не той гравець, якого ви шукаєте.",
         "get_help": "Допомогти Discord серверу",
         "uncaught_error": "# Упс! BlitzKit зіткнувся з помилкою!\nНам дуже шкода. Можете попросити допомоги на [офіційному сервері Discord](https://discord.gg/nDt7AjGJQH).",
@@ -284,19 +285,19 @@
           "name": "рівень",
           "description": "Рівень",
           "choices": {
-            "tier": "Tier {tier_1} - {tier_2}"
+            "tier": "Рівень {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Кар'єра",
         "today": "Сьогодні",
-        "days": "{days} days",
-        "custom": "{day_1} - {day_2} days"
+        "days": "{days} днів",
+        "custom": "{day_1} - {day_2} днів"
       },
       "filters": {
         "none": "Немає фільтрів",
-        "tier": "Tier {tier}"
+        "tier": "Рівень {tier}"
       },
       "no_data": {
         "battles_in_period": "За цей період боїв не було",
@@ -339,19 +340,19 @@
         "body": {
           "subtitle": "Дослідження",
           "total": "Загалом",
-          "research": "Research: {cost}",
-          "upgrades": "Upgrades: {cost}",
-          "purchase": "Purchase: {cost}",
-          "equipment": "Equipment: {cost}",
+          "research": "Дослідження: {cost}",
+          "upgrades": "Прокачування: {cost}",
+          "purchase": "Вартість: {cost}",
+          "equipment": "Спорядження: {cost}",
           "estimation": "# Це оцінка!\n\nЦей список може включати вже досліджені танки через неточну інформацію для вантажу. Спробуйте використати \"початковий танк\" з рядка за допомогою команди."
         },
         "errors": {
-          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
-          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
-          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
-          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
-          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
-          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
+          "non_tech_tree": "#{tank} відсутній в дереві дослідження\n\nВи не можете дослідити преміум/колеційний танк.",
+          "tier_1": "#{tank} І рівня \n\nТанки І рівня завжди розблоковані для всіх гравців безкоштовно",
+          "already_researched": "# {tank} вже було досліджено\n\nСпробуйте використати `початковий-танк` коли використовуєте команду для перегляду загальної гілки, яку ви вже дослідили",
+          "start_end_equal": "#{tank} було введено двічі  \n\nПереконайтесь що `початковий-танк` та  `ціль-танк` різні",
+          "tanks_not_on_line": "# {tank_1} та {tank_2}  не в одній гілці\n\nПереконайтесь що  `початковий-танк` та  `ціль-танк` знаходяться в єдиній гілці дерева дослідження",
+          "unordered": "# {tank_1} вище рівнем відносно {tank_2}\n\nОбов’язково вкажіть {tank_2} як `початковий-танк`, оскільки це танк нижчого рівня."
         }
       },
       "about": {
@@ -394,7 +395,7 @@
           "wn8": "WN8",
           "winrate": "Відсоток перемог",
           "damage": "Шкода",
-          "unknown_tank": "Unknown tank {id}"
+          "unknown_tank": "Невідомий танк {id}"
         }
       },
       "debug": {
@@ -430,12 +431,12 @@
         "options": {
           "threshold": {
             "name": "поріг",
-            "description": "The number of days inactive (default: {days} days)"
+            "description": "Кількість днів неактивності (за замовчуванням: {days} днів)"
           }
         },
         "body": {
-          "subtitle": "Inactive for {days}+ days",
-          "listing": "{days} days"
+          "subtitle": "Неактивний {days}+ днів",
+          "listing": "{days} днів"
         }
       },
       "full_stats": {
@@ -478,7 +479,7 @@
         "body": {
           "accounts_linked": "Прив'язані акаунти",
           "no_role_permissions": {
-            "title": "{name} failed to verify",
+            "title": "{name} не вдалося перевірити",
             "description": "У мене немає дозволу керувати ролями."
           }
         },
@@ -493,11 +494,11 @@
         "options": {
           "limit": {
             "name": "ліміт",
-            "description": "The max number of clan results (default: {limit})"
+            "description": "Максимальна кількість результатів клану (за замовчуванням: {limit})"
           }
         },
         "body": {
-          "title": "Clan search for {search} in region {region}",
+          "title": "Пошук клану для {search} в регіоні {region}",
           "no_results": "Жодного клану не знайдено"
         }
       },
@@ -507,11 +508,11 @@
         "options": {
           "limit": {
             "name": "ліміт",
-            "description": "The max number of player results (default: {limit})"
+            "description": "Максимальна кількість результатів гравця (за замовчуванням: {limit})"
           }
         },
         "body": {
-          "title": "Player search for {search} in region {region}",
+          "title": "Пошук гравця для {search} у регіоні {region}",
           "no_results": "Гравця не знайдено"
         }
       },
@@ -520,8 +521,8 @@
         "description": "Статистика рейтингових боїв",
         "subcommands": {
           "neighbors": {
-            "name": "neighbors",
-            "description": "Neighboring players on the leaderboard"
+            "name": "сусіди",
+            "description": "Сусідуючі гравці в лідерборді"
           },
           "league": {
             "name": "ліга",
@@ -531,32 +532,32 @@
         "options": {
           "limit": {
             "name": "ліміт",
-            "description": "How many neighbors to display (default: {count})"
+            "description": "Скільки сусідів відобразити (за замовчуванням: {count})"
           },
           "season": {
             "name": "сезон",
             "description": "Базова інформація про гравця",
             "choices": {
-              "current": "{season} (current)"
+              "current": "{season} (поточний)"
             }
           },
           "league": {
             "name": "ліга",
-            "description": "The league to display"
+            "description": "Ліга для відображення"
           }
         },
         "body": {
-          "top_players": "Top {count} players",
-          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
-          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
-          "deleted_player": "Deleted {id}",
-          "neighbors": "Rating neighbors",
-          "more": "+ {count} more"
+          "top_players": "Топ {count} гравців",
+          "no_participation": "# {player} не грав у рейтингу в сезоні {season}\n\nЦей гравець не брав участь у цьому сезоні або не проходив калібрування",
+          "no_ongoing_season": "# Немає поточного сезону\n\nВ даний час немає сезону рейтингу.",
+          "deleted_player": "",
+          "neighbors": "Сусіди по рейтингу",
+          "more": "+  {count} ще"
         }
       },
       "today": {
         "name": "сьогодні",
-        "description": "Today's played tanks and statistics"
+        "description": "Сьогодні зіграні танки та статистика"
       },
       "stats": {
         "name": "статистика",
@@ -566,43 +567,43 @@
         "name": "отримані танки",
         "description": "Показує всі ваші танки даного рівня",
         "body": {
-          "title": "# {name}'s owned tier {tier} tanks\n\n"
+          "title": "# {name} отриманих рівнів {tier} танків\n\n"
         }
       },
       "permissions": {
         "name": "дозволи",
-        "description": "Checks wether the bot has the required permissions to function",
+        "description": "Перевіряє чи бот має необхідні дозволи для роботи",
         "body": {
-          "title": "# Permissions\n\n{body}",
-          "view_channels": "View channels: needed to find the message the refresh button was used on",
-          "read_message_history": "Read message history: needed to find the message to refresh",
-          "attach_files": "Attach files: needed to add images to image-based commands",
-          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
+          "title": "# Дозволи\n\n{body}",
+          "view_channels": "Перегляньте канали: необхідне для знаходження повідомлення, на якому використовувалася кнопка оновлення",
+          "read_message_history": "Прочитайте історію повідомлень: потрібно знайти повідомлення для оновлення",
+          "attach_files": "Закріпіть файли: потрібно для додавання зображень до команд на основі зображень",
+          "external_emojis": "Зовнішні емодзі: потрібні для додавання емодзі національних прапорів та класів техніки"
         }
       },
       "ping": {
         "name": "",
-        "description": "Check wether the bot is alive.",
+        "description": "Перевірити чи бот живий",
         "body": {
-          "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - {time}ms"
+          "pong": "Понг🏓",
+          "pong_with_time": "Понг🏓 - {time}мс"
         },
         "subcommands": {
           "blitzkit": {
-            "name": "blitzkit",
+            "name": "BlitzKit",
             "description": "Ping BlitzKit"
           },
           "wotb": {
-            "name": "wotb",
+            "name": "WoTB",
             "description": "Ping World of Tanks Blitz"
           }
         }
       },
       "player_info": {
-        "name": "player-info",
+        "name": "інформація про гравця",
         "description": "Базова інформація про гравця",
         "body": {
-          "title": "{name}'s information",
+          "title": "інформація про {name}",
           "nickname": "Нік",
           "battles": "Бої",
           "winrate": "Відсоток перемог",
@@ -613,39 +614,39 @@
       },
       "rating": {
         "name": "рейтинг",
-        "description": "Rating player's statistics",
+        "description": "Статистика рейтингових боїв гравця ",
         "subcommands": {
           "today": {
             "name": "сьогодні",
-            "description": "Today's rating statistics"
+            "description": "Сьогоднішня статистика рейтингових боїв"
           },
           "season": {
             "name": "сезон",
-            "description": "This season's rating statistics"
+            "description": "Статистика рейтингових боїв поточного сезону"
           }
         },
         "body": {
           "subtitle": {
-            "today": "Today's rating statistics",
-            "season": "This season's rating statistics"
+            "today": "Сьогоднішня статистика рейтингових боїв",
+            "season": "Статистика рейтингових боїв даного сезону"
           }
         },
         "errors": {
-          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
-          "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
+          "no_participation": "# {name} не грав рейтингові бої\n\nЦей гравець не брав участь у рейтинговому режимі цього сезону.",
+          "unrecorded_stats": "# Статистика на цей момент недоступна\n\nWargaming наразі зіткнулась з технічними несправностями. Якщо зараз проходить сезон, статистика буде доступною в найближчі 24 години."
         }
       }
     }
   },
   "website": {
     "redirect": {
-      "title": "301: moved permanently",
+      "title": "301: переміщено назавжди",
       "body": "This page has moved. Redirecting..."
     },
     "settings": {
-      "title": "Settings",
-      "description": "Change BlitzKit settings",
-      "dev_mode": "Development mode",
+      "title": "Налаштування",
+      "description": "Змінити налаштування BlitzKit ",
+      "dev_mode": "Режим розробника",
       "language": "Мова"
     },
     "common": {
@@ -658,16 +659,20 @@
         "copied": "Скопійовано!"
       },
       "tank_search": {
-        "select_dialog_title": "Search for tanks",
+        "select_dialog_title": "Знайти танк",
         "swap_dialog_title": "Swap tank",
-        "clear_filters": "Clear filters",
-        "login": "Login to use this",
+        "clear_filters": "Очистити",
+        "login": "Увійдіть, щоб скористатися",
         "search_bar_hint": "Шукайте техніку...",
         "recent": "Недавно переглянуті",
         "select_all": "Вибрати все",
         "count_singular": "1 танк",
-        "count_plural": "{count} tanks",
-        "sorting_by": "Sorting by {name}",
+        "count_plural": "Танків: {count} ",
+        "sorting_by": "Відсортувати за {name}",
+        "clear": "Clear",
+        "tier": "Рівень {tier}",
+        "passive": "{name} (Passive)",
+        "active": "{name} (Active)",
         "no_tanks_found": {
           "body": "Нічого не знайдено.",
           "search_again": "Спробуйте шукати заново.",
@@ -731,7 +736,7 @@
     "home": {
       "pwa": {
         "title": "Install the BlitzKit App",
-        "new": "NEW",
+        "new": "",
         "checking": "Checking compatibility...",
         "instructions": "Instructions for Apple devices.",
         "install": "Install",
@@ -763,20 +768,20 @@
     },
     "tools": {
       "playlist": {
-        "reset": "Reset",
-        "shuffle": "Shuffle",
-        "remove": "Remove played",
+        "reset": "Скинути",
+        "shuffle": "Перемішати",
+        "remove": "Видалити зіграні",
         "tracking": "BlitzKit is tracking your battles",
         "sort": {
           "button": "Сортувати за",
-          "last_played": "Last played",
-          "least_played": "Least played"
+          "last_played": "Остання гра",
+          "least_played": "Найменше зіграно"
         },
         "table": {
           "index": "#",
-          "never": "Never",
+          "never": "Ніколи",
           "tank": "Танк",
-          "last_played": "Last played",
+          "last_played": "Остання гра",
           "battles": "Career battles",
           "unrecorded": "--",
           "wins": "Перемоги"
@@ -784,14 +789,14 @@
         "large_warning": {
           "title": "That's a lot of tanks!",
           "description": "Are you sure you want to create a playlist of {count} tanks? That's {time} hours of gameplay at 50% winrate!",
-          "cancel": "Cancel",
-          "proceed": "Proceed"
+          "cancel": "Скасувати",
+          "proceed": "Продовжити"
         },
-        "generate": "Generate playlist",
-        "name": "Playlist",
+        "generate": "Згенерувати плейлист",
+        "name": "Плейлист",
         "description": "Tank playlist generator",
         "seo_description": "Don't know what to play in World of Tanks Blitz? Use BlitzKit Playlist to get suggestions!",
-        "button": "Generate",
+        "button": "Створити",
         "pool_size": "{count} possible tanks"
       },
       "mixer": {
@@ -803,8 +808,8 @@
         "randomize": "Randomize"
       },
       "guess": {
-        "name": "Guess the tank",
-        "button": "Guess away",
+        "name": "Guess",
+        "button": "What could it be?",
         "description": "Silhouette mini-game",
         "seo_description": "Play a tank guessing game with a silhouette in World of Tanks Blitz",
         "search": {
@@ -814,7 +819,16 @@
           "next": "Next",
           "no_results": "Немає результатів"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "{correct} / {total} correct, {streak} streak",
+        "help": {
+          "title": "Partially reveal tank?",
+          "description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!",
+          "cancel": "Cancel",
+          "reveal": "Reveal"
+        },
+        "clear": "Clear",
+        "select_all": "Вибрати все",
+        "tier": "Рівень {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -823,33 +837,33 @@
         "description": "Танкова енциклопедія",
         "seo_description": "Характеристики, броня та інше для всіх танків WoT Blitz",
         "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
+        "tank_seo_description": "{name} броня, характеристики, обладнання, амуніція і т.д. {dpm} шкода на хвилину, {alpha} разова шкода, {penetration}мм пробиття, {speed} км/год максимальна швидкість, {health} міцність.",
         "visualizers": {
           "reload": {
-            "skip": "Skip"
+            "skip": "Пропустити"
           },
           "assault": {
-            "title": "Assault shells"
+            "title": "Штурмові снаряди"
           },
           "rotator": {
-            "hull": "Hull",
-            "turret": "Turret",
-            "hard": "Hard",
+            "hull": "Корпус",
+            "turret": "Башта",
+            "hard": "Жорстко",
             "medium": "Середній",
-            "soft": "Soft",
-            "effective": "Effective"
+            "soft": "Ніжно",
+            "effective": "Ефективний"
           },
           "ricochet": {
-            "angle": "Angle",
+            "angle": "Кут",
             "normalization": "Нормалізація",
-            "effective_angle": "Effective angle",
+            "effective_angle": "Ефективний кут",
             "armor": "Броня",
-            "no_ricochet": "Explosive shells don't ricochet"
+            "no_ricochet": "Фугасні снаряди не рикошетять"
           },
           "view_range": {
-            "camo": "Camo",
-            "ghost_factory": "Ghost Factory",
-            "dead_rail": "Dead Rail"
+            "camo": "Камуфляж",
+            "ghost_factory": "Промзона",
+            "dead_rail": "Ешелон"
           },
           "flexibility": {
             "yaw": "Yaw",
@@ -1135,10 +1149,12 @@
             "upgrade": "Upgrade"
           },
           "provisions": {
-            "clear": "Clear"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           },
           "consumables": {
-            "clear": "Clear"
+            "clear": "Clear this tank",
+            "clear_all": "Clear all tanks"
           }
         }
       },

packages/i18n/strings/zh.json

@@ -1,29 +1,30 @@
 {
   "test": {
     "default": "测试",
-    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
+    "long": "这是一个测试用长字符串。你绝对不会在用户界面中看见这些。我最喜欢的水果是{fruit}因为它的颜色是{color}的。我如此喜欢它，以至于我会把它的名字念3次！{fruit}！{fruit}！{fruit}！重申一次，它是{color}的而不是{not_color}的。",
     "fox": "褐色的狐狸迅速地跳过那只懒狗"
   },
   "common": {
     "name": "BlitzKit",
     "units": {
-      "m": "{value}m",
-      "mm": "{value}mm",
-      "deg": "{value}°",
-      "hp": "{value}hp",
+      "m": "{value} 公尺",
+      "mm": "{value} 毫米",
+      "deg": "{value} 度°",
+      "hp": "{value} 生命值",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}°/s"
+      "deg_s": "{value}度°/秒",
+      "plus": "+{value}"
     },
     "gun_types": {
-      "auto_loader": "弹夹型战车",
-      "auto_reloader": "自动装填型战车",
+      "auto_loader": "弹夹型坦克",
+      "auto_reloader": "自动装填型坦克",
       "regular": "单发"
     },
     "shells": {
       "ap": "穿甲弹",
-      "apcr": "硬式复合穿甲弹",
-      "heat": "反战车高爆弹",
+      "ap_cr": "硬式复合穿甲弹",
+      "hc": "反战车高爆弹",
       "he": "高爆弹"
     },
     "player_count_period": {
@@ -101,8 +102,8 @@
     },
     "tank_class_short": {
       "-1": "未识别",
-      "0": "轻型战车",
-      "1": "中型战车",
+      "0": "轻型坦克",
+      "1": "中型坦克",
       "2": "重型战车",
       "3": "驱逐战车"
     },
@@ -186,11 +187,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# 找不到军团\n找不到 \"{search}\". 请尝试选从搜索结果中择一个军团。",
-        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
+        "clan_not_found": "# 找不到公会\n找不到\"{search}\"。请尝试从搜索结果中选择一个公会。",
+        "player_not_found": "# 找不到玩家\n无法找到玩家 “{search}”。 尝试从搜索结果中选择玩家，或输入一个有效的玩家名称， 或使用“/link”命令。",
         "player_not_linked": "# 使用 `/link` 来开始\n我不知道你是谁，但你今天可以告诉我！",
-        "tank_name_not_found": "# 找不到坦克\n找不到名称为 \"{search}\"的坦克。",
-        "tank_id_not_found": "# 找不到坦克\n找不到ID为 \"{search}\"的坦克. 尝试输入坦克的名称。",
+        "tank_name_not_found": "# 找不到坦克\n找不到名为 “{search}” 的坦克。",
+        "tank_id_not_found": "# 找不到坦克\n无法找到ID为 “{search}” 的坦克。 请尝试输入坦克的名称而不是数字。",
         "no_tank_stats": "# 没有这辆战车的数据\n这个玩家没有可用资料。 这可能不是你要找的玩家。",
         "get_help": "Discord的协助服务器",
         "uncaught_error": "# BlitzKit 发生错误！\n我们对此感到抱歉。 欢迎加入[官方Discord](https://discord.gg/nDt7AjGJQH)，以方便帮助你解决问题。",
@@ -284,19 +285,19 @@
           "name": "阶级",
           "description": "阶级",
           "choices": {
-            "tier": "坦克等级 {tier_1} - {tier_2}"
+            "tier": "{tier_1} - {tier_2} 阶"
           }
         }
       },
       "periods": {
         "career": "玩家资料",
         "today": "今日：",
-        "days": "{days} days",
-        "custom": "{day_1} - {day_2} days"
+        "days": "{days} 天",
+        "custom": "{day_1} - {day_2} 天"
       },
       "filters": {
         "none": "无筛选器",
-        "tier": "坦克等级 {tier}"
+        "tier": "{tier} 阶"
       },
       "no_data": {
         "battles_in_period": "在这段时间里没有参与任何战斗",
@@ -339,19 +340,19 @@
         "body": {
           "subtitle": "研发",
           "total": "全部",
-          "research": "Research: {cost}",
-          "upgrades": "Upgrades: {cost}",
-          "purchase": "Purchase: {cost}",
-          "equipment": "Equipment: {cost}",
+          "research": "研发：{cost}",
+          "upgrades": "升级：{cost}",
+          "purchase": "购买：{cost}",
+          "equipment": "装备：{cost}",
           "estimation": "# 这是一个估计值！\n\n这个列表可能包含已经研发过的战车，因为 Wargaming 提供了不正确的资料。 如果可以，请尝试在同一研发线路中提供一个 “起始战车” 。"
         },
         "errors": {
-          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "non_tech_tree": "# \"{tank}\" 不在科技树里\n\n你不能研发一个 加值/收藏家 坦克。",
           "tier_1": "# {tank} 是一级坦克\n\n一级坦克一直是对所有玩家免费解锁的。",
-          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
-          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
-          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
-          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
+          "already_researched": "# \"{tank}\" 已完成研发\n\n请尝试在同一研发线路上提供“起始坦克”， 以查看全部您已研发过的坦克。",
+          "start_end_equal": "# \"{tank}\" 重复提供了\n\n请确认 \"初始坦克\" 和 \"目标坦克\" 是不同的。",
+          "tanks_not_on_line": "# “{tank_1}” 和 “{tank_2}” 不在同一个研发线路上\n\n请确认“起始坦克” 和 “目标坦克” 在同一研发线路中。",
+          "unordered": "# “{tank_1}” 阶级比 “{tank_2}” 高\n\n请以提供 {tank_2} 作为起始坦克，因为它的阶级更低。"
         }
       },
       "about": {
@@ -394,7 +395,7 @@
           "wn8": "WN8",
           "winrate": "胜率",
           "damage": "伤害",
-          "unknown_tank": "未知坦克{id}"
+          "unknown_tank": "未知坦克 {id}"
         }
       },
       "debug": {
@@ -430,12 +431,12 @@
         "options": {
           "threshold": {
             "name": "阈值",
-            "description": "The number of days inactive (default: {days} days)"
+            "description": "未上线天数（ 默认：{days} 天）"
           }
         },
         "body": {
-          "subtitle": "Inactive for {days}+ days",
-          "listing": "{days} days"
+          "subtitle": "{days}+ 天未上线",
+          "listing": "{days} 天"
         }
       },
       "full_stats": {
@@ -478,7 +479,7 @@
         "body": {
           "accounts_linked": "帐号已绑定",
           "no_role_permissions": {
-            "title": "{name} failed to verify",
+            "title": "{name} 验证失败",
             "description": "我没有管理身份的权限。"
           }
         },
@@ -493,11 +494,11 @@
         "options": {
           "limit": {
             "name": "限制",
-            "description": "The max number of clan results (default: {limit})"
+            "description": "公会结果的最大显示数量 (默认：{limit})"
           }
         },
         "body": {
-          "title": "Clan search for {search} in region {region}",
+          "title": "在地区 {region} 中搜索公会 {search}",
           "no_results": "没有找到该公会"
         }
       },
@@ -507,11 +508,11 @@
         "options": {
           "limit": {
             "name": "限制",
-            "description": "The max number of player results (default: {limit})"
+            "description": "玩家结果的最大显示数量 (默认：{limit})"
           }
         },
         "body": {
-          "title": "Player search for {search} in region {region}",
+          "title": "在地区 {region} 中搜索玩家 {search}",
           "no_results": "未找到玩家"
         }
       },
@@ -531,13 +532,13 @@
         "options": {
           "limit": {
             "name": "限制",
-            "description": "How many neighbors to display (default: {count})"
+            "description": "显示附近有多少玩家（默认：{count}）"
           },
           "season": {
             "name": "赛季",
             "description": "赛季数 (默认：当前)",
             "choices": {
-              "current": "{season} (current)"
+              "current": "{season} (当前)"
             }
           },
           "league": {
@@ -546,12 +547,12 @@
           }
         },
         "body": {
-          "top_players": "Top {count} players",
-          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
+          "top_players": "前 {count} 玩家",
+          "no_participation": "# {player} 没有在赛季 {season} 中进行过评价战斗\n\n该玩家没有参加该赛季或没有完成校准。",
           "no_ongoing_season": "# 没有进行中的赛季\n\n目前没有赛季。",
-          "deleted_player": "删除{id}",
+          "deleted_player": "已删除玩家 {id}",
           "neighbors": "对邻居进行评分",
-          "more": "+ {count} more"
+          "more": "+ {count} 更多"
         }
       },
       "today": {
@@ -566,7 +567,7 @@
         "name": "已拥有的战车",
         "description": "显示该阶级中所有您已拥有的战车",
         "body": {
-          "title": "# {name}'s owned tier {tier} tanks\n\n"
+          "title": "# {name} 所拥有的 {tier} 阶坦克\n\n"
         }
       },
       "permissions": {
@@ -585,7 +586,7 @@
         "description": "检查机器人是否处于活动状态。",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - {time}ms"
+          "pong_with_time": "Pong 🏓 - {time} 微秒"
         },
         "subcommands": {
           "blitzkit": {
@@ -602,7 +603,7 @@
         "name": "玩家信息",
         "description": "玩家基本信息",
         "body": {
-          "title": "{name}的信息",
+          "title": "{name} 的信息",
           "nickname": "昵称",
           "battles": "战斗场次",
           "winrate": "胜率",
@@ -631,7 +632,7 @@
           }
         },
         "errors": {
-          "no_participation": "# {name}还没有玩过评级模式。",
+          "no_participation": "# {name} 未曾游玩评价战斗\n\n该玩家未参与本赛季的评价战斗。",
           "unrecorded_stats": "# 统计数据目前无法使用\n\nWargaming 可能暂停了服务器。 如果有连续的赛季，统计数据可能在24小时内提供。"
         }
       }
@@ -644,7 +645,7 @@
     },
     "settings": {
       "title": "设置",
-      "description": "调整BlitzKit设置",
+      "description": "更改 BlitzKit 设置",
       "dev_mode": "开发者模式",
       "language": "语言"
     },
@@ -661,13 +662,17 @@
         "select_dialog_title": "搜索坦克",
         "swap_dialog_title": "交换坦克",
         "clear_filters": "清除筛选",
-        "login": "Login to use this",
+        "login": "登录以使用它",
         "search_bar_hint": "搜寻战车……",
         "recent": "最近查看的",
         "select_all": "全选",
         "count_singular": "1辆战车",
-        "count_plural": "{count} tanks",
-        "sorting_by": "Sorting by {name}",
+        "count_plural": "{count} 辆坦克",
+        "sorting_by": "按 {name} 排序",
+        "clear": "清除",
+        "tier": "{tier} 阶",
+        "passive": "{name} (被动)",
+        "active": "{name} (主动)",
         "no_tanks_found": {
           "body": "找不到战车。",
           "search_again": "请尝试重新搜索。",
@@ -688,7 +693,7 @@
           "fire.caliber": "口径",
           "fire.standardPenetration": "标准炮弹穿透力",
           "fire.premiumPenetration": "加值炮弹穿透力",
-          "fire.tertiaryPenetration": "tertiary penetration",
+          "fire.tertiaryPenetration": "第三种炮弹穿透力",
           "fire.damage": "炮弹伤害值",
           "fire.moduleDamage": "模组伤害值",
           "fire.shellVelocity": "炮弹飞行速度",
@@ -730,12 +735,12 @@
     },
     "home": {
       "pwa": {
-        "title": "安装Blitz Kit App",
-        "new": "NEW",
+        "title": "安装 BlitzKit 应用程序",
+        "new": "新增",
         "checking": "正在检查兼容性……",
-        "instructions": "Instructions for Apple devices.",
+        "instructions": "Apple 设备的说明。",
         "install": "安装",
-        "dismiss": "忽略"
+        "dismiss": "取消"
       },
       "discord": {
         "join_short": "加入超級酷的人群！",
@@ -743,16 +748,16 @@
         "action": "Discord"
       },
       "hero": {
-        "credit": "By {name} ❤️"
+        "credit": "由 {name} 制作 ❤️"
       },
       "hot_tanks": {
         "title": "受欢迎的坦克",
-        "subtitle": "Last {days} days"
+        "subtitle": "过去 {days} 天"
       },
       "other_projects": {
         "title": "其他酷炫的项目"
       },
-      "help_translate": "Please help translate {name} to {language}!",
+      "help_translate": "请帮忙将 {name} 翻译成 {language}！",
       "seo_description": "战车世界闪击战 全方位工具"
     },
     "docs": {
@@ -764,49 +769,49 @@
     "tools": {
       "playlist": {
         "reset": "重置",
-        "shuffle": "Shuffle",
-        "remove": "Remove played",
-        "tracking": "BlitzKit is tracking your battles",
+        "shuffle": "换一批",
+        "remove": "移除已游玩的",
+        "tracking": "BlitzKit 正在追踪您的战斗记录",
         "sort": {
           "button": "排序依据",
-          "last_played": "Last played",
-          "least_played": "Least played"
+          "last_played": "最后一次游玩",
+          "least_played": "最少游玩的"
         },
         "table": {
           "index": "#",
-          "never": "Never",
-          "tank": "战车",
-          "last_played": "Last played",
-          "battles": "Career battles",
+          "never": "从不",
+          "tank": "坦克",
+          "last_played": "最后一次游玩",
+          "battles": "生涯战斗数",
           "unrecorded": "--",
           "wins": "胜利"
         },
         "large_warning": {
-          "title": "That's a lot of tanks!",
-          "description": "Are you sure you want to create a playlist of {count} tanks? That's {time} hours of gameplay at 50% winrate!",
+          "title": "坦克数量太多了！",
+          "description": "您确定要创建包含 {count} 个坦克的游玩列表吗？以50%胜率计算，这需要 {time} 小时的游玩时间！",
           "cancel": "取消",
-          "proceed": "Proceed"
+          "proceed": "继续操作"
         },
-        "generate": "Generate playlist",
-        "name": "Playlist",
-        "description": "Tank playlist generator",
-        "seo_description": "Don't know what to play in World of Tanks Blitz? Use BlitzKit Playlist to get suggestions!",
-        "button": "Generate",
-        "pool_size": "{count} possible tanks"
+        "generate": "创建游玩列表",
+        "name": "遊玩列表",
+        "description": "坦克游玩列表生成器",
+        "seo_description": "想不到在坦克世界闪击战玩什么? 使用BlitzKit 游玩列表来获得建议！",
+        "button": "生成",
+        "pool_size": "{count} 辆可生成的坦克"
       },
       "mixer": {
-        "name": "Mixer",
-        "button": "Mix and match",
-        "description": "Mix tank modules",
-        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
-        "screenshot": "Screenshot",
-        "randomize": "Randomize"
+        "name": "组装",
+        "button": "混合搭配",
+        "description": "混合坦克模块",
+        "seo_description": "《坦克世界：闪击战》的车体, 炮塔, 主炮混合搭配",
+        "screenshot": "屏幕截图",
+        "randomize": "随机搭配"
       },
       "guess": {
-        "name": "猜坦克",
-        "button": "猜猜看",
-        "description": "战车剪影小游戏",
-        "seo_description": "看剪影猜战车",
+        "name": "猜测",
+        "button": "这会是什么？",
+        "description": "坦克剪影小游戏",
+        "seo_description": "看剪影猜坦克",
         "search": {
           "placeholder": "输入你的猜想……",
           "skip": "跳过",
@@ -814,22 +819,31 @@
           "next": "下一个",
           "no_results": "沒有結果"
         },
-        "stats": "{correct} / {total} guessed correctly"
+        "stats": "猜对了 {correct} / {total}",
+        "help": {
+          "title": "显示坦克?",
+          "description": "显示坦克而不显示名字。这轮会被视为不正确，并打破你的连续记录！",
+          "cancel": "取消",
+          "reveal": "显示"
+        },
+        "clear": "清除",
+        "select_all": "全选",
+        "tier": "{tier} 阶"
       },
       "tankopedia": {
         "search": "搜索属性……",
         "name": "战车百科",
         "button": "搜索战车",
-        "description": "闪击战战车百科全书",
-        "seo_description": "战车世界闪击战的所有坦克参数， 装甲， 等等...",
-        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
+        "description": "闪击战坦克百科全书",
+        "seo_description": "《坦克世界：闪击战》的所有坦克参数， 装甲， 等等...",
+        "tank_seo_title": "{name} - {tier} 阶 {nationality} {class} | {website} 坦克百科 | 坦克世界闪击战 (WoTB)",
+        "tank_seo_description": "{name} 装甲，统计资料，装备，规定配给等。 {dpm} 每分钟伤害， {alpha} 伤害值， {penetration}毫米 穿透， {speed}公里/小時 最高速度， {health} 生命值。",
         "visualizers": {
           "reload": {
             "skip": "跳过"
           },
           "assault": {
-            "title": "Assault shells"
+            "title": "突击弹"
           },
           "rotator": {
             "hull": "车体",
@@ -852,10 +866,10 @@
             "dead_rail": "死亡铁道"
           },
           "flexibility": {
-            "yaw": "Yaw",
-            "pitch": "Pitch",
-            "min": "Min",
-            "max": "Max"
+            "yaw": "水平角度",
+            "pitch": "俯仰角度",
+            "min": "最少俯角",
+            "max": "最大仰角"
           }
         },
         "sandbox": {
@@ -901,15 +915,15 @@
                 "track": "履带"
               },
               "status": {
-                "penetration": "{damage}hp penetration",
+                "penetration": "{damage}生命值 击穿",
                 "blocked": "抵挡伤害",
                 "ricochet": "跳弹",
-                "splash": "{damage}hp splash"
+                "splash": "{damage}生命值 溅射"
               },
               "stats": {
-                "thickness_and_angle": "{thickness}mm {angle}°",
-                "nominal": "{thickness}mm nominal",
-                "ricochet_loss": "{loss}% penetration"
+                "thickness_and_angle": "{thickness}毫米 {angle}度°",
+                "nominal": "{thickness}毫米 装甲厚度",
+                "ricochet_loss": "{loss}% 击穿"
               }
             }
           },
@@ -929,13 +943,13 @@
           "compare": "比较",
           "swap": {
             "button": "调换",
-            "title": "调换战车"
+            "title": "调换坦克"
           },
           "vanilla": "原版",
           "opentest": "开放测试",
           "full_name": "全称",
           "nation": "国别",
-          "class": "战车车型",
+          "class": "坦克车型",
           "tier": "阶级",
           "type": "战车类型",
           "dev_id": "开发参数：ID",
@@ -947,20 +961,20 @@
         "tech_tree": {
           "title": "科技树",
           "battle": "一场比赛",
-          "battles": "{count} battles",
-          "route": "Route {index} of {count}"
+          "battles": "{count} 战斗场次",
+          "route": "路线 {index} / {count}"
         },
         "game_modes": {
           "title": "游戏模式技能"
         },
         "review": {
           "title": "回顾影片",
-          "join": "Apply to {name} YouTuber program"
+          "join": "应用到 {name} YouTuber程序"
         },
         "configuration": {
           "title": "配置设定",
           "modules": {
-            "title": "战车模块",
+            "title": "坦克模块",
             "stock": "白板",
             "upgrade": "顶级配置"
           },
@@ -975,7 +989,7 @@
           "consumables": {
             "title": "消耗品",
             "clear": "清除",
-            "info": "黄色高亮消耗品不影响战车参数。"
+            "info": "黄色高亮消耗品不影响坦克参数。"
           },
           "skills": {
             "title": "乘员技能",
@@ -991,15 +1005,15 @@
           "title": "属性",
           "compare": {
             "label": "比较",
-            "class": "Tier {tier} {class}",
-            "tier": "All of tier {tier}",
-            "all": "所有战车"
+            "class": "{tier}阶 {class}",
+            "tier": "所有 {tier} 阶",
+            "all": "所有坦克"
           },
           "values": {
-            "shell_index": "Shell {index}",
-            "at_distance": "At {distance}m",
+            "shell_index": "炮弹 {index}",
+            "at_distance": "在 {distance} 公尺",
             "at_distance_slider_label": "距离",
-            "dispersion_at_distance": "Dispersion at {distance}m",
+            "dispersion_at_distance": "在 {distance} 公尺的扩散度",
             "gun_flexibility": "炮管转动界限",
             "speed": "速度",
             "terrain_coefficients": "地形系数",
@@ -1015,13 +1029,13 @@
             "dpmEffective": "60秒内生效",
             "shells": "炮弹 ",
             "mostOptimalShellIndex": "最优炮弹",
-            "shellReloads": "Reloads",
+            "shellReloads": "装填时间",
             "shellReload": "装填时间",
             "intraClip": "炮弹装填",
             "caliber": "口径",
             "penetration": "穿深",
             "damage": "伤害",
-            "damageWithoutAssault": "Damage without assault shells",
+            "damageWithoutAssault": "无突击弹的伤害",
             "clipDamage": "弹匣伤害期望值",
             "moduleDamage": "模组伤害",
             "explosionRadius": "溅射半径",
@@ -1101,14 +1115,14 @@
       },
       "compare": {
         "name": "比较",
-        "button": "战车比较",
-        "description": "比较战车参数",
-        "seo_description": "比较《战车世界：闪击战》中的战车参数和装备配置",
+        "button": "坦克比较",
+        "description": "比较坦克参数",
+        "seo_description": "比较《坦克世界：闪击战》中的坦克参数和装备配置",
         "actions": {
           "add": {
             "button": "添加",
-            "title": "添加战车",
-            "description": "选择要加入比较的战车"
+            "title": "添加坦克",
+            "description": "选择要加入比较的坦克"
           },
           "clear": "清除",
           "deltas": {
@@ -1135,29 +1149,31 @@
             "upgrade": "顶级配置"
           },
           "provisions": {
-            "clear": "清除"
+            "clear": "清除",
+            "clear_all": "清除所有坦克"
           },
           "consumables": {
-            "clear": "清除"
+            "clear": "清除",
+            "clear_all": "清除所有坦克"
           }
         }
       },
       "performance": {
         "name": "性能表现",
-        "button": "查看战车",
-        "description": "战车性能统计",
-        "seo_description": "最好的战车及其在战车世界闪击战中的表现",
+        "button": "查看坦克",
+        "description": "坦克性能统计",
+        "seo_description": "最好的坦克及其在《坦克世界：闪击战》中的表现",
         "estimation": {
-          "body": "Estimated stats based on {count} players. Updated {age} ago.",
-          "hours": "{count} hours",
-          "minutes": "{count} minutes"
+          "body": "基于 {count} 个玩家的估计数据。更新于 {age} 之前。",
+          "hours": "{count} 小时",
+          "minutes": "{count} 分钟"
         },
         "player_count": {
           "label": "玩家数量"
         },
         "table": {
           "tanks": {
-            "header": "战车",
+            "header": "坦克",
             "total": "全部"
           },
           "stats": {
@@ -1181,18 +1197,18 @@
         "name": "图库",
         "button": "浏览全部",
         "description": "Blitz玩家头像",
-        "seo_description": "所有战车世界闪击战玩家头像",
-        "last_updated": "Last updated on {time}",
+        "seo_description": "所有《坦克世界：闪击战》玩家头像",
+        "last_updated": "最后更新于 {time}",
         "search": {
           "hint": "搜索頭像……",
-          "results": "{count} avatars"
+          "results": "{count} 头像"
         }
       },
       "session": {
         "name": "场次",
         "button": "开始追踪",
         "description": "即时场次统计",
-        "seo_description": "在游玩 战车世界闪击战 时，实时追踪你的统计数据",
+        "seo_description": "在游玩《坦克世界：闪击战》时，实时追踪你的统计数据",
         "search": {
           "lookup": "查询玩家以开始使用",
           "hint": "搜索玩家……",
@@ -1200,14 +1216,14 @@
           "no_results": "找不到玩家"
         },
         "controls": {
-          "title": "Tracking {name}",
-          "subtitle": "Since {time}",
+          "title": "正在追踪 {name}",
+          "subtitle": "起始于 {time}",
           "reset": "重置",
           "change": "变更"
         },
         "no_cc": {
           "title": "你正在尝试追踪一个 CC 帐戶",
-          "body": "CC（社群贡献者）账戶没有公开的战车统计数据。 我们正在为CC账戶添加嵌入功能，敬请期待。",
+          "body": "CC（社群贡献者）账戶没有公开的坦克统计数据。 我们正在为CC账戶添加嵌入功能，敬请期待。",
           "alright": "好的"
         },
         "no_battles": {
@@ -1215,16 +1231,16 @@
           "hint": "去玩一场游戏吧"
         },
         "table": {
-          "tank": "战车",
+          "tank": "坦克",
           "total": "全部",
           "remove": "移除"
         }
       },
       "tier_list": {
         "name": "阶级列表",
-        "button": "排名战车",
-        "description": "战车世界闪击战 战车等级排名",
-        "seo_description": "基于玩家评分和统计表现，从最佳到最差排名的《战车世界：闪击战》战车等级列表",
+        "button": "排名坦克",
+        "description": "《坦克世界：闪击战》坦克等级排名",
+        "seo_description": "基于玩家评分和统计表现，从最佳到最差排名的《坦克世界：闪击战》坦克等级列表",
         "buttons": {
           "reset": "重置",
           "share": "分享"
@@ -1234,7 +1250,7 @@
         "name": "嵌入",
         "button": "立即创建",
         "description": "用于串流的嵌入",
-        "seo_description": "创建具有极高自订化的《战车世界：闪击战》串流嵌入功能",
+        "seo_description": "创建具有极高自订化的《坦克世界：闪击战》串流嵌入功能",
         "coming_soon": "更多嵌入功能即将推出。",
         "suggest": "建议与想法",
         "preview": {
@@ -1261,7 +1277,7 @@
               "cancel": "取消",
               "success": {
                 "title": "拷贝 URL",
-                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
+                "info": "已为 {name} 生成 URL。 当 URL 粘贴后，嵌入功能将开始追踪。 您可以随时在 PC 上点击右键或手机上长按并选择「重置」来重置。",
                 "back": "返回",
                 "copy": "拷贝 URL"
               }
@@ -1285,13 +1301,13 @@
               "height": "高度",
               "showTotal": "显示总计",
               "listGap": "列表间距",
-              "listMaxTanks": "最多战车数量",
+              "listMaxTanks": "最多坦克数量",
               "cardRadius": "卡片半径",
               "cardHeaderBackgroundColor": "卡片标题背景颜色",
               "cardHeaderPadding": "卡片标题內间距",
               "cardTitle": "卡片标题",
-              "cardTitleTypeColor": "卡片标题(战车类型)颜色",
-              "cardTitleClassIcon": "卡片标题(战车车型)颜色",
+              "cardTitleTypeColor": "卡片标题(坦克类型)颜色",
+              "cardTitleClassIcon": "卡片标题(坦克车型)颜色",
               "cardBodyBackgroundColor": "卡片內容背景颜色",
               "cardBodyPadding": "卡片內容內間距",
               "columnGap": "栏间距",
@@ -1312,13 +1328,13 @@
         "name": "图表",
         "button": "瘋狂研究",
         "description": "大量图标",
-        "seo_description": "有关战车世界闪击战 战车、玩家与事件的各种图表与图形"
+        "seo_description": "有关《坦克世界：闪击战》坦克、玩家与事件的各种图表与图形"
       },
       "rating": {
         "name": "评价战斗",
         "button": "查看排行榜",
         "description": "完整评价战斗排行榜",
-        "seo_description": "《战车世界：闪击战》即时及已存档的完整评分排行榜"
+        "seo_description": "《坦克世界：闪击战》即时及已存档的完整评分排行榜"
       },
       "discord": {
         "name": "Discord机器人",
@@ -1336,7 +1352,7 @@
         "name": "玩家",
         "button": "查询玩家",
         "description": "定期玩家统计",
-        "seo_description": "战车世界闪击战 定期玩家统计"
+        "seo_description": "《坦克世界：闪击战》定期玩家统计"
       },
       "home": {
         "name": "主页",
@@ -1345,14 +1361,14 @@
         "seo_description": "开始使用 BlitzKit"
       },
       "api": {
-        "name": "API",
-        "button": "To the docs",
-        "description": "BlitzKit hosted API",
-        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
+        "name": "应用程序接口(API)",
+        "button": "前往文档",
+        "description": "BlitzKit 已托管的应用程序接口(API)",
+        "seo_description": "BlitzKit 托管的《坦克世界：闪击战》静态应用程序接口（API）"
       }
     },
     "footer": {
-      "motto": "战车世界闪击战 全方位工具",
+      "motto": "《坦克世界：闪击战》全方位工具",
       "copyright": "本网站与 Wargaming战游网 或任何服务无关",
       "about": {
         "title": "关于",

packages/scripts/package.json

@@ -14,6 +14,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/lz4js": "^0.2.1",
     "@types/progress": "^2.0.7",
+    "@types/steam-user": "^5.1.0",
     "@types/three": "^0.180.0",
     "crc": "^4.3.2",
     "csv-parse": "^6.1.0",
@@ -27,8 +28,10 @@
     "progress": "^2.0.3",
     "puppeteer": "^24.22.3",
     "sharp": "^0.34.4",
+    "steam-user": "^5.2.3",
     "three": "^0.180.0",
     "ts-proto": "^2.7.7",
+    "unzipit": "^1.4.3",
     "yaml": "^2.8.1"
   },
   "private": true,
@@ -42,8 +45,10 @@
     "build:bot": "bun src/buildBot.ts",
     "build:ratingleaderboard": "bun src/buildRatingLeaderboard.ts",
     "build:proxyclient": "bun src/buildProxyClient.ts",
+    "build:catalogitemaccesssor": "bun src/buildCatalogItemAccessor.ts",
     "prunestrings": "bun src/pruneStrings.ts",
-    "build:protos": "bun src/protos.ts"
+    "build:protos": "bun src/protos.ts",
+    "patchnotes": "bun src/patchNotes.ts"
   },
   "type": "module"
 }

packages/scripts/src/applyPatches.ts

@@ -4,12 +4,10 @@ import { mkdir, writeFile } from "fs/promises";
 import { parse as parsePath } from "path";
 import ProgressBar from "progress";
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
-import { readStringDVPL } from "../src/core/blitz/readStringDVPL";
-import { DATA } from "./buildAssets/constants";
-import { readYAMLDVPL } from "./core/blitz/readYAMLDVPL";
+import { vfs } from "./buildAssets/constants";
 import { writeDVPL } from "./core/blitz/writeDVPL";
 
-const versionTextFile = await readStringDVPL(`${DATA}/version.txt`);
+const versionTextFile = await vfs.text(`Data/version.txt`);
 const currentVersion = versionTextFile
   .split(" ")[0]
   .split(".")
@@ -51,7 +49,7 @@ while (true) {
       const { dir } = parsePath(path);
 
       try {
-        await mkdir(`${DATA}/${dir}`, { recursive: true });
+        await mkdir(`Data/${dir}`, { recursive: true });
       } catch (error) {
         console.warn(`Failed to make directory "${dir}"`);
       }
@@ -60,7 +58,7 @@ while (true) {
       const buffer = Buffer.from(data);
 
       await writeFile(
-        `${DATA}/${path}${isDvpl ? "" : ".dvpl"}`,
+        `Data/${path}${isDvpl ? "" : ".dvpl"}`,
         new Uint8Array(isDvpl ? buffer : writeDVPL(buffer))
       );
 
@@ -76,14 +74,14 @@ while (true) {
         }/en.yaml`
       );
       const newStrings = parseYaml(await localizationsResponse.text());
-      const oldStrings = await readYAMLDVPL<Record<string, string>>(
-        `${DATA}/Strings/en.yaml`
+      const oldStrings = await vfs.yaml<Record<string, string>>(
+        `Data/Strings/en.yaml`
       );
       const patchedStrings = { ...oldStrings, ...newStrings };
       const patchedContent = stringifyYaml(patchedStrings);
 
       await writeFile(
-        `${DATA}/Strings/en.yaml`,
+        `Data/Strings/en.yaml`,
         new Uint8Array(writeDVPL(Buffer.from(patchedContent)))
       );
     }

packages/scripts/src/averages.ts

@@ -11,10 +11,10 @@ import {
   getAccountInfo,
   getTankStats,
   idToRegion,
-} from '@blitzkit/core';
-import { chunk, times } from 'lodash-es';
-import { commitAssets } from './core/github/commitAssets';
-import { fetchPreDiscoveredIds } from './core/github/fetchPreDiscoveredIds';
+} from "@blitzkit/core";
+import { chunk, times } from "lodash-es";
+import { AssetUploader } from "./core/github/assetUploader";
+import { fetchPreDiscoveredIds } from "./core/github/fetchPreDiscoveredIds";
 
 interface DataPoint {
   x: number;
@@ -23,7 +23,7 @@ interface DataPoint {
 }
 
 type OptionalSecondLevel<T> = {
-  [P in keyof T]: P extends 'samples'
+  [P in keyof T]: P extends "samples"
     ? T[P]
     : {
         [K in keyof T[P]]?: T[P][K];
@@ -46,16 +46,16 @@ const startTime = Date.now();
 const preDiscoveredIds = await fetchPreDiscoveredIds();
 const playerIds: Record<Region, number[][]> = {
   asia: chunk(
-    preDiscoveredIds.filter((id) => idToRegion(id) === 'asia'),
-    PLAYER_IDS_PER_CALL,
+    preDiscoveredIds.filter((id) => idToRegion(id) === "asia"),
+    PLAYER_IDS_PER_CALL
   ),
   com: chunk(
-    preDiscoveredIds.filter((id) => idToRegion(id) === 'com'),
-    PLAYER_IDS_PER_CALL,
+    preDiscoveredIds.filter((id) => idToRegion(id) === "com"),
+    PLAYER_IDS_PER_CALL
   ),
   eu: chunk(
-    preDiscoveredIds.filter((id) => idToRegion(id) === 'eu'),
-    PLAYER_IDS_PER_CALL,
+    preDiscoveredIds.filter((id) => idToRegion(id) === "eu"),
+    PLAYER_IDS_PER_CALL
   ),
 };
 let regionIndex = 0;
@@ -71,10 +71,10 @@ times(THREADS, async () => {
     const regionIds = playerIds[region];
     const [ids] = regionIds.splice(
       Math.floor(Math.random() * regionIds.length),
-      1,
+      1
     );
     const accountInfo = await getAccountInfo(region, ids, undefined, {
-      fields: 'last_battle_time,statistics.all.battles',
+      fields: "last_battle_time,statistics.all.battles",
     });
 
     const filteredIds = ids.filter((_, index) => {
@@ -103,9 +103,9 @@ times(THREADS, async () => {
     const players = await Promise.all(
       filteredIds.map((id) =>
         getTankStats(region, id, {
-          fields: 'last_battle_time,battle_life_time,all,tank_id',
-        }),
-      ),
+          fields: "last_battle_time,battle_life_time,all,tank_id",
+        })
+      )
     );
 
     players.forEach((tanks) => {
@@ -114,7 +114,7 @@ times(THREADS, async () => {
 
         if (!tankIds.includes(tank.tank_id)) {
           console.log(
-            `Found new tank: ${tank.tank_id} (${tankIds.length + 1})`,
+            `Found new tank: ${tank.tank_id} (${tankIds.length + 1})`
           );
           tankIds.push(tank.tank_id);
           tanksSorted[tank.tank_id] = [];
@@ -140,9 +140,10 @@ async function postWork() {
   console.log(
     `Generating statistics based on ${samples.d_120.toLocaleString()} players (${samples.total.toLocaleString()} checked in total) and ${
       tankIds.length
-    } tanks...`,
+    } tanks...`
   );
 
+  using uploader = new AssetUploader("averages");
   const averages: Record<number, AverageDefinitionsEntry> = {};
 
   tankIds.forEach((id) => {
@@ -179,7 +180,7 @@ async function postWork() {
       const data: DataPoint[] = dataWY.map(({ w, y }, index) => ({
         w,
         x:
-          (key === 'battle_life_time'
+          (key === "battle_life_time"
             ? tanks[index].battle_life_time
             : tanks[index].all[key]) / w,
         y,
@@ -190,7 +191,7 @@ async function postWork() {
       function sum(slicer: (data: DataPoint) => number) {
         return data.reduce(
           (accumulator, data) => accumulator + slicer(data),
-          0,
+          0
         );
       }
 
@@ -231,14 +232,14 @@ async function postWork() {
     latest,
   };
 
-  commitAssets('averages', [
-    {
-      path: `averages/${latest}.pb`,
-      content: AverageDefinitions.encode(averageDefinitions).finish(),
-    },
-    {
-      path: 'averages/manifest.json',
-      content: new TextEncoder().encode(JSON.stringify(manifest)),
-    },
-  ]);
+  await uploader.add({
+    path: `averages/${latest}.pb`,
+    content: AverageDefinitions.encode(averageDefinitions).finish(),
+  });
+  await uploader.add({
+    path: "averages/manifest.json",
+    content: new TextEncoder().encode(JSON.stringify(manifest)),
+  });
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/blitzkitTankIcons.ts

@@ -1,49 +0,0 @@
-import { BLITZKIT_TANK_ICON_SIZE, fetchTankDefinitions } from "@blitzkit/core";
-import { launch } from "puppeteer";
-import sharp from "sharp";
-import { commitAssets } from "../core/github/commitAssets";
-import { type FileChange } from "../core/github/commitMultipleFiles";
-
-export async function blitzkitTankIcons() {
-  console.log("Building blitzkit tank icons...");
-
-  const browser = await launch();
-  const page = await browser.newPage();
-  const tanks = Object.values((await fetchTankDefinitions()).tanks);
-  const files: FileChange[] = [];
-
-  let index = 0;
-  for (const { id, name } of tanks) {
-    await page.setViewport({
-      width: BLITZKIT_TANK_ICON_SIZE.width - 1,
-      height: BLITZKIT_TANK_ICON_SIZE.height,
-    });
-
-    try {
-      await page.goto(`http://localhost:4321/api/tankopedia/tank-icon/${id}/`, {
-        waitUntil: "networkidle0",
-      });
-    } catch (error) {
-      console.error(`${id} ${name} time out`, error);
-      continue;
-    }
-
-    const screenshot = await page.screenshot({
-      type: "webp",
-      omitBackground: true,
-    });
-    const content = await sharp(screenshot).trim({ threshold: 100 }).toBuffer();
-
-    index++;
-    console.log(
-      `Rendered ${id} (${name}) ${((index / tanks.length) * 100).toFixed(2)}%`
-    );
-
-    files.push({ path: `icons/tanks/big/${id}.webp`, content });
-  }
-
-  await page.close();
-  await browser.close();
-
-  await commitAssets("tank icons", files);
-}

packages/scripts/src/buildAssets/boosterIcons.ts

@@ -1,48 +1,44 @@
-import { readdir } from 'fs/promises';
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 export async function boosterIcons() {
-  const boosterFiles = (await readdir(`${DATA}/Gfx/Shared/boosters`)).filter(
-    (file) => !file.includes('@2x.txt') && !file.startsWith('texture0'),
-  );
+  console.log("Building booster icons...");
+
+  const uploader = new AssetUploader("booster icons");
+  const boosterFiles = vfs
+    .dir("Data/Gfx/Shared/boosters")
+    .filter(
+      (file) => !file.includes("@2x.txt") && !file.startsWith("texture0")
+    );
   const image = sharp(
-    await readDVPLFile(`${DATA}/Gfx/Shared/boosters/texture0.packed.webp`),
-  );
-  const changes: FileChange[] = [];
-
-  await Promise.all(
-    boosterFiles.map(async (file) => {
-      const name = file.match(/booster_(.+).txt/)?.[1];
-
-      if (name === undefined) return;
-
-      const sizes = (
-        await readStringDVPL(`${DATA}/Gfx/Shared/boosters/${file}`)
-      )
-        .split('\n')[4]
-        .split(' ')
-        .map(Number);
-      const content = await image
-        .clone()
-        .extract({
-          left: sizes[0],
-          top: sizes[1],
-          width: sizes[2],
-          height: sizes[3],
-        })
-        .toBuffer();
-
-      changes.push({
-        path: `icons/boosters/${name}.webp`,
-        content,
-      });
-    }),
+    await vfs.file(`Data/Gfx/Shared/boosters/texture0.packed.webp`)
   );
 
-  await commitAssets('booster icons', changes);
+  for (const file of boosterFiles) {
+    const name = file.match(/booster_(.+).txt/)?.[1];
+
+    if (name === undefined) continue;
+
+    const sizes = (await vfs.text(`Data/Gfx/Shared/boosters/${file}`))
+      .split("\n")[4]
+      .split(" ")
+      .map(Number);
+    const content = await image
+      .clone()
+      .extract({
+        left: sizes[0],
+        top: sizes[1],
+        width: sizes[2],
+        height: sizes[3],
+      })
+      .toBuffer();
+
+    await uploader.add({
+      path: `icons/boosters/${name}.webp`,
+      content,
+    });
+  }
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/camouflageIcons.ts

@@ -1,19 +1,14 @@
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 export async function camouflageIcons() {
-  console.log('Building camouflage icons...');
-  const content = await readDVPLFile(
-    `${DATA}/Gfx/UI/Hangar/IconCamouflage.packed.webp`,
-  );
-  const changes: FileChange[] = [
-    {
-      content,
-      path: 'icons/camo.webp',
-    },
-  ];
+  console.log("Building camouflage icons...");
 
-  await commitAssets('camo icons', changes);
+  using uploader = new AssetUploader("camo icons");
+  const content = await vfs.file(
+    `Data/Gfx/UI/Hangar/IconCamouflage.packed.webp`
+  );
+
+  await uploader.add({ content, path: "icons/camo.webp" });
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/constants.ts

@@ -1,32 +1,33 @@
-import { readdir } from "fs/promises";
-import { argv } from "process";
+import { assertSecret } from "@blitzkit/core";
+import { AbstractVFS } from "../core/vfs/abstract";
+import { SteamVFS } from "../core/vfs/steam";
+import { ZipVFS } from "../core/vfs/zip";
 
-const WINDOWS_APPS = "C:/Program Files/WindowsApps";
-const wotbPackageRegex = /7458BE2C\..+_\d+(\.\d+)+_x64__.+/;
+const steamPattern = /steam:(\d+)\/(\d+)/;
+const zipPattern = /zip:(.+)/;
 
-const isManual = argv.includes("--manual");
+const source = Bun.argv
+  .find((arg) => arg.startsWith("--source="))
+  ?.split("=")[1];
 
-let data: string;
-let compressed: boolean;
+let resolved: AbstractVFS;
 
-if (isManual) {
-  data = "../../temp/game/Data";
-  compressed = true;
+if (!source) {
+  throw new Error("No source specified");
+} else if (steamPattern.test(source)) {
+  const [, app, depot] = source.match(steamPattern)!.map(Number);
+
+  resolved = await new SteamVFS(
+    assertSecret(import.meta.env.STEAM_USERNAME),
+    assertSecret(import.meta.env.STEAM_PASSWORD),
+    app,
+    depot
+  ).init();
+} else if (zipPattern.test(source)) {
+  const [, url] = source.match(zipPattern)!;
+  resolved = await new ZipVFS(url).init();
 } else {
-  const directories = await readdir(WINDOWS_APPS).then((files) =>
-    files.filter((file) => wotbPackageRegex.test(file))
-  );
-
-  if (directories.length !== 1) {
-    throw new Error(
-      `Expected 1 directory for WoTB Windows App, got ${directories.length}.`
-    );
-  }
-
-  const [windowsApp] = directories;
-  data = `${WINDOWS_APPS}/${windowsApp}/Data`;
-  compressed = false;
+  throw new Error("No valid source specified");
 }
 
-export const DATA = data;
-export const DATA_COMPRESSED = compressed;
+export const vfs = resolved;

packages/scripts/src/buildAssets/consumableProvisionIcons.ts

@@ -1,178 +1,176 @@
-import { existsSync } from 'fs';
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
-import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
-import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
-import { ConsumablesCommon, ProvisionsCommon } from './definitions';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
+import { ConsumablesCommon, ProvisionsCommon } from "./definitions";
 
 interface Mappings {
   Header: { version: number };
   StyleSheets: {
     selectors: string[];
-    properties: { 'bg-sprite': string };
+    properties: { "bg-sprite": string };
   }[];
 }
 
 const listItemsPattern = /<items path="(.+)\.xml"\/>/g;
 
 export async function consumableProvisionIcons() {
-  console.log('Building consumable and provision icons...');
-
-  const changes: FileChange[] = [];
+  console.log("Building consumable and provision icons...");
 
+  using uploader = new AssetUploader("consumable and provision icons");
   const styles = [
-    'UI/Styles/Lobby/Inventory/Event/InventoryBigStyles.yaml',
-    'UI/Styles/Lobby/Inventory/Event/InventoryNormalStyles.yaml',
-    'UI/Styles/Lobby/Inventory/InventoryNormalStyles.yaml',
-    'UI/Screens3/Lobby/Inventory/Equipment/EquipmentItemImage.style.yaml',
-    'UI/Screens/Battle/Styles/BattleEquipmentStyles.yaml',
+    "UI/Styles/Lobby/Inventory/Event/InventoryBigStyles.yaml",
+    "UI/Styles/Lobby/Inventory/Event/InventoryNormalStyles.yaml",
+    "UI/Styles/Lobby/Inventory/InventoryNormalStyles.yaml",
+    "UI/Screens3/Lobby/Inventory/Equipment/EquipmentItemImage.style.yaml",
+    "UI/Screens/Battle/Styles/BattleEquipmentStyles.yaml",
   ];
   const styleSheets = await Promise.all(
     styles.map(async (path) =>
       Object.values(
-        (await readYAMLDVPL<Mappings>(`${DATA}/${path}`)).StyleSheets,
-      ),
-    ),
+        (
+          await vfs.yaml<Mappings>(`Data/${path}`)
+        ).StyleSheets
+      )
+    )
   ).then((array) => array.flat());
 
   for (const match of (
-    await readStringDVPL(
-      `${DATA}/XML/item_defs/vehicles/common/consumables/list.xml`,
+    await vfs.text(
+      `Data/XML/item_defs/vehicles/common/consumables/list.xml`
     )
   ).matchAll(listItemsPattern)) {
-    const consumablesCommon = await readXMLDVPL<{
+    const consumablesCommon = await vfs.xml<{
       root: ConsumablesCommon;
-    }>(`${DATA}/XML/item_defs/vehicles/common/consumables/${match[1]}.xml`);
+    }>(`Data/XML/item_defs/vehicles/common/consumables/${match[1]}.xml`);
 
-    await Promise.all(
-      Object.values(consumablesCommon.root).map(async (consumable) => {
-        const styleSheet = styleSheets.find((styleSheet) =>
-          styleSheet.selectors.some((selector) =>
-            selector.includes(`${consumable.icon} `),
-          ),
+    for (const consumable of Object.values(consumablesCommon.root)) {
+      const styleSheet = styleSheets.find((styleSheet) =>
+        styleSheet.selectors.some((selector) =>
+          selector.includes(`${consumable.icon} `)
+        )
+      );
+
+      if (!styleSheet) {
+        console.warn(
+          `No style sheet found for consumable ${consumable.icon}; skipping...`
         );
+        continue;
+      }
 
-        if (!styleSheet) {
-          console.warn(
-            `No style sheet found for consumable ${consumable.icon}; skipping...`,
-          );
-          return;
-        }
+      const configPath = styleSheet.properties["bg-sprite"]
+        .replace("~res:/", "")
+        .replace(".psd", "")
+        .replace(".txt", "");
 
-        const configPath = styleSheet.properties['bg-sprite']
-          .replace('~res:/', '')
-          .replace('.psd', '')
-          .replace('.txt', '');
+      if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
+        const image = sharp(
+          await vfs.file(`Data/${configPath}.packed.webp`)
+        );
+        const content = await image.trim({ threshold: 100 }).toBuffer();
 
-        if (existsSync(`${DATA}/${configPath}.packed.webp`)) {
-          const image = sharp(
-            await readDVPLFile(`${DATA}/${configPath}.packed.webp`),
-          );
-          const content = await image.trim({ threshold: 100 }).toBuffer();
+        await uploader.add({
+          path: `icons/consumables/${consumable.id}.webp`,
+          content,
+        });
+      } else {
+        const consumablesTexture = sharp(
+          await vfs.file(
+            `${`Data/${configPath}`
+              .split("/")
+              .slice(0, -1)
+              .join("/")}/texture0.packed.webp`
+          )
+        );
+        const sizes = (await vfs.text(`Data/${configPath}.txt`))
+          .split("\n")[4]
+          .split(" ")
+          .map(Number);
+        const content = await consumablesTexture
+          .clone()
+          .extract({
+            left: sizes[0],
+            top: sizes[1],
+            width: sizes[2],
+            height: sizes[3],
+          })
+          .toBuffer();
 
-          changes.push({
-            path: `icons/consumables/${consumable.id}.webp`,
-            content,
-          });
-        } else {
-          const consumablesTexture = sharp(
-            await readDVPLFile(
-              `${`${DATA}/${configPath}`.split('/').slice(0, -1).join('/')}/texture0.packed.webp`,
-            ),
-          );
-          const sizes = (await readStringDVPL(`${DATA}/${configPath}.txt`))
-            .split('\n')[4]
-            .split(' ')
-            .map(Number);
-          const content = await consumablesTexture
-            .clone()
-            .extract({
-              left: sizes[0],
-              top: sizes[1],
-              width: sizes[2],
-              height: sizes[3],
-            })
-            .toBuffer();
-
-          changes.push({
-            path: `icons/consumables/${consumable.id}.webp`,
-            content,
-          });
-        }
-      }),
-    );
+        await uploader.add({
+          path: `icons/consumables/${consumable.id}.webp`,
+          content,
+        });
+      }
+    }
   }
 
   for (const match of (
-    await readStringDVPL(
-      `${DATA}/XML/item_defs/vehicles/common/provisions/list.xml`,
+    await vfs.text(
+      `Data/XML/item_defs/vehicles/common/provisions/list.xml`
     )
   ).matchAll(listItemsPattern)) {
-    const provisionsCommon = await readXMLDVPL<{
+    const provisionsCommon = await vfs.xml<{
       root: ProvisionsCommon;
-    }>(`${DATA}/XML/item_defs/vehicles/common/provisions/${match[1]}.xml`);
-    await Promise.all(
-      Object.values(provisionsCommon.root).map(async (provision) => {
-        const styleSheet = styleSheets.find((styleSheet) =>
-          styleSheet.selectors.some((selector) =>
-            selector.includes(`${provision.icon} `),
-          ),
+    }>(`Data/XML/item_defs/vehicles/common/provisions/${match[1]}.xml`);
+
+    for (const provision of Object.values(provisionsCommon.root)) {
+      const styleSheet = styleSheets.find((styleSheet) =>
+        styleSheet.selectors.some((selector) =>
+          selector.includes(`${provision.icon} `)
+        )
+      );
+
+      if (!styleSheet) {
+        console.warn(
+          `No style sheet found for provision ${provision.icon}; skipping...`
         );
+        continue;
+      }
 
-        if (!styleSheet) {
-          console.warn(
-            `No style sheet found for provision ${provision.icon}; skipping...`,
-          );
-          return;
-        }
+      const configPath = styleSheet.properties["bg-sprite"]
+        .replace("~res:/", "")
+        .replace(".psd", "")
+        .replace(".txt", "");
 
-        const configPath = styleSheet.properties['bg-sprite']
-          .replace('~res:/', '')
-          .replace('.psd', '')
-          .replace('.txt', '');
+      if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
+        const image = sharp(
+          await vfs.file(`Data/${configPath}.packed.webp`)
+        );
+        const content = await image.trim({ threshold: 100 }).toBuffer();
 
-        if (existsSync(`${DATA}/${configPath}.packed.webp`)) {
-          const image = sharp(
-            await readDVPLFile(`${DATA}/${configPath}.packed.webp`),
-          );
-          const content = await image.trim({ threshold: 100 }).toBuffer();
+        await uploader.add({
+          path: `icons/provisions/${provision.id}.webp`,
+          content,
+        });
+      } else {
+        const provisionsTexture = sharp(
+          await vfs.file(
+            `${`Data/${configPath}`
+              .split("/")
+              .slice(0, -1)
+              .join("/")}/texture0.packed.webp`
+          )
+        );
+        const sizes = (await vfs.text(`Data/${configPath}.txt`))
+          .split("\n")[4]
+          .split(" ")
+          .map(Number);
+        const content = await provisionsTexture
+          .clone()
+          .extract({
+            left: sizes[0],
+            top: sizes[1],
+            width: sizes[2],
+            height: sizes[3],
+          })
+          .toBuffer();
 
-          changes.push({
-            path: `icons/provisions/${provision.id}.webp`,
-            content,
-          });
-        } else {
-          const provisionsTexture = sharp(
-            await readDVPLFile(
-              `${`${DATA}/${configPath}`.split('/').slice(0, -1).join('/')}/texture0.packed.webp`,
-            ),
-          );
-          const sizes = (await readStringDVPL(`${DATA}/${configPath}.txt`))
-            .split('\n')[4]
-            .split(' ')
-            .map(Number);
-          const content = await provisionsTexture
-            .clone()
-            .extract({
-              left: sizes[0],
-              top: sizes[1],
-              width: sizes[2],
-              height: sizes[3],
-            })
-            .toBuffer();
-
-          changes.push({
-            path: `icons/provisions/${provision.id}.webp`,
-            content,
-          });
-        }
-      }),
-    );
+        await uploader.add({
+          path: `icons/provisions/${provision.id}.webp`,
+          content,
+        });
+      }
+    }
   }
 
-  await commitAssets('consumable and provision icons', changes);
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/currencies.ts

@@ -1,66 +1,62 @@
-import { assertSecret, BlitzGlossary } from '@blitzkit/core';
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
+import { assertSecret, BlitzGlossary } from "@blitzkit/core";
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 const ICONS = [
-  ['currency_silver_m.packed.webp', 'silver'],
-  ['currency_premium_xl.packed.webp', 'premium'],
-  ['currency_gold_m.packed.webp', 'gold'],
-  ['currency_free-xp_xl.packed.webp', 'free-xp'],
-  ['currency_elite-xp_xl.packed.webp', 'elite-xp'],
-  ['currency_crew-xp_xl.packed.webp', 'crew-xp'],
-  ['currency_battle-xp_xl.packed.webp', 'xp'],
+  ["currency_silver_m.packed.webp", "silver"],
+  ["currency_premium_xl.packed.webp", "premium"],
+  ["currency_gold_m.packed.webp", "gold"],
+  ["currency_free-xp_xl.packed.webp", "free-xp"],
+  ["currency_elite-xp_xl.packed.webp", "elite-xp"],
+  ["currency_crew-xp_xl.packed.webp", "crew-xp"],
+  ["currency_battle-xp_xl.packed.webp", "xp"],
 ];
 
 export async function currencies() {
-  console.log('Building currency icons...');
+  console.log("Building currency icons...");
 
-  const changes: FileChange[] = [];
+  using uploader = new AssetUploader("currency icons");
 
-  await Promise.all(
-    ICONS.map(async ([file, name]) => {
-      const content = await sharp(
-        await readDVPLFile(`${DATA}/Gfx/Lobby/currency/${file}`),
-      )
-        .trim()
-        .toBuffer();
+  for (const [file, name] of ICONS) {
+    const content = await sharp(
+      await vfs.file(`Data/Gfx/Lobby/currency/${file}`)
+    )
+      .trim()
+      .toBuffer();
 
-      changes.push({
-        content,
-        path: `icons/currencies/${name}.webp`,
-      });
-    }),
-  );
+    await uploader.add({
+      content,
+      path: `icons/currencies/${name}.webp`,
+    });
+  }
 
-  const glossary = await fetch(
-    assertSecret(import.meta.env.WOTB_GLOSSARY),
-  ).then((response) => response.json() as Promise<BlitzGlossary>);
+  const glossary = await fetch(assertSecret(import.meta.env.WOTB_GLOSSARY))
+    .then((response) => response.json() as Promise<BlitzGlossary>)
+    .then((glossary) =>
+      Object.values(glossary)
+        .entries()
+        .filter(([key]) => /^prx_season_\d+$/.test(`${key}`))
+    );
 
-  await Promise.all(
-    Object.entries(glossary)
-      .filter(([key]) => /^prx_season_\d+$/.test(key))
-      .map(async ([key, item]) => {
-        if (item.image_url === null) throw new Error(`No image_url for ${key}`);
+  for (const [key, item] of glossary) {
+    if (item.image_url === null) throw new Error(`No image_url for ${key}`);
 
-        const imageRaw = await fetch(item.image_url).then((response) =>
-          response.arrayBuffer(),
-        );
-        const content = await sharp(imageRaw)
-          .trim({
-            threshold: 100,
-            background: { r: 0, g: 0, b: 0, alpha: 0 },
-          })
-          .toBuffer();
+    const imageRaw = await fetch(item.image_url).then((response) =>
+      response.arrayBuffer()
+    );
+    const content = await sharp(imageRaw)
+      .trim({
+        threshold: 100,
+        background: { r: 0, g: 0, b: 0, alpha: 0 },
+      })
+      .toBuffer();
 
-        changes.push({
-          content,
-          path: `icons/currencies/${key}.webp`,
-        });
-      }),
-  );
+    await uploader.add({
+      content,
+      path: `icons/currencies/${key}.webp`,
+    });
+  }
 
-  await commitAssets('currency icons', changes);
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/definitions.ts

@@ -32,16 +32,12 @@ import {
 } from "@blitzkit/core";
 import { SUPPORTED_LOCALE_BLITZ_MAP } from "@blitzkit/i18n";
 import locales from "@blitzkit/i18n/locales.json";
-import { readdir } from "fs/promises";
 import { deburr } from "lodash-es";
 import { parse as parsePath } from "path";
 import type { Vector3Tuple } from "three";
 import { parse as parseYaml } from "yaml";
-import { readStringDVPL } from "../core/blitz/readStringDVPL";
-import { readXMLDVPL } from "../core/blitz/readXMLDVPL";
-import { readYAMLDVPL } from "../core/blitz/readYAMLDVPL";
-import { commitAssets } from "../core/github/commitAssets";
-import { DATA } from "./constants";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 import type { Avatar } from "./skillIcons";
 import type { TankParameters } from "./tankIcons";
 
@@ -302,7 +298,7 @@ interface VehicleDefinitions {
           type: "default";
           enabled: false;
           factorsModifiers: "";
-        },
+        }
       ];
     };
   };
@@ -538,10 +534,11 @@ const blitzModuleTypeToBlitzkit: Record<keyof BlitzModuleType, ModuleType> = {
 export async function definitions() {
   console.log("Building definitions...");
 
+  const uploader = new AssetUploader("definitions");
   const gameDefinitions: GameDefinitions = {
-    version: (await readStringDVPL(`${DATA}/version.txt`)).split(" ")[0],
+    version: (await vfs.text("Data/version.txt")).split(" ")[0],
     nations: (
-      await readYAMLDVPL<AvailableNationsYaml>(`${DATA}/available_nations.yaml`)
+      await vfs.yaml<AvailableNationsYaml>("Data/available_nations.yaml")
     ).available_nations,
     gameModes: {},
     roles: {},
@@ -564,12 +561,12 @@ export async function definitions() {
       [TankClass.TANK_DESTROYER]: { skills: [] },
     },
   };
-  const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
-    (nations) => nations.filter((nation) => nation !== "common")
-  );
+  const nations = vfs
+    .dir("Data/XML/item_defs/vehicles")
+    .filter((nation) => nation !== "common");
   const tankStringIdMap: Record<string, number> = {};
-  const optionalDevices = await readXMLDVPL<{ root: OptionalDevices }>(
-    `${DATA}/XML/item_defs/vehicles/common/optional_devices.xml`
+  const optionalDevices = await vfs.xml<{ root: OptionalDevices }>(
+    "Data/XML/item_defs/vehicles/common/optional_devices.xml"
   );
   const stringsI18n: Record<string, Record<string, string>> = {};
 
@@ -581,8 +578,8 @@ export async function definitions() {
       )
         .then((response) => response.text())
         .then((string) => parseYaml(string) as BlitzStrings);
-      const preInstalled = await readYAMLDVPL<BlitzStrings>(
-        `${DATA}/Strings/${blitzLocale}.yaml`
+      const preInstalled = await vfs.yaml<BlitzStrings>(
+        `Data/Strings/${blitzLocale}.yaml`
       );
 
       stringsI18n[locale] = {
@@ -615,67 +612,63 @@ export async function definitions() {
     return { locales: collection } satisfies I18nString;
   }
 
-  const optionalDeviceSlots = await readXMLDVPL<{
+  const optionalDeviceSlots = await vfs.xml<{
     root: OptionalDeviceSlots;
-  }>(`${DATA}/XML/item_defs/vehicles/common/optional_device_slots.xml`);
+  }>(`Data/XML/item_defs/vehicles/common/optional_device_slots.xml`);
   const consumables: ConsumablesCommon = {};
   const provisions: ProvisionsCommon = {};
 
   for (const match of (
-    await readStringDVPL(
-      `${DATA}/XML/item_defs/vehicles/common/consumables/list.xml`
-    )
+    await vfs.text(`Data/XML/item_defs/vehicles/common/consumables/list.xml`)
   ).matchAll(/<items path="(.+)\.xml"\/>/g)) {
     if (match[1] === "prototypes") continue;
 
     Object.assign(
       consumables,
       (
-        await readXMLDVPL<{ root: ConsumablesCommon }>(
-          `${DATA}/XML/item_defs/vehicles/common/consumables/${match[1]}.xml`
+        await vfs.xml<{ root: ConsumablesCommon }>(
+          `Data/XML/item_defs/vehicles/common/consumables/${match[1]}.xml`
         )
       ).root
     );
   }
 
   for (const match of (
-    await readStringDVPL(
-      `${DATA}/XML/item_defs/vehicles/common/provisions/list.xml`
-    )
+    await vfs.text(`Data/XML/item_defs/vehicles/common/provisions/list.xml`)
   ).matchAll(/<items path="(.+)\.xml"\/>/g)) {
     if (match[1] === "prototypes") continue;
 
     Object.assign(
       provisions,
       (
-        await readXMLDVPL<{ root: ConsumablesCommon }>(
-          `${DATA}/XML/item_defs/vehicles/common/provisions/${match[1]}.xml`
+        await vfs.xml<{ root: ConsumablesCommon }>(
+          `Data/XML/item_defs/vehicles/common/provisions/${match[1]}.xml`
         )
       ).root
     );
   }
 
-  const avatar = await readXMLDVPL<{ root: Avatar }>(
-    `${DATA}/XML/item_defs/tankmen/avatar.xml`
+  const avatar = await vfs.xml<{ root: Avatar }>(
+    `Data/XML/item_defs/tankmen/avatar.xml`
   );
-  const maps = await readYAMLDVPL<Maps>(`${DATA}/maps.yaml`);
+  const maps = await vfs.yaml<Maps>(`Data/maps.yaml`);
   const tankXps = new Map<number, ResearchCost>();
-  const camouflagesXml = await readXMLDVPL<{ root: CamouflagesXML }>(
-    `${DATA}/XML/item_defs/vehicles/common/camouflages.xml`
+  const camouflagesXml = await vfs.xml<{ root: CamouflagesXML }>(
+    `Data/XML/item_defs/vehicles/common/camouflages.xml`
   );
-  const camouflagesYaml = await readYAMLDVPL<CamouflagesYaml>(
-    `${DATA}/camouflages.yaml`
+  const camouflagesYaml = await vfs.yaml<CamouflagesYaml>(
+    `Data/camouflages.yaml`
   );
   const camouflagesXmlEntries = Object.entries(camouflagesXml.root.camouflages);
-  const squadBattleTypeStyles = await readYAMLDVPL<SquadBattleTypeStyles>(
-    `${DATA}/UI/Screens3/Lobby/Hangar/Squad/SquadBattleType.yaml`
+  const squadBattleTypeStyles = await vfs.yaml<SquadBattleTypeStyles>(
+    `Data/UI/Screens3/Lobby/Hangar/Squad/SquadBattleType.yaml`
   );
-  const gameTypeSelectorStyles = await readYAMLDVPL<SquadBattleTypeStyles>(
-    `${DATA}/UI/Screens/Lobby/Hangar/GameTypeSelector.yaml`
+  const gameTypeSelectorStyles = await vfs.yaml<SquadBattleTypeStyles>(
+    `Data/UI/Screens/Lobby/Hangar/GameTypeSelector.yaml`
   );
   const gameModeNativeNames: Record<string, number> = {};
-  const combatRoles = await readYAMLDVPL<CombatRolesYaml>(
-    `${DATA}/XML/item_defs/vehicles/common/combat_roles.yaml`
+  const combatRoles = await vfs.yaml<CombatRolesYaml>(
+    `Data/XML/item_defs/vehicles/common/combat_roles.yaml`
   );
   const consumableNativeNames: Record<string, number> = {};
   const provisionNativeNames: Record<string, number> = {};
@@ -726,8 +719,8 @@ export async function definitions() {
   const idToNation: Record<number, string> = {};
 
   for (const nation of nations) {
-    const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
-      `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`
+    const tankList = await vfs.xml<{ root: VehicleDefinitionList }>(
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`
     );
 
     for (const tankKey in tankList.root) {
@@ -766,7 +759,9 @@ export async function definitions() {
     }
 
     console.warn(
-      `Multiple tanks share slug ${slug}: ${requesters.map(({ key }) => key).join(", ")}`
+      `Multiple tanks share slug ${slug}: ${requesters
+        .map(({ key }) => key)
+        .join(", ")}`
     );
 
     if (requesters.length !== 2) {
@@ -808,24 +803,24 @@ export async function definitions() {
   });
 
   for (const nation of nations) {
-    const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
-      `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`
+    const tankList = await vfs.xml<{ root: VehicleDefinitionList }>(
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`
     );
-    const turretList = await readXMLDVPL<{
+    const turretList = await vfs.xml<{
       root: TurretDefinitionsList;
-    }>(`${DATA}/XML/item_defs/vehicles/${nation}/components/turrets.xml`);
-    const gunList = await readXMLDVPL<{
+    }>(`Data/XML/item_defs/vehicles/${nation}/components/turrets.xml`);
+    const gunList = await vfs.xml<{
       root: GunDefinitionsList;
-    }>(`${DATA}/XML/item_defs/vehicles/${nation}/components/guns.xml`);
-    const shellList = await readXMLDVPL<{
+    }>(`Data/XML/item_defs/vehicles/${nation}/components/guns.xml`);
+    const shellList = await vfs.xml<{
       root: ShellDefinitionsList;
-    }>(`${DATA}/XML/item_defs/vehicles/${nation}/components/shells.xml`);
-    const enginesList = await readXMLDVPL<{
+    }>(`Data/XML/item_defs/vehicles/${nation}/components/shells.xml`);
+    const enginesList = await vfs.xml<{
       root: EngineDefinitionsList;
-    }>(`${DATA}/XML/item_defs/vehicles/${nation}/components/engines.xml`);
-    const chassisList = await readXMLDVPL<{
+    }>(`Data/XML/item_defs/vehicles/${nation}/components/engines.xml`);
+    const chassisList = await vfs.xml<{
       root: ChassisDefinitionsList;
-    }>(`${DATA}/XML/item_defs/vehicles/${nation}/components/chassis.xml`);
+    }>(`Data/XML/item_defs/vehicles/${nation}/components/chassis.xml`);
 
     function resolveUnlocks(unlocks?: BlitzModuleType) {
       if (!unlocks) return [];
@@ -876,11 +871,11 @@ export async function definitions() {
       const trackXps = new Map<number, ResearchCost>();
       const tank = tankList.root[tankKey];
       let tankPrice: TankPrice;
-      const tankDefinition = await readXMLDVPL<{ root: VehicleDefinitions }>(
-        `${DATA}/XML/item_defs/vehicles/${nation}/${tankKey}.xml`
+      const tankDefinition = await vfs.xml<{ root: VehicleDefinitions }>(
+        `Data/XML/item_defs/vehicles/${nation}/${tankKey}.xml`
       );
-      const tankParameters = await readYAMLDVPL<TankParameters>(
-        `${DATA}/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
+      const tankParameters = await vfs.yaml<TankParameters>(
+        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
       );
       const turretOrigin = tankDefinition.root.hull.turretPositions.turret
         .split(" ")
@@ -1018,8 +1013,8 @@ export async function definitions() {
         type: tankTags.includes("collectible")
           ? TankType.COLLECTOR
           : (typeof tank.price === "number" ? false : "gold" in tank.price)
-            ? TankType.PREMIUM
-            : TankType.RESEARCHABLE,
+          ? TankType.PREMIUM
+          : TankType.RESEARCHABLE,
         tier: tank.level,
         class: blitzTankClassToBlitzkit[tankTags[0] as BlitzTankClass],
         testing: tankTags.includes("testTank"),
@@ -1337,24 +1332,24 @@ export async function definitions() {
                       },
                     }
                   : gunType === "autoReloader"
-                    ? {
-                        $case: "auto_reloader",
-                        value: {
-                          intra_clip: 60 / gun.clip!.rate,
-                          shell_count: gunClipCount,
-                          shell_reloads: gun
-                            .pumpGunReloadTimes!.split(" ")
-                            .map(Number),
-                        },
-                      }
-                    : {
-                        $case: "auto_loader",
-                        value: {
-                          intra_clip: 60 / gun.clip!.rate,
-                          clip_reload: gun.reloadTime,
-                          shell_count: gunClipCount,
-                        },
+                  ? {
+                      $case: "auto_reloader",
+                      value: {
+                        intra_clip: 60 / gun.clip!.rate,
+                        shell_count: gunClipCount,
+                        shell_reloads: gun
+                          .pumpGunReloadTimes!.split(" ")
+                          .map(Number),
                       },
+                    }
+                  : {
+                      $case: "auto_loader",
+                      value: {
+                        intra_clip: 60 / gun.clip!.rate,
+                        clip_reload: gun.reloadTime,
+                        shell_count: gunClipCount,
+                      },
+                    },
             } satisfies GunDefinition);
 
             modelDefinitions.models[tankId].turrets[turretId].guns[gunId] = {
@@ -1365,8 +1360,8 @@ export async function definitions() {
                 gun.armor.gun === undefined
                   ? 0
                   : typeof gun.armor.gun === "number"
-                    ? gun.armor.gun
-                    : gun.armor.gun["#text"],
+                  ? gun.armor.gun
+                  : gun.armor.gun["#text"],
               pitch: {
                 min: gunPitch[0],
                 max: gunPitch[1],
@@ -1413,7 +1408,7 @@ export async function definitions() {
                 type: blitzShellKindToBlitzkit[shell.kind],
                 explosion_radius:
                   shell.kind === "HIGH_EXPLOSIVE"
-                    ? (shell.explosionRadius ?? 0)
+                    ? shell.explosionRadius ?? 0
                     : undefined,
                 icon: shell.icon,
                 penetration: {
@@ -1562,87 +1557,85 @@ export async function definitions() {
     const includeRaw = consumable.vehicleFilter?.include.vehicle;
     const excludeRaw = consumable.vehicleFilter?.exclude?.vehicle;
 
-    if (!entry.game_mode_exclusive) {
-      if (includeRaw) {
-        entry.include = [];
+    if (includeRaw) {
+      entry.include = [];
 
-        if ("minLevel" in includeRaw) {
-          entry.include.push({
-            filter_type: {
-              $case: "tiers",
-              value: {
-                min: includeRaw.minLevel,
-                max: includeRaw.maxLevel,
-              },
+      if ("minLevel" in includeRaw) {
+        entry.include.push({
+          filter_type: {
+            $case: "tiers",
+            value: {
+              min: includeRaw.minLevel,
+              max: includeRaw.maxLevel,
             },
-          });
-        } else if ("name" in includeRaw) {
-          entry.include.push({
-            filter_type: {
-              $case: "ids",
-              value: {
-                ids: includeRaw.name.split(/ +/).map((key) => {
-                  return tankStringIdMap[key];
-                }),
-              },
+          },
+        });
+      } else if ("name" in includeRaw) {
+        entry.include.push({
+          filter_type: {
+            $case: "ids",
+            value: {
+              ids: includeRaw.name.split(/ +/).map((key) => {
+                return tankStringIdMap[key];
+              }),
             },
-          });
-        } else throw new SyntaxError("Unhandled include type");
+          },
+        });
+      } else throw new SyntaxError("Unhandled include type");
 
-        if (consumable.vehicleFilter?.include.nations) {
-          entry.include.push({
-            filter_type: {
-              $case: "nations",
-              value: {
-                nations: consumable.vehicleFilter.include.nations.split(" "),
-              },
+      if (consumable.vehicleFilter?.include.nations) {
+        entry.include.push({
+          filter_type: {
+            $case: "nations",
+            value: {
+              nations: consumable.vehicleFilter.include.nations.split(" "),
             },
-          });
-        }
+          },
+        });
       }
+    }
 
-      if (excludeRaw) {
-        entry.exclude = [];
+    if (excludeRaw) {
+      entry.exclude = [];
 
-        if ("name" in excludeRaw) {
-          entry.exclude!.push({
-            filter_type: {
-              $case: "ids",
-              value: {
-                ids: excludeRaw.name.split(/ +/).map((key) => {
-                  return tankStringIdMap[key];
-                }),
-              },
+      if ("name" in excludeRaw) {
+        entry.exclude!.push({
+          filter_type: {
+            $case: "ids",
+            value: {
+              ids: excludeRaw.name.split(/ +/).map((key) => {
+                return tankStringIdMap[key];
+              }),
             },
-          });
-        } else if ("extendedTags" in excludeRaw) {
-          entry.exclude!.push({
-            filter_type: {
-              $case: "categories",
-              value: {
-                categories: excludeRaw.extendedTags
-                  .split(" ")
-                  .map(
-                    (item) =>
-                      blitzTankFilterDefinitionCategoryToBlitzkit[
-                        item as BlitzTankFilterDefinitionCategory
-                      ]
-                  ),
-              },
+          },
+        });
+      } else if ("extendedTags" in excludeRaw) {
+        entry.exclude!.push({
+          filter_type: {
+            $case: "categories",
+            value: {
+              categories: excludeRaw.extendedTags
+                .split(" ")
+                .map(
+                  (item) =>
+                    blitzTankFilterDefinitionCategoryToBlitzkit[
+                      item as BlitzTankFilterDefinitionCategory
+                    ]
+                ),
             },
-          });
-        } else throw new SyntaxError("Unhandled exclude type");
+          },
+        });
+      } else throw new SyntaxError("Unhandled exclude type");
 
-        if (consumable.vehicleFilter?.exclude?.nations) {
-          entry.exclude!.push({
-            filter_type: {
-              $case: "nations",
-              value: {
-                nations: consumable.vehicleFilter.exclude.nations.split(" "),
-              },
+      if (consumable.vehicleFilter?.exclude?.nations) {
+        entry.exclude!.push({
+          filter_type: {
+            $case: "nations",
+            value: {
+              nations: consumable.vehicleFilter.exclude.nations.split(" "),
             },
-          });
-        }
+          },
+        });
       }
     }
   });
@@ -1662,87 +1655,85 @@ export async function definitions() {
     const includeRaw = provision.vehicleFilter?.include.vehicle;
     const excludeRaw = provision.vehicleFilter?.exclude?.vehicle;
 
-    if (!entry.game_mode_exclusive) {
-      if (includeRaw) {
-        entry.include = [];
+    if (includeRaw) {
+      entry.include = [];
 
-        if ("minLevel" in includeRaw) {
-          entry.include.push({
-            filter_type: {
-              $case: "tiers",
-              value: {
-                min: includeRaw.minLevel,
-                max: includeRaw.maxLevel,
-              },
+      if ("minLevel" in includeRaw) {
+        entry.include.push({
+          filter_type: {
+            $case: "tiers",
+            value: {
+              min: includeRaw.minLevel,
+              max: includeRaw.maxLevel,
             },
-          });
-        } else if ("name" in includeRaw) {
-          entry.include.push({
-            filter_type: {
-              $case: "ids",
-              value: {
-                ids: includeRaw.name.split(/ +/).map((key) => {
-                  return tankStringIdMap[key];
-                }),
-              },
+          },
+        });
+      } else if ("name" in includeRaw) {
+        entry.include.push({
+          filter_type: {
+            $case: "ids",
+            value: {
+              ids: includeRaw.name.split(/ +/).map((key) => {
+                return tankStringIdMap[key];
+              }),
             },
-          });
-        } else throw new SyntaxError("Unhandled include type");
+          },
+        });
+      } else throw new SyntaxError("Unhandled include type");
 
-        if (provision.vehicleFilter?.include.nations) {
-          entry.include.push({
-            filter_type: {
-              $case: "nations",
-              value: {
-                nations: provision.vehicleFilter.include.nations.split(" "),
-              },
+      if (provision.vehicleFilter?.include.nations) {
+        entry.include.push({
+          filter_type: {
+            $case: "nations",
+            value: {
+              nations: provision.vehicleFilter.include.nations.split(" "),
             },
-          });
-        }
+          },
+        });
       }
+    }
 
-      if (excludeRaw) {
-        entry.exclude = [];
+    if (excludeRaw) {
+      entry.exclude = [];
 
-        if ("name" in excludeRaw) {
-          entry.exclude!.push({
-            filter_type: {
-              $case: "ids",
-              value: {
-                ids: excludeRaw.name
-                  .split(/ +/)
-                  .map((key) => tankStringIdMap[key]),
-              },
+      if ("name" in excludeRaw) {
+        entry.exclude!.push({
+          filter_type: {
+            $case: "ids",
+            value: {
+              ids: excludeRaw.name
+                .split(/ +/)
+                .map((key) => tankStringIdMap[key]),
             },
-          });
-        } else if ("extendedTags" in excludeRaw) {
-          entry.exclude!.push({
-            filter_type: {
-              $case: "categories",
-              value: {
-                categories: excludeRaw.extendedTags
-                  .split(" ")
-                  .map(
-                    (item) =>
-                      blitzTankFilterDefinitionCategoryToBlitzkit[
-                        item as BlitzTankFilterDefinitionCategory
-                      ]
-                  ),
-              },
+          },
+        });
+      } else if ("extendedTags" in excludeRaw) {
+        entry.exclude!.push({
+          filter_type: {
+            $case: "categories",
+            value: {
+              categories: excludeRaw.extendedTags
+                .split(" ")
+                .map(
+                  (item) =>
+                    blitzTankFilterDefinitionCategoryToBlitzkit[
+                      item as BlitzTankFilterDefinitionCategory
+                    ]
+                ),
             },
-          });
-        } else throw new SyntaxError("Unhandled exclude type");
+          },
+        });
+      } else throw new SyntaxError("Unhandled exclude type");
 
-        if (provision.vehicleFilter?.exclude?.nations) {
-          entry.exclude!.push({
-            filter_type: {
-              $case: "nations",
-              value: {
-                nations: provision.vehicleFilter.exclude.nations.split(" "),
-              },
+      if (provision.vehicleFilter?.exclude?.nations) {
+        entry.exclude!.push({
+          filter_type: {
+            $case: "nations",
+            value: {
+              nations: provision.vehicleFilter.exclude.nations.split(" "),
             },
-          });
-        }
+          },
+        });
       }
     }
 
@@ -1783,42 +1774,42 @@ export async function definitions() {
     };
   });
 
-  await commitAssets("definitions", [
-    {
-      content: GameDefinitions.encode(gameDefinitions).finish(),
-      path: "definitions/game.pb",
-    },
-    {
-      content: TankDefinitions.encode(tankDefinitions).finish(),
-      path: "definitions/tanks.pb",
-    },
-    {
-      content: ModelDefinitions.encode(modelDefinitions).finish(),
-      path: "definitions/models.pb",
-    },
-    {
-      content: EquipmentDefinitions.encode(equipmentDefinitions).finish(),
-      path: "definitions/equipment.pb",
-    },
-    {
-      content: ConsumableDefinitions.encode(consumableDefinitions).finish(),
-      path: "definitions/consumables.pb",
-    },
-    {
-      content: ProvisionDefinitions.encode(provisionDefinitions).finish(),
-      path: "definitions/provisions.pb",
-    },
-    {
-      content: SkillDefinitions.encode(skillDefinitions).finish(),
-      path: "definitions/skills.pb",
-    },
-    {
-      content: MapDefinitions.encode(mapDefinitions).finish(),
-      path: "definitions/maps.pb",
-    },
-    {
-      content: CamouflageDefinitions.encode(camouflageDefinitions).finish(),
-      path: "definitions/camouflages.pb",
-    },
-  ]);
+  await uploader.add({
+    content: GameDefinitions.encode(gameDefinitions).finish(),
+    path: "definitions/game.pb",
+  });
+  await uploader.add({
+    content: TankDefinitions.encode(tankDefinitions).finish(),
+    path: "definitions/tanks.pb",
+  });
+  await uploader.add({
+    content: ModelDefinitions.encode(modelDefinitions).finish(),
+    path: "definitions/models.pb",
+  });
+  await uploader.add({
+    content: EquipmentDefinitions.encode(equipmentDefinitions).finish(),
+    path: "definitions/equipment.pb",
+  });
+  await uploader.add({
+    content: ConsumableDefinitions.encode(consumableDefinitions).finish(),
+    path: "definitions/consumables.pb",
+  });
+  await uploader.add({
+    content: ProvisionDefinitions.encode(provisionDefinitions).finish(),
+    path: "definitions/provisions.pb",
+  });
+  await uploader.add({
+    content: SkillDefinitions.encode(skillDefinitions).finish(),
+    path: "definitions/skills.pb",
+  });
+  await uploader.add({
+    content: MapDefinitions.encode(mapDefinitions).finish(),
+    path: "definitions/maps.pb",
+  });
+  await uploader.add({
+    content: CamouflageDefinitions.encode(camouflageDefinitions).finish(),
+    path: "definitions/camouflages.pb",
+  });
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/equipmentIcons.ts

@@ -1,91 +1,82 @@
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
-import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
-import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
-import { OptionalDevices } from './definitions';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
+import { OptionalDevices } from "./definitions";
 
 interface Mappings {
   Header: { version: number };
 
   StyleSheets: {
     selectors: string[];
-    properties: { 'bg-sprite': string };
+    properties: { "bg-sprite": string };
   }[];
 }
 
 export async function equipmentIcons() {
-  console.log('Building equipment icons...');
+  console.log("Building equipment icons...");
 
-  const changes: FileChange[] = [];
-  const optionalDevices = await readXMLDVPL<{ root: OptionalDevices }>(
-    `${DATA}/XML/item_defs/vehicles/common/optional_devices.xml`,
+  using uploader = new AssetUploader("equipment icons");
+  const optionalDevices = await vfs.xml<{ root: OptionalDevices }>(
+    `Data/XML/item_defs/vehicles/common/optional_devices.xml`
   );
-  const mappings = await readYAMLDVPL<Mappings>(
-    `${DATA}/UI/Screens3/Lobby/Inventory/OptionalDevices/OptionalDevicesItemImage.style.yaml`,
+  const mappings = await vfs.yaml<Mappings>(
+    `Data/UI/Screens3/Lobby/Inventory/OptionalDevices/OptionalDevicesItemImage.style.yaml`
   );
   const image = sharp(
-    await readDVPLFile(
-      `${DATA}/Gfx/UI/InventoryIcons/Big/OptionalDevices/texture0.packed.webp`,
-    ),
+    await vfs.file(
+      `Data/Gfx/UI/InventoryIcons/Big/OptionalDevices/texture0.packed.webp`
+    )
   );
 
-  await Promise.all(
-    Object.entries(optionalDevices.root).map(
-      async ([optionalDeviceKey, optionalDevice]) => {
-        if (optionalDeviceKey === 'nextAvailableId') return;
+  for (const optionalDeviceKey in optionalDevices.root) {
+    const optionalDevice = optionalDevices.root[optionalDeviceKey];
 
-        const mapping = mappings.StyleSheets.find((mapping) =>
-          mapping.selectors.includes(
-            `.optional_device_item.${optionalDevice.icon} #Img`,
-          ),
-        );
+    if (optionalDeviceKey === "nextAvailableId") continue;
 
-        if (!mapping) {
-          console.warn(
-            `No mapping found for ${optionalDevice.icon}; skipping...`,
-          );
-          return;
-        }
+    const mapping = mappings.StyleSheets.find((mapping) =>
+      mapping.selectors.includes(
+        `.optional_device_item.${optionalDevice.icon} #Img`
+      )
+    );
 
-        const configPathRaw = mapping.properties['bg-sprite'];
-        const configPath = configPathRaw.replace('~res:/', '');
+    if (!mapping) {
+      console.warn(`No mapping found for ${optionalDevice.icon}; skipping...`);
+      continue;
+    }
 
-        if (configPath.startsWith('Gfx/Lobby')) {
-          const configPathWebp = configPath.replace('.txt', '');
-          const image = sharp(
-            await readDVPLFile(`${DATA}/${configPathWebp}.packed.webp`),
-          );
-          const content = await image.trim().toBuffer();
+    const configPathRaw = mapping.properties["bg-sprite"];
+    const configPath = configPathRaw.replace("~res:/", "");
 
-          changes.push({
-            path: `icons/equipment/${optionalDevice.id}.webp`,
-            content,
-          });
-        } else {
-          const config = await readStringDVPL(`${DATA}/${configPath}`);
-          const sizes = config.split('\n')[4].split(' ').map(Number);
-          const content = await image
-            .clone()
-            .extract({
-              left: sizes[0],
-              top: sizes[1],
-              width: sizes[2],
-              height: sizes[3],
-            })
-            .toBuffer();
+    if (configPath.startsWith("Gfx/Lobby")) {
+      const configPathWebp = configPath.replace(".txt", "");
+      const image = sharp(
+        await vfs.file(`Data/${configPathWebp}.packed.webp`)
+      );
+      const content = await image.trim().toBuffer();
 
-          changes.push({
-            path: `icons/equipment/${optionalDevice.id}.webp`,
-            content,
-          });
-        }
-      },
-    ),
-  );
+      await uploader.add({
+        path: `icons/equipment/${optionalDevice.id}.webp`,
+        content,
+      });
+    } else {
+      const config = await vfs.text(`Data/${configPath}`);
+      const sizes = config.split("\n")[4].split(" ").map(Number);
+      const content = await image
+        .clone()
+        .extract({
+          left: sizes[0],
+          top: sizes[1],
+          width: sizes[2],
+          height: sizes[3],
+        })
+        .toBuffer();
 
-  await commitAssets('equipment icons', changes);
+      await uploader.add({
+        path: `icons/equipment/${optionalDevice.id}.webp`,
+        content,
+      });
+    }
+  }
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/flags.ts

@@ -1,75 +1,63 @@
-import { readdir } from 'fs/promises';
-import sharp from 'sharp';
-import { readDVPLFile } from '../core/blitz/readDVPLFile';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 export async function flags() {
-  console.log('Building flags...');
+  console.log("Building flags...");
 
-  const changes = [
-    ...(await Promise.all(
-      (await readdir(`${DATA}/Gfx/Lobby/flags`))
-        .filter(
-          (flag) =>
-            flag.startsWith('flag_profile-stat_') &&
-            !flag.endsWith('@2x.packed.webp'),
-        )
-        .map(async (flag) => {
-          const image = sharp(
-            await readDVPLFile(`${DATA}/Gfx/Lobby/flags/${flag}`),
-          );
-          const content = await image.trim({ threshold: 100 }).toBuffer();
-          const name = flag.match(/flag_profile-stat_(.+)\.packed\.webp/)![1];
+  using uploader = new AssetUploader("flags");
+  const circleFiles = vfs.dir(`Data/Gfx/Lobby/flags`).filter(
+      (flag) =>
+        flag.startsWith("flag_profile-stat_") &&
+        !flag.endsWith("@2x.packed.webp")
+    );
+  const scratchedFiles = vfs.dir(`Data/Gfx/Lobby/flags`).filter(
+        (flag) =>
+          flag.startsWith("flag_tutor-tank_") &&
+          !flag.endsWith("@2x.packed.webp")
+      )
+  const fadedFiles = vfs.dir(`Data/Gfx/Lobby/flags`).filter(
+      (flag) =>
+        flag.startsWith("flag_filter_") && flag.endsWith("@2x.packed.webp")
+    )
 
-          return {
-            content,
-            path: `flags/circle/${name}.webp`,
-          } satisfies FileChange;
-        }),
-    )),
-    ...(await Promise.all(
-      (await readdir(`${DATA}/Gfx/Lobby/flags`))
-        .filter(
-          (flag) =>
-            flag.startsWith('flag_tutor-tank_') &&
-            !flag.endsWith('@2x.packed.webp'),
-        )
-        .map(async (flag) => {
-          const content = await readDVPLFile(`${DATA}/Gfx/Lobby/flags/${flag}`);
-          const name = flag.match(/flag_tutor-tank_(.+)\.packed\.webp/)![1];
+  for (const flag of circleFiles) {
+    const image = sharp(await vfs.file(`Data/Gfx/Lobby/flags/${flag}`));
+    const content = await image.trim({ threshold: 100 }).toBuffer();
+    const name = flag.match(/flag_profile-stat_(.+)\.packed\.webp/)![1];
 
-          return {
-            path: `flags/scratched/${name}.webp`,
-            content,
-          } satisfies FileChange;
-        }),
-    )),
-    ...(await Promise.all(
-      (await readdir(`${DATA}/Gfx/Lobby/flags`))
-        .filter(
-          (flag) =>
-            flag.startsWith('flag_filter_') && flag.endsWith('@2x.packed.webp'),
-        )
-        .map(async (flag) => {
-          const content = await sharp(
-            await readDVPLFile(`${DATA}/Gfx/Lobby/flags/${flag}`),
-          )
-            .trim({
-              threshold: 100,
-              background: { r: 0, g: 0, b: 0, alpha: 0 },
-            })
-            .toBuffer();
-          const name = flag.match(/flag_filter_(.+)@2x\.packed\.webp/)![1];
+    uploader.add({
+      content,
+      path: `flags/circle/${name}.webp`,
+    });
+  }
 
-          return {
-            content,
-            path: `flags/fade_small/${name}.webp`,
-          } satisfies FileChange;
-        }),
-    )),
-  ];
+  for (const flag of scratchedFiles) {
+    const content = await vfs.file(`Data/Gfx/Lobby/flags/${flag}`);
+    const name = flag.match(/flag_tutor-tank_(.+)\.packed\.webp/)![1];
 
-  await commitAssets('flags', changes);
+    uploader.add({
+      path: `flags/scratched/${name}.webp`,
+      content,
+    });
+  }
+
+  for (const flag of fadedFiles) {
+    const content = await sharp(
+      await vfs.file(`Data/Gfx/Lobby/flags/${flag}`)
+    )
+      .trim({
+        threshold: 100,
+        background: { r: 0, g: 0, b: 0, alpha: 0 },
+      })
+      .toBuffer();
+    const name = flag.match(/flag_filter_(.+)@2x\.packed\.webp/)![1];
+
+    uploader.add({
+      content,
+      path: `flags/fade_small/${name}.webp`,
+    });
+  }
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/gameModeBanners.ts

@@ -1,36 +1,33 @@
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
-import { SquadBattleTypeStyles } from './definitions';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
+import { SquadBattleTypeStyles } from "./definitions";
 
 export async function gameModeBanners() {
-  console.log('Building game mode banners...');
+  console.log("Building game mode banners...");
 
-  const changes: FileChange[] = [];
-  const gameTypeSelectorStyles = await readYAMLDVPL<SquadBattleTypeStyles>(
-    `${DATA}/UI/Screens/Lobby/Hangar/GameTypeSelector.yaml`,
+  using uploader = new AssetUploader("game mode banners");
+  const gameTypeSelectorStyles = await vfs.yaml<SquadBattleTypeStyles>(
+    `Data/UI/Screens/Lobby/Hangar/GameTypeSelector.yaml`
   );
-  const squadBattleTypeStyles = await readYAMLDVPL<SquadBattleTypeStyles>(
-    `${DATA}/UI/Screens3/Lobby/Hangar/Squad/SquadBattleType.yaml`,
+  const squadBattleTypeStyles = await vfs.yaml<SquadBattleTypeStyles>(
+    `Data/UI/Screens3/Lobby/Hangar/Squad/SquadBattleType.yaml`
   );
   const bannerMatches: { name: string; path: string }[] = [];
 
   for (const match of gameTypeSelectorStyles.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll(
-    /eGameMode\.([a-zA-Z]+) -> "~res:([^"]+)"/g,
+    /eGameMode\.([a-zA-Z]+) -> "~res:([^"]+)"/g
   )) {
     bannerMatches.push({ name: match[1], path: match[2] });
   }
 
   for (const match of squadBattleTypeStyles.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll(
-    /"(\d+)" -> "battleType\/([a-zA-Z]+)"/g,
+    /"(\d+)" -> "battleType\/([a-zA-Z]+)"/g
   )) {
     const id = Number(match[1]);
     const name = match[2];
     let path = bannerMatches.find(
-      (bannerMatch) => bannerMatch.name.toLowerCase() === name.toLowerCase(),
+      (bannerMatch) => bannerMatch.name.toLowerCase() === name.toLowerCase()
     )?.path;
 
     if (path === undefined) {
@@ -38,16 +35,16 @@ export async function gameModeBanners() {
     }
 
     const content = await sharp(
-      await readDVPLFile(`${DATA}${path}.packed.webp`),
+      await vfs.file(`Data${path}.packed.webp`)
     )
       .trim({ background: { r: 0, g: 0, b: 0, alpha: 0 } })
       .toBuffer();
 
-    changes.push({
+    await uploader.add({
       path: `icons/game_mode_banners/${id}.webp`,
       content,
     });
   }
 
-  await commitAssets('game mode banners', changes);
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/glossary.ts

@@ -1,13 +1,13 @@
-import { Avatar, 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';
+import { Avatar, fetchGlossary, Gallery } from "@blitzkit/core";
+import locales from "@blitzkit/i18n/locales.json";
+import { extname } from "path";
+import ProgressBar from "progress";
+import { AssetUploader } from "../core/github/assetUploader";
 
 export async function glossary() {
-  console.log('Building glossary...');
+  console.log("Building glossary...");
 
+  using uploader = new AssetUploader("glossary");
   const avatars: Record<string, { avatar: Avatar; url: string }> = {};
 
   await Promise.all(
@@ -15,15 +15,15 @@ export async function glossary() {
       const glossary = await fetchGlossary(supported.blitz ?? supported.locale);
 
       console.log(
-        `Found ${Object.keys(glossary).length} things for ${supported.locale}`,
+        `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') ||
+          !key.startsWith("avatar") ||
+          key.endsWith("_part") ||
           glossaryEntry.image_url === null
         ) {
           continue;
@@ -45,16 +45,15 @@ export async function glossary() {
           };
         }
       }
-    }),
+    })
   );
 
-  const changes: FileChange[] = [];
   const gallery: Gallery = { avatars: [] };
   const totalCount = Object.keys(avatars).length;
 
   const bar = new ProgressBar(
     `Fetching avatars of ${totalCount} things :bar`,
-    totalCount,
+    totalCount
   );
 
   await Promise.all(
@@ -72,19 +71,19 @@ export async function glossary() {
         .then((response) => response.arrayBuffer())
         .then((buffer) => new Uint8Array(buffer));
 
-      changes.push({
+      await uploader.add({
         path: `gallery/avatars/${key}${avatar.extension}`,
         content,
       });
 
       bar.tick();
-    }),
+    })
   );
 
-  changes.push({
-    path: 'definitions/gallery.pb',
+  await uploader.add({
+    path: "definitions/gallery.pb",
     content: Gallery.encode(gallery).finish(),
   });
 
-  await commitAssets('glossary', changes);
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/index.ts

@@ -1,16 +1,8 @@
 import { config } from "dotenv";
 import { argv } from "process";
-
-config();
-
-const allTargets = argv.includes("--all-targets");
-const targets = argv
-  .find((argument) => argument.startsWith("--target"))
-  ?.split("=")[1]
-  .split(",");
-
 import { boosterIcons } from "./boosterIcons";
 import { camouflageIcons } from "./camouflageIcons";
+import { vfs } from "./constants";
 import { consumableProvisionIcons } from "./consumableProvisionIcons";
 import { currencies } from "./currencies";
 import { definitions } from "./definitions";
@@ -20,17 +12,26 @@ 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";
 import { tankIcons } from "./tankIcons";
 import { tankModels } from "./tankModels";
 
+config();
+
+const allTargets = argv.includes("--all-targets");
+const targets = argv
+  .find((argument) => argument.startsWith("--target"))
+  ?.split("=")[1]
+  .split(",");
+
 if (!targets && !allTargets) throw new Error("No target(s) specified");
 
 const methods = [
-  migration,
   definitions,
+  tankIcons,
   tankModels,
   tankArmors,
   gameModeBanners,
@@ -43,10 +44,9 @@ const methods = [
   consumableProvisionIcons,
   camouflageIcons,
   boosterIcons,
-  tankIcons,
-  // blitzkitTankIcons,
-  // popularTanks,
   glossary,
+  migration,
+  popularTanks,
 ];
 
 for (const method of methods) {
@@ -59,3 +59,6 @@ for (const method of methods) {
     }
   }
 }
+
+vfs.dispose();
+process.exit(0);

packages/scripts/src/buildAssets/migration.ts

@@ -1,38 +1,32 @@
-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';
+import { toUniqueId } from "@blitzkit/core";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
+import { VehicleDefinitionList } from "./definitions";
 
 export async function migration() {
-  console.log('Building migration map...');
+  console.log("Building migration map...");
 
+  using uploader = new AssetUploader("migration map");
   const map: Record<string, number> = {};
-  const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
-    (nations) => nations.filter((nation) => nation !== 'common'),
-  );
+  const nations = vfs.dir(`Data/XML/item_defs/vehicles`).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 nation of nations) {
+    const tankList = await vfs.xml<{ 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}`;
+    for (const tankKey in tankList.root) {
+      const tank = tankList.root[tankKey];
+      const tankId = toUniqueId(nation, tank.id);
+      const davaKey = `${nation}:${tankKey}`;
 
-        map[davaKey] = tankId;
-      }
-    }),
-  );
+      map[davaKey] = tankId;
+    }
+  }
 
-  await commitAssets('migration', [
-    {
-      path: 'definitions/migration.json',
-      content: new TextEncoder().encode(JSON.stringify(map)),
-    },
-  ]);
+  await uploader.add({
+    path: "definitions/migration.json",
+    content: new TextEncoder().encode(JSON.stringify(map)),
+  });
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/moduleIcons.ts

@@ -1,34 +1,29 @@
-import { readdir } from 'fs/promises';
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 export async function moduleIcons() {
-  console.log('Building module icons...');
+  console.log("Building module icons...");
 
-  const changes = await Promise.all(
-    (await readdir(`${DATA}/Gfx/UI/ModulesTechTree`))
-      .filter(
-        (file) =>
-          !file.endsWith('@2x.packed.webp') && file.startsWith('vehicle'),
-      )
-      .map(async (file) => {
-        const nameRaw = file.match(/vehicle(.+)\.packed\.webp/)![1];
-        const name = nameRaw[0].toLowerCase() + nameRaw.slice(1);
-        const content = await sharp(
-          await readDVPLFile(`${DATA}/Gfx/UI/ModulesTechTree/${file}`),
-        )
-          .trim()
-          .toBuffer();
+  using uploader = new AssetUploader("module icons");
+  const files = vfs.dir(`Data/Gfx/UI/ModulesTechTree`).filter(
+      (file) => !file.endsWith("@2x.packed.webp") && file.startsWith("vehicle")
+    )
 
-        return {
-          content,
-          path: `icons/modules/${name}.webp`,
-        } satisfies FileChange;
-      }),
-  );
+  for (const file of files) {
+    const nameRaw = file.match(/vehicle(.+)\.packed\.webp/)![1];
+    const name = nameRaw[0].toLowerCase() + nameRaw.slice(1);
+    const content = await sharp(
+      await vfs.file(`Data/Gfx/UI/ModulesTechTree/${file}`)
+    )
+      .trim()
+      .toBuffer();
 
-  await commitAssets('module icons', changes);
+    await uploader.add({
+      content,
+      path: `icons/modules/${name}.webp`,
+    });
+  }
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/popularTanks.ts

@@ -2,31 +2,34 @@ import {
   assertSecret,
   fetchTankDefinitions,
   PopularTanks,
-} from '@blitzkit/core';
-import { google } from 'googleapis';
-import { commitAssets } from '../core/github/commitAssets';
+} from "@blitzkit/core";
+import { google } from "googleapis";
+import { AssetUploader } from "../core/github/assetUploader";
 
 export async function popularTanks() {
+  using uploader = new AssetUploader("popular tanks");
   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'],
+    scopes: ["https://www.googleapis.com/auth/analytics.readonly"],
   });
-  const analytics = google.analyticsdata({ version: 'v1beta', auth });
+  const analytics = google.analyticsdata({ version: "v1beta", auth });
   const report = await analytics.properties.runReport({
-    property: `properties/${assertSecret(import.meta.env.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID)}`,
+    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 }],
+      dateRanges: [{ startDate: "7daysAgo", endDate: "today" }],
+      dimensions: [{ name: "pagePath" }],
+      metrics: [{ name: "screenPageViews" }],
+      orderBys: [{ metric: { metricName: "screenPageViews" }, desc: true }],
       dimensionFilter: {
         filter: {
-          fieldName: 'pagePath',
+          fieldName: "pagePath",
           stringFilter: {
-            matchType: 'BEGINS_WITH',
-            value: '/tanks/',
+            matchType: "BEGINS_WITH",
+            value: "/tanks/",
           },
         },
       },
@@ -34,7 +37,7 @@ export async function popularTanks() {
   });
 
   if (!report.data.rows) {
-    throw new Error('No rows in report');
+    throw new Error("No rows in report");
   }
 
   const tanks = report.data.rows
@@ -42,21 +45,21 @@ export async function popularTanks() {
       (row) =>
         row.dimensionValues &&
         row.dimensionValues[0].value &&
-        row.dimensionValues[0].value !== '/tanks/' &&
+        row.dimensionValues[0].value !== "/tanks/" &&
         row.metricValues &&
-        row.metricValues[0].value,
+        row.metricValues[0].value
     )
     .map((row) => ({
       id: Number(
         row.dimensionValues![0].value!.match(
-          /\/tools\/tankopedia\/(\d+)\/?/,
-        )?.[1],
+          /\/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);
+        console.warn("Skipping unknown popular tank", row.id);
         return false;
       }
 
@@ -66,10 +69,9 @@ export async function popularTanks() {
     .map(({ id, views }) => ({ id, views }));
   const popularTanks: PopularTanks = { tanks };
 
-  await commitAssets('popular tanks', [
-    {
-      path: 'definitions/popular-tanks.pb',
-      content: PopularTanks.encode(popularTanks).finish(),
-    },
-  ]);
+  await uploader.add({
+    path: "definitions/popular-tanks.pb",
+    content: PopularTanks.encode(popularTanks).finish(),
+  });
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/shellIcons.ts

@@ -1,48 +1,44 @@
-import { readdir } from 'fs/promises';
-import sharp from 'sharp';
-import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
+import sharp from "sharp";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 export async function shellIcons() {
-  console.log('Building shell icons...');
+  console.log("Building shell icons...");
 
+  using uploader = new AssetUploader("shell icons");
   const image = sharp(
-    await readDVPLFile(
-      `${DATA}/Gfx/Shared/tank-supply/ammunition/big/texture0.packed.webp`,
-    ),
+    await vfs.file(
+      `Data/Gfx/Shared/tank-supply/ammunition/big/texture0.packed.webp`
+    )
   );
+  const files = vfs.dir(
+    `Data/Gfx/Shared/tank-supply/ammunition/big`
+  ).filter((file) => file.endsWith("_l.txt"))
 
-  const changes = await Promise.all(
-    (await readdir(`${DATA}/Gfx/Shared/tank-supply/ammunition/big`))
-      .filter((file) => file.endsWith('_l.txt'))
-      .map(async (file) => {
-        const name = file.match(/(.+)_l\.txt/)![1];
-        const sizes = (
-          await readStringDVPL(
-            `${DATA}/Gfx/Shared/tank-supply/ammunition/big/${file}`,
-          )
-        )
-          .split('\n')[4]
-          .split(' ')
-          .map(Number);
+  for (const file of files) {
+    const name = file.match(/(.+)_l\.txt/)![1];
+    const sizes = (
+      await vfs.text(
+        `Data/Gfx/Shared/tank-supply/ammunition/big/${file}`
+      )
+    )
+      .split("\n")[4]
+      .split(" ")
+      .map(Number);
 
-        return {
-          content: await image
-            .clone()
-            .extract({
-              left: sizes[0],
-              top: sizes[1],
-              width: sizes[2],
-              height: sizes[3],
-            })
-            .toBuffer(),
-          path: `icons/shells/${name}.webp`,
-        } satisfies FileChange;
-      }),
-  );
+    await uploader.add({
+      content: await image
+        .clone()
+        .extract({
+          left: sizes[0],
+          top: sizes[1],
+          width: sizes[2],
+          height: sizes[3],
+        })
+        .toBuffer(),
+      path: `icons/shells/${name}.webp`,
+    });
+  }
 
-  await commitAssets('shell icons', changes);
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/skillIcons.ts

@@ -1,10 +1,7 @@
 import { TankClass } from "@blitzkit/core";
 import sharp from "sharp";
-import { readDVPLFile } from "../core/blitz/readDVPLFile";
-import { readXMLDVPL } from "../core/blitz/readXMLDVPL";
-import { commitAssets } from "../core/github/commitAssets";
-import type { FileChange } from "../core/github/commitMultipleFiles";
-import { DATA } from "./constants";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 
 interface SkillIcon {
   name: string;
@@ -28,23 +25,21 @@ export interface Avatar {
 export async function skillIcons() {
   console.log("Building skill icons...");
 
-  const avatar = await readXMLDVPL<{ root: Avatar }>(
-    `${DATA}/XML/item_defs/tankmen/avatar.xml`
+  const avatar = await vfs.xml<{ root: Avatar }>(
+    `Data/XML/item_defs/tankmen/avatar.xml`
   );
-  const changes = await Promise.all(
-    Object.values(avatar.root.skills).map(async (skill) => {
-      const icon = Array.isArray(skill.icon) ? skill.icon[0] : skill.icon;
-      const name = icon.name.split("/").at(-1)!.replace(/_\d$/, "");
-      const path = `${DATA}${icon.name.replace("~res:", "")}.packed.webp`;
-      const image = sharp(await readDVPLFile(path)).trim();
-      const content = await image.toBuffer();
+  const uploader = new AssetUploader("skill icons");
 
-      return {
-        content,
-        path: `icons/skills/${name}.webp`,
-      } satisfies FileChange;
-    })
-  );
+  for (const key in avatar.root.skills) {
+    const skill = avatar.root.skills[key];
+    const icon = Array.isArray(skill.icon) ? skill.icon[0] : skill.icon;
+    const name = icon.name.split("/").at(-1)!.replace(/_\d$/, "");
+    const path = `Data${icon.name.replace("~res:", "")}.packed.webp`;
+    const image = sharp(await vfs.file(path)).trim();
+    const content = await image.toBuffer();
 
-  commitAssets("skill icons", changes);
+    await uploader.add({ content, path: `icons/skills/${name}.webp` });
+  }
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/tankArmors.ts

@@ -1,44 +1,34 @@
-import { toUniqueId } from '@blitzkit/core';
-import { NodeIO } from '@gltf-transform/core';
-import { readdir } from 'fs/promises';
-import { extractArmor } from '../core/blitz/extractArmor';
-import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
-import { VehicleDefinitionList } from './definitions';
+import { toUniqueId } from "@blitzkit/core";
+import { NodeIO } from "@gltf-transform/core";
+import { extractArmor } from "../core/blitz/extractArmor";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
+import { VehicleDefinitionList } from "./definitions";
 
 export async function tankArmors() {
-  console.log('Building tank armors...');
+  console.log("Building tank armors...");
 
-  const changes: FileChange[] = [];
+  using uploader = new AssetUploader("tank armors");
   const nodeIO = new NodeIO();
-  const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
-    (nations) => nations.filter((nation) => nation !== 'common'),
-  );
+  const nations = vfs.dir(`Data/XML/item_defs/vehicles`).filter((nation) => nation !== "common");
 
-  await Promise.all(
-    nations.map(async (nation) => {
-      const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
-        `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`,
-      );
+  for (const nation of nations) {
+    const tanks = await vfs.xml<{ root: VehicleDefinitionList }>(
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`
+    );
 
-      await Promise.all(
-        Object.entries(tanks.root).map(async ([tankKey, tank]) => {
-          if (tankKey.includes('tutorial_bot')) return;
+    for (const tankKey in tanks.root) {
+      const tank = tanks.root[tankKey];
 
-          const id = toUniqueId(nation, tank.id);
-          const model = await extractArmor(DATA, `${nation}-${tankKey}`);
-          const content = await nodeIO.writeBinary(model);
+      if (tankKey.includes("tutorial_bot")) continue;
 
-          changes.push({
-            path: `3d/tanks/armor/${id}.glb`,
-            content,
-          });
-        }),
-      );
-    }),
-  );
+      const id = toUniqueId(nation, tank.id);
+      const model = await extractArmor(vfs, `${nation}-${tankKey}`);
+      const content = await nodeIO.writeBinary(model);
 
-  await commitAssets('tank armor', changes);
+      await uploader.add({ path: `3d/tanks/armor/${id}.glb`, content });
+    }
+  }
+
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/tankIcons.ts

@@ -1,13 +1,8 @@
 import { NATION_IDS } from "@blitzkit/core";
-import { readdir } from "fs/promises";
 import sharp from "sharp";
 import type { Vector3Tuple } from "three";
-import { readDVPLFile } from "../core/blitz/readDVPLFile";
-import { readXMLDVPL } from "../core/blitz/readXMLDVPL";
-import { readYAMLDVPL } from "../core/blitz/readYAMLDVPL";
-import { commitAssets } from "../core/github/commitAssets";
-import type { FileChange } from "../core/github/commitMultipleFiles";
-import { DATA } from "./constants";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 import type { VehicleDefinitionList } from "./definitions";
 
 export interface TankParameters {
@@ -45,56 +40,52 @@ export interface TankParameters {
 export async function tankIcons() {
   console.log("Building tank icons...");
 
-  const changes: FileChange[] = [];
-  const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
-    (nations) => nations.filter((nation) => nation !== "common")
-  );
+  using uploader = new AssetUploader("tank icons");
+  const nations = vfs.dir(`Data/XML/item_defs/vehicles`).filter((nation) => nation !== "common")
 
-  await Promise.all(
-    nations.map(async (nation) => {
-      const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
-        `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`
+  for (const nation of nations) {
+    const tanks = await vfs.xml<{ root: VehicleDefinitionList }>(
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`
+    );
+
+    for (const tankKey in tanks.root) {
+      const tank = tanks.root[tankKey];
+
+      if (tankKey.includes("tutorial_bot")) continue;
+
+      const nationVehicleId = tank.id;
+      const id = (nationVehicleId << 8) + (NATION_IDS[nation] << 4) + 1;
+
+      const parameters = await vfs.yaml<TankParameters>(
+        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
       );
+      const smallPath = `Data/${parameters.resourcesPath.smallIconPath
+        .replace(/~res:\//, "")
+        .replace(/\..+/, "")}.packed.webp`;
+      const bigPath = `Data/${parameters.resourcesPath.bigIconPath
+        .replace(/~res:\//, "")
+        .replace(/\..+/, "")}.packed.webp`;
+      const big = await sharp(await vfs.file(bigPath))
+        .trim()
+        .toBuffer();
+      const small = await sharp(await vfs.file(smallPath))
+        .trim()
+        .toBuffer();
 
-      await Promise.all(
-        Object.entries(tanks.root).map(async ([tankKey, tank]) => {
-          if (tankKey.includes("tutorial_bot")) return;
+      if (big) {
+        await uploader.add({
+          content: big,
+          path: `icons/tanks/big/${id}.webp`,
+        });
+      }
+      if (small) {
+        await uploader.add({
+          content: small,
+          path: `icons/tanks/small/${id}.webp`,
+        });
+      }
+    }
+  }
 
-          const nationVehicleId = tank.id;
-          const id = (nationVehicleId << 8) + (NATION_IDS[nation] << 4) + 1;
-
-          const parameters = await readYAMLDVPL<TankParameters>(
-            `${DATA}/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
-          );
-          const smallPath = `${DATA}/${parameters.resourcesPath.smallIconPath
-            .replace(/~res:\//, "")
-            .replace(/\..+/, "")}.packed.webp`;
-          const bigPath = `${DATA}/${parameters.resourcesPath.bigIconPath
-            .replace(/~res:\//, "")
-            .replace(/\..+/, "")}.packed.webp`;
-          const big = await sharp(await readDVPLFile(bigPath))
-            .trim()
-            .toBuffer();
-          const small = await sharp(await readDVPLFile(smallPath))
-            .trim()
-            .toBuffer();
-
-          if (big) {
-            changes.push({
-              content: big,
-              path: `icons/tanks/big/${id}.webp`,
-            });
-          }
-          if (small) {
-            changes.push({
-              content: small,
-              path: `icons/tanks/small/${id}.webp`,
-            });
-          }
-        })
-      );
-    })
-  );
-
-  await commitAssets("tank icons", changes);
+  await uploader.flush();
 }

packages/scripts/src/buildAssets/tankModels.ts

@@ -1,54 +1,42 @@
 import { toUniqueId } from "@blitzkit/core";
 import { NodeIO } from "@gltf-transform/core";
 import { ALL_EXTENSIONS } from "@gltf-transform/extensions";
-import { readdir } from "fs/promises";
 import { extractModel } from "../core/blitz/extractModel";
-import { readXMLDVPL } from "../core/blitz/readXMLDVPL";
-import { readYAMLDVPL } from "../core/blitz/readYAMLDVPL";
-import { commitAssets } from "../core/github/commitAssets";
-import { FileChange } from "../core/github/commitMultipleFiles";
-import { DATA } from "./constants";
+import { AssetUploader } from "../core/github/assetUploader";
+import { vfs } from "./constants";
 import { VehicleDefinitionList } from "./definitions";
 import { TankParameters } from "./tankIcons";
 
 export async function tankModels() {
   console.log("Building tank models...");
 
+  using uploader = new AssetUploader("tank models");
   const nodeIO = new NodeIO().registerExtensions(ALL_EXTENSIONS);
-  const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
-    (nations) => nations.filter((nation) => nation !== "common")
-  );
+  const nations = vfs.dir(`Data/XML/item_defs/vehicles`).filter((nation) => nation !== "common")
 
   for (const nationIndex in nations) {
     const nation = nations[nationIndex];
-    const changes: FileChange[] = [];
-    const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
-      `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`
+    const tanks = await vfs.xml<{ root: VehicleDefinitionList }>(
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`
     );
     const entries = Object.entries(tanks.root);
 
-    console.log(`Building models for ${nation}`);
-
-    let index = 0;
     for (const [tankKey, tank] of entries) {
       if (tankKey.includes("tutorial_bot")) continue;
 
       const id = toUniqueId(nation, tank.id);
-
-      console.log(`  ${++index} / ${entries.length} : ${tankKey}`);
-
-      const parameters = await readYAMLDVPL<TankParameters>(
-        `${DATA}/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
+      const parameters = await vfs.yaml<TankParameters>(
+        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
       );
       const model = await extractModel(
-        DATA,
+        vfs,
         parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, "")
       );
       const content = Buffer.from(await nodeIO.writeBinary(model));
 
-      changes.push({ path: `3d/tanks/models/${id}.glb`, content });
+      await uploader.add({ path: `3d/tanks/models/${id}.glb`, content });
     }
-
-    await commitAssets(`tank models ${nation}`, changes);
   }
+
+  await uploader.flush();
 }