feat: smaller heaings

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

@@ -1,81 +0,0 @@
-name: Assets
-
-on:
-  push:
-    branches: main
-
-  workflow_dispatch:
-    inputs:
-      asset_repo:
-        type: choice
-        required: false
-        description: What asset repo to write to
-        options:
-          - blitzkit/assets
-          - blitzkit/assets-preview
-          - blitzkit/assets-dev
-        default: blitzkit/assets
-
-      archive_url:
-        type: string
-        required: false
-        description: Archive URL to download instead of Steam client
-
-  schedule:
-    - cron: "0 2 * * *"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.asset_repo }}
-  cancel-in-progress: true
-
-env:
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  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 != '' && 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 }}
-  ALLOW_ROBOTS: true
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  PUBLIC_PATREON_CLIENT_ID: ${{ secrets.PUBLIC_PATREON_CLIENT_ID }}
-  PUBLIC_PATREON_REDIRECT_URI: ${{ secrets.PUBLIC_PATREON_REDIRECT_URI }}
-  PATREON_CLIENT_SECRET: ${{ secrets.PATREON_CLIENT_SECRET }}
-  PUBLIC_NITROPAY_ID: ${{ secrets.PUBLIC_NITROPAY_ID }}
-  PUBLIC_DEBUG_MISSING_I18N: false
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_FAST_USER: blitzkit
-  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:
-  build_assets:
-    name: Build assets
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - run: bun run setup
-
-      - name: AppArmor hack
-        run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
-
-      - name: Build assets
-        run: bun run build:assets --all-targets --manual

.github/workflows/averages.yml

@@ -1,54 +0,0 @@
-name: Averages
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 8 * * *"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: "true"
-  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Build averages
-        env:
-          PUBLIC_ASSET_BRANCH: main
-          DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
-          GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-        run: bun run build:averages --production

.github/workflows/build-bot.yml

@@ -1,34 +0,0 @@
-name: Bot
-
-on:
-  push:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Build bot
-        run: bun run build:bot
-
-      - name: Archive build
-        uses: actions/upload-artifact@v4
-        with:
-          name: bot
-          path: dist/bot

.github/workflows/discover-ids.yml

@@ -1,36 +0,0 @@
-name: IDs
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 1"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Discover IDs
-        run: bun build:ids --production

.github/workflows/host-bot.yml

@@ -1,67 +0,0 @@
-name: Host
-
-on:
-  push:
-    branches: main
-  schedule:
-    - cron: "0 */5 * * *"
-  workflow_dispatch:
-  release:
-    types: [created, published, released, edited]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
-  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
-  PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
-  SERVICING: ${{ secrets.SERVICING }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-
-      - name: Download release assets
-        run: |
-          DOWNLOAD_URL=$(curl -s https://api.github.com/repos/blitzkit/blitzkit/releases/latest \
-            | grep "browser_download_url.*bot.zip" \
-            | cut -d : -f 2,3 \
-            | tr -d \")
-          curl -L -o bot.zip $DOWNLOAD_URL
-          mkdir -p dist/bot
-          unzip bot.zip -d dist/bot
-
-      - name: Install sharp
-        run: bun init -y && bun add sharp
-
-      - name: Move directories
-        run: mv dist/bot/prisma .
-
-      - name: Run bot
-        run: bun run dist/bot/main.js

.github/workflows/rating-asia.yml

@@ -1,46 +0,0 @@
-name: Rating Asia
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 17 * * *"
-
-env:
-  PUBLIC_ASSET_BRANCH: main
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: "true"
-  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Generate leaderboard
-        run: bun build:ratingleaderboard --region=asia

.github/workflows/rating-eu.yml

@@ -1,46 +0,0 @@
-name: Rating Europe
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 23 * * *"
-
-env:
-  PUBLIC_ASSET_BRANCH: main
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: "true"
-  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Generate leaderboard
-        run: bun build:ratingleaderboard --region=eu

.github/workflows/rating-na.yml

@@ -1,46 +0,0 @@
-name: Rating North America
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 5 * * *"
-
-env:
-  PUBLIC_ASSET_BRANCH: main
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
-  PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
-  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: "true"
-  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Generate leaderboard
-        run: bun build:ratingleaderboard --region=com

.github/workflows/reviews.yml

@@ -1,38 +0,0 @@
-name: Reviews
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: 0 0 * * 2
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-  DATABASE_URL: ${{ secrets.DATABASE_URL }}
-  PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
-  PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
-  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
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - run: bun run setup
-
-      - name: Find reviews
-        run: bun run build:reviews

.github/workflows/website-ue.yml

@@ -0,0 +1,66 @@
+name: Website
+
+on:
+  push:
+  workflow_dispatch:
+
+  schedule:
+    - cron: "0 4 * * *"
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref == 'refs/heads/main' }}
+
+env:
+  WOTB_SERVER: ${{ secrets.WOTB_SERVER }}
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_TOKEN }}
+
+      - uses: oven-sh/setup-bun@v2
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: latest
+
+      - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GH_TOKEN }}
+
+      - uses: actions/configure-pages@v5
+
+      - run: bun run setup
+
+      - name: Build website
+        run: bun run build:website
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v4
+        with:
+          path: dist/website
+
+  deploy-github-pages:
+    if: ${{ github.ref == 'refs/heads/ue' && github.repository == 'blitzkit/host-beta' }}
+    name: Deploy to GitHub Pages
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: Production
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/website.yml

@@ -1,72 +0,0 @@
-name: Website
-
-on:
-  push:
-  workflow_dispatch:
-
-  schedule:
-    - cron: "0 4 * * *"
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref == 'refs/heads/main' }}
-
-env:
-  PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
-  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
-  ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
-  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
-  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
-  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
-  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
-  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
-  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
-  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
-  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
-  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
-  PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
-  SERVICING: ${{ secrets.SERVICING }}
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: oven-sh/setup-bun@v1
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GH_TOKEN }}
-      - uses: actions/configure-pages@v5
-      - run: bun run setup
-
-      - name: Build website
-        run: bun run build:website
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: dist/website
-
-  deploy-github-pages:
-    if: ${{ github.ref == 'refs/heads/main' }}
-    name: Deploy to GitHub Pages
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: Production
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.gitignore

@@ -22,7 +22,7 @@ depots
 public/sitemap*
 /firebase.json
 target
-# packages/core/src/protos/*.ts
+packages/website-ue/src/protos/*.ts
 /.vercel
 .astro
 .vercel

.gitmodules

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

.vscode/settings.json

@@ -17,6 +17,7 @@
     "astrojs",
     "astrolib",
     "atgm",
+    "autocrop",
     "Autoloader",
     "Autoreloader",
     "AYUV",
@@ -61,10 +62,12 @@
     "Ddpf",
     "Ddsd",
     "deadrail",
+    "DEBUFF",
     "debugflags",
     "deburr",
     "decalmask",
     "decompressor",
+    "décor",
     "dedup",
     "defence",
     "degressive",
@@ -74,6 +77,7 @@
     "DIDS",
     "donotremove",
     "drei",
+    "Droodles",
     "dvpd",
     "dvpl",
     "DVPLCRC",
@@ -96,9 +100,11 @@
     "gameplay",
     "glsl",
     "GLTF",
+    "GSOR",
     "gtag",
     "haha",
     "Herdbreaker",
+    "Hetz",
     "highp",
     "iife",
     "imgur",
@@ -142,6 +148,7 @@
     "noout",
     "normalmap",
     "oneof",
+    "Oodle",
     "oopsies",
     "Oopsy",
     "opentest",
@@ -157,6 +164,7 @@
     "playerachievements",
     "playerinfo",
     "playform",
+    "Playtest",
     "pngjs",
     "POSITIVEX",
     "POSITIVEY",
@@ -173,6 +181,7 @@
     "ratingleaderboard",
     "raycaster",
     "Redirector",
+    "REGEN",
     "Relogin",
     "researchable",
     "Resvg",
@@ -186,11 +195,14 @@
     "searchplayers",
     "searchtanks",
     "SHAREDEXP",
+    "Skia",
     "SKLLD",
+    "sluggify",
     "smoothstep",
     "Smri",
     "Specularity",
     "SSAO",
+    "stackable",
     "startcase",
     "statkit",
     "statsfull",
@@ -214,6 +226,7 @@
     "tungstentip",
     "Turretless",
     "TYPELESS",
+    "uasset",
     "ubjson",
     "Unicum",
     "UNLOCALIZED",
@@ -223,6 +236,7 @@
     "unrotate",
     "unwrapper",
     "userns",
+    "usmap",
     "vercel",
     "vickers",
     "vitepress",
@@ -235,6 +249,7 @@
     "winrate",
     "wireframe",
     "Woah",
+    "wooorm",
     "WOTB",
     "wotblitz",
     "wotbreplay",

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                         |
+### S0AP
-| ------------------------------ | ------------------------------ |
+
-| Bot verification               | S0AP                           |
+BlitzKit Discord bot verification, testing, advertisement, and the initial encouragement to create BlitzKit.
-| General testing | Prince_NA |
+
-| Bot advertisement platform     | S0AP                           |
+### Prince_NA
-| Bot rendering pipeline         | Vovko                          |
+
-| Game asset decompression       | Maddox                         |
+BlitzKit Discord bot and website testing and general advise.
-| Game 3D model parsing          | Pyogenics                      |
+
-| Game file layout               | Aeson                          |
+### Vovko
-| 3-caliber rule edge cases      | Minitelrose, ChickenMan7777    |
+
-| Embed UX                       | \_34, HisRoyalFatness, Synx    |
+BlitzKit Discord bot and website rendering pipeline.
-| Tankopedia pre-release testing | [OPTML], Aeson, \_34, xkdkw |
+
-| Website advertisement platform | Aeson                |
+### Maddox
-| Compare pre-release testing    | [OPTML]              |
+
-| Redacted                       | GonnaHetzMe                    |
+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.15.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.29.15
+
+## Fixes
+
+- Tanks now use alpha clipping to render translucency, fixing a lot of "ghostly" looking tanks

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,41 +1,42 @@
 {
   "name": "blitzkit",
-  "version": "1.29.6",
+  "version": "2.0.0-beta.2",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {
+    "build:game": "cd packages/game && bun run build",
     "build:assets": "cd packages/scripts && bun run build:assets",
     "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
     "build:bot": "cd packages/scripts && bun run build:bot",
-    "build:website": "cd packages/website && bun run build",
+    "build:website": "cd packages/website-ue && 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",
+    "dev:website": "cd packages/website-ue && bun run dev",
     "dev:app": "cd packages/app && bun run dev",
     "dev": "bun run dev:website",
     "dev:api": "bun --filter=@blitzkit/api run dev",
     "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
     "setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
-    "start:website": "bun --filter=@blitzkit/website run start",
+    "start:website": "bun --filter=@blitzkit/website-ue run start",
     "host:docs": "vitepress preview docs",
     "lint": "tsc",
-    "lint:website": "cd packages/website && bun run lint",
+    "lint:website": "cd packages/website-ue && bun run lint",
     "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
     "update": "yarn upgrade --latest",
     "tunnel": "cloudflared tunnel --url http://localhost:3000",
     "discoverids": "scripts/discoverIds.ts",
     "build:protos": "cd packages/scripts && bun run build:protos",
-    "preview:website": "cd packages/website && bun run preview",
+    "preview:website": "cd packages/website-ue && bun run preview",
     "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 && bun run build:catalogitemaccesssor",
     "patchnotes": "cd packages/scripts && bun run patchnotes"
   },
   "type": "module",
@@ -43,8 +44,10 @@
     "packages/*"
   ],
   "dependencies": {
+    "@fontsource-variable/jetbrains-mono": "^5.2.8",
     "@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",
+    "discord.js": "^14.25.1",
-    "dotenv": "^17.2.2",
+    "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",
+    "react": "^19.2.4",
-    "satori": "^0.18.3",
+    "satori": "^0.18.4",
-    "sharp": "^0.34.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 { addPeriodicFilterOptions } from '../../core/discord/addPeriodicFilterOptions';
+import { addUsernameChoices } from "../../core/discord/addUsernameChoices";
-import { addUsernameChoices } from '../../core/discord/addUsernameChoices';
+import { autocompleteTanks } from "../../core/discord/autocompleteTanks";
-import { autocompleteTanks } from '../../core/discord/autocompleteTanks';
+import { autocompleteUsername } from "../../core/discord/autocompleteUsername";
-import { autocompleteUsername } from '../../core/discord/autocompleteUsername';
+import { createLocalizedCommand } from "../../core/discord/createLocalizedCommand";
-import { buttonRefresh } from '../../core/discord/buttonRefresh';
+import { getFiltersFromButton } from "../../core/discord/getFiltersFromButton";
-import { commandToURL } from '../../core/discord/commandToURL';
+import { resolvePeriodFromButton } from "../../core/discord/resolvePeriodFromButton";
-import { createLocalizedCommand } from '../../core/discord/createLocalizedCommand';
+import { resolvePlayerFromButton } from "../../core/discord/resolvePlayerFromButton";
-import { getCustomPeriodParams } from '../../core/discord/getCustomPeriodParams';
+import { translator } from "../../core/localization/translator";
-import { getFiltersFromButton } from '../../core/discord/getFiltersFromButton';
+import type { CommandRegistry } from "../../events/interactionCreate";
-import { getFiltersFromCommand } from '../../core/discord/getFiltersFromCommand';
+import { renderBreakdown } from "./render";
-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';
 
 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 { strings } = translator(interaction.locale);
-        const period = resolvePeriodFromCommand(player.region, interaction);
+        return strings.bot.commands.dead;
-        const filters = await getFiltersFromCommand(interaction);
-        const path = commandToURL(interaction, {
-          ...player,
-          ...getCustomPeriodParams(interaction),
-          ...filters,
-        });
 
-        return [
+        // const player = await resolvePlayerFromCommand(interaction);
-          ...(await renderBreakdown(
+        // const period = resolvePeriodFromCommand(player.region, interaction);
-            player,
+        // const filters = await getFiltersFromCommand(interaction);
-            period,
+        // const path = commandToURL(interaction, {
-            filters,
+        //   ...player,
-            interaction.locale,
+        //   ...getCustomPeriodParams(interaction),
-          )),
+        //   ...filters,
-          buttonRefresh(interaction, path),
+        // });
-          await getBlitzStarsLinkButton(player.region, player.id),
+
-        ];
+        // 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)
+        ? calculateWN8(tankAveragesEntry.mu, tank.all)
-        : undefined
+        : 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 {
+import { type ResolvedPeriod } from "../core/discord/resolvePeriodFromCommand";
-  type ResolvedPeriod,
-  resolvePeriodFromCommand,
-} from "../core/discord/resolvePeriodFromCommand";
 import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
-import {
+import { type ResolvedPlayer } from "../core/discord/resolvePlayerFromCommand";
-  type ResolvedPlayer,
+import { translator } from "../core/localization/translator";
-  resolvePlayerFromCommand,
-} from "../core/discord/resolvePlayerFromCommand";
 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 =
+        const { strings } = translator(interaction.locale);
-          interaction.options.getSubcommandGroup() as EvolutionStatType;
+        return strings.bot.commands.dead;
-        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 [
+        // const commandGroup =
-          await render(
+        //   interaction.options.getSubcommandGroup() as EvolutionStatType;
-            player,
+        // const player = await resolvePlayerFromCommand(interaction);
-            period,
+        // const period = resolvePeriodFromCommand(player.region, interaction);
-            commandGroup,
+        // const tankIdRaw = interaction.options.getString("tank")!;
-            tankId,
+        // const tankId =
-            interaction.locale
+        //   commandGroup === "tank"
-          ),
+        //     ? await resolveTankId(tankIdRaw, interaction.locale)
-          buttonRefresh(interaction, path),
+        //     : null;
-          await getBlitzStarsLinkButton(
+        // const path = commandToURL(interaction, {
-            player.region,
+        //   ...player,
-            player.id,
+        //   ...getCustomPeriodParams(interaction),
-            tankId ?? undefined
+        //   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';
+} from "@blitzkit/core";
-import { Locale } from 'discord.js';
+import { Locale } from "discord.js";
-import { CommandWrapper } from '../components/CommandWrapper';
+import { CommandWrapper } from "../components/CommandWrapper";
-import { GenericAllStats } from '../components/GenericAllStats';
+import { GenericAllStats } from "../components/GenericAllStats";
-import { NoData } from '../components/NoData';
+import { NoData } from "../components/NoData";
-import { TierWeights } from '../components/TierWeights';
+import { TierWeights } from "../components/TierWeights";
-import { TitleBar } from '../components/TitleBar';
+import { TitleBar } from "../components/TitleBar";
-import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
+import { filtersToDescription } from "../core/blitzkit/filtersToDescription";
-import { filterStats, type StatFilters } from '../core/blitzstars/filterStats';
+import { filterStats, type StatFilters } from "../core/blitzstars/filterStats";
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import { getStatsInPeriod } from "../core/blitzstars/getStatsInPeriod";
-import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod';
+import { addPeriodicFilterOptions } from "../core/discord/addPeriodicFilterOptions";
-import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions';
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
-import { buttonRefresh } from '../core/discord/buttonRefresh';
+import { getFiltersFromButton } from "../core/discord/getFiltersFromButton";
-import { commandToURL } from '../core/discord/commandToURL';
+import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+import { type ResolvedPeriod } from "../core/discord/resolvePeriodFromCommand";
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
-import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { type ResolvedPlayer } from "../core/discord/resolvePlayerFromCommand";
-import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
+import { translator } from "../core/localization/translator";
-import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton';
+import type { CommandRegistry } from "../events/interactionCreate";
-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';
 
 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 { strings } = translator(interaction.locale);
-        const period = resolvePeriodFromCommand(player.region, interaction);
+        return strings.bot.commands.dead;
-        const filters = await getFiltersFromCommand(interaction);
-        const path = commandToURL(interaction, {
-          ...player,
-          ...getCustomPeriodParams(interaction),
-          ...filters,
-        });
 
-        return Promise.all([
+        // const player = await resolvePlayerFromCommand(interaction);
-          render(player, period, filters, interaction.locale),
+        // const period = resolvePeriodFromCommand(player.region, interaction);
-          buttonRefresh(interaction, path),
+        // const filters = await getFiltersFromCommand(interaction);
-          getBlitzStarsLinkButton(player.region, player.id),
+        // 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 + 1
-            : latestArchivedSeasonNumber;
+          : 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';
+} from "@blitzkit/core";
-import { Locale } from 'discord.js';
+import { Locale } from "discord.js";
-import { clamp } from 'lodash-es';
+import { clamp } from "lodash-es";
-import { CommandWrapper } from '../components/CommandWrapper';
+import { CommandWrapper } from "../components/CommandWrapper";
-import { TitleBar } from '../components/TitleBar';
+import { TitleBar } from "../components/TitleBar";
-import { iconPng } from '../core/blitzkit/iconPng';
+import { iconPng } from "../core/blitzkit/iconPng";
 import {
+  averageDefinitions,
   mapDefinitions,
   tankDefinitions,
-} from '../core/blitzkit/nonBlockingPromises';
+} from "../core/blitzkit/nonBlockingPromises";
-import { RenderConfiguration } from '../core/blitzkit/renderConfiguration';
+import { RenderConfiguration } from "../core/blitzkit/renderConfiguration";
-import { blitzStarsTankAverages } from '../core/blitzstars/tankAverages';
+import { buttonLink } from "../core/discord/buttonLink";
-import { buttonLink } from '../core/discord/buttonLink';
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+import { localizationObject } from "../core/discord/localizationObject";
-import { translator } from '../core/localization/translator';
+import { translator } from "../core/localization/translator";
-import { type CommandRegistry } from '../events/interactionCreate';
+import { type CommandRegistry } from "../events/interactionCreate";
-import { theme } from '../stitches.config';
+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',
+        display: "flex",
-        alignItems: 'center',
+        alignItems: "center",
-        justifyContent: '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'
+      ? "_amber"
-      : '_green'
+      : "_green"
-    : '_red';
+    : "_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',
+        display: "flex",
-        alignItems: 'center',
+        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',
+          overflow: "hidden",
-          alignItems: 'center',
+          alignItems: "center",
         }}
       >
         <img
@@ -284,22 +285,22 @@ async function playerListing(
           style={{
             width: 32,
             height: 32,
-            objectFit: 'contain',
+            objectFit: "contain",
           }}
         />
 
         <div
           style={{
-            display: 'flex',
+            display: "flex",
-            flexDirection: 'column',
+            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%',
+          height: "100%",
-          transform: 'scaleY(-1)',
+          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',
+        display: "flex",
-        alignItems: 'center',
+        alignItems: "center",
         gap: 8,
       }}
     >
@@ -382,16 +383,16 @@ function Header() {
 
       <div
         style={{
-          display: 'flex',
+          display: "flex",
           flex: 1,
         }}
       >
         <div
           style={{
             flex: 2,
-            display: 'flex',
+            display: "flex",
-            alignItems: 'center',
+            alignItems: "center",
-            justifyContent: 'center',
+            justifyContent: "center",
           }}
         >
           <span
@@ -406,9 +407,9 @@ function Header() {
         <div
           style={{
             flex: 2,
-            display: 'flex',
+            display: "flex",
-            alignItems: 'center',
+            alignItems: "center",
-            justifyContent: 'center',
+            justifyContent: "center",
           }}
         >
           <span
@@ -423,9 +424,9 @@ function Header() {
         <div
           style={{
             flex: 2,
-            display: 'flex',
+            display: "flex",
-            alignItems: 'center',
+            alignItems: "center",
-            justifyContent: 'center',
+            justifyContent: "center",
           }}
         >
           <span
@@ -440,9 +441,9 @@ function Header() {
         <div
           style={{
             flex: 1,
-            display: 'flex',
+            display: "flex",
-            alignItems: 'center',
+            alignItems: "center",
-            justifyContent: '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) =>
+    command: createLocalizedCommand("replay").addAttachmentOption((option) =>
-      option.setName('file').setDescription('Replay file').setRequired(true),
+      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 = 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 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'
+                ? "Victory"
-                : 'Defeat'
+                : "Defeat"
             } • ${awaitedMapDefinitions.maps[replayData.map_id].name}`}
           />
 
           <div
             style={{
-              display: 'flex',
+              display: "flex",
               gap: 8,
             }}
           >
             <div
               style={{
                 flex: 1,
-                display: 'flex',
+                display: "flex",
-                flexDirection: 'column',
+                flexDirection: "column",
                 gap: 4,
               }}
             >
@@ -547,8 +562,8 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
             <div
               style={{
                 flex: 1,
-                display: 'flex',
+                display: "flex",
-                flexDirection: 'column',
+                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.view_url, "WoT Inspector"),
-        buttonLink(submissionData.data.download_url, 'Download'),
+        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 {
+import { type ResolvedPeriod } from "../core/discord/resolvePeriodFromCommand";
-  type ResolvedPeriod,
-  resolvePeriodFromCommand,
-} from "../core/discord/resolvePeriodFromCommand";
 import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
-import {
+import { type ResolvedPlayer } from "../core/discord/resolvePlayerFromCommand";
-  type ResolvedPlayer,
+import { translator } from "../core/localization/translator";
-  resolvePlayerFromCommand,
-} from "../core/discord/resolvePlayerFromCommand";
 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 { strings } = translator(interaction.locale);
-      const period = resolvePeriodFromCommand(player.region, interaction);
+      return strings.bot.commands.dead;
-      const filters = await getFiltersFromCommand(interaction);
-      const path = commandToURL(interaction, {
-        ...player,
-        ...getCustomPeriodParams(interaction),
-        ...filters,
-      });
 
-      return Promise.all([
+      // const player = await resolvePlayerFromCommand(interaction);
-        render(player, period, filters, interaction.locale),
+      // const period = resolvePeriodFromCommand(player.region, interaction);
-        buttonRefresh(interaction, path),
+      // const filters = await getFiltersFromCommand(interaction);
-        getBlitzStarsLinkButton(player.region, player.id),
+      // 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 { gameDefinitions } from "../core/blitzkit/nonBlockingPromises";
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import { addFilterOptions } from "../core/discord/addFilterOptions";
-import { addFilterOptions } from '../core/discord/addFilterOptions';
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
-import { buttonRefresh } from '../core/discord/buttonRefresh';
+import { getFiltersFromButton } from "../core/discord/getFiltersFromButton";
-import { commandToURL } from '../core/discord/commandToURL';
+import { resolvePeriodFromButton } from "../core/discord/resolvePeriodFromButton";
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+import { resolvePlayerFromButton } from "../core/discord/resolvePlayerFromButton";
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { translator } from "../core/localization/translator";
-import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { type CommandRegistry } from "../events/interactionCreate";
-import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
+import { renderBreakdown } from "./breakdown/render";
-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';
 
 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 { strings } = translator(interaction.locale);
-      const period = resolvePeriodFromCommand(
+      return strings.bot.commands.dead;
-        player.region,
-        interaction,
-        'today',
-      );
-      const filters = await getFiltersFromCommand(interaction);
-      const path = commandToURL(interaction, {
-        ...player,
-        ...getCustomPeriodParams(interaction, true),
-        ...filters,
-      });
 
-      return [
+      // const player = await resolvePlayerFromCommand(interaction);
-        ...(await renderBreakdown(player, period, filters, interaction.locale)),
+      // const period = resolvePeriodFromCommand(
-        buttonRefresh(interaction, path),
+      //   player.region,
-        await getBlitzStarsLinkButton(player.region, player.id),
+      //   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 { usersDatabase } from "../db/users";
-import { client } from '../discord/client';
+import { client } from "../discord/client";
 
-const EXIT_EVENTS = [
+const EXIT_EVENTS = ["SIGINT", "SIGTERM", "SIGUSR1", "SIGUSR2"];
-  'beforeExit',
-  'exit',
-  'SIGINT',
-  'SIGTERM',
-  'SIGUSR1',
-  'SIGUSR2',
-];
 
-async function cleanup() {
+let cleaningUp = false;
-  console.log('Cleaning up...');
 
-  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);
+  process.on("uncaughtException", (err) => {
-  client.on('error', console.error);
+    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 {
-import { blitzStarsTankAverages } from "./tankAverages";
+  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,
+      awaitedTankAverages.averages[id]
-    0
+        ? 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 { Client, GatewayIntentBits } from "discord.js";
-import { interactionCreate } from '../../events/interactionCreate';
+import { interactionCreate } from "../../events/interactionCreate";
-import { ready } from '../../events/ready';
+import { ready } from "../../events/ready";
 
 export const client = new Client({
   intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
 })
-  .on('ready', ready)
+  .on("clientReady", ready)
-  .on('interactionCreate', interactionCreate);
+  .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(
+        // console.warn(
-          `Invalid localization for ${locale} (${path}): ${translation}; skipping...`
+        //   `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 { AutocompleteInteraction, CacheType } from "discord.js";
-import { commands } from '..';
+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 { ButtonInteraction, CacheType } from "discord.js";
-import { commands } from '..';
+import { commands } from "..";
-import { normalizeInteractionReturnable } from '../../../core/discord/normalizeInteractionReturnable';
+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 commandName = url.pathname.split("/")[1];
-  const button = (await commands)[commandName]?.button;
+  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 = commands[interaction.commandName];
-  const registry = awaitedCommands[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) => {
+export const commands: Record<string, CommandRegistry> = {};
-  return rawCommands.reduce<Record<string, CommandRegistry>>(
+const commandsFulfilled: CommandRegistry[] = [];
-    (commands, registry, index) => {
+
-      if (registry.status === "rejected") {
+let index = 0;
-        console.warn(
+for (const registry of await Promise.allSettled(commandsArray)) {
-          `Command ${index} failed to load; skipping...`,
+  if (registry.status === "rejected") {
-          registry.reason
+    console.warn(`Command ${index} rejected`, registry.reason);
-        );
+    continue;
-        return commands;
+  }
-      }
+
-      return { ...commands, [registry.value.command.name]: registry.value };
+  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) => {
+await rest.put(applicationCommandsRoute, { body });
-  const body = Object.values(awaitedCommands).map((registry) =>
-    registry.command.toJSON()
-  );
-
-  rest.put(
-    Routes.applicationCommands(assertSecret(import.meta.env.DISCORD_CLIENT_ID)),
-    { 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 { assertSecret } from "@blitzkit/core";
-import { ActivityType, ShardingManager } from 'discord.js';
+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}`);
+  manager?.respawnAll();
-
+  manager = new ShardingManager("dist/bot/workers/bot.js", {
-  const 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 { assertSecret } from "@blitzkit/core";
-import { registerProcesses } from '../core/blitzkit/processes';
+import { registerProcesses } from "../core/blitzkit/processes";
-import { client } from '../core/discord/client';
+import { client } from "../core/discord/client";
 
 console.log(`🟡 Launching bot ${client.shard?.ids[0]}`);
 

packages/core/src/blitz/blitzVFS.ts

@@ -1,25 +0,0 @@
-export enum BlitzVFSSourceType {
-  Steam,
-}
-
-type BlitzVFSSource = {
-  type: BlitzVFSSourceType;
-
-  username: string;
-  password: string;
-
-  app: number;
-  os: "windows";
-};
-
-export class BlitzVFS {
-  constructor(private source: BlitzVFSSource) {}
-
-  async init() {
-    return this;
-  }
-
-  async file(path: string) {
-    return new Uint8Array();
-  }
-}

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 =
+  const included = consumableProvision.include?.every((rule) => {
-    !consumableProvision.game_mode_exclusive &&
+    switch (rule.filter_type!.$case) {
-    consumableProvision.include?.every((rule) => {
+      case "tiers":
-      switch (rule.filter_type!.$case) {
+        return (
-        case 'tiers':
+          rule.filter_type!.value.min <= tank.tier &&
-          return (
+          tank.tier <= rule.filter_type!.value.max
-            rule.filter_type!.value.min <= tank.tier &&
+        );
-            tank.tier <= rule.filter_type!.value.max
-          );
 
-        case 'ids':
+      case "ids":
-          return rule.filter_type!.value.ids.includes(tank.id);
+        return rule.filter_type!.value.ids.includes(tank.id);
 
-        case 'nations':
+      case "nations":
-          return rule.filter_type!.value.nations.includes(tank.nation);
+        return rule.filter_type!.value.nations.includes(tank.nation);
 
-        case 'categories':
+      case "categories":
-          throw new SyntaxError('Category filtering found in include rule');
+        throw new SyntaxError("Category filtering found in include rule");
-      }
+    }
-    });
+  });
-  const excluded =
+  const excluded = consumableProvision.exclude?.some((rule) => {
-    consumableProvision.game_mode_exclusive ||
+    switch (rule.filter_type!.$case) {
-    consumableProvision.exclude?.some((rule) => {
+      case "tiers":
-      switch (rule.filter_type!.$case) {
+        return (
-        case 'tiers':
+          rule.filter_type!.value.min <= tank.tier &&
-          return (
+          tank.tier <= rule.filter_type!.value.max
-            rule.filter_type!.value.min <= tank.tier &&
+        );
-            tank.tier <= rule.filter_type!.value.max
-          );
 
-        case 'ids':
+      case "ids":
-          return rule.filter_type!.value.ids.includes(tank.id);
+        return rule.filter_type!.value.ids.includes(tank.id);
 
-        case 'nations':
+      case "nations":
-          return rule.filter_type!.value.nations.includes(tank.nation);
+        return rule.filter_type!.value.nations.includes(tank.nation);
 
-        case 'categories':
+      case "categories":
-          return rule.filter_type!.value.categories.some((category) => {
+        return rule.filter_type!.value.categories.some((category) => {
-            switch (category) {
+          switch (category) {
-              case ConsumableTankCategoryFilterCategory.CLIP:
+            case ConsumableTankCategoryFilterCategory.CLIP:
-                return gun.gun_type!.$case !== 'regular';
+              return gun.gun_type!.$case !== "regular";
-            }
+          }
-          });
+        });
-      }
+    }
-    });
+  });
 
-  return (
+  return consumableProvision.include?.length > 0 && included && !excluded;
-    !consumableProvision.game_mode_exclusive &&
-    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/index.ts

@@ -1,49 +1,50 @@
-export * from './assertSecret';
+export * from "./assertSecret";
-export * from './asset';
+export * from "./asset";
-export * from './availableProvisions';
+export * from "./availableProvisions";
-export * from './averageDefinitions';
+export * from "./averageDefinitions";
 // export * from './camouflageDefinitions';
 // export * from './checkConsumableProvisionInclusivity';
-export * from './coefficient';
+export * from "./coefficient";
-export * from './consumableDefinitions';
+export * from "./consumableDefinitions";
 // export * from './context';
-export * from './createDefaultSkills';
+export * from "./createDefaultSkills";
-export * from './degressiveStat';
+export * from "./degressiveStat";
-export * from './discoveredIdDefinitions';
+export * from "./discoveredIdDefinitions";
-export * from './emblemURL';
+export * from "./emblemURL";
-export * from './equipmentDefinitions';
+export * from "./equipmentDefinitions";
-export * from './eventManager';
+export * from "./eventManager";
-export * from './gameDefinitions';
+export * from "./gameDefinitions";
-export * from './getArchivedLatestSeasonNumber';
+export * from "./getArchivedLatestSeasonNumber";
 // export * from './getArchivedRatingInfo';
-export * from './getArchivedRatingLeaderboard';
+export * from "./getArchivedRatingLeaderboard";
 // export * from './getArchivedRatingMidnightLeaderboard';
-export * from './getTimeDaysAgo';
+export * from "./getTimeDaysAgo";
-export * from './isExplosive';
+export * from "./isExplosive";
-export * from './mapDefinitions';
+export * from "./mapDefinitions";
-export * from './modelDefinitions';
+export * from "./modelDefinitions";
-export * from './normalizeBoundingBox';
+export * from "./normalizeBoundingBox";
 // export * from './parseBkni';
 // export * from './patientFetch';
-export * from './patientFetchJSON';
+export * from "./patientFetchJSON";
-export * from './progressiveStat';
+export * from "./progressiveStat";
-export * from './provisionDefinitions';
+export * from "./provisionDefinitions";
-export * from './resolveDpm';
+export * from "./resolveDpm";
-export * from './resolvePenetrationCoefficient';
+export * from "./resolvePenetrationCoefficient";
-export * from './reviews';
+export * from "./reviews";
-export * from './skillDefinitions';
+export * from "./skillDefinitions";
-export * from './sum';
+export * from "./sum";
-export * from './tankDefinitions';
+export * from "./tankDefinitions";
-export * from './tankIcon';
+export * from "./tankIcon";
-export * from './tankNames';
+export * from "./tankNames";
-export * from './unionBoundingBox';
+export * from "./unionBoundingBox";
-export * from './uniqueGuns';
+export * from "./uniqueGuns";
-export * from './unwrapBlitzkitResponse';
+export * from "./unwrapBlitzkitResponse";
-export * from './votes';
+export * from "./votes";
 // export * from './withCORSProxy';
-export * from './createDefaultProvisions';
+export * from "./createDefaultProvisions";
-export * from './gallery';
+export * from "./gallery";
-export * from './metaSortTank';
+export * from "./metaSortTank";
-export * from './popularTanks';
+export * from "./popularTanks";
-export * from './romanize';
+export * from "./romanize";
-export * from './youtubers';
+export * from "./sluggify.ts";
+export * from "./youtubers";

packages/core/src/blitzkit/sluggify.ts

@@ -0,0 +1,16 @@
+import { deburr } from "lodash-es";
+
+const nonAlphanumericRegex = /[^a-z0-9]/g;
+const multipleDashesRegex = /--+/g;
+const trailingDashRegex = /-$/g;
+const leadingDashRegex = /^-/g;
+
+export function sluggify(value: string) {
+  let slug = deburr(value).toLowerCase();
+  slug = slug.replaceAll(nonAlphanumericRegex, "-");
+  slug = slug.replaceAll(multipleDashesRegex, "-");
+  slug = slug.replaceAll(trailingDashRegex, "");
+  slug = slug.replaceAll(leadingDashRegex, "");
+
+  return slug;
+}

packages/core/src/index.ts

@@ -4,7 +4,6 @@ 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/core/src/math/index.ts

@@ -3,6 +3,7 @@ export * from "./fisherYates";
 export * from "./formatCompact";
 export * from "./isNumber";
 export * from "./NaNFallback";
+export * from "./normalizeAngleDeg";
 export * from "./normalizeAngleRad";
 export * from "./normalToEuler";
 export * from "./numberToRomanNumeral";

packages/core/src/math/normalizeAngleDeg.ts

@@ -0,0 +1,6 @@
+export function normalizeAngleDeg(angle: number) {
+  const newAngle = angle % 360;
+  if (newAngle > 360) return newAngle - 360;
+  if (newAngle < -360) return newAngle + 360;
+  return newAngle;
+}

packages/core/src/streams/bufferToBigInt.ts

@@ -0,0 +1,3 @@
+export function bufferToBigInt(buffer: ArrayBuffer) {
+  return new DataView(buffer).getBigUint64(0, true);
+}

packages/core/src/streams/index.ts

@@ -1,4 +1,5 @@
 export * from './buffer';
+export * from './bufferToBigInt';
 export * from './dds';
 export * from './dids';
 export * from './pvr';
@@ -7,3 +8,4 @@ export * from './sc2';
 export * from './scg';
 export * from './scpg';
 export * from './windows';
+

packages/game/.editorconfig

@@ -0,0 +1,3 @@
+[*.cs]
+indent_style = space
+indent_size = 2

packages/game/.gitignore

@@ -0,0 +1,57 @@
+## A streamlined .gitignore for modern .NET projects
+## including temporary files, build results, and
+## files generated by popular .NET tools. If you are
+## developing with Visual Studio, the VS .gitignore
+## https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+## has more thorough IDE-specific entries.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/Dotnet.gitignore
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+
+# dotenv environment variables file
+.env
+
+# Others
+~$*
+*~
+CodeCoverage/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml

packages/game/JSExport/GameInterface.cs

@@ -0,0 +1,70 @@
+using BlitzKit.Game.Models;
+using CUE4Parse_Conversion.Textures;
+using CUE4Parse.UE4.Assets.Exports.Texture;
+using CUE4Parse.UE4.Objects.Engine;
+using CUE4Parse.UE4.Objects.UObject;
+using Microsoft.JavaScript.NodeApi;
+
+namespace BlitzKit.Game.JSExport;
+
+[JSExport]
+public class GameInterface
+{
+  private readonly BlitzFileProvider provider;
+
+  public string[] files;
+  public string[] tanksDirectoryNations;
+
+  public GameInterface(string directory)
+  {
+    provider = new(directory);
+
+    files = [.. provider.Files.Keys];
+
+    var tanksBase = "Blitz/Content/Tanks/";
+    tanksDirectoryNations =
+    [
+      .. files
+        .Where(path => path.StartsWith(tanksBase))
+        .Select(path => path[tanksBase.Length..])
+        .Select(path => path.Split('/')[0])
+        .Where(nation => !nation.EndsWith(".uasset") && nation != "TankStub")
+        .Distinct(),
+    ];
+  }
+
+  public string[] Files => files;
+  public string[] TanksDirectoryNations => tanksDirectoryNations;
+
+  public byte[] TankBigIcon(string tankId, string pdaName)
+  {
+    foreach (var nation in tanksDirectoryNations)
+    {
+      var path = $"Blitz/Content/Tanks/{nation}/{tankId}/{pdaName}.{pdaName}";
+
+      if (provider.TryLoadPackageObject<UPrimaryDataAsset>(path, out var pda))
+      {
+        try
+        {
+          return pda.Get<FSoftObjectPath>("BigIcon")
+            .Load<UTexture2D>()
+            .Decode(ETexturePlatform.DesktopMobile)!
+            .ToSkBitmap()
+            .Encode(SkiaSharp.SKEncodedImageFormat.Webp, 80)
+            .ToArray();
+        }
+        catch (Exception e)
+        {
+          Console.WriteLine(e);
+          throw;
+        }
+      }
+      else
+      {
+        continue;
+      }
+    }
+
+    throw new FileNotFoundException($"Tank {tankId}/{pdaName} not found in any nation");
+  }
+}

packages/game/Models/BlitzFileProvider.cs

@@ -0,0 +1,41 @@
+using System.Runtime.InteropServices;
+using CUE4Parse.Compression;
+using CUE4Parse.FileProvider;
+using CUE4Parse.MappingsProvider;
+using CUE4Parse.UE4.Versions;
+
+namespace BlitzKit.Game.Models;
+
+public class BlitzFileProvider : DefaultFileProvider
+{
+  public BlitzFileProvider(string directory)
+    : base(
+      directory: directory,
+      searchOption: SearchOption.AllDirectories,
+      versions: new(EGame.GAME_UE5_5),
+      pathComparer: StringComparer.OrdinalIgnoreCase
+    )
+  {
+    MappingsContainer = new FileUsmapTypeMappingsProvider("../../packages/closed/blitz.usmap");
+
+    Initialize();
+    Mount();
+
+    string libraryExtension;
+    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+    {
+      libraryExtension = "dll";
+    }
+    else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+    {
+      libraryExtension = "so";
+    }
+    else
+    {
+      throw new Exception("Unsupported OS");
+    }
+
+    OodleHelper.DownloadOodleDll($"../../temp/oodle.{libraryExtension}");
+    OodleHelper.Initialize($"../../temp/oodle.{libraryExtension}");
+  }
+}

packages/game/game.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>BlitzKit.Game</RootNamespace>
+    <TargetFramework>net9.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <NodeApiAssemblyJSModuleType>esm</NodeApiAssemblyJSModuleType>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../cue4parse/CUE4Parse/CUE4Parse.csproj" />
+    <ProjectReference Include="../cue4parse/CUE4Parse-Conversion/CUE4Parse-Conversion.csproj" />
+    <PackageReference Include="Microsoft.JavaScript.NodeApi" Version="0.9.19" />
+    <PackageReference Include="Microsoft.JavaScript.NodeApi.Generator" Version="0.9.19" />
+  </ItemGroup>
+</Project>

packages/game/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@blitzkit/game",
+  "private": true,
+  "type": "module",
+  "main": "src/index.ts",
+  "scripts": {
+    "build": "dotnet build"
+  },
+  "dependencies": {
+    "node-api-dotnet": "^0.9.19"
+  }
+}

packages/game/src/index.ts

@@ -0,0 +1 @@
+export * from "../bin/Debug/net9.0/win-x64/game";

packages/i18n/src/index.ts

@@ -1,4 +1,2 @@
 export * from "./literals";
 export * from "./strings";
-export * from "./unwrapper";
-export * from "./wrapper";

packages/i18n/src/literals.ts

@@ -1,16 +1,45 @@
 export function literals(
   string: string,
-  literals?: Record<string, string | number | undefined>
+  literals?: Record<string, string | number | undefined>,
 ) {
   for (const key in literals) {
-    const mutated = string.replaceAll(`{${key}}`, `${literals[key]}`);
+    string = string.replaceAll(`{${key}}`, `${literals[key]}`);
-
-    if (import.meta.env.DEV && mutated === string) {
-      console.warn(`Could not find literal {${key}} in string "${string}"`);
-    }
-
-    string = mutated;
   }
 
   return string;
 }
+
+export function literalsArray<Type, Literal = Type | string>(
+  string: string,
+  literals?: Record<string, Literal>,
+) {
+  if (!literals) return [string];
+
+  let array: (string | Literal)[] = [string];
+
+  for (const key in literals) {
+    const value = literals[key];
+    const next: (string | Literal)[] = [];
+
+    for (const chunk of array) {
+      if (typeof chunk !== "string") {
+        next.push(chunk);
+        continue;
+      }
+
+      const parts = chunk.split(`{${key}}`);
+
+      for (let index = 0; index < parts.length; index++) {
+        if (parts[index]) next.push(parts[index]);
+
+        if (index < parts.length - 1) {
+          next.push(value);
+        }
+      }
+    }
+
+    array = next;
+  }
+
+  return array;
+}

packages/i18n/src/strings.ts

@@ -1,68 +1,3 @@
-import { merge } from "ts-deepmerge";
+import type en from "../strings/en.json";
-import locales from "../locales.json";
-import en from "../strings/en.json";
-import es from "../strings/es.json";
-import fr from "../strings/fr.json";
-import ja from "../strings/ja.json";
-import pl from "../strings/pl.json";
-import pt from "../strings/pt.json";
-import ru from "../strings/ru.json";
-import uk from "../strings/uk.json";
-import zh from "../strings/zh.json";
 
-export type BlitzKitStrings = typeof en;
+export type Strings = typeof en;
-
-const stringsRaw: Record<string, TranslationTree> = {
-  en,
-  es,
-  fr,
-  ja,
-  pl,
-  pt,
-  ru,
-  uk,
-  zh,
-};
-
-export const STRINGS: Record<string, BlitzKitStrings> = {};
-
-for (const locale in stringsRaw) {
-  if (locale === locales.default) {
-    STRINGS[locales.default] = stringsRaw[locales.default] as BlitzKitStrings;
-    continue;
-  }
-
-  const localeStrings = stringsRaw[locale];
-  STRINGS[locale] = merge(
-    stringsRaw[locales.default],
-    localeStrings
-  ) as BlitzKitStrings;
-}
-
-export const SUPPORTED_LOCALE_BLITZ_MAP: Record<string, string> = {
-  en: "en",
-  es: "es",
-  fr: "fr",
-  ja: "ja",
-  pt: "pt",
-  ru: "ru",
-  uk: "uk",
-  zh: "zh-Hans",
-  pl: "pl",
-};
-
-export const SUPPORTED_LOCALE_FLAGS: Record<string, string> = {
-  en: "🇺🇸",
-  es: "🇪🇸",
-  fr: "🇫🇷",
-  ja: "🇯🇵",
-  pt: "🇵🇹",
-  ru: "🇷🇺",
-  uk: "🇺🇦",
-  zh: "🇨🇳",
-  pl: "🇵🇱",
-};
-
-export type TranslationTree = { [key: string]: TranslationNode };
-
-export type TranslationNode = string | TranslationTree;

packages/i18n/src/unwrapper.ts

@@ -1,12 +0,0 @@
-import { I18nString } from "../../core/src";
-import locales from "../locales.json";
-
-export function unwrapper(locale = locales.default) {
-  return function (i18nString: I18nString) {
-    if (locale in i18nString.locales) {
-      return i18nString.locales[locale];
-    }
-
-    return i18nString.locales[locales.default];
-  };
-}

packages/i18n/src/wrapper.ts

@@ -1,15 +0,0 @@
-import locales from "../locales.json";
-import { type BlitzKitStrings, STRINGS } from "./strings";
-
-export function wrapper(slicer: (strings: BlitzKitStrings) => string) {
-  const defaultString = slicer(STRINGS[locales.default] as BlitzKitStrings);
-
-  const object = { [locales.default]: defaultString };
-
-  for (const { locale } of locales.supported) {
-    const string = slicer(STRINGS[locale] as BlitzKitStrings);
-    if (string !== defaultString) object[locale] = string;
-  }
-
-  return object;
-}

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",
+      "ap_cr": "APCR",
-      "heat": "AEAC",
+      "hc": "HEAT",
       "he": "AE"
     },
     "player_count_period": {
@@ -319,9 +320,16 @@
       }
     },
     "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": "repetición",
-        "description": "Mostrar resultados de la repetición"
+        "description": "Mostrar resultados de la repetición",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "desarollar",
@@ -668,6 +676,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.",
@@ -814,7 +826,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...",
@@ -991,8 +1012,8 @@
           "title": "Características",
           "compare": {
             "label": "Comparar con",
-            "class": "Tier {tier} {class}",
+            "class": "{tier} {class}",
-            "tier": "All of tier {tier}",
+            "tier": "All tier {tier}",
             "all": "Todos los tanques"
           },
           "values": {
@@ -1135,10 +1156,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",
+      "ap_cr": "APCR",
-      "heat": "HEAT",
+      "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.",
+        "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": "# 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.",
+        "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_name_not_found": "# Char introuvable\nImpossible de trouver le char sous le nom \"{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": "# 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",
+        "days": "{days} jours",
-        "custom": "{day_1} - {day_2} days"
+        "custom": "{day_1} - {day_2} jours"
       },
       "filters": {
         "none": "Aucun filtre",
-        "tier": "Tier {tier}"
+        "tier": "Rang {tier}"
       },
       "no_data": {
         "battles_in_period": "",
@@ -319,9 +320,16 @@
       }
     },
     "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": "rejouer",
-        "description": "Afficher les résultats de la relecture"
+        "description": "Afficher les résultats de la relecture",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "recherche",
@@ -339,19 +347,19 @@
         "body": {
           "subtitle": "Recherche",
           "total": "Total",
-          "research": "Research: {cost}",
+          "research": "Recherche : {cost}",
-          "upgrades": "Upgrades: {cost}",
+          "upgrades": "Améliorations : {cost}",
-          "purchase": "Purchase: {cost}",
+          "purchase": "Achat : {cost}",
-          "equipment": "Equipment: {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.",
+          "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} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "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} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "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} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "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} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "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} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
+          "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 +402,7 @@
           "wn8": "WN8",
           "winrate": "Taux de victoires",
           "damage": "Dégâts",
-          "unknown_tank": "Unknown tank {id}"
+          "unknown_tank": "Char {id} inconnu"
         }
       },
       "debug": {
@@ -430,12 +438,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",
+          "subtitle": "Inactif depuis plus de {days} jours",
-          "listing": "{days} days"
+          "listing": "{days} jours"
         }
       },
       "full_stats": {
@@ -478,7 +486,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 +501,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 +515,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 +539,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 +554,12 @@
           }
         },
         "body": {
-          "top_players": "Top {count} players",
+          "top_players": "Top {count} joueurs",
-          "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_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 +574,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 +610,96 @@
         "name": "info-joueur",
         "description": "Informations de base sur un joueur",
         "body": {
-          "title": "{name}'s information",
+          "title": "Informations de {name}",
-          "nickname": "Nickname",
+          "nickname": "Pseudo",
           "battles": "Batailles",
           "winrate": "Taux de victoires",
           "account_id": "Account ID",
-          "created": "Created",
+          "created": "Créé",
-          "last_battle": "Last battle"
+          "last_battle": "Dernière bataille"
         }
       },
       "rating": {
-        "name": "rating",
+        "name": "côtée",
-        "description": "Rating player's statistics",
+        "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",
+            "today": "Statistiques de batailles cotées d'aujourd'hui",
-            "season": "This season's rating statistics"
+            "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.",
+          "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": "# 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."
+          "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",
+      "title": "301 : déplacé définitivement",
-      "body": "This page has moved. Redirecting..."
+      "body": "Cette page a été déplacée. Redirection en cours…"
     },
     "settings": {
-      "title": "Settings",
+      "title": "Paramètres",
-      "description": "Change BlitzKit settings",
+      "description": "Modifier les paramètres de BlitzKit",
-      "dev_mode": "Development mode",
+      "dev_mode": "Mode développement",
-      "language": "Language"
+      "language": "Langue"
     },
     "common": {
       "player_search": {
-        "hint": "Search players...",
+        "hint": "Recherche de joueurs...",
-        "no_results": "No results",
+        "no_results": "Aucun résultat",
-        "searching": "Searching..."
+        "searching": "Recherche..."
       },
       "copy_button": {
-        "copied": "Copied!"
+        "copied": "Copié !"
       },
       "tank_search": {
-        "select_dialog_title": "Search for tanks",
+        "select_dialog_title": "Recherche de chars",
-        "swap_dialog_title": "Swap tank",
+        "swap_dialog_title": "Échanger le char",
-        "clear_filters": "Clear filters",
+        "clear_filters": "Supprimer les filtres",
-        "login": "Login to use this",
+        "login": "Connectez-vous pour utiliser ceci",
-        "search_bar_hint": "Search tanks...",
+        "search_bar_hint": "Recherche des tanks...",
-        "recent": "Recently viewed",
+        "recent": "Vu récemment",
-        "select_all": "Select all",
+        "select_all": "Sélectionner tout",
-        "count_singular": "1 tank",
+        "count_singular": "1 char",
-        "count_plural": "{count} tanks",
+        "count_plural": "{count} chars",
-        "sorting_by": "Sorting by {name}",
+        "sorting_by": "Trier par {name}",
+        "clear": "Effacer",
+        "tier": "Rang {tier}",
+        "passive": "{name} (Passif)",
+        "active": "{name} (actif)",
         "no_tanks_found": {
-          "body": "No tanks found.",
+          "body": "Aucun tank trouvé.",
-          "search_again": "Try searching again.",
+          "search_again": "Essayez de chercher à nouveau.",
-          "clear_filters": "Try clearing filters."
+          "clear_filters": "Essayez de supprimer les filtres."
         },
         "sort": {
-          "meta.none": "none",
+          "meta.none": "aucun",
-          "survivability.health": "health",
+          "survivability.health": "santé",
-          "survivability.viewRange": "view range",
+          "survivability.viewRange": "portée de vue",
-          "survivability.camouflageStill": "camouflage still",
+          "survivability.camouflageStill": "camouflage à l’arrêt",
-          "survivability.camouflageMoving": "camouflage moving",
+          "survivability.camouflageMoving": "camouflage en movement",
-          "survivability.camouflageShooting": "camouflage shooting",
+          "survivability.camouflageShooting": "camouflage en tirant",
           "survivability.volume": "volume",
-          "survivability.length": "length",
+          "survivability.length": "longueur",
-          "fire.dpm": "standard DPM",
+          "fire.dpm": "DPM standard",
-          "fire.dpmPremium": "premium DPM",
+          "fire.dpmPremium": "DPM premium",
-          "fire.reload": "reload",
+          "fire.reload": "rechargement",
-          "fire.caliber": "caliber",
+          "fire.caliber": "calibration",
-          "fire.standardPenetration": "standard penetration",
+          "fire.standardPenetration": "pénétration standard",
-          "fire.premiumPenetration": "premium penetration",
+          "fire.premiumPenetration": "pénétration premium",
           "fire.tertiaryPenetration": "tertiary penetration",
           "fire.damage": "damage",
           "fire.moduleDamage": "module damage",
@@ -812,9 +824,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...",
@@ -991,8 +1012,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier {tier} {class}",
+            "class": "{tier} {class}",
-            "tier": "All of tier {tier}",
+            "tier": "All tier {tier}",
             "all": "All tanks"
           },
           "values": {
@@ -1135,10 +1156,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 +1218,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...",
+          "hint": "Recherche de joueurs...",
-          "searching": "Searching...",
+          "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",
+      "ap_cr": "APCR",
-      "heat": "HEAT",
+      "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.",
+        "clan_not_found": "",
-        "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.",
+        "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)にお問い合わせください。",
@@ -319,9 +320,16 @@
       }
     },
     "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": {
         "name": "研究",
@@ -394,7 +402,7 @@
           "wn8": "WN8",
           "winrate": "勝率",
           "damage": "ダメージ",
-          "unknown_tank": "Unknown tank {id}"
+          "unknown_tank": "不明な車両{id}"
         }
       },
       "debug": {
@@ -559,7 +567,7 @@
         "description": "Today's played tanks and statistics"
       },
       "stats": {
-        "name": "stats",
+        "name": "",
         "description": "Quick statistics for a period"
       },
       "owned_tanks": {
@@ -668,6 +676,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 +790,7 @@
           "tank": "車輌名",
           "last_played": "Last played",
           "battles": "Career battles",
-          "unrecorded": "--",
+          "unrecorded": "",
           "wins": "勝利"
         },
         "large_warning": {
@@ -814,7 +826,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...",
@@ -991,8 +1012,8 @@
           "title": "性能値",
           "compare": {
             "label": "比較対象",
-            "class": "Tier {tier} {class}",
+            "class": "{tier} {class}",
-            "tier": "All of tier {tier}",
+            "tier": "All tier {tier}",
             "all": "全車輌"
           },
           "values": {
@@ -1135,10 +1156,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

@@ -1,7 +1,7 @@
 {
   "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": ".",
     "fox": "Szybki brązowy lis przeskoczył nad leniwym psem."
   },
   "common": {
@@ -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",
+      "ap_cr": "APCR",
-      "heat": "HEAT",
+      "hc": "HEAT",
       "he": "OB"
     },
     "player_count_period": {
@@ -319,9 +320,16 @@
       }
     },
     "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": "powtórz",
-        "description": "Wyświetl wyniki powtórki"
+        "description": "Wyświetl wyniki powtórki",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "badanie",
@@ -492,7 +500,7 @@
         "description": "Search clans",
         "options": {
           "limit": {
-            "name": "limit",
+            "name": "",
             "description": "The max number of clan results (default: {limit})"
           }
         },
@@ -506,7 +514,7 @@
         "description": "Search players",
         "options": {
           "limit": {
-            "name": "limit",
+            "name": "",
             "description": "The max number of player results (default: {limit})"
           }
         },
@@ -530,7 +538,7 @@
         },
         "options": {
           "limit": {
-            "name": "limit",
+            "name": "",
             "description": "How many neighbors to display (default: {count})"
           },
           "season": {
@@ -668,9 +676,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": {
@@ -814,7 +826,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...",
@@ -991,8 +1012,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier {tier} {class}",
+            "class": "{tier} {class}",
-            "tier": "All of tier {tier}",
+            "tier": "All tier {tier}",
             "all": "All tanks"
           },
           "values": {
@@ -1135,10 +1156,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",
+      "ap_cr": "APCR",
-      "heat": "HEAT",
+      "hc": "HEAT",
       "he": "HE"
     },
     "player_count_period": {
@@ -319,9 +320,16 @@
       }
     },
     "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": "Exibir resultados de replays"
+        "description": "Exibir resultados de replays",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "pesquisa",
@@ -668,6 +676,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.",
@@ -814,7 +826,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...",
@@ -991,8 +1012,8 @@
           "title": "Características",
           "compare": {
             "label": "Comparar com",
-            "class": "Tier {tier} {class}",
+            "class": "{tier} {class}",
-            "tier": "All of tier {tier}",
+            "tier": "All tier {tier}",
             "all": "Todos os tanques"
           },
           "values": {
@@ -1135,10 +1156,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": "БП",
+      "ap_cr": "БП",
-      "heat": "КС",
+      "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": "За этот период боёв не было",
@@ -319,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": ".",
       "replay": {
         "name": "повтор",
-        "description": "Показать результаты повтора"
+        "description": "Показать результаты повтора",
+        "options": {
+          "file": {
+            "name": "Файл",
+            "description": "Запись повтора"
+          }
+        }
       },
       "research": {
         "name": "исследование",
@@ -668,6 +676,10 @@
         "count_singular": "1 танк",
         "count_plural": "Танков: {count}",
         "sorting_by": "Сортировать по {name}",
+        "clear": "Очистить",
+        "tier": "{tier} уровень",
+        "passive": "{name} (Пассивный)",
+        "active": "{name} (Активный)",
         "no_tanks_found": {
           "body": "Танков не найдено.",
           "search_again": "Попробуйте повторить поиск.",
@@ -814,7 +826,16 @@
           "next": "Следующий",
           "no_results": "Ничего не найденo"
         },
-        "stats": "{correct} / {total} угадано верно"
+        "stats": "{correct} / {total} правильно, серия: {streak}",
+        "help": {
+          "title": "Частично раскрыть танк?",
+          "description": "Показывает танк не показывая название. Этот раунд будет считаться проигранным и прекратит серию!",
+          "cancel": "Отмена",
+          "reveal": "Раскрыть"
+        },
+        "clear": "Очистить",
+        "select_all": "Выбрать всё",
+        "tier": "{tier} уровень"
       },
       "tankopedia": {
         "search": "Поиск характеристик...",
@@ -991,8 +1012,8 @@
           "title": "Характеристики",
           "compare": {
             "label": "Сравнивать с",
-            "class": "{class} {tier} уровня",
+            "class": "Уровень Тип",
-            "tier": "Все {tier} уровня",
+            "tier": "Все уровни",
             "all": "Все танки"
           },
           "values": {
@@ -1135,10 +1156,12 @@
             "upgrade": "Топ"
           },
           "provisions": {
-            "clear": "Очистить"
+            "clear": "Убрать",
+            "clear_all": "Убрать со всех"
           },
           "consumables": {
-            "clear": "Очистить"
+            "clear": "Убрать",
+            "clear_all": "Убрать со всех"
           }
         }
       },

packages/i18n/strings/uk.json

@@ -1,7 +1,7 @@
 {
   "test": {
     "default": "тест",
-    "long": "{fruit}",
+    "long": "{color}{fruit}",
     "fox": "Швидка бура лисиця перестрибує через лінивого собаку."
   },
   "common": {
@@ -13,7 +13,8 @@
       "hp": "{value}од",
       "x": "x{value}",
       "percentage": "{value}%",
-      "deg_s": "{value}град/c"
+      "deg_s": "{value}град/c",
+      "plus": "+{value}"
     },
     "gun_types": {
       "auto_loader": "Магазинна система заряджання",
@@ -22,8 +23,8 @@
     },
     "shells": {
       "ap": "ББ",
-      "apcr": "БП",
+      "ap_cr": "",
-      "heat": "КС",
+      "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": "Колекційний"
@@ -319,9 +320,16 @@
       }
     },
     "commands": {
+      "dead": ".",
       "replay": {
         "name": "реплей",
-        "description": "Показати результати реплею"
+        "description": "Показати результати реплею",
+        "options": {
+          "file": {
+            "name": "",
+            "description": "Replay filehttps://crowdin.com/editor/blitzkrieg/80/en-uk?view=side-by-side#9706"
+          }
+        }
       },
       "research": {
         "name": "дослідження",
@@ -340,18 +348,18 @@
           "subtitle": "Дослідження",
           "total": "Загалом",
           "research": "Дослідження: {cost}",
-          "upgrades": "Upgrades: {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.",
+          "non_tech_tree": "#{tank} відсутній в дереві дослідження\n\nВи не можете дослідити преміум/колеційний танк.",
-          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "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.",
+          "already_researched": "# {tank} вже було досліджено\n\nСпробуйте використати `початковий-танк` коли використовуєте команду для перегляду загальної гілки, яку ви вже дослідили",
-          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "start_end_equal": "#{tank} було введено двічі  \n\nПереконайтесь що `початковий-танк` та  `ціль-танк` різні",
-          "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.",
+          "tanks_not_on_line": "# {tank_1} та {tank_2}  не в одній гілці\n\nПереконайтесь що  `початковий-танк` та  `ціль-танк` знаходяться в єдиній гілці дерева дослідження",
-          "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."
+          "unordered": "# {tank_1} вище рівнем відносно {tank_2}\n\nОбов’язково вкажіть {tank_2} як `початковий-танк`, оскільки це танк нижчого рівня."
         }
       },
       "about": {
@@ -394,7 +402,7 @@
           "wn8": "WN8",
           "winrate": "Відсоток перемог",
           "damage": "Шкода",
-          "unknown_tank": "Unknown tank {id}"
+          "unknown_tank": "Невідомий танк {id}"
         }
       },
       "debug": {
@@ -430,11 +438,11 @@
         "options": {
           "threshold": {
             "name": "поріг",
-            "description": "The number of days inactive (default: {days} days)"
+            "description": "Кількість днів неактивності (за замовчуванням: {days} днів)"
           }
         },
         "body": {
-          "subtitle": "Inactive for {days}+ days",
+          "subtitle": "Неактивний {days}+ днів",
           "listing": "{days} днів"
         }
       },
@@ -478,7 +486,7 @@
         "body": {
           "accounts_linked": "Прив'язані акаунти",
           "no_role_permissions": {
-            "title": "{name} failed to verify",
+            "title": "{name} не вдалося перевірити",
             "description": "У мене немає дозволу керувати ролями."
           }
         },
@@ -493,11 +501,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 +515,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 +528,8 @@
         "description": "Статистика рейтингових боїв",
         "subcommands": {
           "neighbors": {
-            "name": "neighbors",
+            "name": "сусіди",
-            "description": "Neighboring players on the leaderboard"
+            "description": "Сусідуючі гравці в лідерборді"
           },
           "league": {
             "name": "ліга",
@@ -531,32 +539,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",
+          "top_players": "Топ {count} гравців",
-          "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_participation": "# {player} не грав у рейтингу в сезоні {season}\n\nЦей гравець не брав участь у цьому сезоні або не проходив калібрування",
-          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
+          "no_ongoing_season": "# Немає поточного сезону\n\nВ даний час немає сезону рейтингу.",
           "deleted_player": "",
-          "neighbors": "Rating neighbors",
+          "neighbors": "Сусіди по рейтингу",
-          "more": "+ {count} more"
+          "more": "+  {count} ще"
         }
       },
       "today": {
         "name": "сьогодні",
-        "description": "Today's played tanks and statistics"
+        "description": "Сьогодні зіграні танки та статистика"
       },
       "stats": {
         "name": "статистика",
@@ -566,43 +574,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}",
+          "title": "# Дозволи\n\n{body}",
-          "view_channels": "View channels: needed to find the message the refresh button was used on",
+          "view_channels": "Перегляньте канали: необхідне для знаходження повідомлення, на якому використовувалася кнопка оновлення",
-          "read_message_history": "Read message history: needed to find the message to refresh",
+          "read_message_history": "Прочитайте історію повідомлень: потрібно знайти повідомлення для оновлення",
-          "attach_files": "Attach files: needed to add images to image-based commands",
+          "attach_files": "Закріпіть файли: потрібно для додавання зображень до команд на основі зображень",
-          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
+          "external_emojis": "Зовнішні емодзі: потрібні для додавання емодзі національних прапорів та класів техніки"
         }
       },
       "ping": {
         "name": "",
-        "description": "Check wether the bot is alive.",
+        "description": "Перевірити чи бот живий",
         "body": {
-          "pong": "Pong 🏓",
+          "pong": "Понг🏓",
-          "pong_with_time": "Pong 🏓 - {time}ms"
+          "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,33 +621,33 @@
       },
       "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",
+            "today": "Сьогоднішня статистика рейтингових боїв",
-            "season": "This season's rating statistics"
+            "season": "Статистика рейтингових боїв даного сезону"
           }
         },
         "errors": {
-          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "no_participation": "# {name} не грав рейтингові бої\n\nЦей гравець не брав участь у рейтинговому режимі цього сезону.",
-          "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."
+          "unrecorded_stats": "# Статистика на цей момент недоступна\n\nWargaming наразі зіткнулась з технічними несправностями. Якщо зараз проходить сезон, статистика буде доступною в найближчі 24 години."
         }
       }
     }
   },
   "website": {
     "redirect": {
-      "title": "301: moved permanently",
+      "title": "301: переміщено назавжди",
       "body": "This page has moved. Redirecting..."
     },
     "settings": {
@@ -659,7 +667,7 @@
       },
       "tank_search": {
         "select_dialog_title": "Знайти танк",
-        "swap_dialog_title": "Swap tank",
+        "swap_dialog_title": "Резервуар підміни",
         "clear_filters": "Очистити",
         "login": "Увійдіть, щоб скористатися",
         "search_bar_hint": "Шукайте техніку...",
@@ -668,6 +676,10 @@
         "count_singular": "1 танк",
         "count_plural": "Танків: {count} ",
         "sorting_by": "Відсортувати за {name}",
+        "clear": "Clear",
+        "tier": "Рівень {tier}",
+        "passive": "",
+        "active": "{name}{name}",
         "no_tanks_found": {
           "body": "Нічого не знайдено.",
           "search_again": "Спробуйте шукати заново.",
@@ -730,11 +742,11 @@
     },
     "home": {
       "pwa": {
-        "title": "Install the BlitzKit App",
+        "title": "",
         "new": "",
-        "checking": "Checking compatibility...",
+        "checking": "",
-        "instructions": "Instructions for Apple devices.",
+        "instructions": ".",
-        "install": "Install",
+        "install": "",
         "dismiss": "Dismiss"
       },
       "discord": {
@@ -814,7 +826,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": "",
+          "reveal": "Reveal"
+        },
+        "clear": "Clear",
+        "select_all": "Вибрати все",
+        "tier": "Рівень {tier}"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -823,33 +844,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",
+            "hull": "Корпус",
-            "turret": "Turret",
+            "turret": "Башта",
-            "hard": "Hard",
+            "hard": "Жорстко",
             "medium": "Середній",
-            "soft": "Soft",
+            "soft": "Ніжно",
-            "effective": "Effective"
+            "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",
+            "camo": "Камуфляж",
-            "ghost_factory": "Ghost Factory",
+            "ghost_factory": "Промзона",
-            "dead_rail": "Dead Rail"
+            "dead_rail": "Ешелон"
           },
           "flexibility": {
             "yaw": "Yaw",
@@ -991,8 +1012,8 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier {tier} {class}",
+            "class": "{tier} {class}",
-            "tier": "All of tier {tier}",
+            "tier": "All tier {tier}",
             "all": "Усі танки"
           },
           "values": {
@@ -1135,10 +1156,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"
           }
         }
       },
@@ -1258,7 +1281,7 @@
               "button": "Generate URL",
               "title": "Generate URL",
               "subtitle": "Search an account to track",
-              "cancel": "Cancel",
+              "cancel": "",
               "success": {
                 "title": "Copy 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\".",

packages/i18n/strings/zh.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": "硬式复合穿甲弹",
+      "ap_cr": "硬式复合穿甲弹",
-      "heat": "反战车高爆弹",
+      "hc": "反战车高爆弹",
       "he": "高爆弹"
     },
     "player_count_period": {
@@ -319,9 +320,16 @@
       }
     },
     "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": "回放",
-        "description": "显示重播结果"
+        "description": "显示重播结果",
+        "options": {
+          "file": {
+            "name": "file",
+            "description": "Replay file"
+          }
+        }
       },
       "research": {
         "name": "研发",
@@ -668,6 +676,10 @@
         "count_singular": "1辆战车",
         "count_plural": "{count} 辆坦克",
         "sorting_by": "按 {name} 排序",
+        "clear": "清除",
+        "tier": "{tier} 阶",
+        "passive": "{name} (被动)",
+        "active": "{name} (主动)",
         "no_tanks_found": {
           "body": "找不到战车。",
           "search_again": "请尝试重新搜索。",
@@ -804,7 +816,7 @@
       },
       "guess": {
         "name": "猜测",
-        "button": "What could it be?",
+        "button": "这会是什么？",
         "description": "坦克剪影小游戏",
         "seo_description": "看剪影猜坦克",
         "search": {
@@ -814,7 +826,16 @@
           "next": "下一个",
           "no_results": "沒有結果"
         },
-        "stats": "猜对了 {correct} / {total}"
+        "stats": "猜对了 {correct} / {total}",
+        "help": {
+          "title": "显示坦克?",
+          "description": "显示坦克而不显示名字。这轮会被视为不正确，并打破你的连续记录！",
+          "cancel": "取消",
+          "reveal": "显示"
+        },
+        "clear": "清除",
+        "select_all": "全选",
+        "tier": "{tier} 阶"
       },
       "tankopedia": {
         "search": "搜索属性……",
@@ -991,8 +1012,8 @@
           "title": "属性",
           "compare": {
             "label": "比较",
-            "class": "{tier}阶 {class}",
+            "class": "{tier} {class}",
-            "tier": "所有 {tier} 阶",
+            "tier": "All tier {tier}",
             "all": "所有坦克"
           },
           "values": {
@@ -1135,10 +1156,12 @@
             "upgrade": "顶级配置"
           },
           "provisions": {
-            "clear": "清除"
+            "clear": "清除",
+            "clear_all": "清除所有坦克"
           },
           "consumables": {
-            "clear": "清除"
+            "clear": "清除",
+            "clear_all": "清除所有坦克"
           }
         }
       },

packages/scripts/package.json

@@ -31,6 +31,7 @@
     "steam-user": "^5.2.3",
     "three": "^0.180.0",
     "ts-proto": "^2.7.7",
+    "unzipit": "^1.4.3",
     "yaml": "^2.8.1"
   },
   "private": true,

packages/scripts/src/buildAssets/boosterIcons.ts

@@ -5,10 +5,12 @@ import { vfs } from "./constants";
 export async function boosterIcons() {
   console.log("Building booster icons...");
 
-  using uploader = new AssetUploader("booster icons");
+  const uploader = new AssetUploader("booster icons");
-  const boosterFiles = (vfs.dir(`Data/Gfx/Shared/boosters`)).filter(
+  const boosterFiles = vfs
-    (file) => !file.includes("@2x.txt") && !file.startsWith("texture0")
+    .dir("Data/Gfx/Shared/boosters")
-  );
+    .filter(
+      (file) => !file.includes("@2x.txt") && !file.startsWith("texture0")
+    );
   const image = sharp(
     await vfs.file(`Data/Gfx/Shared/boosters/texture0.packed.webp`)
   );

packages/scripts/src/buildAssets/constants.ts

@@ -1,12 +1,33 @@
 import { assertSecret } from "@blitzkit/core";
-import { SteamVFS } from "../core/steam/vfs";
+import { AbstractVFS } from "../core/vfs/abstract";
+import { SteamVFS } from "../core/vfs/steam";
+import { ZipVFS } from "../core/vfs/zip";
 
-const APP = 444200;
+const steamPattern = /steam:(\d+)\/(\d+)/;
-const DEPOT = 444202;
+const zipPattern = /zip:(.+)/;
 
-export const vfs = await new SteamVFS(
+const source = Bun.argv
-  assertSecret(import.meta.env.STEAM_USERNAME),
+  .find((arg) => arg.startsWith("--source="))
-  assertSecret(import.meta.env.STEAM_PASSWORD),
+  ?.split("=")[1];
-  APP,
+
-  DEPOT
+let resolved: AbstractVFS;
-).init();
+
+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 {
+  throw new Error("No valid source specified");
+}
+
+export const vfs = resolved;

packages/scripts/src/buildAssets/consumableProvisionIcons.ts

@@ -62,7 +62,7 @@ export async function consumableProvisionIcons() {
         .replace(".psd", "")
         .replace(".txt", "");
 
-      if (vfs.has(`Data/${configPath}.packed.webp`)) {
+      if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
         const image = sharp(
           await vfs.file(`Data/${configPath}.packed.webp`)
         );
@@ -131,7 +131,7 @@ export async function consumableProvisionIcons() {
         .replace(".psd", "")
         .replace(".txt", "");
 
-      if (vfs.has(`Data/${configPath}.packed.webp`)) {
+      if (vfs.resolve(`Data/${configPath}.packed.webp`)) {
         const image = sharp(
           await vfs.file(`Data/${configPath}.packed.webp`)
         );

packages/scripts/src/buildAssets/definitions.ts

@@ -534,11 +534,11 @@ const blitzModuleTypeToBlitzkit: Record<keyof BlitzModuleType, ModuleType> = {
 export async function definitions() {
   console.log("Building definitions...");
 
-  using uploader = new AssetUploader("definitions");
+  const uploader = new AssetUploader("definitions");
   const gameDefinitions: GameDefinitions = {
-    version: (await vfs.text('Data/version.txt')).split(" ")[0],
+    version: (await vfs.text("Data/version.txt")).split(" ")[0],
     nations: (
-      await vfs.yaml<AvailableNationsYaml>('Data/available_nations.yaml')
+      await vfs.yaml<AvailableNationsYaml>("Data/available_nations.yaml")
     ).available_nations,
     gameModes: {},
     roles: {},
@@ -561,10 +561,12 @@ export async function definitions() {
       [TankClass.TANK_DESTROYER]: { skills: [] },
     },
   };
-  const nations = vfs.dir('Data/XML/item_defs/vehicles').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 vfs.xml<{ root: OptionalDevices }>(
-    'Data/XML/item_defs/vehicles/common/optional_devices.xml'
+    "Data/XML/item_defs/vehicles/common/optional_devices.xml"
   );
   const stringsI18n: Record<string, Record<string, string>> = {};
 
@@ -617,9 +619,7 @@ export async function definitions() {
   const provisions: ProvisionsCommon = {};
 
   for (const match of (
-    await vfs.text(
+    await vfs.text(`Data/XML/item_defs/vehicles/common/consumables/list.xml`)
-      `Data/XML/item_defs/vehicles/common/consumables/list.xml`
-    )
   ).matchAll(/<items path="(.+)\.xml"\/>/g)) {
     if (match[1] === "prototypes") continue;
 
@@ -634,9 +634,7 @@ export async function definitions() {
   }
 
   for (const match of (
-    await vfs.text(
+    await vfs.text(`Data/XML/item_defs/vehicles/common/provisions/list.xml`)
-      `Data/XML/item_defs/vehicles/common/provisions/list.xml`
-    )
   ).matchAll(/<items path="(.+)\.xml"\/>/g)) {
     if (match[1] === "prototypes") continue;
 
@@ -1559,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) {
-      if (includeRaw) {
+      entry.include = [];
-        entry.include = [];
 
-        if ("minLevel" in includeRaw) {
+      if ("minLevel" in includeRaw) {
-          entry.include.push({
+        entry.include.push({
-            filter_type: {
+          filter_type: {
-              $case: "tiers",
+            $case: "tiers",
-              value: {
+            value: {
-                min: includeRaw.minLevel,
+              min: includeRaw.minLevel,
-                max: includeRaw.maxLevel,
+              max: includeRaw.maxLevel,
-              },
             },
-          });
+          },
-        } else if ("name" in includeRaw) {
+        });
-          entry.include.push({
+      } else if ("name" in includeRaw) {
-            filter_type: {
+        entry.include.push({
-              $case: "ids",
+          filter_type: {
-              value: {
+            $case: "ids",
-                ids: includeRaw.name.split(/ +/).map((key) => {
+            value: {
-                  return tankStringIdMap[key];
+              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) {
+      if (consumable.vehicleFilter?.include.nations) {
-          entry.include.push({
+        entry.include.push({
-            filter_type: {
+          filter_type: {
-              $case: "nations",
+            $case: "nations",
-              value: {
+            value: {
-                nations: consumable.vehicleFilter.include.nations.split(" "),
+              nations: consumable.vehicleFilter.include.nations.split(" "),
-              },
             },
-          });
+          },
-        }
+        });
       }
+    }
 
-      if (excludeRaw) {
+    if (excludeRaw) {
-        entry.exclude = [];
+      entry.exclude = [];
 
-        if ("name" in excludeRaw) {
+      if ("name" in excludeRaw) {
-          entry.exclude!.push({
+        entry.exclude!.push({
-            filter_type: {
+          filter_type: {
-              $case: "ids",
+            $case: "ids",
-              value: {
+            value: {
-                ids: excludeRaw.name.split(/ +/).map((key) => {
+              ids: excludeRaw.name.split(/ +/).map((key) => {
-                  return tankStringIdMap[key];
+                return tankStringIdMap[key];
-                }),
+              }),
-              },
             },
-          });
+          },
-        } else if ("extendedTags" in excludeRaw) {
+        });
-          entry.exclude!.push({
+      } else if ("extendedTags" in excludeRaw) {
-            filter_type: {
+        entry.exclude!.push({
-              $case: "categories",
+          filter_type: {
-              value: {
+            $case: "categories",
-                categories: excludeRaw.extendedTags
+            value: {
-                  .split(" ")
+              categories: excludeRaw.extendedTags
-                  .map(
+                .split(" ")
-                    (item) =>
+                .map(
-                      blitzTankFilterDefinitionCategoryToBlitzkit[
+                  (item) =>
-                        item as BlitzTankFilterDefinitionCategory
+                    blitzTankFilterDefinitionCategoryToBlitzkit[
-                      ]
+                      item as BlitzTankFilterDefinitionCategory
-                  ),
+                    ]
-              },
+                ),
             },
-          });
+          },
-        } else throw new SyntaxError("Unhandled exclude type");
+        });
+      } else throw new SyntaxError("Unhandled exclude type");
 
-        if (consumable.vehicleFilter?.exclude?.nations) {
+      if (consumable.vehicleFilter?.exclude?.nations) {
-          entry.exclude!.push({
+        entry.exclude!.push({
-            filter_type: {
+          filter_type: {
-              $case: "nations",
+            $case: "nations",
-              value: {
+            value: {
-                nations: consumable.vehicleFilter.exclude.nations.split(" "),
+              nations: consumable.vehicleFilter.exclude.nations.split(" "),
-              },
             },
-          });
+          },
-        }
+        });
       }
     }
   });
@@ -1659,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) {
-      if (includeRaw) {
+      entry.include = [];
-        entry.include = [];
 
-        if ("minLevel" in includeRaw) {
+      if ("minLevel" in includeRaw) {
-          entry.include.push({
+        entry.include.push({
-            filter_type: {
+          filter_type: {
-              $case: "tiers",
+            $case: "tiers",
-              value: {
+            value: {
-                min: includeRaw.minLevel,
+              min: includeRaw.minLevel,
-                max: includeRaw.maxLevel,
+              max: includeRaw.maxLevel,
-              },
             },
-          });
+          },
-        } else if ("name" in includeRaw) {
+        });
-          entry.include.push({
+      } else if ("name" in includeRaw) {
-            filter_type: {
+        entry.include.push({
-              $case: "ids",
+          filter_type: {
-              value: {
+            $case: "ids",
-                ids: includeRaw.name.split(/ +/).map((key) => {
+            value: {
-                  return tankStringIdMap[key];
+              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) {
+      if (provision.vehicleFilter?.include.nations) {
-          entry.include.push({
+        entry.include.push({
-            filter_type: {
+          filter_type: {
-              $case: "nations",
+            $case: "nations",
-              value: {
+            value: {
-                nations: provision.vehicleFilter.include.nations.split(" "),
+              nations: provision.vehicleFilter.include.nations.split(" "),
-              },
             },
-          });
+          },
-        }
+        });
       }
+    }
 
-      if (excludeRaw) {
+    if (excludeRaw) {
-        entry.exclude = [];
+      entry.exclude = [];
 
-        if ("name" in excludeRaw) {
+      if ("name" in excludeRaw) {
-          entry.exclude!.push({
+        entry.exclude!.push({
-            filter_type: {
+          filter_type: {
-              $case: "ids",
+            $case: "ids",
-              value: {
+            value: {
-                ids: excludeRaw.name
+              ids: excludeRaw.name
-                  .split(/ +/)
+                .split(/ +/)
-                  .map((key) => tankStringIdMap[key]),
+                .map((key) => tankStringIdMap[key]),
-              },
             },
-          });
+          },
-        } else if ("extendedTags" in excludeRaw) {
+        });
-          entry.exclude!.push({
+      } else if ("extendedTags" in excludeRaw) {
-            filter_type: {
+        entry.exclude!.push({
-              $case: "categories",
+          filter_type: {
-              value: {
+            $case: "categories",
-                categories: excludeRaw.extendedTags
+            value: {
-                  .split(" ")
+              categories: excludeRaw.extendedTags
-                  .map(
+                .split(" ")
-                    (item) =>
+                .map(
-                      blitzTankFilterDefinitionCategoryToBlitzkit[
+                  (item) =>
-                        item as BlitzTankFilterDefinitionCategory
+                    blitzTankFilterDefinitionCategoryToBlitzkit[
-                      ]
+                      item as BlitzTankFilterDefinitionCategory
-                  ),
+                    ]
-              },
+                ),
             },
-          });
+          },
-        } else throw new SyntaxError("Unhandled exclude type");
+        });
+      } else throw new SyntaxError("Unhandled exclude type");
 
-        if (provision.vehicleFilter?.exclude?.nations) {
+      if (provision.vehicleFilter?.exclude?.nations) {
-          entry.exclude!.push({
+        entry.exclude!.push({
-            filter_type: {
+          filter_type: {
-              $case: "nations",
+            $case: "nations",
-              value: {
+            value: {
-                nations: provision.vehicleFilter.exclude.nations.split(" "),
+              nations: provision.vehicleFilter.exclude.nations.split(" "),
-              },
             },
-          });
+          },
-        }
+        });
       }
     }
 

packages/scripts/src/buildAssets/skillIcons.ts

@@ -28,7 +28,7 @@ export async function skillIcons() {
   const avatar = await vfs.xml<{ root: Avatar }>(
     `Data/XML/item_defs/tankmen/avatar.xml`
   );
-  using uploader = new AssetUploader("skill icons");
+  const uploader = new AssetUploader("skill icons");
 
   for (const key in avatar.root.skills) {
     const skill = avatar.root.skills[key];

packages/scripts/src/buildAssets/tankModels.ts

@@ -12,12 +12,14 @@ export async function tankModels() {
 
   using uploader = new AssetUploader("tank models");
   const nodeIO = new NodeIO().registerExtensions(ALL_EXTENSIONS);
-  const nations = vfs.dir(`Data/XML/item_defs/vehicles`).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 tanks = await vfs.xml<{ root: VehicleDefinitionList }>(
-      `Data/XML/item_defs/vehicles/${nation}/list.xml`
+      `Data/XML/item_defs/vehicles/${nation}/list.xml`,
     );
     const entries = Object.entries(tanks.root);
 
@@ -26,11 +28,11 @@ export async function tankModels() {
 
       const id = toUniqueId(nation, tank.id);
       const parameters = await vfs.yaml<TankParameters>(
-        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
+        `Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`,
       );
       const model = await extractModel(
         vfs,
-        parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, "")
+        parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, ""),
       );
       const content = Buffer.from(await nodeIO.writeBinary(model));
 
@@ -39,4 +41,4 @@ export async function tankModels() {
   }
 
   await uploader.flush();
-}
+}

packages/scripts/src/buildBot.ts

@@ -1,13 +1,11 @@
 import { build } from "esbuild";
 import { cp, readdir, rm } from "fs/promises";
-import { argv } from "process";
 
 const projectDir = "../..";
 const srcRoot = `${projectDir}/packages/bot`;
 const distRoot = `${projectDir}/dist/bot`;
 const modulesRoot = "../../node_modules";
 const workers = await readdir(`${srcRoot}/src/workers`);
-const dev = argv.includes("--dev");
 
 await rm(distRoot, { recursive: true, force: true });
 
@@ -27,9 +25,9 @@ build({
   },
   external: ["sharp"],
   minifyIdentifiers: false, // causes goofy ahh issues
-  minifySyntax: !dev,
+  minifySyntax: true,
-  minifyWhitespace: !dev,
+  minifyWhitespace: true,
-  sourcemap: !dev,
+  sourcemap: true,
   jsxImportSource: "react",
   jsx: "automatic",
 });
@@ -41,18 +39,16 @@ for (const module of await readdir(`${modulesRoot}/@resvg`)) {
       .map((file) =>
         cp(
           `${modulesRoot}/@resvg/${module}/${file}`,
-          `${distRoot}/workers/${file}`
+          `${distRoot}/workers/${file}`,
-        )
+        ),
-      )
+      ),
   );
 }
 
-if (!dev) {
+await cp(`${projectDir}/prisma`, `${distRoot}/prisma`, { recursive: true });
-  await cp(`${projectDir}/prisma`, `${distRoot}/prisma`, { recursive: true });
 
-  for (const file of await readdir(`${modulesRoot}/prisma`).then((files) =>
+for (const file of await readdir(`${modulesRoot}/prisma`).then((files) =>
-    files.filter((file) => file.endsWith(".node"))
+  files.filter((file) => file.endsWith(".node")),
-  )) {
+)) {
-    cp(`${modulesRoot}/prisma/${file}`, `${distRoot}/prisma/${file}`);
+  cp(`${modulesRoot}/prisma/${file}`, `${distRoot}/prisma/${file}`);
-  }
 }

packages/scripts/src/core/blitz/extractArmor.ts

@@ -6,20 +6,20 @@ import {
 } from "@blitzkit/core";
 import { Accessor, Document, Node, Scene } from "@gltf-transform/core";
 import { times } from "lodash-es";
-import { SteamVFS } from "../steam/vfs";
+import { AbstractVFS } from "../vfs/abstract";
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
 } from "./extractModel/constants";
 
-export async function extractArmor(vfs: SteamVFS, fileName: string) {
+export async function extractArmor(vfs: AbstractVFS, fileName: string) {
   const sc2Path = `Data/3d/Tanks/CollisionMeshes/${fileName}.sc2`;
   const scgPath = `Data/3d/Tanks/CollisionMeshes/${fileName}.scg`;
   const sc2 = new Sc2ReadStream(
-    (await vfs.file(sc2Path)).buffer as ArrayBuffer
+    (await vfs.file(sc2Path)).buffer as ArrayBuffer,
   ).sc2();
   const scg = new ScgReadStream(
-    (await vfs.file(scgPath)).buffer as ArrayBuffer
+    (await vfs.file(scgPath)).buffer as ArrayBuffer,
   ).scg();
   const document = new Document();
   const scene = document.createScene();
@@ -29,7 +29,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
     hierarchies.forEach((hierarchy) => {
       const components = times(
         hierarchy.components.count,
-        (index) => hierarchy.components[index.toString().padStart(4, "0")]
+        (index) => hierarchy.components[index.toString().padStart(4, "0")],
       );
 
       components.forEach((component) => {
@@ -43,7 +43,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
 
             if (!polygonGroup) {
               console.warn(
-                `Missing polygon group ${batch["rb.datasource"]} (${hierarchy.name}); skipping...`
+                `Missing polygon group ${batch["rb.datasource"]} (${hierarchy.name}); skipping...`,
               );
 
               break;
@@ -73,7 +73,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
                 VertexAttribute.TANGENT,
                 attributes
                   .get(VertexAttribute.TANGENT)!
-                  .map((tangent) => [...tangent, 1])
+                  .map((tangent) => [...tangent, 1]),
               );
             }
 
@@ -94,7 +94,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
 
             hardJointIndices.forEach((hardJointIndex) => {
               const node = document.createNode(
-                `${hierarchy.name}_armor_${hardJointIndex}`
+                `${hierarchy.name}_armor_${hardJointIndex}`,
               );
               const mesh = document.createMesh(batch["##name"]);
               const indicesAccessor = document
@@ -104,9 +104,9 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
                   new Uint16Array(
                     polygonGroup.indices.filter(
                       (index) =>
-                        vertexHardJointIndices.get(index) === hardJointIndex
+                        vertexHardJointIndices.get(index) === hardJointIndex,
-                    )
+                    ),
-                  )
+                  ),
                 )
                 .setBuffer(buffer);
               const primitive = document
@@ -127,7 +127,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
 
           default:
             throw new TypeError(
-              `Unhandled component type: ${component["comp.typename"]}`
+              `Unhandled component type: ${component["comp.typename"]}`,
             );
         }
       });
@@ -141,4 +141,4 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
   parseHierarchies(sc2["#hierarchy"], scene);
 
   return document;
-}
+}

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

@@ -1,4 +1,5 @@
 import {
+  bufferToBigInt,
   Hierarchy,
   Sc2ReadStream,
   ScgReadStream,
@@ -9,7 +10,7 @@ import { Document, Material, Node, Scene } from "@gltf-transform/core";
 import { dedup, prune } from "@gltf-transform/functions";
 import { times } from "lodash-es";
 import { dirname } from "path";
-import { SteamVFS } from "../../steam/vfs";
+import { AbstractVFS } from "../../vfs/abstract";
 import { readBaseColor } from "../readBaseColor";
 import { readNormal } from "../readNormal";
 import { readRoughnessMetallic } from "../readRoughnessMetallic";
@@ -25,14 +26,14 @@ const omitMeshNames = {
   end: ["_POINT"],
 };
 
-export async function extractModel(vfs: SteamVFS, path: string) {
+export async function extractModel(vfs: AbstractVFS, path: string) {
   const sc2Path = `Data/3d/${path}.sc2`;
   const scgPath = `Data/3d/${path}.scg`;
   const sc2 = new Sc2ReadStream(
-    (await vfs.file(sc2Path)).buffer as ArrayBuffer
+    (await vfs.file(sc2Path)).buffer as ArrayBuffer,
   ).sc2();
   const scg = new ScgReadStream(
-    (await vfs.file(scgPath)).buffer as ArrayBuffer
+    (await vfs.file(scgPath)).buffer as ArrayBuffer,
   ).scg();
   const document = new Document();
   const scene = document.createScene();
@@ -40,7 +41,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
   const materials = new Map<bigint, Material | bigint | undefined>();
 
   for (const node of sc2["#dataNodes"]) {
-    const id = new DataView(node["#id"]).getBigUint64(0, true);
+    const id = bufferToBigInt(node["#id"]);
 
     if (node.parentMaterialKey !== undefined) {
       /**
@@ -61,20 +62,17 @@ export async function extractModel(vfs: SteamVFS, path: string) {
     }
 
     if (textures) {
+      const { image: baseColor, hasAlpha } = await readBaseColor(
+        `Data/3d/${dirname(path)}/${textures.baseColorMap ?? textures.albedo}`,
+        textures.miscMap
+          ? `Data/3d/${dirname(path)}/${textures.miscMap}`
+          : undefined,
+      );
       material.setBaseColorTexture(
         document
           .createTexture(node.materialName)
           .setMimeType("image/webp")
-          .setImage(
+          .setImage(baseColor),
-            await readBaseColor(
-              `Data/3d/${dirname(path)}/${
-                textures.baseColorMap ?? textures.albedo
-              }`,
-              textures.miscMap
-                ? `Data/3d/${dirname(path)}/${textures.miscMap}`
-                : undefined
-            )
-          )
       );
 
       if (node.configCount) {
@@ -92,7 +90,11 @@ export async function extractModel(vfs: SteamVFS, path: string) {
             continue;
           }
 
-          material.setAlphaMode("BLEND").setDoubleSided(true);
+          const view = new DataView(archive.properties.alphatestThreshold);
+          const _ = view.getUint8(0); // only god knows what these flags are
+          const alphaCutoff = view.getFloat32(1, true);
+
+          material.setAlphaMode("MASK").setAlphaCutoff(alphaCutoff);
         }
       }
 
@@ -103,9 +105,9 @@ export async function extractModel(vfs: SteamVFS, path: string) {
             .setMimeType("image/webp")
             .setImage(
               await readRoughnessMetallic(
-                `Data/3d/${dirname(path)}/${textures.baseRMMap}`
+                `Data/3d/${dirname(path)}/${textures.baseRMMap}`,
-              )
+              ),
-            )
+            ),
         );
       }
 
@@ -121,13 +123,13 @@ export async function extractModel(vfs: SteamVFS, path: string) {
                 `Data/3d/${dirname(path)}/${
                   textures.baseNormalMap ?? textures.normalmap
                 }`,
-                isBase
+                isBase,
-              )
+              ),
-            )
+            ),
         );
       }
 
-      materials.set(new DataView(node["#id"]).getBigUint64(0, true), material);
+      materials.set(id, material);
     }
   }
 
@@ -157,7 +159,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
       const node = document.createNode(hierarchy.name);
       const components = times(
         hierarchy.components.count,
-        (index) => hierarchy.components[index.toString().padStart(4, "0")]
+        (index) => hierarchy.components[index.toString().padStart(4, "0")],
       );
 
       components.forEach((component) => {
@@ -194,7 +196,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
               }
               if (polygonGroup === undefined) {
                 throw new Error(
-                  `Missing polygon group ${batch["rb.datasource"]}`
+                  `Missing polygon group ${batch["rb.datasource"]}`,
                 );
               }
 
@@ -255,7 +257,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
           default: {
             if (ERROR_ON_UNKNOWN_COMPONENT) {
               throw new Error(
-                `Unhandled component type: ${component["comp.typename"]}`
+                `Unhandled component type: ${component["comp.typename"]}`,
               );
             }
           }
@@ -277,4 +279,4 @@ export async function extractModel(vfs: SteamVFS, path: string) {
   await document.transform(prune({ keepAttributes: true }), dedup());
 
   return document;
-}
+}

packages/scripts/src/core/blitz/readBaseColor.ts

@@ -2,6 +2,7 @@ import sharp from "sharp";
 import { readTexture } from "./readTexture";
 
 export async function readBaseColor(path: string, occlusionPath?: string) {
+  let hasAlpha = false;
   const baseRaw = await readTexture(path);
   const occlusionRaw = occlusionPath
     ? await readTexture(occlusionPath)
@@ -30,10 +31,13 @@ export async function readBaseColor(path: string, occlusionPath?: string) {
       c = occlusion![occlusionI] / 255;
     }
 
+    const alpha = base[i * 4 + 3];
+    hasAlpha ||= alpha < 255;
+
     combined[i * 4 + 0] = Math.round(base[i * 4 + 0] * c);
     combined[i * 4 + 1] = Math.round(base[i * 4 + 1] * c);
     combined[i * 4 + 2] = Math.round(base[i * 4 + 2] * c);
-    combined[i * 4 + 3] = base[i * 4 + 3];
+    combined[i * 4 + 3] = alpha;
   }
 
   const image = await sharp(combined, {
@@ -42,5 +46,5 @@ export async function readBaseColor(path: string, occlusionPath?: string) {
     .webp()
     .toBuffer();
 
-  return image;
+  return { hasAlpha, image };
 }