fix: []

*Total -- 6,696.66kb -> 4,836.70kb (27.77%)

/public/assets/banners/discord.png -- 1,632.36kb -> 921.18kb (43.57%)
/public/assets/banners/compare.png -- 2,571.28kb -> 1,799.75kb (30.01%)
/docs/public/assets/images/hero.png -- 183.03kb -> 147.76kb (19.27%)
/public/assets/banners/statistics.png -- 2,309.99kb -> 1,968.00kb (14.8%)

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

.github/workflows/cd-assets.yml

@@ -2,9 +2,10 @@ name: CD Build Assets
 
 on:
   push:
+    branches: main
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -52,7 +53,7 @@ jobs:
         run: |
           $env:GH_TOKEN = "${{ secrets.GH_TOKEN }}"
           $env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}"
-          $env:DISCORD_BLITZ_DB = "${{ secrets.DISCORD_BLITZ_DB }}"
+          $env:DATABASE_URL = "${{ secrets.DATABASE_URL }}"
           $env:WOTB_DLC_CDN = "${{ secrets.WOTB_DLC_CDN }}"
           yarn setup:patches --depot
 
@@ -60,5 +61,7 @@ jobs:
         run: |
           $env:GH_TOKEN = "${{ secrets.GH_TOKEN }}"
           $env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}"
-          $env:DISCORD_BLITZ_DB = "${{ secrets.DISCORD_BLITZ_DB }}"
+          $env:DATABASE_URL = "${{ secrets.DATABASE_URL }}"
+          $env:VIDEOS_SHEET = "${{ secrets.VIDEOS_SHEET }}"
+          $env:GOOGLE_APPLICATION_CREDENTIALS = "${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}"
           yarn build:assets --all-targets --depot ${{ github.ref == 'refs/heads/main' && '--production' || '' }}

.github/workflows/cd-host.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Download release assets
         run: |
-          DOWNLOAD_URL=$(curl -s https://api.github.com/repos/tresabhi/blitzkrieg/releases/latest \
+          DOWNLOAD_URL=$(curl -s https://api.github.com/repos/tresabhi/blitzkit/releases/latest \
             | grep "browser_download_url.*bot.zip" \
             | cut -d : -f 2,3 \
             | tr -d \")
@@ -33,4 +33,4 @@ jobs:
           unzip bot.zip
 
       - name: Run bot
-        run: NODE_ENV=production GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} node --enable-source-maps index.cjs
+        run: NODE_ENV=production GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} node --enable-source-maps index.cjs

.github/workflows/cd-rating-asia.yml

@@ -1,11 +1,7 @@
-name: CD Ratings Asia
+name: CD Rating Asia
-
-# latest: '0 0 * * *'
-# asia midnight: '0 17 * * *'
 
 on:
   schedule:
-    - cron: '0 0 * * *'
     - cron: '0 17 * * *'
 
 jobs:
@@ -35,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingsleaderboard --region=asia --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} yarn publish:ratingleaderboard --region=asia --target=midnight --production

.github/workflows/cd-rating-eu.yml

@@ -1,11 +1,7 @@
-name: CD Ratings Europe
+name: CD Rating Europe
-
-# latest: '0 0 * * *'
-# eu midnight: '0 23 * * *'
 
 on:
   schedule:
-    - cron: '0 0 * * *'
     - cron: '0 23 * * *'
 
 jobs:
@@ -35,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingsleaderboard --region=eu --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} yarn publish:ratingleaderboard --region=eu --target=midnight --production

.github/workflows/cd-rating-latest.yml

@@ -0,0 +1,34 @@
+name: CD Rating Latest
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  host:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Use node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'npm'
+
+      - name: Install Yarn
+        run: npm install --location=global yarn
+
+      - name: Use node_modules cache
+        uses: actions/cache@v3
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Generate all leaderboards
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} yarn publish:ratingleaderboard --region=na,asia,eu --target=latest --production

.github/workflows/cd-rating-na.yml

@@ -1,11 +1,7 @@
-name: CD Ratings North America
+name: CD Rating North America
-
-# latest: '0 0 * * *'
-# na midnight: '0 5 * * *'
 
 on:
   schedule:
-    - cron: '0 0 * * *'
     - cron: '0 5 * * *'
 
 jobs:
@@ -35,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingsleaderboard --region=na --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DATABASE_URL=${{ secrets.DATABASE_URL }} yarn publish:ratingleaderboard --region=na --target=midnight --production

.github/workflows/ci-build-bot.yml

@@ -33,8 +33,11 @@ jobs:
       - name: Install dependencies
         run: yarn
 
+      - name: Build Prisma
+        run: yarn prisma generate
+
       - name: Build
-        run: yarn build:bot
+        run: yarn build:bot --production
 
       - name: Archive build
         uses: actions/upload-artifact@v4

.gitignore

@@ -8,7 +8,6 @@ dist/
 dist.*
 yarn-error.log
 /test.*
-test.*
 /docs/.vitepress/dist
 /docs/.vitepress/cache
 servers.csv
@@ -18,4 +17,6 @@ temp/
 /.yarn
 /.VSCodeCounter
 /.yarn
-depots
+depots
+public/sitemap*
+/firebase.json

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "submodules/closedkrieg"]
+[submodule "submodules/blitzkit-closed"]
-	path = submodules/closedkrieg
+	path = submodules/blitzkit-closed
-	url = https://github.com/tresabhi/closedkrieg
+	url = https://github.com/tresabhi/blitzkit-closed

.vscode/settings.json

@@ -3,6 +3,7 @@
     "AABBOX",
     "Abhi",
     "accountinfo",
+    "adsense",
     "aeson",
     "alphatest",
     "APAC",
@@ -10,13 +11,20 @@
     "applypatches",
     "artefacts",
     "atgm",
+    "Avearges",
     "AYUV",
+    "battleresults",
     "bbox",
     "bepaint",
     "betakrieg",
     "BINORMAL",
     "Binormals",
+    "BKRL",
+    "BKRTS",
+    "BKRTSMANIFEST",
     "bkwd",
+    "blitzkit",
+    "blitzrinth",
     "blitzstars",
     "Camo",
     "CDON",
@@ -31,6 +39,7 @@
     "CUBETEXCOORD",
     "customperiod",
     "datasource",
+    "dbid",
     "Ddpf",
     "Ddsd",
     "debugflags",
@@ -71,12 +80,16 @@
     "leaderboards",
     "lerp",
     "LINEARSIZE",
+    "loadouts",
     "loddist",
     "lods",
+    "lossrate",
+    "mantlets",
     "metallicness",
     "minitelrose",
     "Minotauro",
     "MIPMAPCOUNT",
+    "mišek",
     "modeltransform",
     "MURICA",
     "NEGATIVEX",
@@ -98,14 +111,19 @@
     "POSITIVEY",
     "POSITIVEZ",
     "Promisable",
+    "protobuf",
+    "protos",
     "Pyogenics",
-    "ratingsleaderboard",
+    "ratingleaderboard",
-    "ratingsplot",
     "raycaster",
     "researchable",
     "Resvg",
+    "rizz",
     "roboto",
+    "rtsc",
+    "RTSM",
     "SCPG",
+    "scroller",
     "searchclans",
     "searchplayers",
     "searchtanks",
@@ -125,6 +143,7 @@
     "Synx",
     "tankaverages",
     "Tankerch",
+    "tankmen",
     "tankopedia",
     "tankopedias",
     "tankstats",
@@ -137,20 +156,26 @@
     "Unicum",
     "UNLOCALIZED",
     "UNORM",
+    "unpickled",
     "Unregistering",
     "vickers",
     "vitepress",
     "Vovko",
     "wargaming",
     "webp",
+    "whitespaces",
     "winrate",
     "wireframe",
+    "Woah",
     "WOTB",
     "wotblitz",
+    "wotbreplay",
+    "WOTINSPECTOR",
     "xffn",
     "xkdkw",
     "XMLDVPL",
     "YAMLDVPL",
+    "youtubers",
     "zustand"
   ],
   "deno.enable": false,

README.md

@@ -1,4 +1,4 @@
-# Blitzkrieg
+# BlitzKit
 
 [![built with Codeium](https://codeium.com/badges/main)](https://codeium.com)
 
@@ -6,18 +6,18 @@ Tools for everything World of Tanks Blitz
 
 ## Invite the bot
 
-Go to [application directory for Blitzkrieg](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
+Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
 
-![Blitzkrieg application directory](https://i.imgur.com/JlEA0J1.png)
+![BlitzKit application directory](https://i.imgur.com/YWCtOuJ.png)
 
 ## Visit the website
 
-### https://blitz-krieg.vercel.app/
+### https://blitzkit.vercel.app/
 
-![Blitzkrieg website](https://i.imgur.com/eRIZe5P.png)
+![BlitzKit website](https://i.imgur.com/bdYMUCL.png)
 
 ## Visit the documentation website
 
-### https://tresabhi.github.io/blitzkrieg/
+### https://tresabhi.github.io/blitzkit/
 
-![Blitzkrieg documentation website](https://i.imgur.com/TOt5fMx.png)
+![BlitzKit documentation website](https://i.imgur.com/hm3KTsF.png)

docs/.vitepress/config.ts

@@ -5,9 +5,9 @@ import { defineConfig } from 'vitepress';
 import { getSidebar } from 'vitepress-plugin-auto-sidebar';
 
 export default defineConfig({
-  title: 'blitzkrieg',
+  title: 'BlitzKit',
   description: '🎉 All-in-one Discord bot for everything World of Tanks Blitz',
-  base: '/blitzkrieg/',
+  base: '/blitzkit/',
   outDir: '../dist/docs',
 
   themeConfig: {
@@ -33,7 +33,7 @@ export default defineConfig({
     ],
 
     socialLinks: [
-      { icon: 'github', link: 'https://github.com/tresabhi/blitzkrieg' },
+      { icon: 'github', link: 'https://github.com/tresabhi/blitzkit' },
     ],
   },
 });

docs/changelogs/1.17.0.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.17.0
+
+A preview command and a touchup.
+
+## Features
+
+- Added `/research` in preview only accessible in the official Discord server.
+  - More details will be posted when the command is made public.
+
+## Changes
+
+- `/owned-tanks` now returns a simple text message listing all the tanks instead of an image.
+  - This is meant to improve the readability and ease of copying.

docs/changelogs/1.17.1.md

@@ -0,0 +1,8 @@
+# Blitzkrieg 1.17.1
+
+Some stability fixes.
+
+## Technical Changes
+
+- `sharp` is now included in the build instead of having being installed before runtime.
+- Png converter cache is now more memory efficient.

docs/changelogs/1.17.2.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.17.2
+
+Introducing the new `/research` command!
+
+## Features
+
+- Added the `/research` command
+  - Type in the name of a tech tree tank you desire to research and this command will list all the expenses in researching all tanks in that line
+  - The starting tank is inferred automatically by the tanks you own
+    - This may be a bit inaccurate because of the lack of accurate information Wargaming provides about owned tanks
+  - You are also manually provide a starting tank and a user to see the progress on a line for
+- Replaced Vercel Analytics (which collapsed under the insane amount of traffic on the website) with Google Analytics
+- Spaced armor can now be toggled in the Tankopedia armor sandbox

docs/changelogs/1.18.0.md

@@ -0,0 +1,19 @@
+# Blitzkrieg 1.18.0
+
+Introducing the new `/rating` command!
+
+## Features
+
+- `/rating` command
+  - Features statistics on today's performance in ratings
+  - The included stats are battles, winrate, damage, survival, and kills
+  - This command also features the score, rank, and league you are at plus the reward you'll get if you are high enough on the leaderboard
+- `/ratings`, the old leaderboard command, has been renamed `/rating-leaderboard`
+  - Reward icons have been removed from the leaderboard
+
+## Technical Changes
+
+- Rating leaderboards are now built in a more action-efficient manner.
+  - This version also introduces the BKRL (Blitzkrieg rating leaderboard) file format which is an efficient way to store entire leaderboards of regions to disk (1 MB per 40,000 users).
+  - Latest archival actions now build all regions at once in a single action.
+- The sharp module is now included in the build.

docs/changelogs/1.18.1.md

@@ -0,0 +1,11 @@
+# Blitzkrieg 1.18.1
+
+HE gets more accurate and say goodbye to NaNaNaNaNaN.
+
+## Fixes
+
+- Armor highlighting now works on Apple MacBooks
+- Applied equipments now persist after switching shells
+- The bottom of the tank sandbox panel can now be interacted with as it was previously blocked by an invisible layer
+- `/rating` now uses the midnight leaderboard instead of the absolute latest one
+  - 0-battle stats are now hidden

docs/changelogs/1.18.2.md

@@ -0,0 +1,7 @@
+# Blitzkrieg 1.18.2
+
+Redefining how micro a micro-path is.
+
+## Fixes
+
+- The pitch and yaw controls, along with the quick equipment buttons, can once again be interacted with

docs/changelogs/1.18.3.md

@@ -0,0 +1,29 @@
+# Blitzkrieg 1.18.3
+
+Making Tankopedia more pleasing to use. This update only affects the website.
+
+## Features
+
+- Added crew skills
+- Added quick actions
+  - For example, crew skills have the "clear" and "maximize" actions and equipment simply has a "clear" action
+- Added info buttons
+  - Beside the titles of a few sections, a new info buttons have been added for extended descriptions
+- Tank configurations have been condensed thanks to a new layout that works well on most screen sizes
+- The Tankopedia now takes advantage of wider screens than before; hence, getting rid of the useless whitespaces on the sides
+- Tank modules are now neatly wrapped into dropdown menus
+- Sorting tanks by "size" has been renamed to "volume" and length has been added as a new option
+- The antagonist (the shooting tank) bar has been shrunk to only fit the its contents
+- Fullscreen mode now features all the missing dropdowns and options that were previously hidden
+- Added icons for donations on Patreon and Ko-fi in the navigation bar
+- Tank search now uses regular links allowing for things like opening in new tabs, copying links, etc.
+
+## Fixes
+
+- Armor highlighting once again works properly even after switching around tank modules
+- Inputting invalid numbers into the pitch and yaw fields is now handled correctly
+- Removed unnecessary tooltips that didn't show up anyway due to Radix UI 3
+
+## Technical Changes
+
+- Upgraded to Radix UI 3

docs/changelogs/1.19.0.md

@@ -0,0 +1,23 @@
+# Blitzkrieg 1.19.0
+
+Introducing the Blitzkrieg Compare tool!
+
+## Features
+
+- Added Compare
+  - Allows you to compare multiple tanks
+  - Shows deltas in the form of differences between values or percentages
+  - All stats from the Tankopedia are available here
+- [CLS](https://web.dev/articles/cls) was reduced due to the new loading screens
+- Clicking enter when searching for tanks now selects the first result
+  - The first tank name is also displayed in the search input
+
+## Changes
+
+- Removed the donation banner instead for a little note in the footer
+  - The footer now shows the version of Blitzkrieg and the version of WoTB its running on
+- Removed frosted glass effect from most components apart from the navigation bar for performance reasons (I am looking at you, Apple!)
+
+## Fixes
+
+- Tank search is now not ignored when changing filters

docs/changelogs/1.19.1.md

@@ -0,0 +1,11 @@
+# Blitzkrieg 1.19.1
+
+A minor-major fix to the armor sandbox. This update only affects the website.
+
+## Fixes
+
+- Guns are now clipped properly allowing some tanks like the 252U and T34's mantlets to be penetrable (usually with premium shells) as they are in-game
+
+| Before                                     | After                                     |
+| ------------------------------------------ | ----------------------------------------- |
+| ![before](https://i.imgur.com/wB0kuk0.png) | ![after](https://i.imgur.com/vxp8wB0.png) |

docs/changelogs/1.19.2.md

@@ -0,0 +1,6 @@
+# Blitzkrieg 1.19.2
+
+## Fixes
+
+- Maximum DPM for double shot auto-reloaders is now calculate correctly with intra-clip in mind
+- Blitzkrieg logo is now removed on lower resolutions to allow for other buttons to fit in the title bar of the Tankopedia

docs/changelogs/1.19.3.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.19.3
+
+Google rizz. This version only affects the website.
+
+## Features
+
+- The titles and descriptions of the Tankopedia tank pages are now more informative
+- Added a settings page
+- Added a hamburger menu to the navigation bar
+
+## Fixes
+
+- Tank icons in URL previews are now presented properly

docs/changelogs/1.19.4.md

@@ -0,0 +1,18 @@
+# Blitzkrieg 1.19.4
+
+I genuinely have no idea how these bugs sneaked in here. This update only affects the website.
+
+## Features
+
+- Added a button in Compare which links to the corresponding Tankopedia page
+- Added a button in Tankopedia that links to the corresponding Compare page
+  - If the two tanks (the shooter and the one of which armor is displayed) in the Tankopedia are different, they will be both added by default in the Compare page
+- Simplified the footer and added a link to my website and the credits page
+- Added an aggressive donate button right at the top of the home page
+
+## Fixes
+
+Thanks to mišek for these bug reports!
+
+- The intra-clip time is now displayed for auto-loaders
+- High End Consumables now increase the duration of consumables correctly instead of decreasing it

docs/changelogs/1.19.5.md

@@ -0,0 +1,19 @@
+# Blitzkrieg 1.19.5
+
+The tankopedia, now more helpful than ever! This update only affects the website.
+
+## Features
+
+- The Tankopedia pages for tanks now include videos from YouTubers
+  - The selection of tanks that have videos is very small currently but you can help expand it by dropping suggestions on [the official Discord server](https://discord.gg/nDt7AjGJQH)
+- Added shell normalization and ricochet angles to the Tankopedia and Compare
+
+## Fixes
+
+- Removed undefined clipping planes
+- Added proper keying to all JSX tree nodes, navbar menu items, antagonist bar shells, skill rows and fragments of tank stats in the Tankopedia
+- The second half of barrels for tanks like the T-100 LT are now properly included
+
+## Technical Features
+
+- The list of videos is fetched transpiled from a Google Sheets spreadsheet into a CSV file in the asset repository

docs/changelogs/1.19.6.md

@@ -0,0 +1,3 @@
+# BlitzKit 1.19.6
+
+Renamed Blitzkrieg to BlitzKit.

docs/changelogs/1.20.0.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.20.0
+
+**IMPORTANT FOR STREAMERS:** This version removed the session tracker embed. Embeds will be reintroduced in the future.
+
+## Features
+
+- Reworked session tracker
+  - Played tanks are now displayed as a clean table that fits the theme of the website
+  - Tank images are now displayed along with them being linked to their respective tankopedia pages
+  - The UI has been simplified
+  - You can also change what columns are shown in the table but this is a work in progress feature
+- Added the `/replay` command
+  - This command uploads your replays to WOTINSPECTOR and displays the battle results
+
+## Fixes
+
+- Fixed website logo to be "BK"
+- Fixed the logo of the website to have a capital "K"

docs/guide/bkrl.md

@@ -0,0 +1,45 @@
+# Blitzkit Rating Leaderboard
+
+A straightforward way of storing the entire World of Tanks Blitz rating leaderboard to disk.
+
+```cpp
+primary BlitzkitRatingLeaderboard {
+  utf8"BKRL" magic;
+  Header header;
+  primary Body<header> body;
+}
+
+Header {
+  uint16 version; // always 1
+  Format format;
+  uint32 count;
+}
+
+Format enum<uint8> {
+  Base,
+  Superset1,
+}
+
+Body<Header header> match<header.format> {
+  Base {
+    primary {
+      uint32 id;
+      uint16 score;
+    }[header.count] entries;
+  };
+
+  Superset1 {
+    primary {
+      uint32 id;
+      uint16 score;
+
+      uint32 battles;
+      uint32 wins;
+      uint32 survived;
+
+      uint32 damage;
+      uint32 kills;
+    }[header.count] entries;
+  };
+}
+```

docs/guide/cdon.md

@@ -1,7 +1,5 @@
 # Cedilla Object Notation
 
-This documentation uses an experimental binary notation syntax called "Buffer Up".
-
 1. JSON compressed as CDON, written directly to disk (a direct 50% reduction).
 2. CDON further compressed with LZ4 (a clean 90% reduction).
 3. The raw JSON file as fetched from a random data source.
@@ -19,7 +17,7 @@ primary CedillaObjectNotation {
 }
 
 Header {
-  uint16 version;
+  uint16 version; // always 1
   FSFormat fsFormat;
   StringTable<fsFormat> stringTable;
 }

docs/guide/credits.md

@@ -1,15 +1,16 @@
 # Team
 
 - TrèsAbhi: creator & programmer
-- Prince_NA: game advisor & tester
 
 # Contributors
 
-- S0AP: bot verification process & initial advertizement platform
+- Prince_NA: general game advisor and tester
+- S0AP: bot verification and initial advertizement platform
 - Vovko: discord bot rendering pipeline
 - Maddox: game file decompression
-- Pyogenics: tank model decompression
+- Pyogenics: tank model parsing
 - Aeson: game files layout
 - Minitelrose, ChickenMan7777: 3-caliber rule edge cases
 - \_34, HisRoyalFatness, Synx, xkdkw: embed UX
-- [OPTML], Aeson, \_34, Droodles: beta testing tankopedia
+- [OPTML], Aeson, \_34, Droodles: beta testing Tankopedia
+- [OPTML], Droodles: beta testing Compare

docs/guide/introduction.md

@@ -4,7 +4,7 @@
 
 ## Bot
 
-Blitzkrieg is available as a Discord bot and can be [installed very easily](/guide/invite).
+BlitzKit is available as a Discord bot and can be [installed very easily](/guide/invite).
 
 - Track statistics
 - Find inactive players in a clan
@@ -15,8 +15,8 @@ Blitzkrieg is available as a Discord bot and can be [installed very easily](/gui
 
 ## Website
 
-Provides a bunch of very helpful tools; https://blitz-krieg.vercel.app/
+Provides a bunch of very helpful tools; https://blitzkit.vercel.app/
 
 - Session tracker
-- Ratings leaderboard
+- Rating leaderboard
 - Way more to come

docs/guide/invite.md

@@ -1,3 +1,3 @@
 # Inviting the Bot
 
-Go to [application directory for Blitzkrieg](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
+Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.

docs/guide/rts.md

@@ -0,0 +1,71 @@
+# BlitzKit Regular Tank Stats
+
+A straightforward way of storing the entire World of Tanks Blitz tank statistics for players to disk.
+
+## Manifest `manifest.rtsm`
+
+```cpp
+primary RegularTankStatisticsManifest {
+  utf8"RTSM" magic;
+  Header header;
+  primary Body body;
+}
+
+Header {
+  uint16 version; // always 1
+}
+
+Body {
+  uint32 time;
+  uint8 base;
+}
+```
+
+## Chunk `*.rtsc`
+
+```cpp
+primary RegularTankStatisticsChunk {
+  utf8"RTSC" magic;
+  Header header;
+  primary Body body<header.playerCount>;
+}
+
+Header {
+  uint16 version; // always 1
+  uint32 playerCount;
+}
+
+Body<uint32 playerCount> {
+  Player[playerCount] players;
+}
+
+Player {
+  uint32 id;
+  uint16 tankCount;
+  Tank[tankCount] tanks;
+}
+
+Tank {
+  uint32 id;
+  uint32 battleLifeTime;
+  uint32 lastBattleTime;
+  uint8 markOfMastery;
+  uint32 battles;
+  uint32 capturePoints;
+  uint32 damageDealt;
+  uint32 damageReceived;
+  uint32 droppedCapturePoints;
+  uint32 frags;
+  uint32 frags8p;
+  uint32 hits;
+  uint32 losses;
+  uint8 maxFrags;
+  uint16 maxXp;
+  uint32 shots;
+  uint32 spotted;
+  uint32 survivedBattles;
+  uint32 winAndSurvived;
+  uint32 wins;
+  uint32 xp;
+}
+```

docs/index.md

@@ -3,12 +3,12 @@
 layout: home
 
 hero:
-  name: 'blitzkrieg'
+  name: 'BlitzKit'
   text: Everything Blitz, right in Discord
   tagline: All-in-one Discord bot for everything World of Tanks Blitz
   image:
     src: '/assets/images/hero.png'
-    alt: 'blitzkrieg'
+    alt: 'blitzkit'
   actions:
     - theme: brand
       text: Add to Discord Server
@@ -20,11 +20,11 @@ hero:
 features:
   - title: Clean and Efficient UI
     icon: 🚀
-    details: Blitzkrieg is where concise meets efficient. Get the information you need in the way you want.
+    details: BlitzKit is where concise meets efficient. Get the information you need in the way you want.
   - title: Endless Possibilities
     icon: 🛠
     details: With endless ways to customize the output, it's guaranteed that you'll always get the information you need.
   - title: Easy to Use
     icon: 💻
-    details: Leveraging Discord's, Blitz Stars', and Wargaming's powerful APIS, Blitzkrieg does all the hard work for you.
+    details: Leveraging Discord's, Blitz Stars', and Wargaming's powerful APIS, Blitzkit does all the hard work for you.
 ---

docs/legal/privacy-policy.md

@@ -1,22 +1,18 @@
-# Blitzkrieg Privacy Policy
+# BlitzKit Privacy Policy
 
-Blitzkrieg collects little to no data. Regardless, here is an exhaustive list of Blitzkrieg's data collection practices.
+BlitzKit collects little to no data. Regardless, here is an exhaustive list of BlitzKit's data collection practices.
 
 ## Logs
 
-All Blitzkrieg logs are available to the public as an effort for open source transparency. A history of all logs [can be found on GitHub](https://github.com/tresabhi/blitzkrieg/actions/workflows/host.yml). All logs expire automatically and are permanently deleted after 30 days. However, anyone may chose to save a local copy of the logs which is not tracked by GitHub.
+All BlitzKit logs are available to the public as an effort for open source transparency. A history of all logs [can be found on GitHub](https://github.com/tresabhi/blitzkit/actions/workflows/host.yml). All logs expire automatically and are permanently deleted after 30 days. However, anyone may chose to save a local copy of the logs which is not tracked by GitHub.
 
 ## Commands
 
 Everytime a command a command is used, the command name and parameters provided is logged. Any identifying information like manually provided in-game usernames are also recorded.
 
-## Errors
-
-Everytime an error occurs, a detailed stack trace, scope of the error, and the error message is logged both in the GitHub logs and in the public channel [#🔲︱blitzkrieg-logs](https://discord.com/channels/734786591205359697/880650462540476416) in [the official Discord server](https://discord.gg/nDt7AjGJQH).
-
 ## Databases
 
-No databases are used by Blitzkrieg meaning that no data is collected outside of what has already been mentioned above. This is no permanent state.
+No databases are used by BlitzKit meaning that no data is collected outside of what has already been mentioned above. This is no permanent state.
 
 ## 3rd Party
 

docs/legal/terms-of-service.md

@@ -1,12 +1,12 @@
-# Blitzkrieg Terms of Service
+# BlitzKit Terms of Service
 
 ## About
 
-Blitzkrieg is a multi-function Discord bot that serves users with needs specific to the game World of Tanks Blitz.
+BlitzKit is a multi-function Discord bot that serves users with needs specific to the game World of Tanks Blitz.
 
 ## License
 
-Blitzkrieg is licensed under the MIT License.
+BlitzKit is licensed under the MIT License.
 
 ## 3rd Party
 

package.json

@@ -1,24 +1,26 @@
 {
-  "name": "blitzkrieg",
+  "name": "blitzkit",
-  "version": "1.16.4",
+  "version": "1.20.0",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
   "scripts": {
-    "build:bot": "vite-node --script scripts/build",
+    "build:db": "prisma generate",
-    "build:website": "next build",
+    "build:bot": "vite-node --script scripts/build --production",
+    "build:website": "yarn build:db && yarn build:sitemap && next build",
+    "build:sitemap": "vite-node --script scripts/sitemap",
     "build:docs": "vitepress build docs",
-    "build:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard",
+    "build:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard",
     "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index",
-    "build:test": "vite-node --script scripts/buildTest",
+    "test": "vite-node --script scripts/test",
-    "build:ratingsplot": "vite-node --script scripts/buildRatingsPlot",
+    "test2": "vite-node --script scripts/test2",
-    "dev:bot": "yarn build:bot && yarn start:bot",
+    "dev:bot": "vite-node --script scripts/build && yarn start:bot",
     "dev:docs": "vitepress dev docs",
     "dev:website": "next dev",
     "start:bot": "node --enable-source-maps dist/bot/index.cjs",
     "start:website": "next start",
     "host:docs": "vitepress preview docs",
-    "publish:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard --publish",
+    "publish:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard --publish",
     "setup:patches": "vite-node --script scripts/applyPatches",
     "lint": "npx tsc",
     "lint:website": "next lint",
@@ -35,15 +37,15 @@
     "@octokit/plugin-throttling": "^8.1.3",
     "@octokit/rest": "^20.0.1",
     "@prisma/client": "^5.4.1",
-    "@radix-ui/colors": "^3.0.0-rc.4",
+    "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/themes": "^2.0.1",
+    "@radix-ui/themes": "^3.0.1",
     "@react-three/drei": "^9.93.0",
     "@react-three/fiber": "^8.15.14",
     "@resvg/resvg-js": "^2.4.1",
     "@types/three": "^0.160.0",
     "@vanilla-extract/css": "^1.13.0",
-    "@vercel/analytics": "^1.2.2",
+    "adm-zip": "^0.5.12",
     "bepaint": "^0.1.0-beta.3",
     "decompress": "^4.2.1",
     "discord.js": "^14.13.0",
@@ -52,6 +54,7 @@
     "express": "^4.18.2",
     "false": "^0.0.4",
     "fuzzysort": "^2.0.4",
+    "googleapis": "^134.0.0",
     "immer": "^10.0.2",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
@@ -59,15 +62,16 @@
     "markdown-escape": "^2.0.0",
     "next": "^14.1.0",
     "parse-dds": "^1.2.1",
+    "pickleparser": "^0.2.1",
     "postprocessing": "^6.34.1",
+    "protobufjs": "^7.2.6",
     "react": "^18.2.0",
     "react-device-detect": "^2.2.3",
     "react-dom": "^18.2.0",
     "react-fuzzysort": "^1.0.1",
     "react-promise-suspense": "^0.3.4",
-    "react-spinners": "^0.13.8",
+    "satori": "^0.10.13",
-    "satori": "^0.10.8",
+    "sharp": "^0.33.3",
-    "sharp": "0.33.1",
     "three": "0.159.0",
     "three-stdlib": "^2.29.4",
     "vite-node": "^0.34.5",
@@ -78,12 +82,14 @@
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "^0.5.1",
+    "@types/adm-zip": "^0.5.5",
     "@types/decompress": "^4.2.7",
     "@types/escape-html": "^1.0.2",
     "@types/express": "^4.17.18",
     "@types/js-yaml": "^4.0.8",
     "@types/lodash": "^4.14.199",
     "@types/lz4": "^0.6.4",
+    "@types/lz4js": "^0.2.1",
     "@types/markdown-escape": "^1.1.0",
     "@types/node": "^20.6.5",
     "@types/parse-dds": "^1.0.3",

prisma/migrations/20231009152251_use_big_int/migration.sql

@@ -1,8 +0,0 @@
--- CreateTable
-CREATE TABLE "discord_blitz" (
-    "discord" INT8 NOT NULL,
-    "region" STRING NOT NULL,
-    "blitz" INT4 NOT NULL,
-
-    CONSTRAINT "discord_blitz_pkey" PRIMARY KEY ("discord")
-);

prisma/migrations/migration_lock.toml

@@ -1,3 +0,0 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "cockroachdb"

prisma/schema.prisma

@@ -4,11 +4,15 @@ generator client {
 
 datasource db {
   provider = "cockroachdb"
-  url      = env("DISCORD_BLITZ_DB")
+  url      = env("DATABASE_URL")
 }
 
-model discord_blitz {
+model Users {
+  blitz     Int       @id
+  last_used DateTime? @default(now())
+}
+
+model DiscordUsers {
   discord BigInt @id
-  region  String
   blitz   Int
 }

public/ads.txt

@@ -0,0 +1,3 @@
+google.com, pub-1289406790225052, DIRECT, f08c47fec0942fa0
+appnexus.com, 14163, RESELLER 
+pubcenter.microsoft.com, 253617120, DIRECT

public/robots.txt

@@ -0,0 +1,7 @@
+User-agent: *
+Allow: /
+
+Host: https://blitzkit.vercel.app
+
+Sitemap: https://blitzkit.vercel.app/sitemap.txt
+Sitemap: https://blitzkit.vercel.app/sitemap.xml

scripts/applyPatches.ts

@@ -3,8 +3,8 @@ import { parse as parsePath } from 'path';
 import { parse as parseYaml } from 'yaml';
 import { readStringDVPL } from '../src/core/blitz/readStringDVPL';
 import { writeDVPL } from '../src/core/blitz/writeDVPL';
-import { secrets } from '../src/core/blitzkrieg/secrets';
+import { secrets } from '../src/core/blitzkit/secrets';
-import { dvp } from '../submodules/closedkrieg/src/dvp';
+import { dvp } from '../submodules/blitzkit-closed/src/dvp';
 import { DATA } from './buildAssets/constants';
 
 const versionTextFile = await readStringDVPL(`${DATA}/version.txt.dvpl`);

scripts/build.ts

@@ -1,7 +1,13 @@
+import { exec } from 'child_process';
 import { build } from 'esbuild';
 import { cp, readdir } from 'fs/promises';
+import { argv } from 'process';
+import { promisify } from 'util';
 
-readdir('src/workers').then((workers) => {
+const execPromise = promisify(exec);
+const isProduction = argv.includes('--production');
+
+await readdir('src/workers').then((workers) => {
   const files = [
     'bot',
     'index',
@@ -25,6 +31,7 @@ readdir('src/workers').then((workers) => {
       '.js': '.cjs',
     },
 
+    external: ['sharp'],
     bundle: true,
     sourcemap: true,
     minifyIdentifiers: false, // causes goofy errors
@@ -36,9 +43,19 @@ readdir('src/workers').then((workers) => {
 });
 
 // copy schema.prisma
-cp('prisma/schema.prisma', 'dist/bot/schema.prisma');
+await cp('prisma/schema.prisma', 'dist/bot/schema.prisma');
-readdir('node_modules/prisma').then((files) =>
+await readdir('node_modules/prisma').then((files) =>
   files
     .filter((file) => file.endsWith('.node'))
     .map((file) => cp(`node_modules/prisma/${file}`, `dist/bot/${file}`)),
 );
+
+if (isProduction) {
+  // install fixed sharp
+  console.log('Installing fixed sharp...');
+  await execPromise('yarn init -y && yarn add [email protected] --ignore-engines', {
+    cwd: 'dist/bot',
+  });
+}
+
+console.log('Generated:', await readdir('dist/bot'));

scripts/buildAssets/boosterIcons.ts

@@ -2,8 +2,8 @@ import { readdir } from 'fs/promises';
 import sharp from 'sharp';
 import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
 export async function boosterIcons(production: boolean) {

scripts/buildAssets/camouflageIcons.ts

@@ -1,6 +1,6 @@
 import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
 export async function camouflageIcons(production: boolean) {

scripts/buildAssets/circleFlags.ts

@@ -1,7 +1,7 @@
 import { readdir } from 'fs/promises';
 import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
 export async function circleFlags(production: boolean) {

scripts/buildAssets/consumableProvisionIcons.ts

@@ -3,8 +3,8 @@ import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 import { ConsumablesCommon, ProvisionsCommon } from './definitions';
 

scripts/buildAssets/currencies.ts

@@ -0,0 +1,39 @@
+import sharp from 'sharp';
+import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
+import { DATA } from './constants';
+
+const ICONS = [
+  ['currency_silver_m.packed.webp', 'silver'],
+  ['currency_premium_xl.packed.webp', 'premium'],
+  ['currency_gold_m.packed.webp', 'gold'],
+  ['currency_free-xp_xl.packed.webp', 'free-xp'],
+  ['currency_elite-xp_xl.packed.webp', 'elite-xp'],
+  ['currency_crew-xp_xl.packed.webp', 'crew-xp'],
+  ['currency_battle-xp_xl.packed.webp', 'xp'],
+];
+
+export async function currencies(production: boolean) {
+  console.log('Building currency icons...');
+
+  const changes = await Promise.all(
+    ICONS.map(async ([file, name]) => {
+      const content = (
+        await sharp(
+          await readDVPLFile(`${DATA}/Gfx/Lobby/currency/${file}.dvpl`),
+        )
+          .trim()
+          .toBuffer()
+      ).toString('base64');
+
+      return {
+        content,
+        encoding: 'base64',
+        path: `icons/currencies/${name}.webp`,
+      } satisfies FileChange;
+    }),
+  );
+
+  await commitAssets('currency icons', changes, production);
+}

scripts/buildAssets/definitions.ts

@@ -3,25 +3,29 @@ import { parse as parsePath } from 'path';
 import { Vector3Tuple } from 'three';
 import { parse as parseYaml } from 'yaml';
 import { TankClass } from '../../src/components/Tanks';
+import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
 import { toUniqueId } from '../../src/core/blitz/toUniqueId';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import {
   ConsumableDefinitions,
   TankFilterDefinitionCategory,
-} from '../../src/core/blitzkrieg/consumableDefinitions';
+} from '../../src/core/blitzkit/consumableDefinitions';
 import {
   EquipmentDefinitions,
   EquipmentPreset,
   EquipmentRow,
-} from '../../src/core/blitzkrieg/equipmentDefinitions';
+} from '../../src/core/blitzkit/equipmentDefinitions';
+import { GameDefinitions } from '../../src/core/blitzkit/gameDefinitions';
+import { MapDefinitions } from '../../src/core/blitzkit/mapDefinitions';
 import {
   ModelArmor,
   ModelDefinitions,
-} from '../../src/core/blitzkrieg/modelDefinitions';
+} from '../../src/core/blitzkit/modelDefinitions';
-import { ProvisionDefinitions } from '../../src/core/blitzkrieg/provisionDefinitions';
+import { ProvisionDefinitions } from '../../src/core/blitzkit/provisionDefinitions';
-import { superCompress } from '../../src/core/blitzkrieg/superCompress';
+import { SkillDefinitions } from '../../src/core/blitzkit/skillDefinitions';
+import { superCompress } from '../../src/core/blitzkit/superCompress';
 import {
   Crew,
   CrewMember,
@@ -30,11 +34,12 @@ import {
   TankDefinitionPrice,
   TankDefinitions,
   Tier,
-} from '../../src/core/blitzkrieg/tankDefinitions';
+} from '../../src/core/blitzkit/tankDefinitions';
 import { DATA, POI } from './constants';
+import { Avatar } from './skillIcons';
 import { TankParameters } from './tankIcons';
 
-interface Strings {
+export interface BlitzStrings {
   [key: string]: string;
 }
 type ShellKind =
@@ -79,6 +84,16 @@ type VehicleDefinitionArmor = Record<
   string,
   number | { vehicleDamageFactor: 0; '#text': number }
 >;
+interface UnlocksInner {
+  cost: number;
+  '#text': number;
+}
+type Unlocks = {
+  [key in 'vehicle' | 'engine' | 'chassis' | 'turret' | 'gun']:
+    | UnlocksInner
+    | UnlocksInner[];
+};
+type UnlocksListing = Unlocks | undefined;
 interface VehicleDefinitions {
   invisibility: {
     moving: number;
@@ -92,7 +107,7 @@ interface VehicleDefinitions {
   };
   consumableSlots: number;
   provisionSlots: number;
-  optDevicePreset: string;
+  optDevicePreset: string | string[];
   hull: {
     armor: VehicleDefinitionArmor;
     turretPositions: { turret: string };
@@ -102,9 +117,11 @@ interface VehicleDefinitions {
   };
   chassis: {
     [key: string]: {
+      unlocks: UnlocksListing;
       weight: number;
       terrainResistance: string;
       rotationSpeed: number;
+      userString: string;
       shotDispersionFactors: {
         vehicleMovement: number;
         vehicleRotation: number;
@@ -130,10 +147,13 @@ interface VehicleDefinitions {
     };
   };
   engines: {
-    [key: string]: unknown;
+    [key: string]: {
+      unlocks: UnlocksListing;
+    };
   };
   turrets0: {
     [key: string]: {
+      unlocks: UnlocksListing;
       rotationSpeed: number;
       weight: number;
       circularVisionRadius: number;
@@ -149,6 +169,7 @@ interface VehicleDefinitions {
       };
       guns: {
         [key: string]: {
+          unlocks: UnlocksListing;
           armor: VehicleDefinitionArmor & {
             gun?:
               | number
@@ -305,7 +326,32 @@ type ConsumablesVehicleFilter =
   | { name: string }
   | { extendedTags: string };
 
-const blitzShellKindToBLitzkrieg: Record<ShellKind, ShellType> = {
+export interface Maps {
+  maps: {
+    [key: string]: {
+      id: number;
+      tags?: string;
+      localName: string;
+      avaliableInTrainingRoom: boolean; // lol wg typo
+      spriteFrame: number;
+      supremacyPointsThreshold?: number;
+      availableModes: number[];
+      shadowMapsAvailable?: boolean;
+      assaultRespawnPoints: {
+        allies: MapAlly[];
+        enemies: MapAlly[];
+      };
+      levels?: number[];
+    };
+  };
+}
+
+export interface MapAlly {
+  respawnNumber: number;
+  points: Array<number[]>;
+}
+
+const blitzShellKindToBlitzkit: Record<ShellKind, ShellType> = {
   ARMOR_PIERCING: 'ap',
   ARMOR_PIERCING_CR: 'ap_cr',
   HIGH_EXPLOSIVE: 'he',
@@ -314,28 +360,40 @@ const blitzShellKindToBLitzkrieg: Record<ShellKind, ShellType> = {
 const missingStrings: Record<string, string> = {
   '#artefacts:tungstentip/name': 'Tungsten Shells',
 };
+export const botPattern = /^.+((tutorial_bot(\d+)?)|(TU(R?)))$/;
 
 export async function definitions(production: boolean) {
   console.log('Building definitions...');
 
+  const gameDefinitions: GameDefinitions = {
+    version: (await readStringDVPL(`${DATA}/version.txt.dvpl`))
+      .split(' ')[0]
+      .split('.')
+      .slice(0, 3)
+      .join('.'),
+  };
   const tankDefinitions: TankDefinitions = {};
   const modelDefinitions: ModelDefinitions = {};
+  const mapDefinitions: MapDefinitions = {};
   const equipmentDefinitions: EquipmentDefinitions = {
     presets: {},
     equipments: {},
   };
   const consumableDefinitions: ConsumableDefinitions = {};
   const provisionDefinitions: ProvisionDefinitions = {};
+  const skillDefinitions: SkillDefinitions = {
+    classes: { lightTank: [], mediumTank: [], heavyTank: [], 'AT-SPG': [] },
+  };
   const nations = await readdir(`${DATA}/${POI.vehicleDefinitions}`).then(
     (nations) => nations.filter((nation) => nation !== 'common'),
   );
   const tankStringIdMap: Record<string, number> = {};
-  const stringsPreInstalled = await readYAMLDVPL<Strings>(
+  const stringsPreInstalled = await readYAMLDVPL<BlitzStrings>(
     `${DATA}/${POI.strings}/en.yaml.dvpl`,
   );
   const stringsCache = await fetch(POI.cachedStrings)
     .then((response) => response.text())
-    .then((string) => parseYaml(string) as Strings);
+    .then((string) => parseYaml(string) as BlitzStrings);
   const optionalDevices = await readXMLDVPL<{ root: OptionalDevices }>(
     `${DATA}/${POI.optionalDevices}.dvpl`,
   );
@@ -352,6 +410,11 @@ export async function definitions(production: boolean) {
   const provisions = await readXMLDVPL<{ root: ProvisionsCommon }>(
     `${DATA}/${POI.provisionsCommon}.dvpl`,
   );
+  const avatar = await readXMLDVPL<{ root: Avatar }>(
+    `${DATA}/XML/item_defs/tankmen/avatar.xml.dvpl`,
+  );
+  const maps = await readYAMLDVPL<Maps>(`${DATA}/maps.yaml.dvpl`);
+  const tankXps = new Map<number, number>();
 
   await Promise.all(
     nations.map(async (nation) => {
@@ -385,6 +448,12 @@ export async function definitions(production: boolean) {
       );
 
       for (const tankKey in tankList.root) {
+        if (botPattern.test(tankKey)) continue;
+
+        const gunXps = new Map<number, number>();
+        const turretXps = new Map<number, number>();
+        const engineXps = new Map<number, number>();
+        const trackXps = new Map<number, number>();
         const tank = tankList.root[tankKey];
         const tankPrice: TankDefinitionPrice =
           typeof tank.price === 'number'
@@ -427,6 +496,7 @@ export async function definitions(production: boolean) {
           });
         const crew: Crew[] = [];
         const fixedCamouflage = tankTags.includes('eventCamouflage_user');
+        const totalUnlocks: UnlocksListing[] = [];
 
         Object.entries(tankDefinition.root.crew).forEach(([key, value]) => {
           let entry: Crew;
@@ -473,7 +543,8 @@ export async function definitions(production: boolean) {
             forwards: tankDefinition.root.speedLimits.forward,
             backwards: tankDefinition.root.speedLimits.backward,
           },
-          equipment,
+          equipment:
+            typeof equipment === 'string' ? equipment : equipment.at(-1)!,
           consumables: tankDefinition.root.consumableSlots,
           provisions: tankDefinition.root.provisionSlots,
           name:
@@ -531,9 +602,11 @@ export async function definitions(production: boolean) {
             .split(' ')
             .map(Number) as Vector3Tuple;
 
+          totalUnlocks.push(track.unlocks);
           tankDefinitions[tankId].tracks.push({
             id: trackId,
             weight: track.weight,
+            name: strings[track.userString],
             traverseSpeed: track.rotationSpeed,
             dispersion: {
               move: track.shotDispersionFactors.vehicleMovement,
@@ -557,16 +630,18 @@ export async function definitions(production: boolean) {
         });
 
         Object.keys(tankDefinition.root.engines).forEach((engineKey) => {
-          const engine = enginesList.root.shared[engineKey];
+          const engine = tankDefinition.root.engines[engineKey];
+          const engineListEntry = enginesList.root.shared[engineKey];
           const engineId = toUniqueId(nation, enginesList.root.ids[engineKey]);
 
+          totalUnlocks.push(engine.unlocks);
           tankDefinitions[tankId].engines.push({
             id: engineId,
-            name: strings[engine.userString],
+            name: strings[engineListEntry.userString],
-            fireChance: engine.fireStartingChance,
+            fireChance: engineListEntry.fireStartingChance,
-            tier: engine.level as Tier,
+            tier: engineListEntry.level as Tier,
-            weight: engine.weight,
+            weight: engineListEntry.weight,
-            power: engine.power,
+            power: engineListEntry.power,
           });
         });
 
@@ -593,6 +668,7 @@ export async function definitions(production: boolean) {
               .map(Number) as Vector3Tuple;
             const turretArmor: ModelArmor = { thickness: {} };
 
+            totalUnlocks.push(turret.unlocks);
             Object.keys(turret.armor)
               .filter((name) => name.startsWith('armor_'))
               .forEach((name) => {
@@ -645,11 +721,11 @@ export async function definitions(production: boolean) {
             };
 
             Object.keys(turret.guns).forEach((gunKey, gunIndex) => {
-              const turretGunEntry = turret.guns[gunKey];
+              const gun = turret.guns[gunKey];
               const gunId = toUniqueId(nation, gunList.root.ids[gunKey]);
               const gunListEntry = gunList.root.shared[gunKey];
               const pitchLimitsRaw =
-                turretGunEntry.pitchLimits ?? gunListEntry.pitchLimits;
+                gun.pitchLimits ?? gunListEntry.pitchLimits;
               const gunPitch = (
                 typeof pitchLimitsRaw === 'string'
                   ? pitchLimitsRaw
@@ -658,43 +734,52 @@ export async function definitions(production: boolean) {
                 .split(' ')
                 .map(Number) as [number, number];
               const gunModel = Number(
-                parsePath(turretGunEntry.models.undamaged).name.split('_')[1],
+                parsePath(gun.models.undamaged).name.split('_')[1],
               );
               const gunName =
                 strings[gunListEntry.userString] ?? gunKey.replaceAll('_', ' ');
               const gunType =
-                'clip' in turretGunEntry
+                'clip' in gun
-                  ? turretGunEntry.pumpGunMode
+                  ? gun.pumpGunMode
                     ? 'autoReloader'
                     : 'autoLoader'
                   : 'regular';
               const gunReload =
                 gunType === 'autoReloader'
-                  ? turretGunEntry.pumpGunReloadTimes!.split(' ').map(Number)
+                  ? gun.pumpGunReloadTimes!.split(' ').map(Number)
-                  : turretGunEntry.reloadTime;
+                  : gun.reloadTime;
               const gunClipCount =
-                gunType === 'regular' ? undefined : turretGunEntry.clip!.count;
+                gunType === 'regular' ? undefined : gun.clip!.count;
               const gunIntraClip =
-                gunType === 'regular'
+                gunType === 'regular' ? undefined : 60 / gun.clip!.rate;
-                  ? undefined
+              const front = gun.extraPitchLimits?.front
-                  : 60 / turretGunEntry.clip!.rate;
+                ? gun.extraPitchLimits.front.split(' ').map(Number)
-              const front = turretGunEntry.extraPitchLimits?.front
-                ? turretGunEntry.extraPitchLimits.front.split(' ').map(Number)
                 : undefined;
-              const back = turretGunEntry.extraPitchLimits?.back
+              const back = gun.extraPitchLimits?.back
-                ? turretGunEntry.extraPitchLimits.back.split(' ').map(Number)
+                ? gun.extraPitchLimits.back.split(' ').map(Number)
                 : undefined;
-              const transition = turretGunEntry.extraPitchLimits?.transition
+              const transition = gun.extraPitchLimits?.transition
-                ? typeof turretGunEntry.extraPitchLimits.transition === 'number'
+                ? typeof gun.extraPitchLimits.transition === 'number'
-                  ? turretGunEntry.extraPitchLimits.transition
+                  ? gun.extraPitchLimits.transition
-                  : turretGunEntry.extraPitchLimits.transition.at(-1)!
+                  : gun.extraPitchLimits.transition.at(-1)!
                 : undefined;
               const gunArmor: ModelArmor = { thickness: {} };
               const shotDispersionFactors =
-                turretGunEntry.shotDispersionFactors ??
+                gun.shotDispersionFactors ?? gunListEntry.shotDispersionFactors;
-                gunListEntry.shotDispersionFactors;
+              const maskName = `gun_${gunModel.toString().padStart(2, '0')}`;
+              const maskEnabled =
+                tankParameters.maskSlice?.[maskName]?.enabled ?? false;
+              let mask: number | undefined;
 
-              Object.keys(turretGunEntry.armor)
+              if (maskEnabled) {
+                const maskRaw = tankParameters.maskSlice![maskName]!;
+                mask = maskRaw.planePosition[1];
+              } else {
+                mask = undefined;
+              }
+
+              totalUnlocks.push(gun.unlocks);
+              Object.keys(gun.armor)
                 .filter((name) => name.startsWith('armor_'))
                 .forEach((name) => {
                   const armorIdString = name.match(/armor_(\d+)/)?.[1];
@@ -702,7 +787,7 @@ export async function definitions(production: boolean) {
                     throw new SyntaxError(`Invalid armor id: ${name}`);
                   }
                   const armorId = parseInt(armorIdString);
-                  const armorRaw = turretGunEntry.armor[name];
+                  const armorRaw = gun.armor[name];
                   if (typeof armorRaw === 'number') {
                     gunArmor.thickness[armorId] = armorRaw;
                   } else {
@@ -724,13 +809,13 @@ export async function definitions(production: boolean) {
                 count: gunClipCount,
                 intraClip: gunIntraClip,
                 camouflageLoss:
-                  typeof turretGunEntry.invisibilityFactorAtShot === 'number'
+                  typeof gun.invisibilityFactorAtShot === 'number'
-                    ? turretGunEntry.invisibilityFactorAtShot
+                    ? gun.invisibilityFactorAtShot
-                    : turretGunEntry.invisibilityFactorAtShot.at(-1)!,
+                    : gun.invisibilityFactorAtShot.at(-1)!,
-                aimTime: turretGunEntry.aimingTime ?? gunListEntry.aimingTime,
+                aimTime: gun.aimingTime ?? gunListEntry.aimingTime,
                 dispersion: {
                   base:
-                    turretGunEntry.shotDispersionRadius ??
+                    gun.shotDispersionRadius ??
                     gunListEntry.shotDispersionRadius,
                   damaged: shotDispersionFactors.whileGunDamaged,
                   shot: shotDispersionFactors.afterShot,
@@ -741,12 +826,13 @@ export async function definitions(production: boolean) {
               modelDefinitions[tankId].turrets[turretId].guns[gunId] = {
                 armor: gunArmor,
                 model: gunModel,
+                mask,
                 thickness:
-                  turretGunEntry.armor.gun === undefined
+                  gun.armor.gun === undefined
                     ? 0
-                    : typeof turretGunEntry.armor.gun === 'number'
+                    : typeof gun.armor.gun === 'number'
-                      ? turretGunEntry.armor.gun
+                      ? gun.armor.gun
-                      : turretGunEntry.armor.gun['#text'],
+                      : gun.armor.gun['#text'],
                 pitch: {
                   min: gunPitch[0],
                   max: gunPitch[1],
@@ -793,7 +879,7 @@ export async function definitions(production: boolean) {
                   caliber: shell.caliber,
                   normalization: shell.normalizationAngle,
                   ricochet: shell.ricochetAngle,
-                  type: blitzShellKindToBLitzkrieg[shell.kind],
+                  type: blitzShellKindToBlitzkit[shell.kind],
                   explosionRadius:
                     shell.kind === 'HIGH_EXPLOSIVE'
                       ? shell.explosionRadius ?? 0
@@ -808,10 +894,100 @@ export async function definitions(production: boolean) {
             });
           },
         );
+
+        totalUnlocks.forEach((unlocks) => {
+          if (unlocks === undefined) return;
+
+          Object.entries(unlocks).forEach(([key, value]) => {
+            (Array.isArray(value) ? value : [value]).forEach((vehicle) => {
+              switch (key as keyof Unlocks) {
+                case 'vehicle': {
+                  const tankListEntry = tankList.root[vehicle['#text']];
+                  const currentTank = tankDefinitions[tankId];
+                  const successorId = toUniqueId(nation, tankListEntry.id);
+
+                  tankXps.set(successorId, vehicle.cost);
+
+                  if (currentTank.successors === undefined) {
+                    currentTank.successors = [];
+                  }
+                  if (!currentTank.successors!.includes(successorId)) {
+                    currentTank.successors!.push(successorId);
+                  }
+                  break;
+                }
+
+                case 'gun': {
+                  gunXps.set(
+                    toUniqueId(nation, gunList.root.ids[vehicle['#text']]),
+                    vehicle.cost,
+                  );
+                  break;
+                }
+
+                case 'turret': {
+                  turretXps.set(
+                    toUniqueId(nation, turretList.root.ids[vehicle['#text']]),
+                    vehicle.cost,
+                  );
+                  break;
+                }
+
+                case 'engine': {
+                  engineXps.set(
+                    toUniqueId(nation, enginesList.root.ids[vehicle['#text']]),
+                    vehicle.cost,
+                  );
+                  break;
+                }
+
+                case 'chassis': {
+                  trackXps.set(
+                    toUniqueId(nation, chassisList.root.ids[vehicle['#text']]),
+                    vehicle.cost,
+                  );
+                  break;
+                }
+              }
+            });
+          });
+        });
+
+        Object.values(tankDefinitions[tankId].turrets).forEach((turret) => {
+          turret.xp = turretXps.get(turret.id);
+
+          Object.values(turret.guns).forEach((gun) => {
+            gun.xp = gunXps.get(gun.id);
+          });
+        });
+
+        Object.values(tankDefinitions[tankId].engines).forEach((engine) => {
+          engine.xp = engineXps.get(engine.id);
+        });
+
+        Object.values(tankDefinitions[tankId].tracks).forEach((track) => {
+          track.xp = trackXps.get(track.id);
+        });
       }
     }),
   );
 
+  Object.values(tankDefinitions).forEach((tank) => {
+    tank.xp = tankXps.get(tank.id);
+  });
+
+  Object.values(tankDefinitions).forEach((tank) => {
+    tank.successors?.forEach((predecessorId) => {
+      if (tankDefinitions[predecessorId].ancestors === undefined) {
+        tankDefinitions[predecessorId].ancestors = [];
+      }
+
+      if (!tankDefinitions[predecessorId].ancestors?.includes(tank.id)) {
+        tankDefinitions[predecessorId].ancestors?.push(tank.id);
+      }
+    });
+  });
+
   Object.entries(optionalDevices.root).forEach(
     ([optionalDeviceKey, optionalDeviceEntry]) => {
       if (optionalDeviceKey === 'nextAvailableId') return;
@@ -969,9 +1145,25 @@ export async function definitions(production: boolean) {
     }
   });
 
+  Object.entries(avatar.root.skillsByClasses).forEach(([tankClass, skills]) => {
+    skillDefinitions.classes[tankClass as TankClass] = skills.split(' ');
+  });
+
+  Object.entries(maps.maps).forEach(([key, map]) => {
+    mapDefinitions[map.id] = {
+      id: map.id,
+      name: strings[`#maps:${key}:${map.localName}`],
+    };
+  });
+
   await commitAssets(
     'definitions',
     [
+      {
+        content: superCompress(gameDefinitions),
+        encoding: 'base64',
+        path: 'definitions/game.cdon.lz4',
+      },
       {
         content: superCompress(tankDefinitions),
         encoding: 'base64',
@@ -997,6 +1189,16 @@ export async function definitions(production: boolean) {
         encoding: 'base64',
         path: 'definitions/provisions.cdon.lz4',
       },
+      {
+        content: superCompress(skillDefinitions),
+        encoding: 'base64',
+        path: 'definitions/skills.cdon.lz4',
+      },
+      {
+        content: superCompress(mapDefinitions),
+        encoding: 'base64',
+        path: 'definitions/maps.cdon.lz4',
+      },
     ],
     production,
   );

scripts/buildAssets/equipmentIcons.ts

@@ -3,8 +3,8 @@ import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 import { OptionalDevices } from './definitions';
 

scripts/buildAssets/index.ts

@@ -14,21 +14,26 @@ import { boosterIcons } from './boosterIcons';
 import { camouflageIcons } from './camouflageIcons';
 import { circleFlags } from './circleFlags';
 import { consumableProvisionIcons } from './consumableProvisionIcons';
+import { currencies } from './currencies';
 import { definitions } from './definitions';
 import { equipmentIcons } from './equipmentIcons';
 import { moduleIcons } from './moduleIcons';
 import { scratchedFlags } from './scratchedFlags';
 import { shellIcons } from './shellIcons';
+import { skillIcons } from './skillIcons';
 import { tankArmors } from './tankArmors';
 import { tankIcons } from './tankIcons';
 import { tankModels } from './tankModels';
+import { videos } from './videos';
 
 if (!targets && !allTargets) throw new Error('No target(s) specified');
 
 const methods = [
   definitions,
-  tankIcons,
+  videos,
   scratchedFlags,
+  currencies,
+  skillIcons,
   circleFlags,
   shellIcons,
   moduleIcons,
@@ -36,6 +41,7 @@ const methods = [
   consumableProvisionIcons,
   camouflageIcons,
   boosterIcons,
+  tankIcons,
   tankArmors,
   tankModels,
 ];

scripts/buildAssets/moduleIcons.ts

@@ -1,7 +1,8 @@
 import { readdir } from 'fs/promises';
-import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
+import sharp from 'sharp';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
 export async function moduleIcons(production: boolean) {
@@ -16,9 +17,11 @@ export async function moduleIcons(production: boolean) {
       .map(async (file) => {
         const nameRaw = file.match(/vehicle(.+)\.packed\.webp\.dvpl/)![1];
         const name = nameRaw[0].toLowerCase() + nameRaw.slice(1);
-        const content = await readBase64DVPL(
+        const content = (
-          `${DATA}/${POI.moduleIcons}/${file}`,
+          await sharp(await readDVPLFile(`${DATA}/${POI.moduleIcons}/${file}`))
-        );
+            .trim()
+            .toBuffer()
+        ).toString('base64');
 
         return {
           content,

scripts/buildAssets/scratchedFlags.ts

@@ -1,7 +1,7 @@
 import { readdir } from 'fs/promises';
 import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
 export async function scratchedFlags(production: boolean) {

scripts/buildAssets/shellIcons.ts

@@ -2,8 +2,8 @@ import { readdir } from 'fs/promises';
 import sharp from 'sharp';
 import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { readStringDVPL } from '../../src/core/blitz/readStringDVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 
 export async function shellIcons(production: boolean) {

scripts/buildAssets/skillIcons.ts

@@ -0,0 +1,51 @@
+import sharp from 'sharp';
+import { TankClass } from '../../src/components/Tanks';
+import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
+import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
+import { DATA } from './constants';
+
+interface SkillIcon {
+  name: string;
+  state: number;
+}
+
+export interface Avatar {
+  roles: unknown;
+  skillsByClasses: Record<TankClass, string>;
+  skills: {
+    [name: string]: {
+      userString: string;
+      effectDescription: string;
+      tipDescription: string;
+      icon: SkillIcon | SkillIcon[];
+      type: 'continuous' | 'trigger';
+    };
+  };
+}
+
+export async function skillIcons(production: boolean) {
+  console.log('Building skill icons...');
+
+  const avatar = await readXMLDVPL<{ root: Avatar }>(
+    `${DATA}/XML/item_defs/tankmen/avatar.xml.dvpl`,
+  );
+  const changes = await Promise.all(
+    Object.values(avatar.root.skills).map(async (skill) => {
+      const icon = Array.isArray(skill.icon) ? skill.icon[0] : skill.icon;
+      const name = icon.name.split('/').at(-1)!.replace(/_\d$/, '');
+      const path = `${DATA}${icon.name.replace('~res:', '')}.packed.webp.dvpl`;
+      const image = sharp(await readDVPLFile(path)).trim();
+      const content = (await image.toBuffer()).toString('base64');
+
+      return {
+        content,
+        encoding: 'base64',
+        path: `icons/skills/${name}.webp`,
+      } satisfies FileChange;
+    }),
+  );
+
+  commitAssets('skill icons', changes, production);
+}

scripts/buildAssets/tankArmors.ts

@@ -3,8 +3,8 @@ import { readdir } from 'fs/promises';
 import { extractArmor } from '../../src/core/blitz/extractArmor';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { toUniqueId } from '../../src/core/blitz/toUniqueId';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 import { VehicleDefinitionList } from './definitions';
 
@@ -28,9 +28,6 @@ export async function tankArmors(production: boolean) {
           if (tankKey.includes('tutorial_bot')) return;
 
           const id = toUniqueId(nation, tank.id);
-
-          console.log(`Building armor ${id} @ ${nation}/${tankKey}`);
-
           const model = await extractArmor(DATA, `${nation}-${tankKey}`);
 
           changes.push({

scripts/buildAssets/tankIcons.ts

@@ -1,11 +1,12 @@
 import { readdir } from 'fs/promises';
+import sharp from 'sharp';
 import { Vector3Tuple } from 'three';
 import { NATION_IDS } from '../../src/constants/nations';
-import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
+import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 import { VehicleDefinitionList } from './definitions';
 
@@ -25,6 +26,20 @@ export interface TankParameters {
       averageThickness?: Record<string, number>;
     };
   };
+  maskSlice?: {
+    [key: string]:
+      | {
+          enabled: boolean;
+          planePosition: Vector3Tuple;
+          planeNormal: Vector3Tuple;
+          planeAxis: Vector3Tuple;
+          frustumConeBaseRadius: number;
+          frustumConeAngleDegrees: number;
+          planeSliceMode: number;
+          frustumConeSliceMode: number;
+        }
+      | undefined;
+  };
 }
 
 export async function tankIcons(production: boolean) {
@@ -50,23 +65,29 @@ export async function tankIcons(production: boolean) {
           const parameters = await readYAMLDVPL<TankParameters>(
             `${DATA}/${POI.tankParameters}/${nation}/${tankKey}.yaml.dvpl`,
           );
-          const small = `${DATA}/${parameters.resourcesPath.smallIconPath
+          const smallPath = `${DATA}/${parameters.resourcesPath.smallIconPath
             .replace(/~res:\//, '')
             .replace(/\..+/, '')}.packed.webp.dvpl`;
-          const big = `${DATA}/${parameters.resourcesPath.bigIconPath
+          const bigPath = `${DATA}/${parameters.resourcesPath.bigIconPath
             .replace(/~res:\//, '')
             .replace(/\..+/, '')}.packed.webp.dvpl`;
+          const big = await sharp(await readDVPLFile(bigPath))
+            .trim()
+            .toBuffer();
+          const small = await sharp(await readDVPLFile(smallPath))
+            .trim()
+            .toBuffer();
 
           if (big) {
             changes.push({
-              content: await readBase64DVPL(big),
+              content: big.toString('base64'),
               encoding: 'base64',
               path: `icons/tanks/big/${id}.webp`,
             });
           }
           if (small) {
             changes.push({
-              content: await readBase64DVPL(small),
+              content: small.toString('base64'),
               encoding: 'base64',
               path: `icons/tanks/small/${id}.webp`,
             });

scripts/buildAssets/tankModels.ts

@@ -4,8 +4,8 @@ import { extractModel } from '../../src/core/blitz/extractModel';
 import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
 import { toUniqueId } from '../../src/core/blitz/toUniqueId';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA, POI } from './constants';
 import { VehicleDefinitionList } from './definitions';
 import { TankParameters } from './tankIcons';
@@ -32,9 +32,6 @@ export async function tankModels(production: boolean) {
         if (tankKey.includes('tutorial_bot')) return;
 
         const id = toUniqueId(nation, tank.id);
-
-        console.log(`Building model ${id} @ ${nation}/${tankKey}`);
-
         const parameters = await readYAMLDVPL<TankParameters>(
           `${DATA}/${POI.tankParameters}/${nation}/${tankKey}.yaml.dvpl`,
         );

scripts/buildAssets/videos.ts

@@ -0,0 +1,142 @@
+import { readdir } from 'fs/promises';
+import { google } from 'googleapis';
+import { cloneDeep, uniqBy } from 'lodash';
+import { parse as parseYaml } from 'yaml';
+import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
+import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
+import { toUniqueId } from '../../src/core/blitz/toUniqueId';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
+import { VideoDefinitions } from '../../src/core/blitzkit/videos';
+import { DATA, POI } from './constants';
+import { BlitzStrings, botPattern, VehicleDefinitionList } from './definitions';
+
+const youtubers = [
+  'UCKBYXp4Xn2I2tL1UL4fpbhw', // droodles
+  'UCrQ-Dy8lVsm11u8pCJ8W7Tw', // fatness
+  'UCxRpZqMElssTdPYDK3x7wyg', // n90
+];
+
+export async function videos(production: boolean) {
+  console.log('Building videos...');
+
+  const currentVideos = await fetch(
+    'https://raw.githubusercontent.com/tresabhi/blitzkit-assets/main/definitions/videos.csv',
+  )
+    .then((response) => response.text())
+    .then((lines) => {
+      return lines
+        .split('\n')
+        .map((line) => {
+          const [idString, lastUpdatedString, ...videos] = line.split(',');
+          const id = Number(idString);
+          const lastUpdated = Number(lastUpdatedString);
+          return { id, lastUpdated, videos };
+        })
+        .reduce<VideoDefinitions>(
+          (accumulator, { id, lastUpdated, videos }) => {
+            accumulator[id] = { lastUpdated, videos };
+            return accumulator;
+          },
+          {},
+        );
+    });
+  const auth = await google.auth.getClient({
+    scopes: ['https://www.googleapis.com/auth/youtube.readonly'],
+  });
+  const youtube = google.youtube({ version: 'v3', auth });
+
+  const nations = await readdir(`${DATA}/${POI.vehicleDefinitions}`).then(
+    (nations) => nations.filter((nation) => nation !== 'common'),
+  );
+  const stringsPreInstalled = await readYAMLDVPL<BlitzStrings>(
+    `${DATA}/${POI.strings}/en.yaml.dvpl`,
+  );
+  const stringsCache = await fetch(POI.cachedStrings)
+    .then((response) => response.text())
+    .then((string) => parseYaml(string) as BlitzStrings);
+  const strings = {
+    ...stringsPreInstalled,
+    ...stringsCache,
+  };
+  const tanks: { id: number; name: string; tier: number }[] = [];
+  await Promise.all(
+    nations.map(async (nation) => {
+      const tankList = await readXMLDVPL<{ root: VehicleDefinitionList }>(
+        `${DATA}/${POI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
+      );
+
+      await Promise.all(
+        Object.entries(tankList.root).map(async ([tankKey, tank]) => {
+          if (botPattern.test(tankKey)) return null;
+
+          const id = toUniqueId(nation, tank.id);
+          const name =
+            (tank.shortUserString
+              ? strings[tank.shortUserString]
+              : undefined) ?? strings[tank.userString];
+          const tier = tank.level;
+
+          tanks.push({ id, name, tier });
+        }),
+      );
+    }),
+  );
+
+  const tanksSanitized = tanks
+    .sort((a, b) => b.tier - a.tier)
+    .sort((a, b) => {
+      const lastUpdatedA = currentVideos[a.id]?.lastUpdated ?? 0;
+      const lastUpdatedB = currentVideos[b.id]?.lastUpdated ?? 0;
+      return lastUpdatedA - lastUpdatedB;
+    });
+  const videos: VideoDefinitions = cloneDeep(currentVideos);
+
+  let done = 0;
+  for (const tank of tanksSanitized) {
+    try {
+      const results = await youtube.search.list({
+        part: ['snippet'],
+        q: `World of Tanks Blitz ${tank.name}`,
+      });
+
+      if (!results.data.items || results.data.items.length === 0) continue;
+
+      const items = uniqBy(
+        results.data.items.filter(
+          (item) =>
+            item.snippet?.channelId &&
+            item.id?.videoId &&
+            youtubers.includes(item.snippet.channelId),
+        ),
+        (item) => item.snippet!.channelId,
+      );
+
+      videos[tank.id] = {
+        lastUpdated: Math.round(Date.now() / 1000),
+        videos: items.map((item) => item.id!.videoId!),
+      };
+
+      console.log(
+        `${++done} / ${tanks.length} (${Math.round(100 * (done / tanks.length))}%) done; found ${items.length} for ${tank.name}`,
+      );
+
+      await new Promise((resolve) => setTimeout(resolve, 1000 / 5));
+    } catch (error) {
+      console.warn('An error occurred, safely exiting prematurely...', error);
+      break;
+    }
+  }
+
+  const content = Object.entries(videos)
+    .map(
+      ([id, { videos, lastUpdated }]) =>
+        `${id},${lastUpdated},${videos.join(',')}`,
+    )
+    .join('\n');
+
+  await commitAssets(
+    'videos',
+    [{ content, encoding: 'utf-8', path: 'definitions/videos.csv' }],
+    production,
+  );
+}

scripts/buildRatingLeaderboard.ts

@@ -0,0 +1,199 @@
+import { chunk } from 'lodash';
+import { argv } from 'process';
+import {
+  RatingInfo,
+  RatingNeighbors,
+  RatingPlayer,
+} from '../src/commands/ratingLeaderboard';
+import { RegionSubdomain } from '../src/constants/regions';
+import { getAccountInfo } from '../src/core/blitz/getAccountInfo';
+import regionSubdomainToRegion from '../src/core/blitz/regionSubdomainToRegion';
+import { commitAssets } from '../src/core/blitzkit/commitAssets';
+import { FileChange } from '../src/core/blitzkit/commitMultipleFiles.js';
+import { patientFetchJSON } from '../src/core/blitzkit/patientFetchJSON';
+import { superCompress } from '../src/core/blitzkit/superCompress';
+import {
+  BkrlBaseEntry,
+  BkrlFormat,
+  BkrlSuperset1Entry,
+  BkrlWriteStream,
+} from '../src/core/streams/bkrl';
+import { CdonValue, CdonWriteStream } from '../src/core/streams/cdon';
+
+/*
+ * Central North American Time (UTC-5): use 0 5 * * *.
+ * Central European Time (UTC+1): use 0 23 * * *.
+ * Central Asia Standard Time (UTC+7): use 0 17 * * *.
+ */
+
+const production = argv.includes('--production');
+const target = argv
+  .find((arg) => arg.startsWith('--target='))
+  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
+const regionSubdomains = argv
+  .find((arg) => arg.startsWith('--region='))
+  ?.split('=')[1];
+
+if (!target) throw new Error('Target parameter not specified');
+if (!regionSubdomains) throw new Error('Region parameter not specified');
+
+regionSubdomains.split(',').forEach(async (regionSubdomain) => {
+  const region = regionSubdomainToRegion(regionSubdomain as RegionSubdomain);
+
+  console.log(`Building ${target} rating leaderboard for ${region}`);
+
+  const NEIGHBORS = 2 ** 8;
+  const PLAYERS = await patientFetchJSON<RatingInfo>(
+    `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/season/`,
+  ).then((data) => (data.detail === undefined ? data.count : undefined));
+
+  if (PLAYERS === undefined) {
+    throw new Error('No current rating season running');
+  }
+
+  const players: Record<number, RatingPlayer> = {};
+  const leaderboard: BkrlBaseEntry[] = [];
+  let registered = 0;
+
+  async function branchFromPlayer(id: number) {
+    const { neighbors } = await patientFetchJSON<RatingNeighbors>(
+      `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${NEIGHBORS}`,
+    );
+
+    const firstPlayer = neighbors[0];
+    const lastPlayer = neighbors[neighbors.length - 1];
+
+    const branches: Promise<void>[] = [];
+    if (!players[firstPlayer.number])
+      branches.push(branchFromPlayer(firstPlayer.spa_id));
+    if (!players[lastPlayer.number])
+      branches.push(branchFromPlayer(lastPlayer.spa_id));
+
+    neighbors.forEach((neighbor) => {
+      if (players[neighbor.number]) return;
+
+      players[neighbor.number] = neighbor;
+      registered++;
+    });
+
+    console.log(
+      `Registered ${registered} / ${PLAYERS} (${(
+        (registered / PLAYERS!) *
+        100
+      ).toFixed(2)}%)`,
+    );
+
+    await Promise.all(branches);
+  }
+
+  async function branchFromLeague(id: number) {
+    const { result } = await patientFetchJSON<{ result: RatingPlayer[] }>(
+      `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/league/${id}/top/`,
+    );
+
+    const firstPlayer = result[0];
+    const lastPlayer = result.at(-1)!;
+
+    await Promise.all([
+      branchFromPlayer(firstPlayer.spa_id),
+      branchFromPlayer(lastPlayer.spa_id),
+    ]);
+  }
+
+  console.log('Branching from leagues...');
+  await Promise.all([
+    branchFromLeague(0),
+    branchFromLeague(1),
+    branchFromLeague(2),
+    branchFromLeague(3),
+    branchFromLeague(4),
+  ]);
+
+  console.log('Converting to an array...');
+  for (let index = 0; index < PLAYERS; index++) {
+    const listing = players[index + 1];
+    if (listing) {
+      leaderboard[index] = { id: listing.spa_id, score: listing.score };
+    } else {
+      console.warn(`Position ${index + 1} had no player`);
+      leaderboard[index] = { id: 0, score: 0 };
+    }
+  }
+
+  console.log('Requesting further stats...');
+  const comprehensiveLeaderboard: BkrlSuperset1Entry[] = [];
+  let chunkIndex = 0;
+  for (const leaderboardChunk of chunk(leaderboard, 100)) {
+    console.log(
+      `Chunk ${chunkIndex + 1} of ${Math.ceil(leaderboard.length / 100)}`,
+    );
+
+    const stats = await getAccountInfo(
+      region,
+      leaderboardChunk.map(({ id }) => id),
+      ['statistics.rating'],
+    );
+
+    stats.forEach((stat, index) => {
+      const trueIndex = chunkIndex * 100 + index;
+      comprehensiveLeaderboard[trueIndex] =
+        leaderboardChunk[index].id === 0 ||
+        stat?.statistics.rating === undefined
+          ? {
+              battles: 0,
+              damage: 0,
+              id: 0,
+              kills: 0,
+              score: 0,
+              survived: 0,
+              wins: 0,
+            }
+          : {
+              id: leaderboardChunk[index].id,
+              score: leaderboardChunk[index].score,
+              battles: stat.statistics.rating.battles,
+              damage: stat.statistics.rating.damage_dealt,
+              kills: stat.statistics.rating.frags,
+              survived: stat.statistics.rating.survived_battles,
+              wins: stat.statistics.rating.wins,
+            };
+    });
+
+    chunkIndex++;
+  }
+
+  const info = await patientFetchJSON<RatingInfo & { detail: undefined }>(
+    `https://${regionSubdomain}.wotblitz.com/en/api/rating-leaderboards/season/`,
+  );
+  const normalizedServer = regionSubdomain === 'na' ? 'com' : regionSubdomain;
+  const infoContent = new CdonWriteStream().cdon(
+    info as unknown as CdonValue,
+  ).uint8Array;
+  const leaderboardWriteStream = new BkrlWriteStream();
+
+  leaderboardWriteStream.bkrl({
+    format: BkrlFormat.Superset1,
+    entries: comprehensiveLeaderboard,
+  });
+
+  const changes: FileChange[] = [
+    {
+      path: `regions/${normalizedServer}/rating/${info.current_season}/info.cdon.lz4`,
+      content: superCompress(infoContent),
+      encoding: 'base64',
+    },
+    {
+      path: `regions/${normalizedServer}/rating/${info.current_season}/${target}.bkrl`,
+      content: Buffer.from(leaderboardWriteStream.uint8Array).toString(
+        'base64',
+      ),
+      encoding: 'base64',
+    },
+  ];
+
+  commitAssets(
+    `rating leaderboard ${regionSubdomain} ${target}`,
+    changes,
+    production,
+  );
+});

scripts/buildRatingsLeaderboard.ts

@@ -1,140 +0,0 @@
-import { rm, writeFile } from 'fs/promises';
-import { argv } from 'process';
-import {
-  RatingsInfo,
-  RatingsNeighbors,
-  RatingsPlayer,
-} from '../src/commands/ratings';
-import commitMultipleFiles from '../src/core/blitzkrieg/commitMultipleFiles.js';
-import { patientFetchJSON } from '../src/core/blitzkrieg/patientFetchJSON';
-
-/*
- * Central North American Time (UTC-5): use 0 5 * * *.
- * Central European Time (UTC+1): use 0 23 * * *.
- * Central Asia Standard Time (UTC+7): use 0 17 * * *.
- *
- * [region]/ratings/[season]/info.json: season info like rewards, start & end time, etc.
- * [region]/ratings/[season]/latest.json: the absolute latest leaderboard recorded at UTC+0 midnight
- * [region]/ratings/[season]/midnight.json: last midnight's leaderboard relative to the region
- */
-
-export type BlitzkriegRatingsLeaderboardEntry = { id: number; score: number };
-export type BlitzkriegRatingsLeaderboard = BlitzkriegRatingsLeaderboardEntry[];
-
-const publish = argv.includes('--publish');
-const target = argv
-  .find((arg) => arg.startsWith('--target='))
-  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
-const server = argv.find((arg) => arg.startsWith('--region='))?.split('=')[1];
-
-if (!target) throw new Error('Target parameter not specified');
-if (!server) throw new Error('Region parameter not specified');
-
-const NEIGHBORS = 2 ** 8;
-const PLAYERS = await patientFetchJSON<RatingsInfo>(
-  `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-).then((data) => (data.detail === undefined ? data.count : undefined));
-
-if (PLAYERS === undefined) {
-  throw new Error('No current ratings season running');
-}
-
-const players: Record<number, RatingsPlayer> = {};
-const leaderboard: BlitzkriegRatingsLeaderboard = [];
-let registered = 0;
-
-async function branchFromPlayer(id: number) {
-  const { neighbors } = await patientFetchJSON<RatingsNeighbors>(
-    `https://${server}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${NEIGHBORS}`,
-  );
-
-  const firstPlayer = neighbors[0];
-  const lastPlayer = neighbors[neighbors.length - 1];
-
-  const branches: Promise<void>[] = [];
-  if (!players[firstPlayer.number])
-    branches.push(branchFromPlayer(firstPlayer.spa_id));
-  if (!players[lastPlayer.number])
-    branches.push(branchFromPlayer(lastPlayer.spa_id));
-
-  neighbors.forEach((neighbor) => {
-    if (players[neighbor.number]) return;
-
-    players[neighbor.number] = neighbor;
-    registered++;
-  });
-
-  console.log(
-    `Registered ${registered} / ${PLAYERS} (${(
-      (registered / PLAYERS!) *
-      100
-    ).toFixed(2)}%)`,
-  );
-
-  await Promise.all(branches);
-}
-
-async function branchFromLeague(id: number) {
-  const { result } = await patientFetchJSON<{ result: RatingsPlayer[] }>(
-    `https://${server}.wotblitz.com/en/api/rating-leaderboards/league/${id}/top/`,
-  );
-
-  const firstPlayer = result[0];
-  const lastPlayer = result[result.length - 1];
-
-  await Promise.all([
-    branchFromPlayer(firstPlayer.spa_id),
-    branchFromPlayer(lastPlayer.spa_id),
-  ]);
-}
-
-console.log('Branching from leagues...');
-await Promise.all([
-  branchFromLeague(0),
-  branchFromLeague(1),
-  branchFromLeague(2),
-  branchFromLeague(3),
-  branchFromLeague(4),
-]);
-
-console.log('Converting to an array...');
-for (let index = 0; index < PLAYERS; index++) {
-  const listing = players[index + 1];
-  if (!listing) {
-    console.warn(`Position ${index + 1} had no player`);
-    continue;
-  }
-
-  leaderboard[index] = {
-    id: listing.spa_id,
-    score: listing.score,
-  };
-}
-
-const leaderboardJSON = JSON.stringify(leaderboard);
-
-if (publish) {
-  const info = await patientFetchJSON<RatingsInfo & { detail: undefined }>(
-    `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
-  );
-  const normalizedServer = server === 'na' ? 'com' : server;
-  const infoPath = `regions/${normalizedServer}/ratings/${info.current_season}/info.json`;
-  const leaderboardPath = `regions/${normalizedServer}/ratings/${info.current_season}/${target}.json`;
-  const infoJSON = JSON.stringify(info);
-
-  console.log(`Publishing to season ${info.current_season}...`);
-  commitMultipleFiles(
-    'tresabhi',
-    'blitzkrieg-assets',
-    'main',
-    new Date().toString(),
-    [
-      { path: infoPath, content: infoJSON, encoding: 'utf-8' },
-      { path: leaderboardPath, content: leaderboardJSON, encoding: 'utf-8' },
-    ],
-  );
-} else {
-  console.log('Writing to disk...');
-  await rm('dist.json', { force: true });
-  await writeFile('dist.json', leaderboardJSON);
-}

scripts/buildRatingsPlot.ts

@@ -1,46 +0,0 @@
-import { writeFile } from 'fs/promises';
-import { Region } from '../src/constants/regions';
-import { getRatingsNeighbors } from '../src/core/blitz/getRatingsNeighbors';
-
-const REGION: Region = 'com';
-const PLAYER = 1041988373;
-const ITERATIONS = 2 ** 4;
-const MAX_NEIGHBORS = 2 ** 7;
-const data: [number, number][] = [];
-let finished = 0;
-
-for (let index = 0; index < ITERATIONS; index++) {
-  const neighbors = Math.round((Math.random() * MAX_NEIGHBORS) / 2) * 2;
-  const start = Date.now();
-
-  console.log(`🟡 Iteration ${index} with ${neighbors} neighbors`);
-
-  try {
-    await getRatingsNeighbors(REGION, PLAYER, neighbors);
-
-    finished++;
-    console.log(
-      `🟢 (${Math.round(
-        100 * (finished / ITERATIONS),
-      )}%) Iteration ${index} with ${neighbors} neighbors`,
-    );
-
-    const end = Date.now();
-    const time = end - start;
-
-    data.push([neighbors, time]);
-  } catch (error) {
-    console.log(
-      `🔴 Iteration ${index} with ${neighbors} neighbors\n\n${error}`,
-    );
-  }
-}
-
-console.log('🟢 Done, sorting');
-data.sort(([neighborsA], [neighborsB]) => neighborsA - neighborsB);
-
-console.log('🟢 Writing');
-writeFile(
-  'dist/ratingsPlot.csv',
-  data.map(([neighbors, time]) => `${neighbors},${time}`).join('\n'),
-);

scripts/sitemap.ts

@@ -0,0 +1,26 @@
+import { tankDefinitions } from '../src/core/blitzkit/tankDefinitions';
+
+// random vercel bug forces require import
+const { writeFileSync } = require('fs');
+
+console.log('Building sitemap...');
+
+const awaitedTankDefinitions = await tankDefinitions;
+const values = Object.values(awaitedTankDefinitions);
+const txt = values
+  .map((tank) => `https://blitzkit.vercel.app/tools/tankopedia/${tank.id}/`)
+  .join('\n');
+const xml = `<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+${values
+  .map(
+    (tank) =>
+      `<url><loc>https://blitzkit.vercel.app/tools/tankopedia/${tank.id}/</loc></url>`,
+  )
+  .join('\n')}
+</urlset>`;
+
+writeFileSync('public/sitemap.txt', txt);
+writeFileSync('public/sitemap.xml', xml);
+
+console.log(`Built sitemap for ${values.length} tanks`);

scripts/test.ts

@@ -0,0 +1,96 @@
+import { chunk, times } from 'lodash';
+import { compress } from 'lz4js';
+import { argv } from 'process';
+import { Region, REGIONS } from '../src/constants/regions';
+import getTankStats from '../src/core/blitz/getTankStats';
+import { idToRegion } from '../src/core/blitz/idToRegion';
+import { commitAssets } from '../src/core/blitzkit/commitAssets';
+import { FileChange } from '../src/core/blitzkit/commitMultipleFiles';
+import {
+  RtscWritePlayer,
+  RtscWriteStream,
+  RtsmWriteStream,
+} from '../src/core/streams/rts';
+import usersRaw from '../test.users.json';
+
+const PLAYERS_PER_CHUNK = 256;
+const CHUNKS_PER_BATCH = 128;
+
+const production = argv.includes('--production');
+const region = argv
+  .find((argument) => argument.startsWith('--region'))
+  ?.split('=')[1] as Region | undefined;
+
+if (!region || !REGIONS.includes(region)) {
+  throw new Error('No valid region specified');
+}
+
+const today = new Date();
+const todayPath = `${today.getUTCFullYear()}/${today.getUTCMonth() + 1}/${today.getUTCDate()}`;
+const users = usersRaw.filter(({ blitz }) => idToRegion(blitz) === region);
+const base = Math.ceil(users.length / PLAYERS_PER_CHUNK);
+const chunks = times(base, (offset) => ({
+  offset,
+  users: users.filter((user) => user.blitz % base === offset),
+}));
+const batches = chunk(chunks, CHUNKS_PER_BATCH);
+const manifestWriteStream = new RtsmWriteStream();
+
+console.log(`Found ${users.length} players in ${region}`);
+
+await commitAssets(
+  `regular tank stats manifests ${todayPath}`,
+  [
+    {
+      encoding: 'base64',
+      path: `regions/${region}/regular/tanks/${todayPath}/manifest.rtsm`,
+      content: Buffer.from(
+        compress(manifestWriteStream.rtsm(base).uint8Array),
+      ).toString('base64'),
+    },
+  ],
+  production,
+);
+
+let batchesDone = 0;
+for (const batch of batches) {
+  console.log(`Batch ${++batchesDone} of ${batches.length}`);
+
+  const changes: FileChange[] = [];
+
+  let chunksDone = 0;
+  for (const chunk of batch) {
+    console.log(`Chunk ${++chunksDone} of ${chunks.length}`);
+
+    let playersDone = 0;
+    const players = await Promise.all(
+      chunk.users.map(async (user) => {
+        const tanks = await getTankStats(region, user.blitz);
+
+        console.log(`Player ${++playersDone} of ${chunk.users.length}`);
+
+        if (tanks === null) return null;
+
+        return {
+          id: user.blitz,
+          tanks,
+        } satisfies RtscWritePlayer;
+      }),
+    ).then((players) => players.filter((player) => player !== null));
+    const writeStream = new RtscWriteStream();
+
+    writeStream.rtsc(players);
+    changes.push({
+      encoding: 'base64',
+      content: Buffer.from(compress(writeStream.uint8Array)).toString('base64'),
+      path: `regions/${region}/regular/tanks/${todayPath}/${chunk.offset}.rtsc.lz4`,
+    });
+  }
+
+  // do not await; commit in background
+  commitAssets(
+    `regular tank stats ${todayPath} batch ${batches.indexOf(batch) + 1}`,
+    changes,
+    production,
+  );
+}

scripts/test2.ts

@@ -0,0 +1,36 @@
+import AdmZip from 'adm-zip';
+import { readFile } from 'fs/promises';
+import { BattleResultsReadStream } from '../src/core/streams/battleResults';
+
+interface WoTBReplayMeta {
+  version: string;
+  title: string;
+  dbid: string;
+  playerName: string;
+  battleStartTime: string;
+  playerVehicleName: string;
+  mapName: string;
+  arenaUniqueId: string;
+  battleDuration: number;
+  vehicleCompDescriptor: number;
+  camouflageId: number;
+  mapId: number;
+  arenaBonusType: number;
+}
+
+const file = await readFile('temp/test.wotbreplay');
+const zip = new AdmZip(file);
+const entries = zip.getEntries();
+
+const metaRaw = entries.find((entry) => entry.name === 'meta.json');
+const battleResultsRaw = entries.find(
+  (entry) => entry.name === 'battle_results.dat',
+);
+
+if (!metaRaw) throw new Error('No meta.json found');
+if (!battleResultsRaw) throw new Error('No battle_results.dat found');
+
+const meta = JSON.parse(metaRaw.getData().toString()) as WoTBReplayMeta;
+const battleResults = new BattleResultsReadStream(
+  battleResultsRaw.getData().buffer,
+).battleResults();

scripts/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "resolveJsonModule": true,
+    "jsx": "preserve",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "incremental": true,
+    "isolatedModules": true
+  }
+}

src/app/api/[region]/rating/current/info/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from 'next/server';
 import { Region } from '../../../../../../constants/regions';
-import getRatingsInfo from '../../../../../../core/blitz/getRatingsInfo';
+import getRatingInfo from '../../../../../../core/blitz/getRatingInfo';
 
 export async function GET(
   request: Request,
   { params }: { params: { region: Region } },
 ) {
-  return NextResponse.json(await getRatingsInfo(params.region));
+  return NextResponse.json(await getRatingInfo(params.region));
 }

src/app/api/[region]/rating/current/league/[league]/route.ts

@@ -1,12 +1,12 @@
 import { NextResponse } from 'next/server';
 import { Region } from '../../../../../../../constants/regions';
-import { getRatingsLeague } from '../../../../../../../core/blitz/getRatingsLeague';
+import { getRatingLeague } from '../../../../../../../core/blitz/getRatingLeague';
 
 export async function GET(
   request: Request,
   { params }: { params: { region: Region; league: number } },
 ) {
   return NextResponse.json(
-    await getRatingsLeague(params.region, params.league, true),
+    await getRatingLeague(params.region, params.league, true),
   );
 }

src/app/api/[region]/rating/current/search/[username]/route.ts

@@ -1,12 +1,12 @@
 import { NextResponse } from 'next/server';
 import { Region } from '../../../../../../../constants/regions';
-import { searchCurrentRatingsPlayers } from '../../../../../../../core/blitz/searchCurrentRatingsPlayers';
+import { searchCurrentRatingPlayers } from '../../../../../../../core/blitz/searchCurrentRatingPlayers';
 
 export async function GET(
   request: Request,
   { params }: { params: { region: Region; username: string } },
 ) {
   return NextResponse.json(
-    await searchCurrentRatingsPlayers(params.region, params.username),
+    await searchCurrentRatingPlayers(params.region, params.username),
   );
 }

src/app/callback/[provider]/page.tsx

@@ -0,0 +1,62 @@
+'use client';
+
+import { Flex, Heading, Text } from '@radix-ui/themes';
+import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
+import PageWrapper from '../../../components/PageWrapper';
+import { mutateApp } from '../../../stores/app';
+
+export default function Page({
+  params,
+  searchParams,
+}: {
+  params: { provider: string };
+  searchParams: { [key: string]: string };
+}) {
+  const router = useRouter();
+
+  useEffect(() => {
+    switch (params.provider) {
+      case 'wargaming': {
+        if (
+          !searchParams.expires_at ||
+          !searchParams.access_token ||
+          !searchParams.account_id
+        ) {
+          break;
+        }
+
+        mutateApp((draft) => {
+          draft.login = {
+            expiresAt: Number(searchParams.expires_at),
+            id: Number(searchParams.account_id),
+            token: searchParams.access_token,
+          };
+        });
+
+        break;
+      }
+
+      default: {
+        console.error(`Unknown provider: ${params.provider}`);
+      }
+    }
+
+    router.push(searchParams.return ? searchParams.return : '/');
+  });
+
+  return (
+    <PageWrapper>
+      <Flex
+        style={{ flex: 1 }}
+        align="center"
+        justify="center"
+        direction="column"
+        gap="2"
+      >
+        <Heading>Verifying you...</Heading>
+        <Text color="gray">You'll be on your way shortly.</Text>
+      </Flex>
+    </PageWrapper>
+  );
+}

src/app/embeds/session/page.tsx

@@ -1,339 +0,0 @@
-'use client';
-
-import { ContextMenu } from '@radix-ui/themes';
-import { useEffect, useState } from 'react';
-import * as Breakdown from '../../../components/Breakdown';
-import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
-import fetchBlitz from '../../../core/blitz/fetchBlitz';
-import { resetSession } from '../../../core/blitzkrieg/resetSession';
-import {
-  TankDefinition,
-  tankDefinitions,
-} from '../../../core/blitzkrieg/tankDefinitions';
-import { tankAverages } from '../../../core/blitzstars/tankAverages';
-import calculateWN8 from '../../../core/statistics/calculateWN8';
-import { deltaTankStats } from '../../../core/statistics/deltaTankStats';
-import getWN8Percentile from '../../../core/statistics/getWN8Percentile';
-import mutateSession, { useSession } from '../../../stores/session';
-import { IndividualTankStats, TanksStats } from '../../../types/tanksStats';
-import { CustomColumnDisplay } from '../../tools/session/components/CustomColumn';
-import { Menu } from '../../tools/session/components/Menu';
-
-const REFRESH_RATE = 1 / 5;
-
-interface SessionPageProps {
-  naked?: boolean;
-}
-
-export default function SessionPage({ naked = true }: SessionPageProps) {
-  const session = useSession();
-  const since = session.isTracking ? new Date(session.time) : undefined;
-  const [diff, setDiff] = useState<
-    | {
-        careerWN8: number;
-
-        list: {
-          stats: IndividualTankStats;
-          tankDefinitions?: TankDefinition;
-          career: IndividualTankStats;
-          currentWN8?: number;
-          careerWN8?: number;
-        }[];
-      }
-    | undefined
-  >(undefined);
-  const sessionBattles = diff?.list.reduce(
-    (accumulator, { stats }) => accumulator + stats.all.battles,
-    0,
-  );
-  const tankStatsArray = session.isTracking
-    ? (Object.values(session.tankStats) as IndividualTankStats[])
-    : [];
-  const sessionWinrate = diff
-    ? diff.list.reduce(
-        (accumulator, { stats }) => accumulator + stats.all.wins,
-        0,
-      ) / sessionBattles!
-    : 0;
-  const careerBattles = tankStatsArray.reduce(
-    (accumulator, stats) => accumulator + stats.all.battles,
-    0,
-  );
-  const careerWinrate =
-    tankStatsArray.reduce(
-      (accumulator, stats) => accumulator + stats.all.wins,
-      0,
-    ) / careerBattles;
-  const currentDamage = diff
-    ? diff.list.reduce(
-        (accumulator, { stats }) => accumulator + stats.all.damage_dealt,
-        0,
-      ) / sessionBattles!
-    : 0;
-  const careerDamage =
-    tankStatsArray.reduce(
-      (accumulator, stats) => accumulator + stats.all.damage_dealt,
-      0,
-    ) / careerBattles;
-
-  useEffect(() => {
-    if (session.title === 'Untitled session') {
-      mutateSession((draft) => {
-        if (draft.isTracking) draft.title = draft.nickname;
-      });
-    }
-  }, [session.title]);
-
-  useEffect(() => {
-    async function recalculateDiff() {
-      if (session.isTracking) {
-        const { id, region } = session;
-        const careerRaw = await fetchBlitz<TanksStats>(
-          `https://api.wotblitz.${region}/wotb/tanks/stats/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
-        );
-        const career = careerRaw[id].reduce<
-          Record<number, IndividualTankStats>
-        >(
-          (accumulator, curr) => ({
-            ...accumulator,
-            [curr.tank_id]: curr,
-          }),
-          {},
-        );
-        const awaitedTankDefinitions = await tankDefinitions;
-        const awaitedTankAverages = await tankAverages;
-        const careerWN8 =
-          careerRaw[id].reduce(
-            (accumulator, { tank_id, all }) =>
-              accumulator +
-              (awaitedTankAverages[tank_id] && all.battles > 0
-                ? all.battles *
-                  calculateWN8(awaitedTankAverages[tank_id].all, all)
-                : 0),
-            0,
-          ) /
-          careerRaw[id].reduce(
-            (accumulator, { tank_id, all }) =>
-              accumulator +
-              (awaitedTankAverages[tank_id] && all.battles > 0
-                ? all.battles
-                : 0),
-            0,
-          );
-
-        setDiff({
-          careerWN8,
-
-          list: (
-            Object.values(
-              deltaTankStats(session.tankStats, career, session.time / 1000),
-            ) as IndividualTankStats[]
-          ).map((stats) => {
-            return {
-              stats,
-              tankDefinitions: awaitedTankDefinitions[stats.tank_id],
-              career: career[stats.tank_id],
-              currentWN8: awaitedTankAverages[stats.tank_id]
-                ? calculateWN8(
-                    awaitedTankAverages[stats.tank_id].all,
-                    stats.all,
-                  )
-                : undefined,
-              careerWN8: awaitedTankAverages[stats.tank_id]
-                ? calculateWN8(
-                    awaitedTankAverages[stats.tank_id].all,
-                    career[stats.tank_id].all,
-                  )
-                : undefined,
-            };
-          }),
-        });
-      }
-    }
-
-    recalculateDiff();
-    const interval = setInterval(recalculateDiff, 1000 / REFRESH_RATE);
-
-    return () => clearInterval(interval);
-  }, [session]);
-
-  const totalRowStats: Record<
-    CustomColumnDisplay,
-    Breakdown.RowStatItem | undefined
-  > = {
-    battles: {
-      title: 'Battles',
-      current: sessionBattles?.toLocaleString(),
-      career: tankStatsArray
-        .reduce((accumulator, stats) => accumulator + stats.all.battles, 0)
-        .toLocaleString(),
-    },
-    winrate: {
-      title: 'Winrate',
-      current: sessionBattles ? `${(100 * sessionWinrate).toFixed(2)}%` : '--',
-      career: `${(100 * careerWinrate).toFixed(2)}%`,
-      delta: sessionBattles === 0 ? 0 : sessionWinrate - careerWinrate,
-    },
-    wn8: (() => {
-      if (!diff) return undefined;
-
-      const battlesWithWN8 = diff.list.reduce(
-        (accumulator, { currentWN8, stats }) =>
-          (currentWN8 === undefined ? 0 : stats.all.battles) + accumulator,
-        0,
-      );
-      const currentWN8 =
-        diff.list.reduce(
-          (accumulator, { currentWN8, stats }) =>
-            stats.all.battles * (currentWN8 ?? 0) + accumulator,
-          0,
-        ) / battlesWithWN8!;
-
-      return {
-        title: 'WN8',
-        current: battlesWithWN8
-          ? Math.round(currentWN8!).toLocaleString()
-          : '--',
-        percentile: battlesWithWN8 ? getWN8Percentile(currentWN8!) : undefined,
-        career: Math.round(diff.careerWN8).toLocaleString(),
-      };
-    })(),
-    damage: {
-      title: 'Damage',
-      delta: sessionBattles === 0 ? 0 : currentDamage - careerDamage,
-      current: sessionBattles
-        ? Math.round(currentDamage).toLocaleString()
-        : '--',
-      career: Math.round(careerDamage).toLocaleString(),
-    },
-    none: undefined,
-  };
-
-  return (
-    <ContextMenu.Root>
-      <ContextMenu.Trigger>
-        <div>
-          <Breakdown.Root>
-            {session.showTotal &&
-              session.isTracking &&
-              since !== undefined &&
-              diff !== undefined && (
-                <Breakdown.Row
-                  naked={naked}
-                  color={session.color}
-                  minimized={!session.showCareer}
-                  title={session.title}
-                  stats={session.customColumns.map((customColumn) => {
-                    const rowStat = totalRowStats[customColumn.display];
-
-                    if (!rowStat) return undefined;
-
-                    return {
-                      ...rowStat,
-                      delta:
-                        customColumn.showDelta &&
-                        rowStat.percentile === undefined
-                          ? rowStat.delta
-                          : undefined,
-                    };
-                  })}
-                />
-              )}
-
-            {diff?.list
-              .sort(
-                (a, b) => b.stats.last_battle_time - a.stats.last_battle_time,
-              )
-              .map(
-                ({ stats, tankDefinitions, career, careerWN8, currentWN8 }) => {
-                  const rowStats: Record<
-                    CustomColumnDisplay,
-                    Breakdown.RowStatItem | undefined
-                  > = {
-                    battles: {
-                      title: 'Battles',
-                      current: stats.all.battles.toLocaleString(),
-                      career: career.all.battles.toLocaleString(),
-                    },
-                    winrate: {
-                      title: 'Winrate',
-                      current: `${(
-                        100 *
-                        (stats.all.wins / stats.all.battles)
-                      ).toFixed(2)}%`,
-                      career: `${(
-                        100 *
-                        (career.all.wins / career.all.battles)
-                      ).toFixed(2)}%`,
-                      delta:
-                        stats.all.wins / stats.all.battles -
-                        career.all.wins / career.all.battles,
-                    },
-                    wn8: {
-                      title: 'WN8',
-                      current:
-                        currentWN8 === undefined
-                          ? undefined
-                          : Math.round(currentWN8).toLocaleString(),
-                      career:
-                        careerWN8 === undefined
-                          ? undefined
-                          : Math.round(careerWN8).toLocaleString(),
-                      percentile:
-                        currentWN8 === undefined
-                          ? undefined
-                          : getWN8Percentile(currentWN8),
-                    },
-                    damage: {
-                      title: 'Damage',
-                      current: Math.round(
-                        stats.all.damage_dealt / stats.all.battles,
-                      ).toLocaleString(),
-                      career: Math.round(
-                        career.all.damage_dealt / career.all.battles,
-                      ).toLocaleString(),
-                      delta:
-                        stats.all.damage_dealt / stats.all.battles -
-                        career.all.damage_dealt / career.all.battles,
-                    },
-                    none: undefined,
-                  };
-
-                  return (
-                    <Breakdown.Row
-                      naked={naked}
-                      color={session.color}
-                      key={stats.tank_id}
-                      minimized={!session.showCareer}
-                      title={
-                        tankDefinitions?.name ?? `Unknown tank ${stats.tank_id}`
-                      }
-                      type="tank"
-                      tankType={tankDefinitions?.class}
-                      treeType={tankDefinitions?.treeType}
-                      stats={session.customColumns.map((customColumn) => {
-                        const rowStat = rowStats[customColumn.display];
-
-                        if (!rowStat) return undefined;
-
-                        return {
-                          ...rowStat,
-                          delta:
-                            customColumn.showDelta &&
-                            rowStat.percentile === undefined
-                              ? rowStat.delta
-                              : undefined,
-                        };
-                      })}
-                    />
-                  );
-                },
-              )}
-          </Breakdown.Root>
-        </div>
-      </ContextMenu.Trigger>
-
-      <Menu reset={resetSession} Builder={ContextMenu} />
-    </ContextMenu.Root>
-  );
-}

src/app/layout.tsx

@@ -1,20 +1,19 @@
 'use client';
 
-import { CaretRightIcon } from '@radix-ui/react-icons';
+import { AlertDialog, Button, Flex, Theme } from '@radix-ui/themes';
-import { AlertDialog, Button, Flex, Text, Theme } from '@radix-ui/themes';
 import '@radix-ui/themes/styles.css';
-import { Analytics } from '@vercel/analytics/react';
 import { config } from 'dotenv';
 import { Roboto_Flex } from 'next/font/google';
 import { usePathname } from 'next/navigation';
-import { ReactNode, useEffect, useState } from 'react';
+import { ReactNode, Suspense, useEffect, useState } from 'react';
-import { SkyLine } from '../assets/art/SkyLine';
+import { Footer } from '../components/Footer';
+import { Loader } from '../components/Loader';
 import Navbar from '../components/Navbar';
-import PageWrapper from '../components/PageWrapper';
+import { Party3 } from '../components/Party3';
-import isDev from '../core/blitzkrieg/isDev';
+import isDev from '../core/blitzkit/isDev';
-import { isLocalhost } from '../core/blitzkrieg/isLocalhost';
+import { isLocalhost } from '../core/blitzkit/isLocalhost';
+import { useFullScreen } from '../hooks/useFullScreen';
 import { useApp } from '../stores/app';
-import { mintTheme } from '../themes/mint';
 
 config();
 
@@ -32,7 +31,10 @@ const robotoFlex = Roboto_Flex({
 export default function RootLayout({ children }: RootLayoutProps) {
   const pathname = usePathname();
   const isEmbed = pathname.split('/')[1] === 'embeds';
+  const isRoot = pathname === '/';
+  const darkMode = useApp((state) => state.darkMode);
   const [showDevBuildAlert, setShowDevBuildAlert] = useState(false);
+  const isFullScreen = useFullScreen();
 
   useEffect(() => {
     setShowDevBuildAlert(
@@ -46,116 +48,80 @@ export default function RootLayout({ children }: RootLayoutProps) {
   return (
     <html lang="en" className={robotoFlex.className}>
       <head>
-        <title>Blitzkrieg</title>
+        {isRoot && (
-        <meta
+          <>
-          name="description"
+            <title>BlitzKit</title>
-          content="🎉 Tools for everything World of Tanks Blitz"
+            <meta
-        />
+              name="description"
+              content="🎉 Tools for everything World of Tanks Blitz"
+            />
+          </>
+        )}
+        <meta property="og:site_name" content="BlitzKit" />
+        <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+
+        <Party3 />
       </head>
 
       <body
         style={{
           margin: 0,
-          paddingTop: isEmbed ? 0 : '3.25rem',
           backgroundColor: isEmbed ? 'transparent' : undefined,
         }}
       >
-        <Analytics />
-
         <Theme
-          appearance="dark"
+          appearance={darkMode ? 'dark' : 'light'}
-          panelBackground="translucent"
+          panelBackground="solid"
           radius="full"
           suppressHydrationWarning
           suppressContentEditableWarning
         >
-          {!isEmbed && <Navbar />}
+          <Flex
-          <AlertDialog.Root open={showDevBuildAlert}>
+            direction="column"
-            <AlertDialog.Content>
+            style={{ minHeight: '100vh', paddingTop: isEmbed ? undefined : 64 }}
-              <AlertDialog.Title>Experimental version!</AlertDialog.Title>
+          >
-              <AlertDialog.Description>
+            {!isEmbed && <Navbar />}
-                This version may have a lot of issues. Report issues to{' '}
+            <AlertDialog.Root open={showDevBuildAlert}>
-                <a href="https://discord.gg/nDt7AjGJQH" target="_blank">
+              <AlertDialog.Content>
-                  the official Discord server
+                <AlertDialog.Title>Experimental version!</AlertDialog.Title>
-                </a>
+                <AlertDialog.Description>
-                . Also consider using{' '}
+                  This version may have a lot of issues. Report issues to{' '}
-                <a href="https://blitz-krieg.vercel.app/">
+                  <a href="https://discord.gg/nDt7AjGJQH" target="_blank">
-                  the more stable release version
+                    the official Discord server
-                </a>
+                  </a>
-                . You will be asked again in 8 days.
+                  . Also consider using{' '}
-              </AlertDialog.Description>
+                  <a href="https://blitzkit.vercel.app/">
+                    the more stable release version
+                  </a>
+                  . You will be asked again in 8 days.
+                </AlertDialog.Description>
 
-              <Flex justify="end">
+                <Flex justify="end">
-                <Button
+                  <Button
-                  variant="solid"
+                    variant="solid"
-                  onClick={() => {
+                    onClick={() => {
-                    setShowDevBuildAlert(false);
+                      setShowDevBuildAlert(false);
-                    useApp.setState({ devBuildAgreementTime: Date.now() });
+                      useApp.setState({ devBuildAgreementTime: Date.now() });
-                  }}
-                >
-                  Continue
-                </Button>
-              </Flex>
-            </AlertDialog.Content>
-          </AlertDialog.Root>
-
-          <Flex direction="column">{children}</Flex>
-
-          {!isEmbed && (
-            <PageWrapper>
-              <a
-                target="_blank"
-                href="https://ko-fi.com/tresabhi"
-                style={{ textDecoration: 'none' }}
-              >
-                <Flex
-                  align="center"
-                  style={{
-                    padding: 16,
-                    borderRadius: 8,
-                    backgroundColor: mintTheme.colors.componentInteractive,
-                    position: 'relative',
-                    overflow: 'hidden',
-                  }}
-                >
-                  <Flex
-                    direction="column"
-                    gap="1"
-                    style={{
-                      flex: 1,
-                      zIndex: 1,
                     }}
                   >
-                    <Text size="4" color="mint">
+                    Continue
-                      Blitzkrieg. Free forever. For everyone.
+                  </Button>
-                    </Text>
-                    <Text color="mint">
-                      <b>Consider supporting today 🍀</b>
-                    </Text>
-                  </Flex>
-
-                  <Text
-                    color="mint"
-                    style={{
-                      zIndex: 1,
-                    }}
-                  >
-                    <Flex>
-                      <CaretRightIcon width={32} height={32} />
-                    </Flex>
-                  </Text>
-
-                  <SkyLine
-                    style={{
-                      position: 'absolute',
-                      right: 'min(8vw, 15%)',
-                      top: '5%',
-                    }}
-                  />
                 </Flex>
-              </a>
+              </AlertDialog.Content>
-            </PageWrapper>
+            </AlertDialog.Root>
-          )}
+
+            <Suspense
+              fallback={
+                <div style={{ flex: 1 }}>
+                  <Loader />
+                </div>
+              }
+            >
+              {children}
+            </Suspense>
+
+            {!isEmbed && !isFullScreen && <Footer />}
+          </Flex>
         </Theme>
       </body>
     </html>

src/app/page.css.ts

@@ -3,7 +3,7 @@ import { theme } from '../stitches.config';
 
 export const tool = styleVariants({
   enabled: {
-    boxShadow: `inset 0 -256px 512px -128px ${theme.colors.appBackground1}`,
+    boxShadow: `inset 0 -200px 128px -128px ${theme.colors.appBackground1}`,
 
     ':hover': {
       boxShadow: `inset 0 -160px 128px -128px ${theme.colors.appBackground1}`,

src/app/page.tsx

@@ -1,95 +1,91 @@
 'use client';
 
-import { CaretRightIcon, MagnifyingGlassIcon } from '@radix-ui/react-icons';
+import { CaretRightIcon } from '@radix-ui/react-icons';
-import { Flex, Text, TextField } from '@radix-ui/themes';
+import { Button, Flex, Link as LinkRadix } from '@radix-ui/themes';
 import Link from 'next/link';
-import { useRef } from 'react';
-import { Search, SearchItem } from 'react-fuzzysort';
 import PageWrapper from '../components/PageWrapper';
 import { TOOLS } from '../constants/tools';
+import { PatreonIcon } from '../icons/Patreon';
 import { theme } from '../stitches.config';
 import * as styles from './page.css';
 
 export default function Page() {
-  const input = useRef<HTMLInputElement>(null);
-
   return (
     <PageWrapper>
-      <TextField.Root>
+      <Flex
-        <TextField.Slot>
+        direction="column"
-          <MagnifyingGlassIcon height="16" width="16" />
+        gap="5"
-        </TextField.Slot>
+        justify="center"
-        <TextField.Input ref={input} placeholder="Search tools..." />
+        align="center"
-      </TextField.Root>
+        style={{ flex: 1 }}
+      >
+        <LinkRadix href="https://www.patreon.com/tresabhi" target="_blank">
+          <Button
+            color="ruby"
+            style={{
+              boxShadow: `0 0 8px ${theme.colors.solidBackground_ruby}f0`,
+            }}
+          >
+            <PatreonIcon style={{ width: '1em', height: '1em' }} /> Consider
+            donating on Patreon
+          </Button>
+        </LinkRadix>
 
-      <Flex gap="3" wrap="wrap" align="center" justify="center">
+        <Flex gap="3" wrap="wrap" align="center" justify="center">
-        <Search
+          {TOOLS.map((tool) => (
-          input={input}
+            <Link
-          list={TOOLS.map(
+              href={tool.href ?? `/tools/${tool.id}`}
-            (tool) =>
+              target={tool.href ? '_blank' : undefined}
-              ({
+              className={
-                node: (
+                tool.disabled ? styles.tool.disabled : styles.tool.enabled
-                  <Link
+              }
-                    href={tool.href ?? `/tools/${tool.id}`}
+              style={{
-                    target={tool.href ? '_blank' : undefined}
+                backgroundImage: `url(/assets/banners/${tool.id}.webp)`,
-                    className={
+                cursor: tool.disabled ? 'default' : 'pointer',
-                      tool.disabled ? styles.tool.disabled : styles.tool.enabled
+                opacity: tool.disabled ? 0.25 : 1,
-                    }
+                height: 128,
-                    style={{
+                minWidth: 256,
-                      backgroundImage: `url(/assets/banners/${tool.id}.webp)`,
+                flex: 1,
-                      cursor: tool.disabled ? 'default' : 'pointer',
+                borderRadius: 8,
-                      opacity: tool.disabled ? 0.25 : 1,
+                textDecoration: 'none',
-                      height: 128,
+                backgroundSize: 'cover',
-                      minWidth: 256,
+                backgroundPosition: 'center',
-                      flex: 1,
+                overflow: 'hidden',
-                      borderRadius: 8,
+                display: 'flex',
-                      textDecoration: 'none',
+                flexDirection: 'column',
-                      backgroundSize: 'cover',
+                alignItems: 'flex-start',
-                      backgroundPosition: 'center',
+                justifyContent: 'flex-end',
-                      overflow: 'hidden',
+                padding: 16,
-                      display: 'flex',
+                transition: `box-shadow ${theme.durations.regular}`,
-                      flexDirection: 'column',
+              }}
-                      alignItems: 'flex-start',
+              onClick={(event) => {
-                      justifyContent: 'flex-end',
+                if (tool.disabled) event.preventDefault();
-                      padding: 16,
+              }}
-                      gap: 4,
+            >
-                      transition: `box-shadow ${theme.durations.regular}`,
+              <span
-                    }}
+                style={{
-                    onClick={(event) => {
+                  fontSize: 32,
-                      if (tool.disabled) event.preventDefault();
+                  color: theme.colors.textHighContrast,
-                    }}
+                  display: 'flex',
-                  >
+                  alignItems: 'center',
-                    <span
+                  justifyContent: 'center',
-                      style={{
+                }}
-                        fontSize: 32,
+              >
-                        color: theme.colors.textHighContrast,
+                {tool.title}
-                        display: 'flex',
+                <CaretRightIcon style={{ width: '1em', height: '1em' }} />
-                        alignItems: 'center',
+              </span>
-                        justifyContent: 'center',
+              <span
-                      }}
+                style={{
-                    >
+                  color: theme.colors.textLowContrast,
-                      {tool.title}
+                  fontSize: 16,
-                      <CaretRightIcon style={{ width: '1em', height: '1em' }} />
+                }}
-                    </span>
+              >
-                    <span
+                {tool.disabled ? 'Coming soon!' : tool.description}
-                      style={{
+              </span>
-                        color: theme.colors.textLowContrast,
+            </Link>
-                        fontSize: 16,
+          ))}
-                      }}
+        </Flex>
-                    >
-                      {tool.disabled ? 'Coming soon!' : tool.description}
-                    </span>
-                  </Link>
-                ),
-                query: `${tool.title} ${tool.description}`,
-              }) satisfies SearchItem,
-          )}
-        />
       </Flex>
-
-      <Text size="1" color="gray" align="center">
-        Images courtesy of Wargaming Art Department
-      </Text>
     </PageWrapper>
   );
 }

src/app/settings/page.tsx

@@ -0,0 +1,44 @@
+'use client';
+
+import { Flex, Heading, Switch, Text } from '@radix-ui/themes';
+import PageWrapper from '../../components/PageWrapper';
+import { useApp } from '../../stores/app';
+
+export default function Page() {
+  const developerMode = useApp((state) => state.developerMode);
+  const darkMode = useApp((state) => state.darkMode);
+
+  return (
+    <PageWrapper justify="center" align="center">
+      <Flex direction="column" gap="4">
+        <Flex gap="3" direction="column">
+          <Heading size="5">Appearance</Heading>
+
+          <Flex align="center" gap="2">
+            <Text>Dark mode (experimental)</Text>
+            <Switch
+              checked={darkMode}
+              onCheckedChange={(checked) =>
+                useApp.setState({ darkMode: checked })
+              }
+            />
+          </Flex>
+        </Flex>
+
+        <Flex gap="3" direction="column">
+          <Heading size="5">Advanced</Heading>
+
+          <Flex align="center" gap="2">
+            <Text>Developer mode</Text>
+            <Switch
+              checked={developerMode}
+              onCheckedChange={(checked) =>
+                useApp.setState({ developerMode: checked })
+              }
+            />
+          </Flex>
+        </Flex>
+      </Flex>
+    </PageWrapper>
+  );
+}

src/app/tools/compare/components/TankControl.tsx

@@ -0,0 +1,76 @@
+import { ExternalLinkIcon, LoopIcon, TrashIcon } from '@radix-ui/react-icons';
+import { Dialog, Flex, IconButton } from '@radix-ui/themes';
+import Link from 'next/link';
+import { use, useState } from 'react';
+import { provisionDefinitions } from '../../../../core/blitzkit/provisionDefinitions';
+import { tankToCompareMember } from '../../../../core/blitzkit/tankToCompareMember';
+import { mutateCompareTemporary } from '../../../../stores/compare';
+import { TankSearch } from '../../tankopedia/components/TankSearch';
+
+interface TankControlProps {
+  index: number;
+  id: number;
+}
+
+export function TankControl({ index, id }: TankControlProps) {
+  const awaitedProvisionDefinitions = use(provisionDefinitions);
+  const [switchTankDialogOpen, setSwitchTankDialogOpen] = useState(false);
+
+  return (
+    <Flex gap="3" justify="center" style={{ width: '100%' }}>
+      <IconButton
+        variant="ghost"
+        onClick={() => {
+          mutateCompareTemporary((draft) => {
+            draft.members.splice(index, 1);
+            draft.sorting = undefined;
+          });
+        }}
+      >
+        <TrashIcon />
+      </IconButton>
+
+      <Dialog.Root
+        open={switchTankDialogOpen}
+        onOpenChange={setSwitchTankDialogOpen}
+      >
+        <Dialog.Trigger>
+          <IconButton variant="ghost">
+            <LoopIcon />
+          </IconButton>
+        </Dialog.Trigger>
+
+        <Dialog.Content>
+          <Flex gap="4" direction="column">
+            <Flex
+              direction="column"
+              gap="4"
+              style={{ flex: 1 }}
+              justify="center"
+            >
+              <TankSearch
+                compact
+                onSelect={(tank) => {
+                  mutateCompareTemporary((draft) => {
+                    draft.members[index] = tankToCompareMember(
+                      tank,
+                      awaitedProvisionDefinitions,
+                    );
+                    draft.sorting = undefined;
+                  });
+                  setSwitchTankDialogOpen(false);
+                }}
+              />
+            </Flex>
+          </Flex>
+        </Dialog.Content>
+      </Dialog.Root>
+
+      <Link href={`/tools/tankopedia/${id}`}>
+        <IconButton variant="ghost">
+          <ExternalLinkIcon />
+        </IconButton>
+      </Link>
+    </Flex>
+  );
+}

src/app/tools/components/Loader.tsx

@@ -1,52 +0,0 @@
-import { blackA } from '@radix-ui/colors';
-import { Flex, Text } from '@radix-ui/themes';
-import { PuffLoader } from 'react-spinners';
-import { theme } from '../../../stitches.config';
-
-const NAV_HEIGHT = 52.65;
-
-interface LoaderProps {
-  naked?: boolean;
-  color?: string;
-  progress?: number;
-}
-
-export function Loader({ naked, color, progress }: LoaderProps) {
-  const animation = (
-    <div style={{ position: 'relative' }}>
-      {progress !== undefined && (
-        <Text
-          style={{
-            position: 'absolute',
-            left: '50%',
-            top: '50%',
-            transform: 'translate(calc(-50% + 5px), calc(-50% + 5px))',
-          }}
-        >
-          {Math.round(progress * 100)}%
-        </Text>
-      )}
-      <PuffLoader color={color ?? theme.colors.solidBackground} />
-    </div>
-  );
-
-  if (naked) return animation;
-
-  return (
-    <Flex
-      style={{
-        backgroundColor: blackA.blackA10,
-        position: 'fixed',
-        top: NAV_HEIGHT,
-        left: 0,
-        width: '100%',
-        height: `calc(100% - ${NAV_HEIGHT}px)`,
-        padding: theme.spaces.paddingMajor,
-      }}
-      align="center"
-      justify="center"
-    >
-      {animation}
-    </Flex>
-  );
-}

src/app/tools/layout.tsx

@@ -2,10 +2,9 @@
 
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
-import { ReactNode, Suspense } from 'react';
+import { ReactNode } from 'react';
 import { TOOLS } from '../../constants/tools';
 import { theme } from '../../stitches.config';
-import { Loader } from './components/Loader';
 
 interface ToolsLayoutProps {
   children: ReactNode;
@@ -15,11 +14,34 @@ export default function ToolsLayout({ children }: ToolsLayoutProps) {
   const pathname = usePathname();
   const pathSplit = pathname.split('/');
   const toolId = pathSplit.at(2);
+  const isToolRoot = pathname === `/tools/${toolId}`;
   const tool = TOOLS.find((tool) => tool.id === toolId);
 
   return (
     <>
-      {tool && <title>{tool.title}</title>}
+      {tool && (
+        <>
+          {isToolRoot && (
+            <>
+              <title>{tool.title}</title>
+              <meta
+                property="og:image"
+                content={`/assets/banners/${toolId}.webp`}
+              />
+
+              {tool.pageDescription !== undefined && (
+                <>
+                  <meta name="description" content={tool.pageDescription} />
+                  <meta
+                    property="og:description"
+                    content={tool.pageDescription}
+                  />
+                </>
+              )}
+            </>
+          )}
+        </>
+      )}
 
       {pathSplit.length === 3 && (
         <div
@@ -73,7 +95,7 @@ export default function ToolsLayout({ children }: ToolsLayoutProps) {
         </div>
       )}
 
-      <Suspense fallback={<Loader />}>{children}</Suspense>
+      {children}
     </>
   );
 }

src/app/tools/rating/components/PageTurner/index.tsx

@@ -53,29 +53,26 @@ export function PageTurner({
             <CaretLeftIcon />
           )}
         </Button>
-        <TextField.Root>
+
+        <TextField.Root
+          type="number"
+          ref={pageInput}
+          style={{ textAlign: 'center' }}
+          min={1}
+          max={pages}
+          onBlur={(event) => {
+            onPageChange(
+              Math.max(0, Math.min(pages - 1, event.target.valueAsNumber - 1)),
+              false,
+            );
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              (event.target as HTMLInputElement).blur();
+            }
+          }}
+        >
           <TextField.Slot>Page</TextField.Slot>
-          <TextField.Input
-            type="number"
-            ref={pageInput}
-            style={{ width: 64, textAlign: 'center' }}
-            min={1}
-            max={pages}
-            onBlur={(event) => {
-              onPageChange(
-                Math.max(
-                  0,
-                  Math.min(pages - 1, event.target.valueAsNumber - 1),
-                ),
-                false,
-              );
-            }}
-            onKeyDown={(event) => {
-              if (event.key === 'Enter') {
-                (event.target as HTMLInputElement).blur();
-              }
-            }}
-          />
           <TextField.Slot>out of {pages}</TextField.Slot>
         </TextField.Root>
         <Button

src/app/tools/rating/page.tsx

@@ -15,30 +15,29 @@ import { produce } from 'immer';
 import { debounce, range } from 'lodash';
 import { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { create } from 'zustand';
-import { RatingsInfo, RatingsPlayer } from '../../../commands/ratings';
+import { RatingInfo, RatingPlayer } from '../../../commands/ratingLeaderboard';
 import PageWrapper from '../../../components/PageWrapper';
 import { Skeleton } from '../../../components/Skeleton';
 import { LEAGUES } from '../../../constants/leagues';
-import { FIRST_ARCHIVED_RATINGS_SEASON } from '../../../constants/ratings';
+import { FIRST_MINIMAL_ARCHIVED_RATING_SEASON } from '../../../constants/rating';
 import {
   REGIONS,
   Region,
   UNLOCALIZED_REGION_NAMES,
 } from '../../../constants/regions';
-import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
 import fetchBlitz from '../../../core/blitz/fetchBlitz';
 import { getClanAccountInfo } from '../../../core/blitz/getClanAccountInfo';
-import getRatingsInfo from '../../../core/blitz/getRatingsInfo';
+import getRatingInfo from '../../../core/blitz/getRatingInfo';
-import { getRatingsLeague } from '../../../core/blitz/getRatingsLeague';
+import { getRatingLeague } from '../../../core/blitz/getRatingLeague';
-import { getRatingsNeighbors } from '../../../core/blitz/getRatingsNeighbors';
+import { getRatingNeighbors } from '../../../core/blitz/getRatingNeighbors';
-import { searchCurrentRatingsPlayers } from '../../../core/blitz/searchCurrentRatingsPlayers';
+import { searchCurrentRatingPlayers } from '../../../core/blitz/searchCurrentRatingPlayers';
 import {
   AccountList,
   AccountListItem,
 } from '../../../core/blitz/searchPlayersAcrossRegions';
-import { getArchivedLatestSeasonNumber } from '../../../core/blitzkrieg/getArchivedLatestSeasonNumber';
+import { getArchivedLatestSeasonNumber } from '../../../core/blitzkit/getArchivedLatestSeasonNumber';
-import getArchivedRatingsInfo from '../../../core/blitzkrieg/getArchivedRatingsInfo';
+import getArchivedRatingInfo from '../../../core/blitzkit/getArchivedRatingInfo';
-import { getArchivedRatingsLeaderboard } from '../../../core/blitzkrieg/getArchivedRatingsLeaderboard';
+import { getArchivedRatingLeaderboard } from '../../../core/blitzkit/getArchivedRatingLeaderboard';
 import { theme } from '../../../stitches.config';
 import { PageTurner } from './components/PageTurner';
 
@@ -51,7 +50,7 @@ interface NameCacheEntry {
 }
 type NameCache = Record<Region, Record<number, NameCacheEntry | null>>;
 type LeaderboardCache = Record<Region, Record<number, Record<number, number>>>;
-type InfoCache = Record<Region, Record<number, RatingsInfo | undefined>>;
+type InfoCache = Record<Region, Record<number, RatingInfo | undefined>>;
 type ScoreCache = Record<Region, Record<number, Record<number, number>>>;
 
 const useNameCache = create<NameCache>(() => ({
@@ -93,7 +92,7 @@ export default function Page() {
     { type: 'id'; id: number } | { type: 'position'; position: number } | null
   >(null);
 
-  const ratingsInfo = useInfoCache()[region][season];
+  const ratingInfo = useInfoCache()[region][season];
   const [latestArchivedSeasonNumber, setLatestArchivedSeasonNumber] = useState<
     number | null
   >(null);
@@ -111,7 +110,7 @@ export default function Page() {
   });
 
   const pages = Math.ceil(
-    (ratingsInfo && ratingsInfo.detail === undefined ? ratingsInfo?.count : 1) /
+    (ratingInfo && ratingInfo.detail === undefined ? ratingInfo?.count : 1) /
       ROWS_PER_PAGE,
   );
 
@@ -122,8 +121,8 @@ export default function Page() {
     (async () => {
       const newInfo =
         season === 0
-          ? await getRatingsInfo(region)
+          ? await getRatingInfo(region)
-          : await getArchivedRatingsInfo(region, season);
+          : await getArchivedRatingInfo(region, season);
       useInfoCache.setState(
         produce((draft: InfoCache) => {
           draft[region][season] = newInfo;
@@ -140,7 +139,7 @@ export default function Page() {
         const results = (
           await Promise.all(
             range(0, 5).map(async (league: number) => {
-              const data = await getRatingsLeague(region, league);
+              const data = await getRatingLeague(region, league);
               leaguePositionCache.current[region][league] = data[0].number - 1;
 
               return data;
@@ -178,12 +177,12 @@ export default function Page() {
         );
       })();
     } else {
-      getArchivedRatingsLeaderboard(region, season).then((results) => {
+      getArchivedRatingLeaderboard(region, season).then((results) => {
         useLeaderboardCache.setState(
           produce((draft: LeaderboardCache) => {
             if (!(season in draft[region])) draft[region][season] = {};
 
-            results.forEach((result, index) => {
+            results.entries.forEach((result, index) => {
               draft[region][season][index] = result.id;
             });
           }),
@@ -192,7 +191,7 @@ export default function Page() {
           produce((draft: ScoreCache) => {
             if (!(season in draft[region])) draft[region][season] = {};
 
-            results.forEach((result) => {
+            results.entries.forEach((result) => {
               draft[region][season][result.id] = result.score;
             });
           }),
@@ -213,7 +212,7 @@ export default function Page() {
   }, [leaderboard[region]?.[season] && 0 in leaderboard[region][season]]);
   // neighboring page caching for all seasons
   useEffect(() => {
-    if (!ratingsInfo || ratingsInfo?.detail) return;
+    if (!ratingInfo || ratingInfo?.detail) return;
 
     if (season === 0) {
       const middleIndex = page * ROWS_PER_PAGE + ROWS_PER_PAGE / 2;
@@ -236,7 +235,7 @@ export default function Page() {
       const ids = range(
         Math.max(0, (page - 1) * ROWS_PER_PAGE),
         Math.min(
-          ratingsInfo.count - 1,
+          ratingInfo.count - 1,
           (page + 1) * ROWS_PER_PAGE + ROWS_PER_PAGE,
         ),
       )
@@ -265,7 +264,7 @@ export default function Page() {
     page,
     region,
     season,
-    ratingsInfo?.detail,
+    ratingInfo?.detail,
     leaderboard[region][season] !== undefined &&
       0 in leaderboard[region][season],
   ]);
@@ -279,7 +278,7 @@ export default function Page() {
   async function cacheNeighbors(
     id: number,
     size: number,
-  ): Promise<RatingsPlayer[] | null> {
+  ): Promise<RatingPlayer[] | null> {
     const radius = Math.round(size / 2);
     const targetPosition = Object.entries(leaderboard[region][season]).find(
       ([, player]) => id === player,
@@ -303,7 +302,7 @@ export default function Page() {
       }
     }
 
-    const { neighbors } = await getRatingsNeighbors(region, id, size, true);
+    const { neighbors } = await getRatingNeighbors(region, id, size, true);
 
     useLeaderboardCache.setState(
       produce((draft: LeaderboardCache) => {
@@ -341,11 +340,11 @@ export default function Page() {
     return neighbors;
   }
   async function jumpToPosition(position: number) {
-    if (!ratingsInfo || ratingsInfo?.detail) return;
+    if (!ratingInfo || ratingInfo?.detail) return;
 
     const targetPosition = Math.min(
-      ratingsInfo.count - 1,
+      ratingInfo.count - 1,
-      Math.max(0, Math.min(position, ratingsInfo.count - 1)),
+      Math.max(0, Math.min(position, ratingInfo.count - 1)),
     );
 
     if (season === 0) {
@@ -378,7 +377,7 @@ export default function Page() {
       const loadingDirection = Math.sign(targetPosition - closestPosition);
       let seedingPlayer = closestPlayerId as number;
       let targetPositionAcquired = false;
-      let neighbors: RatingsPlayer[] | null;
+      let neighbors: RatingPlayer[] | null;
 
       setLoadingProgress([0, closestPositionDistance]);
 
@@ -423,7 +422,7 @@ export default function Page() {
     }
   }
   async function jumpToScore() {
-    if (!ratingsInfo || ratingsInfo?.detail) return;
+    if (!ratingInfo || ratingInfo?.detail) return;
 
     const targetScore = scoreInput.current!.valueAsNumber;
 
@@ -522,7 +521,7 @@ export default function Page() {
     } else {
       let playerIndex = -1;
 
-      for (let index = ratingsInfo.count; index >= 0; index--) {
+      for (let index = ratingInfo.count; index >= 0; index--) {
         if (!(index in leaderboard[region][season])) continue;
 
         if (scores[leaderboard[region][season][index]] >= targetScore) {
@@ -545,7 +544,7 @@ export default function Page() {
   }
 
   const totalPlayers =
-    !ratingsInfo?.detail && ratingsInfo?.count ? ratingsInfo.count : undefined;
+    !ratingInfo?.detail && ratingInfo?.count ? ratingInfo.count : undefined;
 
   return (
     <PageWrapper color="orange">
@@ -573,7 +572,7 @@ export default function Page() {
             <Select.Trigger style={{ flex: 1 }} />
 
             <Select.Content>
-              {ratingsInfo?.detail === undefined && (
+              {ratingInfo?.detail === undefined && (
                 <Select.Item value="0">Current season</Select.Item>
               )}
 
@@ -582,7 +581,7 @@ export default function Page() {
 
                 {latestArchivedSeasonNumber &&
                   range(
-                    FIRST_ARCHIVED_RATINGS_SEASON,
+                    FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
                     latestArchivedSeasonNumber + 1,
                   )
                     .map((season) => (
@@ -605,7 +604,7 @@ export default function Page() {
 
             <Dialog.Content>
               <Flex gap="4" justify="center">
-                <TextField.Input
+                <TextField.Root
                   ref={scoreInput}
                   type="number"
                   placeholder="Type a score..."
@@ -638,7 +637,7 @@ export default function Page() {
 
             <Dialog.Content>
               <Flex gap="4" justify="center">
-                <TextField.Input
+                <TextField.Root
                   ref={positionInput}
                   type="number"
                   placeholder="Type a position..."
@@ -681,8 +680,8 @@ export default function Page() {
                   <Select.Trigger />
 
                   <Select.Content>
-                    {ratingsInfo?.detail === undefined &&
+                    {ratingInfo?.detail === undefined &&
-                      ratingsInfo?.leagues.map(({ index, title }) => (
+                      ratingInfo?.leagues.map(({ index, title }) => (
                         <Select.Item key={index} value={`${index}`}>
                           {title}
                         </Select.Item>
@@ -714,11 +713,7 @@ export default function Page() {
                             );
                           }
                         } else {
-                          if (
+                          if (!ratingInfo || ratingInfo.detail || !leaderboard)
-                            !ratingsInfo ||
-                            ratingsInfo.detail ||
-                            !leaderboard
-                          )
                             return;
 
                           const minScore =
@@ -727,7 +722,7 @@ export default function Page() {
 
                           for (
                             let index = 0;
-                            index < ratingsInfo.count;
+                            index < ratingInfo.count;
                             index++
                           ) {
                             if (
@@ -763,105 +758,102 @@ export default function Page() {
 
             <Dialog.Content>
               <Flex gap="4" direction="column">
-                <TextField.Root>
+                <TextField.Root
+                  onChange={debounce(
+                    async (event: ChangeEvent<HTMLInputElement>) => {
+                      const trimmedSearch = event.target.value.trim();
+                      const encodedSearch = encodeURIComponent(trimmedSearch);
+
+                      if (trimmedSearch) {
+                        if (season === 0) {
+                          setSearchLoading(true);
+
+                          const accountList = await searchCurrentRatingPlayers(
+                            region,
+                            trimmedSearch,
+                          );
+                          const values = Object.values(accountList).filter(
+                            (searchedPlayer) => !searchedPlayer.skip,
+                          );
+                          const valuesWithTypes =
+                            values as ((typeof values)[number] & {
+                              skip: false;
+                            })[];
+
+                          useLeaderboardCache.setState(
+                            produce((draft: LeaderboardCache) => {
+                              if (draft) {
+                                values.forEach((player) => {
+                                  const playerWithTypes =
+                                    player as typeof player & { skip: false };
+
+                                  draft[region][season][
+                                    playerWithTypes.number - 1
+                                  ] = playerWithTypes.spa_id;
+                                });
+                              }
+                            }),
+                          );
+                          useNameCache.setState(
+                            produce((draft: typeof names) => {
+                              valuesWithTypes.forEach((searchedPlayer) => {
+                                if (searchedPlayer.nickname) {
+                                  draft[region][searchedPlayer.spa_id] = {
+                                    nickname: searchedPlayer.nickname,
+                                    clan: searchedPlayer.clan_tag,
+                                  };
+                                }
+                              });
+                            }),
+                          );
+                          setSearchResults(
+                            valuesWithTypes.map((searchedPlayer) => ({
+                              account_id: searchedPlayer.spa_id,
+                              nickname: searchedPlayer.nickname,
+                              number: searchedPlayer.number,
+                            })),
+                          );
+                          setSearchLoading(false);
+                        } else {
+                          setSearchLoading(true);
+                          const accountList = await fetchBlitz<AccountList>(
+                            region,
+                            'account/list',
+                            { search: encodedSearch },
+                          );
+                          const playerKeys = Object.keys(
+                            leaderboard[region][season],
+                          );
+
+                          setSearchResults(
+                            accountList
+                              .map((searchedPlayer) => ({
+                                ...searchedPlayer,
+                                number: parseInt(
+                                  playerKeys.find(
+                                    (indexAsString) =>
+                                      leaderboard[region][season][
+                                        parseInt(indexAsString)
+                                      ] === searchedPlayer.account_id,
+                                  )!,
+                                ),
+                              }))
+                              .filter((player) => !Number.isNaN(player.number)),
+                          );
+
+                          setSearchLoading(false);
+                        }
+                      } else {
+                        setSearchResults(undefined);
+                      }
+                    },
+                    500,
+                  )}
+                  placeholder="Search for player..."
+                >
                   <TextField.Slot>
                     <MagnifyingGlassIcon height="16" width="16" />
                   </TextField.Slot>
-
-                  <TextField.Input
-                    onChange={debounce(
-                      async (event: ChangeEvent<HTMLInputElement>) => {
-                        const trimmedSearch = event.target.value.trim();
-                        const encodedSearch = encodeURIComponent(trimmedSearch);
-
-                        if (trimmedSearch) {
-                          if (season === 0) {
-                            setSearchLoading(true);
-
-                            const accountList =
-                              await searchCurrentRatingsPlayers(
-                                region,
-                                trimmedSearch,
-                              );
-                            const values = Object.values(accountList).filter(
-                              (searchedPlayer) => !searchedPlayer.skip,
-                            );
-                            const valuesWithTypes =
-                              values as ((typeof values)[number] & {
-                                skip: false;
-                              })[];
-
-                            useLeaderboardCache.setState(
-                              produce((draft: LeaderboardCache) => {
-                                if (draft) {
-                                  values.forEach((player) => {
-                                    const playerWithTypes =
-                                      player as typeof player & { skip: false };
-
-                                    draft[region][season][
-                                      playerWithTypes.number - 1
-                                    ] = playerWithTypes.spa_id;
-                                  });
-                                }
-                              }),
-                            );
-                            useNameCache.setState(
-                              produce((draft: typeof names) => {
-                                valuesWithTypes.forEach((searchedPlayer) => {
-                                  if (searchedPlayer.nickname) {
-                                    draft[region][searchedPlayer.spa_id] = {
-                                      nickname: searchedPlayer.nickname,
-                                      clan: searchedPlayer.clan_tag,
-                                    };
-                                  }
-                                });
-                              }),
-                            );
-                            setSearchResults(
-                              valuesWithTypes.map((searchedPlayer) => ({
-                                account_id: searchedPlayer.spa_id,
-                                nickname: searchedPlayer.nickname,
-                                number: searchedPlayer.number,
-                              })),
-                            );
-                            setSearchLoading(false);
-                          } else {
-                            setSearchLoading(true);
-                            const accountList = await fetchBlitz<AccountList>(
-                              `https://api.wotblitz.${region}/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodedSearch}`,
-                            );
-                            const playerKeys = Object.keys(
-                              leaderboard[region][season],
-                            );
-
-                            setSearchResults(
-                              accountList
-                                .map((searchedPlayer) => ({
-                                  ...searchedPlayer,
-                                  number: parseInt(
-                                    playerKeys.find(
-                                      (indexAsString) =>
-                                        leaderboard[region][season][
-                                          parseInt(indexAsString)
-                                        ] === searchedPlayer.account_id,
-                                    )!,
-                                  ),
-                                }))
-                                .filter(
-                                  (player) => !Number.isNaN(player.number),
-                                ),
-                            );
-
-                            setSearchLoading(false);
-                          }
-                        } else {
-                          setSearchResults(undefined);
-                        }
-                      },
-                      500,
-                    )}
-                    placeholder="Search for player..."
-                  />
                 </TextField.Root>
 
                 <Flex direction="column" gap="2">
@@ -885,12 +877,12 @@ export default function Page() {
                                 id: player.account_id,
                               });
                             } else {
-                              if (!ratingsInfo || ratingsInfo.detail) return;
+                              if (!ratingInfo || ratingInfo.detail) return;
                               let playerIndex = -1;
 
                               for (
                                 let index = 0;
-                                index < ratingsInfo.count;
+                                index < ratingInfo.count;
                                 index++
                               ) {
                                 if (
@@ -951,9 +943,7 @@ export default function Page() {
       </Flex>
 
       <PageTurner
-        totalPlayers={
+        totalPlayers={(ratingInfo?.detail ? undefined : ratingInfo?.count) ?? 0}
-          (ratingsInfo?.detail ? undefined : ratingsInfo?.count) ?? 0
-        }
         leaderboard={leaderboard[region][season] ?? {}}
         rowsPerPage={ROWS_PER_PAGE}
         page={page}
@@ -982,7 +972,7 @@ export default function Page() {
           page * ROWS_PER_PAGE,
           Math.min(
             page * ROWS_PER_PAGE + ROWS_PER_PAGE,
-            ratingsInfo?.detail ? 0 : (ratingsInfo?.count ?? 1) - 1,
+            ratingInfo?.detail ? 0 : (ratingInfo?.count ?? 1) - 1,
           ),
         ).map((index) => {
           const id = leaderboard[region][season]?.[index];
@@ -994,8 +984,8 @@ export default function Page() {
               : highlightedPlayer.position === index
             : false;
           const reward =
-            !ratingsInfo?.detail && ratingsInfo?.rewards
+            !ratingInfo?.detail && ratingInfo?.rewards
-              ? ratingsInfo.rewards.find(
+              ? ratingInfo.rewards.find(
                   (reward) =>
                     reward.from_position <= position &&
                     reward.to_position >= position,
@@ -1090,9 +1080,7 @@ export default function Page() {
       </Table.Root>
 
       <PageTurner
-        totalPlayers={
+        totalPlayers={(ratingInfo?.detail ? undefined : ratingInfo?.count) ?? 0}
-          (ratingsInfo?.detail ? undefined : ratingsInfo?.count) ?? 0
-        }
         rowsPerPage={ROWS_PER_PAGE}
         leaderboard={leaderboard[region][season] ?? {}}
         page={page}

src/app/tools/session/components/CustomColumn.tsx

@@ -1,61 +0,0 @@
-import { ContextMenu, DropdownMenu } from '@radix-ui/themes';
-import mutateSession, { useSession } from '../../../../stores/session';
-
-export type CustomColumnDisplay =
-  | 'battles'
-  | 'winrate'
-  | 'wn8'
-  | 'damage'
-  | 'none';
-
-const NO_DELTA: CustomColumnDisplay[] = ['battles', 'wn8', 'none'];
-
-interface CustomColumn {
-  Builder: typeof DropdownMenu | typeof ContextMenu;
-  column: number;
-}
-
-export function CustomColumn({ column, Builder }: CustomColumn) {
-  const customColumn = useSession((state) => state.customColumns[column]);
-
-  return (
-    <Builder.Sub>
-      <Builder.SubTrigger>Column {column + 1}</Builder.SubTrigger>
-
-      <Builder.SubContent>
-        <Builder.RadioGroup
-          value={customColumn.display}
-          onValueChange={(event) =>
-            mutateSession((draft) => {
-              draft.customColumns[column].display =
-                event as CustomColumnDisplay;
-            })
-          }
-        >
-          <Builder.RadioItem value="battles">Battles</Builder.RadioItem>
-          <Builder.RadioItem value="winrate">Winrate</Builder.RadioItem>
-          <Builder.RadioItem value="wn8">WN8</Builder.RadioItem>
-          <Builder.RadioItem value="damage">Damage</Builder.RadioItem>
-          <Builder.RadioItem value="none">None</Builder.RadioItem>
-        </Builder.RadioGroup>
-
-        {!NO_DELTA.includes(customColumn.display) && (
-          <>
-            <Builder.Separator />
-
-            <Builder.CheckboxItem
-              checked={customColumn.showDelta}
-              onCheckedChange={(checked) =>
-                mutateSession((draft) => {
-                  draft.customColumns[column].showDelta = checked;
-                })
-              }
-            >
-              Show delta
-            </Builder.CheckboxItem>
-          </>
-        )}
-      </Builder.SubContent>
-    </Builder.Sub>
-  );
-}

src/app/tools/session/components/Menu.tsx

@@ -1,136 +0,0 @@
-import {
-  Button,
-  ContextMenu,
-  Dialog,
-  DropdownMenu,
-  Flex,
-  Heading,
-  TextField,
-} from '@radix-ui/themes';
-import { createColors } from 'bepaint';
-import { useRef, useState } from 'react';
-import {
-  ACCENT_COLORS,
-  AccentColor,
-  GRAY_COLORS,
-  GrayColor,
-  PALETTES,
-} from '../../../../constants/radixColors';
-import { useSession } from '../../../../stores/session';
-import { CustomColumn } from './CustomColumn';
-
-interface ContextMenuProps {
-  Builder: typeof DropdownMenu | typeof ContextMenu;
-  reset: () => void;
-}
-
-export function Menu({ Builder, reset }: ContextMenuProps) {
-  const session = useSession();
-  const [showTitleEditor, setShowTitleEditor] = useState(false);
-  const titleInput = useRef<HTMLInputElement>(null);
-
-  return (
-    <>
-      <Dialog.Root open={showTitleEditor} onOpenChange={setShowTitleEditor}>
-        <Dialog.Content>
-          <Flex direction="column" gap="4">
-            <Heading size="4">Edit title</Heading>
-
-            <Flex gap="2" style={{ width: '100%' }}>
-              <TextField.Root style={{ flex: 1 }}>
-                <TextField.Input
-                  ref={titleInput}
-                  defaultValue={session.title}
-                  placeholder="Enter title..."
-                  onKeyDown={(event) => {
-                    if (event.key === 'Enter' && titleInput.current) {
-                      setShowTitleEditor(false);
-                      useSession.setState({ title: titleInput.current!.value });
-                    }
-                  }}
-                />
-              </TextField.Root>
-
-              <Dialog.Close>
-                <Button
-                  onClick={() =>
-                    useSession.setState({ title: titleInput.current!.value })
-                  }
-                >
-                  Set
-                </Button>
-              </Dialog.Close>
-            </Flex>
-          </Flex>
-        </Dialog.Content>
-      </Dialog.Root>
-
-      <Builder.Content>
-        <Builder.Sub>
-          <Builder.SubTrigger>Accent color</Builder.SubTrigger>
-
-          <Builder.SubContent>
-            <Builder.RadioGroup
-              value={session.color}
-              onValueChange={(value) =>
-                useSession.setState({ color: value as AccentColor | GrayColor })
-              }
-            >
-              {[...ACCENT_COLORS, ...GRAY_COLORS].map((color) => (
-                <Builder.RadioItem value={color} key={color}>
-                  <Flex gap="2" align="center">
-                    <div
-                      style={{
-                        backgroundColor: createColors(PALETTES[color])
-                          .solidBackground,
-                        width: 16,
-                        height: 16,
-                        borderRadius: '100%',
-                      }}
-                    />
-                    {`${color.charAt(0).toUpperCase()}${color.slice(1)}`}
-                  </Flex>
-                </Builder.RadioItem>
-              ))}
-            </Builder.RadioGroup>
-          </Builder.SubContent>
-        </Builder.Sub>
-
-        <Builder.Separator />
-
-        <Builder.Item onClick={() => setShowTitleEditor(true)}>
-          Edit title...
-        </Builder.Item>
-        <CustomColumn Builder={Builder} column={0} />
-        <CustomColumn Builder={Builder} column={1} />
-        <CustomColumn Builder={Builder} column={2} />
-        <CustomColumn Builder={Builder} column={3} />
-
-        <Builder.Separator />
-
-        <Builder.CheckboxItem
-          checked={session.showTotal}
-          onCheckedChange={(checked) =>
-            useSession.setState({ showTotal: checked })
-          }
-        >
-          Show total
-        </Builder.CheckboxItem>
-        <Builder.CheckboxItem
-          checked={session.showCareer}
-          onCheckedChange={(checked) =>
-            useSession.setState({ showCareer: checked })
-          }
-        >
-          Show career
-        </Builder.CheckboxItem>
-
-        <Builder.Separator />
-
-        <Builder.Item color="red" onClick={reset}>
-          Reset
-        </Builder.Item>
-      </Builder.Content>
-    </>
-  );
-}

src/app/tools/session/page.css.ts

@@ -1,40 +0,0 @@
-import { style } from '@vanilla-extract/css';
-import { theme } from '../../../stitches.config';
-
-export const toolBar = style({
-  '@media': {
-    'screen and (min-width: 640px)': {
-      flexDirection: 'row',
-    },
-  },
-
-  flexDirection: 'column',
-  display: 'flex',
-  gap: 8,
-});
-
-export const toolbarButton = style({
-  '@media': {
-    'screen and (min-width: 640px)': {
-      flex: 0,
-    },
-  },
-
-  flex: 1,
-});
-
-export const searchButton = style({
-  border: 'none',
-  background: 'none',
-  fontSize: 16,
-  display: 'flex',
-  padding: 8,
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  cursor: 'pointer',
-
-  ':hover': {
-    backgroundColor: theme.colors.componentInteractiveHover,
-    borderRadius: 4,
-  },
-});

src/app/tools/session/page.tsx

@@ -1,256 +1,502 @@
 'use client';
 
 import {
-  CaretDownIcon,
+  ArrowDownIcon,
-  CopyIcon,
+  MagnifyingGlassIcon,
-  PersonIcon,
+  PlusIcon,
-  ReloadIcon,
 } from '@radix-ui/react-icons';
 import {
   AlertDialog,
   Button,
-  Checkbox,
+  Card,
   DropdownMenu,
   Flex,
+  Heading,
+  IconButton,
+  Link,
+  Select,
+  Table,
   Text,
   TextField,
 } from '@radix-ui/themes';
 import { debounce } from 'lodash';
-import { ChangeEvent, useEffect, useRef, useState } from 'react';
+import { use, useEffect, useMemo, useRef, useState } from 'react';
 import PageWrapper from '../../../components/PageWrapper';
-import { UNLOCALIZED_REGION_NAMES } from '../../../constants/regions';
+import { UNLOCALIZED_REGION_NAMES_SHORT } from '../../../constants/regions';
+import {
+  generateStats,
+  prettifyStats,
+  Stat,
+  STAT_KEYS,
+  STAT_NAMES,
+  sumStats,
+} from '../../../core/blitz/generateStats';
+import {
+  getAccountInfo,
+  IndividualAccountInfo,
+} from '../../../core/blitz/getAccountInfo';
+import getTankStats from '../../../core/blitz/getTankStats';
+import { idToRegion } from '../../../core/blitz/idToRegion';
 import searchPlayersAcrossRegions, {
   AccountListWithServer,
 } from '../../../core/blitz/searchPlayersAcrossRegions';
-import { resetSession } from '../../../core/blitzkrieg/resetSession';
+import { tankDefinitions } from '../../../core/blitzkit/tankDefinitions';
-import { setSession } from '../../../core/blitzkrieg/setSession';
+import { tankIcon } from '../../../core/blitzkit/tankIcon';
-import { useSession } from '../../../stores/session';
+import { tankAverages } from '../../../core/blitzstars/tankAverages';
-import SessionPage from '../../embeds/session/page';
+import { deltaTankStats } from '../../../core/statistics/deltaTankStats';
-import { Menu } from './components/Menu';
+import { useWideFormat } from '../../../hooks/useWideFormat';
-import * as styles from './page.css';
+import { theme } from '../../../stitches.config';
+import mutateSession, {
+  SessionTracking,
+  useSession,
+} from '../../../stores/session';
+import { IndividualTankStats } from '../../../types/tanksStats';
 
 export default function Page() {
+  const wideFormat = useWideFormat(640);
+  const awaitedTankDefinitions = use(tankDefinitions);
+  const awaitedTankAvearges = use(tankAverages);
+  const [showSearch, setShowSearch] = useState(false);
+  const [searching, setSearching] = useState(false);
+  const [searchResults, setSearchResults] = useState<AccountListWithServer>([]);
+  const [showCCInaccessibilityPrompt, setShowCCInaccessibilityPrompt] =
+    useState(false);
   const input = useRef<HTMLInputElement>(null);
-  const [searchResults, setSearchResults] = useState<
-    AccountListWithServer | undefined
-  >(undefined);
-  const [showSearchResults, setShowSearchResults] = useState(false);
-  const handleChange = debounce(
-    async (event: ChangeEvent<HTMLInputElement>) => {
-      if (event.target.value) {
-        setSearchResults(await searchPlayersAcrossRegions(event.target.value));
-      } else {
-        setSearchResults(undefined);
-        setShowSearchResults(false);
-      }
-    },
-    500,
-  );
   const session = useSession();
+  const [tankStatsB, setTankStatsB] = useState<IndividualTankStats[] | null>(
+    null,
+  );
+  const accountInfoPromise = useMemo(
+    () =>
+      new Promise<IndividualAccountInfo | null>(async (resolve) => {
+        resolve(
+          session.tracking
+            ? await getAccountInfo(session.player.region, session.player.id)
+            : null,
+        );
+      }),
+    [session.tracking && session.player.id],
+  );
+  const accountInfo = use(accountInfoPromise);
+  const delta = useMemo(
+    () =>
+      session.tracking && tankStatsB
+        ? deltaTankStats(session.player.stats, tankStatsB)
+            .sort((a, b) => b.last_battle_time - a.last_battle_time)
+            .map((entry) => {
+              const tank = awaitedTankDefinitions[entry.tank_id];
+              const average = awaitedTankAvearges[tank.id];
+              const stats = generateStats(entry.all, average?.all);
+              const statsPretty = prettifyStats(stats);
+
+              return {
+                tank,
+                stats,
+                statsPretty,
+              };
+            })
+        : undefined,
+    [session.tracking && session.player, tankStatsB],
+  );
+  const total = useMemo(
+    () =>
+      delta
+        ? prettifyStats(sumStats(delta.map(({ stats }) => stats)))
+        : undefined,
+    [delta],
+  );
+
+  const search = debounce(async () => {
+    if (!input.current) return;
+
+    setSearchResults(await searchPlayersAcrossRegions(input.current.value, 9));
+    setSearching(false);
+  }, 500);
 
   useEffect(() => {
-    if (session.isTracking) input.current!.value = session.nickname;
+    async function update() {
-  }, [session]);
+      if (!session.tracking) return;
+
+      const tankStats = await getTankStats(
+        idToRegion(session.player.id),
+        session.player.id,
+      );
+      setTankStatsB(tankStats);
+    }
+
+    update();
+    const interval = setInterval(update, 5 * 1000);
+
+    return () => clearInterval(interval);
+  }, [session.tracking && session.player.id]);
 
   return (
-    <PageWrapper color="blue">
+    <PageWrapper>
-      <div className={styles.toolBar}>
+      <AlertDialog.Root
-        <div style={{ flex: 1, boxSizing: 'border-box', position: 'relative' }}>
+        open={showCCInaccessibilityPrompt}
-          <TextField.Root>
+        onOpenChange={setShowCCInaccessibilityPrompt}
+      >
+        <AlertDialog.Content>
+          <AlertDialog.Title>
+            You're attempting to track a CC account
+          </AlertDialog.Title>
+          <AlertDialog.Description>
+            CC (community contributor) accounts do not have public tank
+            statistics. We are in the process of adding embeds for CC accounts,
+            stay tuned.
+          </AlertDialog.Description>
+
+          <Flex mt="4" justify="end">
+            <AlertDialog.Action>
+              <Button variant="solid">Alright</Button>
+            </AlertDialog.Action>
+          </Flex>
+        </AlertDialog.Content>
+      </AlertDialog.Root>
+
+      {!session.tracking && (
+        <Flex
+          style={{ flex: 1 }}
+          align="center"
+          justify="center"
+          direction="column"
+          gap="3"
+        >
+          <Flex gap="2" align="center">
+            <Text color="gray">Look up a player to get started</Text>
+            <ArrowDownIcon />
+          </Flex>
+
+          <TextField.Root
+            size="3"
+            style={{
+              position: 'relative',
+              width: '75vw',
+              maxWidth: 480,
+            }}
+            ref={input}
+            placeholder="Search players..."
+            onChange={() => {
+              if (!input.current) return;
+
+              const sanitized = input.current.value.trim();
+
+              if (sanitized.length > 0) {
+                setShowSearch(true);
+                setSearching(true);
+                search();
+              } else {
+                setShowSearch(false);
+              }
+            }}
+          >
             <TextField.Slot>
-              <PersonIcon height="16" width="16" />
+              <MagnifyingGlassIcon />
             </TextField.Slot>
 
-            <TextField.Input
+            {showSearch && (
-              defaultValue={session.isTracking ? session.nickname : undefined}
+              <Card
-              ref={input}
+                mt="2"
-              onChange={(event) => {
+                style={{
-                event.stopPropagation();
+                  position: 'absolute',
+                  top: '100%',
+                  left: 0,
+                  width: '100%',
+                }}
+              >
+                {searching && (
+                  <Flex justify="center">
+                    <Text color="gray">Searching...</Text>
+                  </Flex>
+                )}
 
-                if (event.target.value) {
+                {!searching && searchResults.length === 0 && (
-                  setShowSearchResults(true);
+                  <Flex justify="center">
-                  setSearchResults(undefined);
+                    <Text color="gray">No players found</Text>
-                } else {
+                  </Flex>
-                  setShowSearchResults(false);
+                )}
-                }
 
-                handleChange(event);
+                {!searching && searchResults.length > 0 && (
-              }}
+                  <Flex direction="column" gap="2">
-              onBlur={(event) => {
+                    {searchResults.map((player) => (
-                // TODO: remove this hack when https://github.com/radix-ui/primitives/issues/2193 is fixed
+                      <Button
-                if (showSearchResults) event.target.focus();
+                        key={player.account_id}
-              }}
+                        variant="ghost"
-              onKeyDown={(event) => {
+                        onClick={async () => {
-                if (event.key === 'Escape') {
+                          const stats = await getTankStats(
-                  setShowSearchResults(false);
+                            player.region,
-                  input.current?.blur();
+                            player.account_id,
-                }
+                          );
-              }}
+
-              placeholder="Search for a player..."
+                          if (stats === null) {
-            />
+                            setShowCCInaccessibilityPrompt(true);
+                            return;
+                          }
+
+                          setShowSearch(false);
+                          mutateSession((draft) => {
+                            if (!input.current) return;
+
+                            draft.tracking = true;
+                            (draft as SessionTracking).player = {
+                              id: player.account_id,
+                              region: player.region,
+                              since: Date.now(),
+                              stats,
+                            };
+
+                            input.current.value = player.nickname;
+                          });
+                        }}
+                      >
+                        {player.nickname} (
+                        {UNLOCALIZED_REGION_NAMES_SHORT[player.region]})
+                      </Button>
+                    ))}
+                  </Flex>
+                )}
+              </Card>
+            )}
           </TextField.Root>
+        </Flex>
+      )}
 
-          <DropdownMenu.Root open={showSearchResults} modal={false}>
+      {session.tracking && (
-            <DropdownMenu.Trigger>
+        <Flex
-              <div />
+          mt="2"
-            </DropdownMenu.Trigger>
+          mb="2"
+          direction={wideFormat ? 'row' : 'column'}
+          align="center"
+          justify="between"
+          gap="2"
+        >
+          <Flex mt="2" mb="2" direction="column" gap="2">
+            <Heading size="5">Tracking {accountInfo?.nickname}</Heading>
+            <Text color="gray">
+              Since {new Date(session.player.since).toLocaleString()}
+            </Text>
+          </Flex>
 
-            <DropdownMenu.Content>
+          <Flex gap="2" align="center" justify="center">
-              {searchResults === undefined ? (
+            <Button
-                <DropdownMenu.Item disabled>Searching...</DropdownMenu.Item>
+              color="red"
-              ) : searchResults.length === 0 ? (
+              onClick={async () => {
-                <DropdownMenu.Item disabled>No results</DropdownMenu.Item>
+                const stats = await getTankStats(
-              ) : (
+                  session.player.region,
-                searchResults?.map(
+                  session.player.id,
-                  ({ account_id: id, nickname, region }, index) => (
+                );
-                    <DropdownMenu.Item
-                      key={id}
-                      onClick={() => {
-                        setShowSearchResults(false);
-                        setSession(region, id, nickname);
-                      }}
-                      shortcut={UNLOCALIZED_REGION_NAMES[region]}
-                    >
-                      {nickname}
-                    </DropdownMenu.Item>
-                  ),
-                )
-              )}
-            </DropdownMenu.Content>
-          </DropdownMenu.Root>
-        </div>
 
-        <div style={{ display: 'flex', gap: 8 }}>
+                if (stats === null) {
-          <AlertDialog.Root>
+                  setShowCCInaccessibilityPrompt(true);
-            <AlertDialog.Trigger>
+                  return;
-              <Button
+                }
-                variant="soft"
-                onClick={(event) => {
-                  if (!session.resetPrompt) {
-                    event.preventDefault();
-                    resetSession();
-                  }
-                }}
-                className={styles.toolbarButton}
-                color="red"
-              >
-                <ReloadIcon width="16" height="16" /> Reset
-              </Button>
-            </AlertDialog.Trigger>
 
-            <AlertDialog.Content>
+                mutateSession((draft) => {
-              <Flex direction="column" gap="4">
+                  (draft as SessionTracking).player.stats = stats;
-                <Flex direction="column" gap="0">
+                });
-                  <AlertDialog.Title>
+              }}
-                    Are you sure you want to reset?
+            >
-                  </AlertDialog.Title>
+              Reset
-                  <AlertDialog.Description>
+            </Button>
-                    This'll discard your current session and start tracking from
+            <Button
-                    scratch again.
+              onClick={() => {
-                  </AlertDialog.Description>
+                mutateSession((draft) => {
-                </Flex>
+                  draft.tracking = false;
+                });
+              }}
+            >
+              Change
+            </Button>
+          </Flex>
+        </Flex>
+      )}
 
-                <Text size="2">
+      {session.tracking && delta && delta.length > 0 && (
-                  <Checkbox
+        <Table.Root variant="surface">
-                    mr="1"
+          <Table.Header>
-                    onCheckedChange={(checked) =>
+            <Table.Row>
-                      useSession.setState({
+              <Table.ColumnHeaderCell>Tank</Table.ColumnHeaderCell>
-                        resetPrompt: !checked,
+              {session.columns.map((column, index) => (
-                      })
+                <Table.ColumnHeaderCell
-                    }
+                  width="0"
-                  />
+                  key={column}
-                  Don't ask me again
-                </Text>
-              </Flex>
-
-              <Flex gap="3" mt="4">
-                <AlertDialog.Cancel>
-                  <Button variant="soft" color="gray">
-                    Cancel
-                  </Button>
-                </AlertDialog.Cancel>
-
-                <AlertDialog.Action>
-                  <Button variant="solid" color="red" onClick={resetSession}>
-                    Reset
-                  </Button>
-                </AlertDialog.Action>
-              </Flex>
-            </AlertDialog.Content>
-          </AlertDialog.Root>
-
-          <AlertDialog.Root>
-            <AlertDialog.Trigger>
-              <Button
-                variant="soft"
-                className={styles.toolbarButton}
-                onClick={(event) => {
-                  if (!session.embedPrompt) {
-                    event.preventDefault();
-                    resetSession();
-                  }
-
-                  navigator.clipboard.writeText(
-                    `${location.origin}/embeds/session`,
-                  );
-                }}
-              >
-                <CopyIcon width="16" height="16" /> Embed
-              </Button>
-            </AlertDialog.Trigger>
-
-            <AlertDialog.Content>
-              <AlertDialog.Title>
-                Copied link to your clipboard
-              </AlertDialog.Title>
-              <AlertDialog.Description>
-                Instructions for streamers:
-                <iframe
                   style={{
-                    width: '100%',
+                    position: 'relative',
-                    aspectRatio: '16 / 9',
-                    border: 'none',
                   }}
-                  src="https://www.youtube-nocookie.com/embed/e--GwjyrJAE?si=ftEiCmpbMI2FUY5N"
+                >
-                  title="YouTube video player"
+                  {index === 0 && session.columns.length < 4 && (
-                  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+                    <DropdownMenu.Root>
-                ></iframe>
+                      <DropdownMenu.Trigger>
-              </AlertDialog.Description>
+                        <IconButton
+                          size="1"
+                          variant="surface"
+                          style={{
+                            position: 'absolute',
+                            left: 0,
+                            top: '50%',
+                            transform: 'translate(-100%, -50%)',
+                            zIndex: 1,
+                          }}
+                        >
+                          <PlusIcon />
+                        </IconButton>
+                      </DropdownMenu.Trigger>
 
-              <Text size="2">
+                      <DropdownMenu.Content>
-                <Checkbox
+                        {STAT_KEYS.filter(
-                  mr="1"
+                          (item) => !session.columns.includes(item),
-                  onCheckedChange={(checked) =>
+                        ).map((key) => (
-                    useSession.setState({
+                          <DropdownMenu.Item
-                      embedPrompt: !checked,
+                            key={key}
-                    })
+                            onClick={() => {
-                  }
+                              mutateSession((draft) => {
-                />
+                                (draft as SessionTracking).columns.unshift(
-                Don't show this again
+                                  key as Stat,
-              </Text>
+                                );
+                              });
+                            }}
+                          >
+                            {STAT_NAMES[key]}
+                          </DropdownMenu.Item>
+                        ))}
+                      </DropdownMenu.Content>
+                    </DropdownMenu.Root>
+                  )}
 
-              <Flex gap="3" mt="4">
+                  <Select.Root
-                <AlertDialog.Cancel>
+                    value={column}
-                  <Button variant="soft">Got it!</Button>
+                    onValueChange={(value) => {
-                </AlertDialog.Cancel>
+                      mutateSession((draft) => {
-              </Flex>
+                        if (value === 'remove') {
-            </AlertDialog.Content>
+                          (draft as SessionTracking).columns.splice(index, 1);
-          </AlertDialog.Root>
+                        } else {
+                          (draft as SessionTracking).columns[index] =
+                            value as Stat;
+                        }
+                      });
+                    }}
+                  >
+                    <Select.Trigger variant="ghost" />
 
-          <DropdownMenu.Root>
+                    <Select.Content>
-            <DropdownMenu.Trigger>
+                      {STAT_KEYS.filter(
-              <Button variant="soft" className={styles.toolbarButton}>
+                        (item) =>
-                Options
+                          !session.columns.includes(item) || item === column,
-                <CaretDownIcon />
+                      ).map((key) => (
-              </Button>
+                        <Select.Item key={key} value={key}>
-            </DropdownMenu.Trigger>
+                          {STAT_NAMES[key]}
+                        </Select.Item>
+                      ))}
 
-            <Menu Builder={DropdownMenu} reset={resetSession} />
+                      <Select.Separator />
-          </DropdownMenu.Root>
-        </div>
-      </div>
 
-      <SessionPage naked={false} />
+                      <Select.Item value="remove">Remove</Select.Item>
+                    </Select.Content>
+                  </Select.Root>
+                </Table.ColumnHeaderCell>
+              ))}
+            </Table.Row>
+          </Table.Header>
+
+          <Table.Body>
+            <Table.Row
+              style={{
+                overflow: 'hidden',
+              }}
+            >
+              <Table.RowHeaderCell
+                style={{
+                  paddingLeft: 32,
+                  position: 'relative',
+                  overflowY: 'hidden',
+                }}
+              >
+                Total
+              </Table.RowHeaderCell>
+              {session.columns.map((column) => (
+                <Table.Cell key={column}>{total![column]}</Table.Cell>
+              ))}
+            </Table.Row>
+
+            {delta.map(({ statsPretty, tank }) => {
+              return (
+                <Table.Row
+                  key={tank.id}
+                  style={{
+                    overflow: 'hidden',
+                  }}
+                >
+                  <Table.RowHeaderCell
+                    style={{
+                      paddingLeft: 32,
+                      position: 'relative',
+                      overflowY: 'hidden',
+                    }}
+                  >
+                    <Link href={`/tools/tankopedia/${tank.id}`}>
+                      <img
+                        draggable={false}
+                        src={tankIcon(tank.id)}
+                        style={{
+                          position: 'absolute',
+                          width: 128 + 32,
+                          height: '200%',
+                          top: '-50%',
+                          left: 0,
+                          objectFit: 'contain',
+                          objectPosition: '50% 50%',
+                          overflow: 'hidden',
+                        }}
+                      />
+
+                      <div
+                        style={{
+                          backgroundColor: 'red',
+                          position: 'absolute',
+                          top: 0,
+                          left: 0,
+                          height: '100%',
+                          width: 128,
+                          background:
+                            'linear-gradient(90deg, #00000080, #00000000)',
+                        }}
+                      />
+
+                      <Text
+                        style={{
+                          color: theme.colors.textHighContrast,
+                          position: 'relative',
+                          textWrap: 'nowrap',
+                          textShadow: 'black 0 0 4px',
+                        }}
+                      >
+                        {tank.name}
+                      </Text>
+                    </Link>
+                  </Table.RowHeaderCell>
+                  {session.columns.map((column) => (
+                    <Table.Cell key={column}>{statsPretty[column]}</Table.Cell>
+                  ))}
+                </Table.Row>
+              );
+            })}
+          </Table.Body>
+        </Table.Root>
+      )}
+
+      {session.tracking && delta && delta.length === 0 && (
+        <Flex
+          align="center"
+          justify="center"
+          direction="column"
+          style={{
+            flex: 1,
+          }}
+        >
+          <Heading color="gray">No battles</Heading>
+          <Text color="gray">Go ahead and play a game</Text>
+        </Flex>
+      )}
     </PageWrapper>
   );
 }

src/app/tools/statistics/components/Day.tsx

@@ -0,0 +1,107 @@
+import { CaretDownIcon, CaretRightIcon } from '@radix-ui/react-icons';
+import { Button, Flex, Table, Text } from '@radix-ui/themes';
+import { random } from 'lodash';
+import { use, useMemo, useState } from 'react';
+import { tankDefinitions } from '../../../../core/blitzkit/tankDefinitions';
+import { tankIcon } from '../../../../core/blitzkit/tankIcon';
+
+interface DayProps {
+  offset: number;
+}
+
+export function Day({ offset }: DayProps) {
+  const timeTo = new Date(Date.now() - offset * 24 * 60 * 60 * 1000);
+  const timeFrom = new Date(Date.now() - (offset + 1) * 24 * 60 * 60 * 1000);
+  const awaitedTankDefinitions = use(tankDefinitions);
+  const tanksList = useMemo(
+    () => Object.values(awaitedTankDefinitions),
+    [awaitedTankDefinitions],
+  );
+  const [expanded, setExpanded] = useState(offset === 0);
+  const tanks = tanksList
+    .filter((tank) => tank.tier === 10)
+    .sort(() => Math.random() - 0.5)
+    .slice(0, random(2, 5));
+
+  return (
+    <>
+      <Table.Row>
+        <Table.RowHeaderCell>
+          <Button
+            style={{
+              width: '100%',
+            }}
+            variant="ghost"
+            onClick={() => setExpanded((state) => !state)}
+          >
+            <Flex
+              align="center"
+              gap="1"
+              style={{
+                width: '100%',
+              }}
+            >
+              {expanded ? <CaretDownIcon /> : <CaretRightIcon />}
+              {timeTo.toLocaleString('default', {
+                month: 'short',
+                day: 'numeric',
+              })}
+            </Flex>
+          </Button>
+        </Table.RowHeaderCell>
+        <Table.Cell align="right">{random(1, 10)}</Table.Cell>
+        <Table.Cell align="right">
+          {random(60, 80, true).toFixed(0)}%
+        </Table.Cell>
+      </Table.Row>
+
+      {expanded &&
+        tanks.map((tank) => (
+          <Table.Row
+            key={tank.id}
+            style={{
+              overflow: 'hidden',
+            }}
+          >
+            <Table.RowHeaderCell
+              style={{
+                paddingLeft: 32,
+                position: 'relative',
+                overflowY: 'hidden',
+              }}
+            >
+              <img
+                draggable={false}
+                src={tankIcon(tank.id)}
+                style={{
+                  position: 'absolute',
+                  width: 128 + 32,
+                  height: '200%',
+                  top: '-50%',
+                  left: 0,
+                  boxShadow: 'inset 128px 0 64px -64px #00000040',
+                  objectFit: 'contain',
+                  objectPosition: '50% 50%',
+                  overflow: 'hidden',
+                }}
+              />
+
+              <Text
+                style={{
+                  position: 'relative',
+                  textWrap: 'nowrap',
+                  textShadow: 'black 0 0 4px',
+                }}
+              >
+                {tank.name}
+              </Text>
+            </Table.RowHeaderCell>
+            <Table.Cell align="right">{random(1, 10)}</Table.Cell>
+            <Table.Cell align="right">
+              {random(60, 80, true).toFixed(0)}%
+            </Table.Cell>
+          </Table.Row>
+        ))}
+    </>
+  );
+}

src/app/tools/statistics/page.tsx

@@ -0,0 +1,40 @@
+'use client';
+
+import { Flex, Heading, Table } from '@radix-ui/themes';
+import { random, times } from 'lodash';
+import { HeroStat } from '../../../components/AllStatsOverview/components/HeroStat';
+import PageWrapper from '../../../components/PageWrapper';
+import { Day } from './components/Day';
+
+export default function Page() {
+  return (
+    <PageWrapper color="iris">
+      <Flex gap="2">
+        <Heading>TresAbhi</Heading>
+        <Heading color="gray">[OPTML]</Heading>
+      </Flex>
+
+      <HeroStat color="#8E4EC6" subtitle="Super Unicum" value={3142} />
+
+      <Table.Root variant="surface">
+        <Table.Header>
+          <Table.Row>
+            <Table.ColumnHeaderCell>Day</Table.ColumnHeaderCell>
+            <Table.ColumnHeaderCell width="0" align="right">
+              Battles
+            </Table.ColumnHeaderCell>
+            <Table.ColumnHeaderCell width="0" align="right">
+              Winrate
+            </Table.ColumnHeaderCell>
+          </Table.Row>
+        </Table.Header>
+
+        <Table.Body>
+          {times(random(5, 10), (index) => (
+            <Day offset={index} key={index} />
+          ))}
+        </Table.Body>
+      </Table.Root>
+    </PageWrapper>
+  );
+}

src/app/tools/tankopedia/[id]/components/AntagonistBar.tsx

@@ -1,25 +1,15 @@
-import { CaretRightIcon, Cross1Icon, ShuffleIcon } from '@radix-ui/react-icons';
+import { Cross1Icon, ShuffleIcon } from '@radix-ui/react-icons';
-import {
+import { Button, Card, Dialog, Flex, Heading, Tabs } from '@radix-ui/themes';
-  Button,
-  Card,
-  Dialog,
-  Flex,
-  Heading,
-  Tabs,
-  Text,
-  Tooltip,
-} from '@radix-ui/themes';
-import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { ModuleButton } from '../../../../../components/ModuleButtons/ModuleButton';
 import { ShellButton } from '../../../../../components/ModuleButtons/ShellButton';
 import { SmallTankIcon } from '../../../../../components/SmallTankIcon';
 import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
-import { pushTankopediaPath } from '../../../../../core/blitzkrieg/pushTankopediaPath';
+import { pushTankopediaPath } from '../../../../../core/blitzkit/pushTankopediaPath';
 import {
   SHELL_NAMES,
   TIER_ROMAN_NUMERALS,
-} from '../../../../../core/blitzkrieg/tankDefinitions/constants';
+} from '../../../../../core/blitzkit/tankDefinitions/constants';
 import { mutateDuel, useDuel } from '../../../../../stores/duel';
 import {
   mutateTankopediaTemporary,
@@ -37,58 +27,70 @@ export function AntagonistBar({ floating }: AntagonistBarProps) {
   const [tab, setTab] = useState('search');
   const [antagonistSelectorOpen, setAntagonistSelectorVisible] =
     useState(false);
-  const router = useRouter();
 
   if (mode !== 'armor') return null;
 
   return (
-    <Card
+    <Flex justify="center">
-      style={
+      <Card
-        floating
+        style={
-          ? {
+          floating
-              position: 'absolute',
+            ? {
-              bottom: 8,
+                position: 'absolute',
-              left: '50%',
+                bottom: 8,
-              transform: 'translateX(-50%)',
+                left: '50%',
-            }
+                transform: 'translateX(-50%)',
-          : undefined
+              }
-      }
+            : undefined
-    >
+        }
-      <Flex align="center" justify="between" gap="6">
+      >
-        <Flex>
+        <Flex
-          {antagonist.gun.shells.map((shell, index) => {
+          align="center"
-            return (
+          justify="center"
-              <ShellButton
+          wrap="wrap"
-                selected={antagonist.shell.id === shell.id}
+          style={{
-                shell={shell.icon}
+            gap: 'min(5vw, 32px)',
-                rowChild
+          }}
-                first={index === 0}
+        >
-                key={shell.id}
+          <Flex>
-                last={index === antagonist.gun.shells.length - 1}
+            {antagonist.gun.shells.map((shell, index) => {
-                onClick={() => {
+              return (
-                  mutateDuel((draft) => {
+                <ShellButton
-                    draft.antagonist!.shell = shell;
+                  selected={antagonist.shell.id === shell.id}
-                    mutateTankopediaTemporary((draft) => {
+                  shell={shell.icon}
-                      draft.shot = undefined;
+                  rowChild
+                  first={index === 0}
+                  key={shell.id}
+                  last={index === antagonist.gun.shells.length - 1}
+                  onClick={() => {
+                    mutateDuel((draft) => {
+                      draft.antagonist!.shell = shell;
+                      mutateTankopediaTemporary((draft) => {
+                        draft.shot = undefined;
+                      });
                     });
-                  });
+                  }}
-                }}
+                />
-              />
+              );
-            );
+            })}
-          })}
+          </Flex>
-        </Flex>
 
-        <Flex align="center" gap="4">
+          <Button
-          {!floating && <Text>Versus</Text>}
+            variant="ghost"
+            onClick={() => {
+              mutateDuel((draft) => {
+                [draft.protagonist, draft.antagonist] = [
+                  draft.antagonist,
+                  draft.protagonist,
+                ];
+                pushTankopediaPath(draft.antagonist!.tank.id);
+              });
+            }}
+          >
+            <ShuffleIcon /> Swap
+          </Button>
 
-          {floating && (
+          <Flex align="center" gap="4">
-            <Flex gap="2" align="center">
-              Versus {antagonist.tank.name}
-              <SmallTankIcon id={antagonist.tank.id} size={16} />
-            </Flex>
-          )}
-
-          {!floating && (
             <Dialog.Root
               open={antagonistSelectorOpen}
               onOpenChange={setAntagonistSelectorVisible}
@@ -96,9 +98,8 @@ export function AntagonistBar({ floating }: AntagonistBarProps) {
               <Dialog.Trigger>
                 <Button variant="ghost">
                   <Flex gap="2" align="center">
-                    {antagonist.tank.name}
+                    Versus {antagonist.tank.name}
                     <SmallTankIcon id={antagonist.tank.id} size={16} />
-                    <CaretRightIcon />
                   </Flex>
                 </Button>
               </Dialog.Trigger>
@@ -160,61 +161,52 @@ export function AntagonistBar({ floating }: AntagonistBarProps) {
                           <Flex gap="2" wrap="wrap">
                             <Flex>
                               {antagonist.tank.turrets.map((turret, index) => (
-                                <Tooltip content={turret.name} key={turret.id}>
+                                <ModuleButton
-                                  <ModuleButton
+                                  rowChild
-                                    rowChild
+                                  first={index === 0}
-                                    first={index === 0}
+                                  last={
-                                    last={
+                                    index === antagonist.tank.turrets.length - 1
-                                      index ===
+                                  }
-                                      antagonist.tank.turrets.length - 1
+                                  key={turret.id}
-                                    }
+                                  onClick={() => {
-                                    key={turret.id}
+                                    mutateDuel((draft) => {
-                                    onClick={() => {
+                                      draft.antagonist!.turret = turret;
-                                      mutateDuel((draft) => {
+                                      draft.antagonist!.gun =
-                                        draft.antagonist!.turret = turret;
+                                        turret.guns.at(-1)!;
-                                        draft.antagonist!.gun =
+                                      draft.antagonist!.shell =
-                                          turret.guns.at(-1)!;
+                                        draft.antagonist!.gun.shells[0];
-                                        draft.antagonist!.shell =
+                                    });
-                                          draft.antagonist!.gun.shells[0];
+                                    mutateTankopediaTemporary((draft) => {
-                                      });
+                                      draft.shot = undefined;
-                                      mutateTankopediaTemporary((draft) => {
+                                    });
-                                        draft.shot = undefined;
+                                  }}
-                                      });
+                                  selected={antagonist.turret.id === turret.id}
-                                    }}
+                                  discriminator={
-                                    selected={
+                                    TIER_ROMAN_NUMERALS[turret.tier]
-                                      antagonist.turret.id === turret.id
+                                  }
-                                    }
+                                  module="turret"
-                                    discriminator={
+                                />
-                                      TIER_ROMAN_NUMERALS[turret.tier]
-                                    }
-                                    module="turret"
-                                  />
-                                </Tooltip>
                               ))}
                             </Flex>
                             <Flex>
                               {antagonist.turret.guns.map((gun, index) => (
-                                <Tooltip content={gun.name} key={gun.id}>
+                                <ModuleButton
-                                  <ModuleButton
+                                  key={gun.id}
-                                    rowChild
+                                  rowChild
-                                    first={index === 0}
+                                  first={index === 0}
-                                    last={
+                                  last={
-                                      index ===
+                                    index === antagonist.turret.guns.length - 1
-                                      antagonist.turret.guns.length - 1
+                                  }
-                                    }
+                                  onClick={() => {
-                                    onClick={() => {
+                                    mutateDuel((draft) => {
-                                      mutateDuel((draft) => {
+                                      draft.antagonist!.gun = gun;
-                                        draft.antagonist!.gun = gun;
+                                      draft.antagonist!.shell = gun.shells[0];
-                                        draft.antagonist!.shell = gun.shells[0];
+                                    });
-                                      });
+                                  }}
-                                    }}
+                                  selected={antagonist.gun.id === gun.id}
-                                    selected={antagonist.gun.id === gun.id}
+                                  discriminator={TIER_ROMAN_NUMERALS[gun.tier]}
-                                    discriminator={
+                                  module="gun"
-                                      TIER_ROMAN_NUMERALS[gun.tier]
+                                />
-                                    }
-                                    module="gun"
-                                  />
-                                </Tooltip>
                               ))}
                             </Flex>
                           </Flex>
@@ -251,24 +243,9 @@ export function AntagonistBar({ floating }: AntagonistBarProps) {
                 </Tabs.Root>
               </Dialog.Content>
             </Dialog.Root>
-          )}
+          </Flex>
         </Flex>
-
+      </Card>
-        <Button
+    </Flex>
-          variant="ghost"
-          onClick={() => {
-            mutateDuel((draft) => {
-              [draft.protagonist, draft.antagonist] = [
-                draft.antagonist,
-                draft.protagonist,
-              ];
-              pushTankopediaPath(draft.antagonist!.tank.id);
-            });
-          }}
-        >
-          <ShuffleIcon /> Swap
-        </Button>
-      </Flex>
-    </Card>
   );
 }