feat: logs

*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

@@ -53,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
 
@@ -61,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

@@ -31,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:ratingleaderboard --region=asia --target=midnight --production
+        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

@@ -31,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:ratingleaderboard --region=eu --target=midnight --production
+        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

@@ -1,4 +1,4 @@
-name: CD Rating North America
+name: CD Rating Latest
 
 on:
   schedule:
@@ -31,4 +31,4 @@ jobs:
         run: yarn
 
       - name: Generate all leaderboards
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} DISCORD_BLITZ_DB=${{ secrets.DISCORD_BLITZ_DB }} yarn publish:ratingleaderboard --region=na,asia,eu --target=latest --production
+        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

@@ -31,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:ratingleaderboard --region=na --target=midnight --production
+        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,11 +33,11 @@ jobs:
       - name: Install dependencies
         run: yarn
 
-      - name: Add fixed sharp
-        run: yarn add [email protected] --ignore-engines
+      - 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

@@ -18,5 +18,5 @@ temp/
 /.VSCodeCounter
 /.yarn
 depots
-public/sitemap*.xml
-public/robots.txt
+public/sitemap*
+/firebase.json

.gitmodules

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

.vscode/settings.json

@@ -3,6 +3,7 @@
     "AABBOX",
     "Abhi",
     "accountinfo",
+    "adsense",
     "aeson",
     "alphatest",
     "APAC",
@@ -17,7 +18,11 @@
     "BINORMAL",
     "Binormals",
     "BKRL",
+    "BKRTS",
+    "BKRTSMANIFEST",
     "bkwd",
+    "blitzkit",
+    "blitzrinth",
     "blitzstars",
     "Camo",
     "CDON",
@@ -72,12 +77,15 @@
     "leaderboards",
     "lerp",
     "LINEARSIZE",
+    "loadouts",
     "loddist",
     "lods",
+    "mantlets",
     "metallicness",
     "minitelrose",
     "Minotauro",
     "MIPMAPCOUNT",
+    "mišek",
     "modeltransform",
     "MURICA",
     "NEGATIVEX",
@@ -104,8 +112,12 @@
     "raycaster",
     "researchable",
     "Resvg",
+    "rizz",
     "roboto",
+    "rtsc",
+    "RTSM",
     "SCPG",
+    "scroller",
     "searchclans",
     "searchplayers",
     "searchtanks",
@@ -125,6 +137,7 @@
     "Synx",
     "tankaverages",
     "Tankerch",
+    "tankmen",
     "tankopedia",
     "tankopedias",
     "tankstats",
@@ -143,14 +156,17 @@
     "Vovko",
     "wargaming",
     "webp",
+    "whitespaces",
     "winrate",
     "wireframe",
+    "Woah",
     "WOTB",
     "wotblitz",
     "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/JlEA0J1.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/oLVIx2n.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/TOt5fMx.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.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/guide/bkrl.md

@@ -1,9 +1,9 @@
-# Blitzkrieg Rating Leaderboard
+# Blitzkit Rating Leaderboard
 
 A straightforward way of storing the entire World of Tanks Blitz rating leaderboard to disk.
 
 ```cpp
-primary BlitzkriegRatingLeaderboard {
+primary BlitzkitRatingLeaderboard {
   utf8"BKRL" magic;
   Header header;
   primary Body<header> body;

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,7 +15,7 @@ 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
 - Rating leaderboard

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
 

next-sitemap.config.cjs

@@ -1,6 +0,0 @@
-/** @type {import('next-sitemap').IConfig} */
-module.exports = {
-  siteUrl: process.env.SITE_URL || 'https://blitz-krieg.vercel.app',
-  generateRobotsTxt: true,
-  sourceDir: 'dist/website',
-};

package.json

@@ -1,17 +1,19 @@
 {
-  "name": "blitzkrieg",
-  "version": "1.18.0",
+  "name": "blitzkit",
+  "version": "1.19.6",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
   "scripts": {
+    "build:db": "prisma generate",
     "build:bot": "vite-node --script scripts/build --production",
-    "build:website": "next build && next-sitemap --config next-sitemap.config.cjs",
+    "build:website": "yarn build:db && yarn build:sitemap && next build",
+    "build:sitemap": "vite-node --script scripts/sitemap",
     "build:docs": "vitepress build docs",
     "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",
-    "dev:bot": "vite-node --script scripts/build --production && yarn start:bot",
+    "test": "vite-node --script scripts/test",
+    "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",
@@ -36,7 +38,7 @@
     "@prisma/client": "^5.4.1",
     "@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",
@@ -50,13 +52,13 @@
     "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",
     "lz4js": "^0.2.0",
     "markdown-escape": "^2.0.0",
     "next": "^14.1.0",
-    "next-sitemap": "^4.2.3",
     "parse-dds": "^1.2.1",
     "postprocessing": "^6.34.1",
     "react": "^18.2.0",
@@ -64,7 +66,6 @@
     "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",
     "sharp": "0.33.1",
     "three": "0.159.0",
@@ -83,6 +84,7 @@
     "@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,7 +3,7 @@ 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 { DATA } from './buildAssets/constants';
 

scripts/build.ts

@@ -2,10 +2,12 @@ import { exec } from 'child_process';
 import { build } from 'esbuild';
 import { cp, readdir } from 'fs/promises';
 import { argv } from 'process';
+import { promisify } from 'util';
 
+const execPromise = promisify(exec);
 const isProduction = argv.includes('--production');
 
-readdir('src/workers').then((workers) => {
+await readdir('src/workers').then((workers) => {
   const files = [
     'bot',
     'index',
@@ -41,8 +43,8 @@ readdir('src/workers').then((workers) => {
 });
 
 // copy schema.prisma
-cp('prisma/schema.prisma', 'dist/bot/schema.prisma');
-readdir('node_modules/prisma').then((files) =>
+await cp('prisma/schema.prisma', 'dist/bot/schema.prisma');
+await readdir('node_modules/prisma').then((files) =>
   files
     .filter((file) => file.endsWith('.node'))
     .map((file) => cp(`node_modules/prisma/${file}`, `dist/bot/${file}`)),
@@ -51,7 +53,9 @@ readdir('node_modules/prisma').then((files) =>
 if (isProduction) {
   // install fixed sharp
   console.log('Installing fixed sharp...');
-  exec('yarn init -y && yarn add [email protected] --ignore-engines', {
+  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 { 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 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 { 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 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 { 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 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 { 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';
 import { ConsumablesCommon, ProvisionsCommon } from './definitions';
 

scripts/buildAssets/currencies.ts

@@ -1,7 +1,7 @@
 import sharp from 'sharp';
 import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+import { commitAssets } from '../../src/core/blitzkit/commitAssets';
+import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 
 const ICONS = [

scripts/buildAssets/definitions.ts

@@ -1,27 +1,30 @@
-import { readdir, writeFile } from 'fs/promises';
+import { readdir } from 'fs/promises';
 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 {
   ModelArmor,
   ModelDefinitions,
-} from '../../src/core/blitzkrieg/modelDefinitions';
-import { ProvisionDefinitions } from '../../src/core/blitzkrieg/provisionDefinitions';
-import { superCompress } from '../../src/core/blitzkrieg/superCompress';
+} from '../../src/core/blitzkit/modelDefinitions';
+import { ProvisionDefinitions } from '../../src/core/blitzkit/provisionDefinitions';
+import { SkillDefinitions } from '../../src/core/blitzkit/skillDefinitions';
+import { superCompress } from '../../src/core/blitzkit/superCompress';
 import {
   Crew,
   CrewMember,
@@ -30,11 +33,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 =
@@ -116,6 +120,7 @@ interface VehicleDefinitions {
       weight: number;
       terrainResistance: string;
       rotationSpeed: number;
+      userString: string;
       shotDispersionFactors: {
         vehicleMovement: number;
         vehicleRotation: number;
@@ -320,7 +325,7 @@ type ConsumablesVehicleFilter =
   | { name: string }
   | { extendedTags: string };
 
-const blitzShellKindToBLitzkrieg: Record<ShellKind, ShellType> = {
+const blitzShellKindToBlitzkit: Record<ShellKind, ShellType> = {
   ARMOR_PIERCING: 'ap',
   ARMOR_PIERCING_CR: 'ap_cr',
   HIGH_EXPLOSIVE: 'he',
@@ -329,10 +334,18 @@ 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 equipmentDefinitions: EquipmentDefinitions = {
@@ -341,16 +354,19 @@ export async function definitions(production: boolean) {
   };
   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`,
   );
@@ -367,6 +383,9 @@ 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 tankXps = new Map<number, number>();
 
@@ -402,6 +421,8 @@ 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>();
@@ -558,6 +579,7 @@ export async function definitions(production: boolean) {
           tankDefinitions[tankId].tracks.push({
             id: trackId,
             weight: track.weight,
+            name: strings[track.userString],
             traverseSpeed: track.rotationSpeed,
             dispersion: {
               move: track.shotDispersionFactors.vehicleMovement,
@@ -717,6 +739,17 @@ export async function definitions(production: boolean) {
               const gunArmor: ModelArmor = { thickness: {} };
               const shotDispersionFactors =
                 gun.shotDispersionFactors ?? gunListEntry.shotDispersionFactors;
+              const maskName = `gun_${gunModel.toString().padStart(2, '0')}`;
+              const maskEnabled =
+                tankParameters.maskSlice?.[maskName]?.enabled ?? false;
+              let mask: number | undefined;
+
+              if (maskEnabled) {
+                const maskRaw = tankParameters.maskSlice![maskName]!;
+                mask = maskRaw.planePosition[1];
+              } else {
+                mask = undefined;
+              }
 
               totalUnlocks.push(gun.unlocks);
               Object.keys(gun.armor)
@@ -766,6 +799,7 @@ export async function definitions(production: boolean) {
               modelDefinitions[tankId].turrets[turretId].guns[gunId] = {
                 armor: gunArmor,
                 model: gunModel,
+                mask,
                 thickness:
                   gun.armor.gun === undefined
                     ? 0
@@ -818,7 +852,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
@@ -1084,13 +1118,18 @@ export async function definitions(production: boolean) {
     }
   });
 
-  writeFile(
-    'test.tanks.cdon.lz4',
-    Buffer.from(superCompress(tankDefinitions), 'base64'),
-  );
+  Object.entries(avatar.root.skillsByClasses).forEach(([tankClass, skills]) => {
+    skillDefinitions.classes[tankClass as TankClass] = skills.split(' ');
+  });
+
   await commitAssets(
     'definitions',
     [
+      {
+        content: superCompress(gameDefinitions),
+        encoding: 'base64',
+        path: 'definitions/game.cdon.lz4',
+      },
       {
         content: superCompress(tankDefinitions),
         encoding: 'base64',
@@ -1116,6 +1155,11 @@ export async function definitions(production: boolean) {
         encoding: 'base64',
         path: 'definitions/provisions.cdon.lz4',
       },
+      {
+        content: superCompress(skillDefinitions),
+        encoding: 'base64',
+        path: 'definitions/skills.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 { 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';
 import { OptionalDevices } from './definitions';
 

scripts/buildAssets/index.ts

@@ -20,16 +20,20 @@ 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,
@@ -37,9 +41,9 @@ const methods = [
   consumableProvisionIcons,
   camouflageIcons,
   boosterIcons,
+  tankIcons,
   tankArmors,
   tankModels,
-  currencies,
 ];
 
 for (const method of methods) {

scripts/buildAssets/moduleIcons.ts

@@ -1,7 +1,8 @@
 import { readdir } from 'fs/promises';
-import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
-import { commitAssets } from '../../src/core/blitzkrieg/commitAssets';
-import { FileChange } from '../../src/core/blitzkrieg/commitMultipleFiles';
+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, 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(
-          `${DATA}/${POI.moduleIcons}/${file}`,
-        );
+        const content = (
+          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 { 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 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 { 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 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 { 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';
 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 { 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';
 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 { 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';
 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,124 @@
+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,
+  videoDefinitions,
+} from '../../src/core/blitzkit/videos';
+import { DATA, POI } from './constants';
+import { BlitzStrings, botPattern, VehicleDefinitionList } from './definitions';
+
+const youtubers = [
+  'UCKBYXp4Xn2I2tL1UL4fpbhw', // droodles
+  'UCrQ-Dy8lVsm11u8pCJ8W7Tw', // fatness
+];
+
+export async function videos(production: boolean) {
+  console.log('Building videos...');
+
+  const currentVideos = await videoDefinitions;
+  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

@@ -8,10 +8,10 @@ import {
 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/blitzkrieg/commitAssets';
-import { FileChange } from '../src/core/blitzkrieg/commitMultipleFiles.js';
-import { patientFetchJSON } from '../src/core/blitzkrieg/patientFetchJSON';
-import { superCompress } from '../src/core/blitzkrieg/superCompress';
+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,

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,
+  );
+}

src/app/embeds/session/page.tsx

@@ -3,13 +3,12 @@
 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 { resetSession } from '../../../core/blitzkit/resetSession';
 import {
   TankDefinition,
   tankDefinitions,
-} from '../../../core/blitzkrieg/tankDefinitions';
+} from '../../../core/blitzkit/tankDefinitions';
 import { tankAverages } from '../../../core/blitzstars/tankAverages';
 import calculateWN8 from '../../../core/statistics/calculateWN8';
 import { deltaTankStats } from '../../../core/statistics/deltaTankStats';
@@ -88,10 +87,10 @@ export default function SessionPage({ naked = true }: SessionPageProps) {
     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<
+        const careerRaw = await fetchBlitz<TanksStats>(region, 'tanks/stats', {
+          account_id: id,
+        });
+        const career = careerRaw[id]!.reduce<
           Record<number, IndividualTankStats>
         >(
           (accumulator, curr) => ({
@@ -103,7 +102,7 @@ export default function SessionPage({ naked = true }: SessionPageProps) {
         const awaitedTankDefinitions = await tankDefinitions;
         const awaitedTankAverages = await tankAverages;
         const careerWN8 =
-          careerRaw[id].reduce(
+          careerRaw[id]!.reduce(
             (accumulator, { tank_id, all }) =>
               accumulator +
               (awaitedTankAverages[tank_id] && all.battles > 0
@@ -112,7 +111,7 @@ export default function SessionPage({ naked = true }: SessionPageProps) {
                 : 0),
             0,
           ) /
-          careerRaw[id].reduce(
+          careerRaw[id]!.reduce(
             (accumulator, { tank_id, all }) =>
               accumulator +
               (awaitedTankAverages[tank_id] && all.battles > 0

src/app/layout.tsx

@@ -1,20 +1,19 @@
 'use client';
 
-import { CaretRightIcon } from '@radix-ui/react-icons';
-import { AlertDialog, Button, Flex, Text, Theme } from '@radix-ui/themes';
+import { AlertDialog, Button, Flex, Theme } from '@radix-ui/themes';
 import '@radix-ui/themes/styles.css';
 import { config } from 'dotenv';
 import { Roboto_Flex } from 'next/font/google';
 import { usePathname } from 'next/navigation';
-import { ReactNode, useEffect, useState } from 'react';
-import { SkyLine } from '../assets/art/SkyLine';
-import { Analytics } from '../components/Analytics';
+import { ReactNode, Suspense, useEffect, useState } from 'react';
+import { Footer } from '../components/Footer';
+import { Loader } from '../components/Loader';
 import Navbar from '../components/Navbar';
-import PageWrapper from '../components/PageWrapper';
-import isDev from '../core/blitzkrieg/isDev';
-import { isLocalhost } from '../core/blitzkrieg/isLocalhost';
+import { Party3 } from '../components/Party3';
+import isDev from '../core/blitzkit/isDev';
+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,115 +48,80 @@ export default function RootLayout({ children }: RootLayoutProps) {
   return (
     <html lang="en" className={robotoFlex.className}>
       <head>
-        <title>Blitzkrieg</title>
-        <meta
-          name="description"
-          content="🎉 Tools for everything World of Tanks Blitz"
-        />
-        <Analytics />
+        {isRoot && (
+          <>
+            <title>BlitzKit</title>
+            <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,
         }}
       >
         <Theme
-          appearance="dark"
-          panelBackground="translucent"
+          appearance={darkMode ? 'dark' : 'light'}
+          panelBackground="solid"
           radius="full"
           suppressHydrationWarning
           suppressContentEditableWarning
         >
-          {!isEmbed && <Navbar />}
-          <AlertDialog.Root open={showDevBuildAlert}>
-            <AlertDialog.Content>
-              <AlertDialog.Title>Experimental version!</AlertDialog.Title>
-              <AlertDialog.Description>
-                This version may have a lot of issues. Report issues to{' '}
-                <a href="https://discord.gg/nDt7AjGJQH" target="_blank">
-                  the official Discord server
-                </a>
-                . Also consider using{' '}
-                <a href="https://blitz-krieg.vercel.app/">
-                  the more stable release version
-                </a>
-                . You will be asked again in 8 days.
-              </AlertDialog.Description>
+          <Flex
+            direction="column"
+            style={{ minHeight: '100vh', paddingTop: isEmbed ? undefined : 64 }}
+          >
+            {!isEmbed && <Navbar />}
+            <AlertDialog.Root open={showDevBuildAlert}>
+              <AlertDialog.Content>
+                <AlertDialog.Title>Experimental version!</AlertDialog.Title>
+                <AlertDialog.Description>
+                  This version may have a lot of issues. Report issues to{' '}
+                  <a href="https://discord.gg/nDt7AjGJQH" target="_blank">
+                    the official Discord server
+                  </a>
+                  . Also consider using{' '}
+                  <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">
-                <Button
-                  variant="solid"
-                  onClick={() => {
-                    setShowDevBuildAlert(false);
-                    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,
+                <Flex justify="end">
+                  <Button
+                    variant="solid"
+                    onClick={() => {
+                      setShowDevBuildAlert(false);
+                      useApp.setState({ devBuildAgreementTime: Date.now() });
                     }}
                   >
-                    <Text size="4" color="mint">
-                      Blitzkrieg. Free forever. For everyone.
-                    </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%',
-                    }}
-                  />
+                    Continue
+                  </Button>
                 </Flex>
-              </a>
-            </PageWrapper>
-          )}
+              </AlertDialog.Content>
+            </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 { Flex, Text, TextField } from '@radix-ui/themes';
+import { CaretRightIcon } from '@radix-ui/react-icons';
+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>
-        <TextField.Slot>
-          <MagnifyingGlassIcon height="16" width="16" />
-        </TextField.Slot>
-        <TextField.Input ref={input} placeholder="Search tools..." />
-      </TextField.Root>
+      <Flex
+        direction="column"
+        gap="5"
+        justify="center"
+        align="center"
+        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">
-        <Search
-          input={input}
-          list={TOOLS.map(
-            (tool) =>
-              ({
-                node: (
-                  <Link
-                    href={tool.href ?? `/tools/${tool.id}`}
-                    target={tool.href ? '_blank' : undefined}
-                    className={
-                      tool.disabled ? styles.tool.disabled : styles.tool.enabled
-                    }
-                    style={{
-                      backgroundImage: `url(/assets/banners/${tool.id}.webp)`,
-                      cursor: tool.disabled ? 'default' : 'pointer',
-                      opacity: tool.disabled ? 0.25 : 1,
-                      height: 128,
-                      minWidth: 256,
-                      flex: 1,
-                      borderRadius: 8,
-                      textDecoration: 'none',
-                      backgroundSize: 'cover',
-                      backgroundPosition: 'center',
-                      overflow: 'hidden',
-                      display: 'flex',
-                      flexDirection: 'column',
-                      alignItems: 'flex-start',
-                      justifyContent: 'flex-end',
-                      padding: 16,
-                      gap: 4,
-                      transition: `box-shadow ${theme.durations.regular}`,
-                    }}
-                    onClick={(event) => {
-                      if (tool.disabled) event.preventDefault();
-                    }}
-                  >
-                    <span
-                      style={{
-                        fontSize: 32,
-                        color: theme.colors.textHighContrast,
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'center',
-                      }}
-                    >
-                      {tool.title}
-                      <CaretRightIcon style={{ width: '1em', height: '1em' }} />
-                    </span>
-                    <span
-                      style={{
-                        color: theme.colors.textLowContrast,
-                        fontSize: 16,
-                      }}
-                    >
-                      {tool.disabled ? 'Coming soon!' : tool.description}
-                    </span>
-                  </Link>
-                ),
-                query: `${tool.title} ${tool.description}`,
-              }) satisfies SearchItem,
-          )}
-        />
+        <Flex gap="3" wrap="wrap" align="center" justify="center">
+          {TOOLS.map((tool) => (
+            <Link
+              href={tool.href ?? `/tools/${tool.id}`}
+              target={tool.href ? '_blank' : undefined}
+              className={
+                tool.disabled ? styles.tool.disabled : styles.tool.enabled
+              }
+              style={{
+                backgroundImage: `url(/assets/banners/${tool.id}.webp)`,
+                cursor: tool.disabled ? 'default' : 'pointer',
+                opacity: tool.disabled ? 0.25 : 1,
+                height: 128,
+                minWidth: 256,
+                flex: 1,
+                borderRadius: 8,
+                textDecoration: 'none',
+                backgroundSize: 'cover',
+                backgroundPosition: 'center',
+                overflow: 'hidden',
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'flex-start',
+                justifyContent: 'flex-end',
+                padding: 16,
+                transition: `box-shadow ${theme.durations.regular}`,
+              }}
+              onClick={(event) => {
+                if (tool.disabled) event.preventDefault();
+              }}
+            >
+              <span
+                style={{
+                  fontSize: 32,
+                  color: theme.colors.textHighContrast,
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                }}
+              >
+                {tool.title}
+                <CaretRightIcon style={{ width: '1em', height: '1em' }} />
+              </span>
+              <span
+                style={{
+                  color: theme.colors.textLowContrast,
+                  fontSize: 16,
+                }}
+              >
+                {tool.disabled ? 'Coming soon!' : tool.description}
+              </span>
+            </Link>
+          ))}
+        </Flex>
       </Flex>
-
-      <Text size="1" color="gray" align="center">
-        Images courtesy of Wargaming Art Department
-      </Text>
     </PageWrapper>
   );
 }

src/app/settings/page.tsx

@@ -0,0 +1,48 @@
+'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</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>
+
+        <Text color="gray">
+          <i>Not a lot here, eh?</i>
+        </Text>
+      </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

@@ -25,7 +25,6 @@ import {
   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 getRatingInfo from '../../../core/blitz/getRatingInfo';
@@ -36,9 +35,9 @@ import {
   AccountList,
   AccountListItem,
 } from '../../../core/blitz/searchPlayersAcrossRegions';
-import { getArchivedLatestSeasonNumber } from '../../../core/blitzkrieg/getArchivedLatestSeasonNumber';
-import getArchivedRatingInfo from '../../../core/blitzkrieg/getArchivedRatingInfo';
-import { getArchivedRatingLeaderboard } from '../../../core/blitzkrieg/getArchivedRatingLeaderboard';
+import { getArchivedLatestSeasonNumber } from '../../../core/blitzkit/getArchivedLatestSeasonNumber';
+import getArchivedRatingInfo from '../../../core/blitzkit/getArchivedRatingInfo';
+import { getArchivedRatingLeaderboard } from '../../../core/blitzkit/getArchivedRatingLeaderboard';
 import { theme } from '../../../stitches.config';
 import { PageTurner } from './components/PageTurner';
 
@@ -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..."
@@ -759,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 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>(
-                              `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">

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

@@ -37,19 +37,18 @@ export function Menu({ Builder, reset }: ContextMenuProps) {
             <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>
+              <TextField.Root
+                style={{ flex: 1 }}
+                ref={titleInput}
+                defaultValue={session.title}
+                placeholder="Enter title..."
+                onKeyDown={(event) => {
+                  if (event.key === 'Enter' && titleInput.current) {
+                    setShowTitleEditor(false);
+                    useSession.setState({ title: titleInput.current!.value });
+                  }
+                }}
+              />
 
               <Dialog.Close>
                 <Button

src/app/tools/session/page.tsx

@@ -12,6 +12,7 @@ import {
   Checkbox,
   DropdownMenu,
   Flex,
+  Heading,
   Text,
   TextField,
 } from '@radix-ui/themes';
@@ -22,8 +23,8 @@ import { UNLOCALIZED_REGION_NAMES } from '../../../constants/regions';
 import searchPlayersAcrossRegions, {
   AccountListWithServer,
 } from '../../../core/blitz/searchPlayersAcrossRegions';
-import { resetSession } from '../../../core/blitzkrieg/resetSession';
-import { setSession } from '../../../core/blitzkrieg/setSession';
+import { resetSession } from '../../../core/blitzkit/resetSession';
+import { setSession } from '../../../core/blitzkit/setSession';
 import { useSession } from '../../../stores/session';
 import SessionPage from '../../embeds/session/page';
 import { Menu } from './components/Menu';
@@ -56,38 +57,36 @@ export default function Page() {
     <PageWrapper color="blue">
       <div className={styles.toolBar}>
         <div style={{ flex: 1, boxSizing: 'border-box', position: 'relative' }}>
-          <TextField.Root>
+          <TextField.Root
+            defaultValue={session.isTracking ? session.nickname : undefined}
+            ref={input}
+            onChange={(event) => {
+              event.stopPropagation();
+
+              if (event.target.value) {
+                setShowSearchResults(true);
+                setSearchResults(undefined);
+              } else {
+                setShowSearchResults(false);
+              }
+
+              handleChange(event);
+            }}
+            onBlur={(event) => {
+              // TODO: remove this hack when https://github.com/radix-ui/primitives/issues/2193 (https://github.com/radix-ui/primitives/issues/1969) is fixed
+              if (showSearchResults) event.target.focus();
+            }}
+            onKeyDown={(event) => {
+              if (event.key === 'Escape') {
+                setShowSearchResults(false);
+                input.current?.blur();
+              }
+            }}
+            placeholder="Search for a player..."
+          >
             <TextField.Slot>
               <PersonIcon height="16" width="16" />
             </TextField.Slot>
-
-            <TextField.Input
-              defaultValue={session.isTracking ? session.nickname : undefined}
-              ref={input}
-              onChange={(event) => {
-                event.stopPropagation();
-
-                if (event.target.value) {
-                  setShowSearchResults(true);
-                  setSearchResults(undefined);
-                } else {
-                  setShowSearchResults(false);
-                }
-
-                handleChange(event);
-              }}
-              onBlur={(event) => {
-                // TODO: remove this hack when https://github.com/radix-ui/primitives/issues/2193 is fixed
-                if (showSearchResults) event.target.focus();
-              }}
-              onKeyDown={(event) => {
-                if (event.key === 'Escape') {
-                  setShowSearchResults(false);
-                  input.current?.blur();
-                }
-              }}
-              placeholder="Search for a player..."
-            />
           </TextField.Root>
 
           <DropdownMenu.Root open={showSearchResults} modal={false}>
@@ -251,6 +250,20 @@ export default function Page() {
       </div>
 
       <SessionPage naked={false} />
+
+      {!session.isTracking && (
+        <Flex
+          align="center"
+          justify="center"
+          direction="column"
+          style={{ flex: 1 }}
+        >
+          <Heading color="gray">No player selected</Heading>
+          <Text color="gray">
+            Search for a <PersonIcon /> Player to get started
+          </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 {
-  Button,
-  Card,
-  Dialog,
-  Flex,
-  Heading,
-  Tabs,
-  Text,
-  Tooltip,
-} from '@radix-ui/themes';
-import { useRouter } from 'next/navigation';
+import { Cross1Icon, ShuffleIcon } from '@radix-ui/react-icons';
+import { Button, Card, Dialog, Flex, Heading, Tabs } from '@radix-ui/themes';
 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
-      style={
-        floating
-          ? {
-              position: 'absolute',
-              bottom: 8,
-              left: '50%',
-              transform: 'translateX(-50%)',
-            }
-          : undefined
-      }
-    >
-      <Flex align="center" justify="between" gap="6">
-        <Flex>
-          {antagonist.gun.shells.map((shell, index) => {
-            return (
-              <ShellButton
-                selected={antagonist.shell.id === shell.id}
-                shell={shell.icon}
-                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 justify="center">
+      <Card
+        style={
+          floating
+            ? {
+                position: 'absolute',
+                bottom: 8,
+                left: '50%',
+                transform: 'translateX(-50%)',
+              }
+            : undefined
+        }
+      >
+        <Flex
+          align="center"
+          justify="center"
+          wrap="wrap"
+          style={{
+            gap: 'min(5vw, 32px)',
+          }}
+        >
+          <Flex>
+            {antagonist.gun.shells.map((shell, index) => {
+              return (
+                <ShellButton
+                  selected={antagonist.shell.id === shell.id}
+                  shell={shell.icon}
+                  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">
-          {!floating && <Text>Versus</Text>}
+          <Button
+            variant="ghost"
+            onClick={() => {
+              mutateDuel((draft) => {
+                [draft.protagonist, draft.antagonist] = [
+                  draft.antagonist,
+                  draft.protagonist,
+                ];
+                pushTankopediaPath(draft.antagonist!.tank.id);
+              });
+            }}
+          >
+            <ShuffleIcon /> Swap
+          </Button>
 
-          {floating && (
-            <Flex gap="2" align="center">
-              Versus {antagonist.tank.name}
-              <SmallTankIcon id={antagonist.tank.id} size={16} />
-            </Flex>
-          )}
-
-          {!floating && (
+          <Flex align="center" gap="4">
             <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
-                                    rowChild
-                                    first={index === 0}
-                                    last={
-                                      index ===
-                                      antagonist.tank.turrets.length - 1
-                                    }
-                                    key={turret.id}
-                                    onClick={() => {
-                                      mutateDuel((draft) => {
-                                        draft.antagonist!.turret = turret;
-                                        draft.antagonist!.gun =
-                                          turret.guns.at(-1)!;
-                                        draft.antagonist!.shell =
-                                          draft.antagonist!.gun.shells[0];
-                                      });
-                                      mutateTankopediaTemporary((draft) => {
-                                        draft.shot = undefined;
-                                      });
-                                    }}
-                                    selected={
-                                      antagonist.turret.id === turret.id
-                                    }
-                                    discriminator={
-                                      TIER_ROMAN_NUMERALS[turret.tier]
-                                    }
-                                    module="turret"
-                                  />
-                                </Tooltip>
+                                <ModuleButton
+                                  rowChild
+                                  first={index === 0}
+                                  last={
+                                    index === antagonist.tank.turrets.length - 1
+                                  }
+                                  key={turret.id}
+                                  onClick={() => {
+                                    mutateDuel((draft) => {
+                                      draft.antagonist!.turret = turret;
+                                      draft.antagonist!.gun =
+                                        turret.guns.at(-1)!;
+                                      draft.antagonist!.shell =
+                                        draft.antagonist!.gun.shells[0];
+                                    });
+                                    mutateTankopediaTemporary((draft) => {
+                                      draft.shot = undefined;
+                                    });
+                                  }}
+                                  selected={antagonist.turret.id === turret.id}
+                                  discriminator={
+                                    TIER_ROMAN_NUMERALS[turret.tier]
+                                  }
+                                  module="turret"
+                                />
                               ))}
                             </Flex>
                             <Flex>
                               {antagonist.turret.guns.map((gun, index) => (
-                                <Tooltip content={gun.name} key={gun.id}>
-                                  <ModuleButton
-                                    rowChild
-                                    first={index === 0}
-                                    last={
-                                      index ===
-                                      antagonist.turret.guns.length - 1
-                                    }
-                                    onClick={() => {
-                                      mutateDuel((draft) => {
-                                        draft.antagonist!.gun = gun;
-                                        draft.antagonist!.shell = gun.shells[0];
-                                      });
-                                    }}
-                                    selected={antagonist.gun.id === gun.id}
-                                    discriminator={
-                                      TIER_ROMAN_NUMERALS[gun.tier]
-                                    }
-                                    module="gun"
-                                  />
-                                </Tooltip>
+                                <ModuleButton
+                                  key={gun.id}
+                                  rowChild
+                                  first={index === 0}
+                                  last={
+                                    index === antagonist.turret.guns.length - 1
+                                  }
+                                  onClick={() => {
+                                    mutateDuel((draft) => {
+                                      draft.antagonist!.gun = gun;
+                                      draft.antagonist!.shell = gun.shells[0];
+                                    });
+                                  }}
+                                  selected={antagonist.gun.id === gun.id}
+                                  discriminator={TIER_ROMAN_NUMERALS[gun.tier]}
+                                  module="gun"
+                                />
                               ))}
                             </Flex>
                           </Flex>
@@ -251,24 +243,9 @@ export function AntagonistBar({ floating }: AntagonistBarProps) {
                 </Tabs.Root>
               </Dialog.Content>
             </Dialog.Root>
-          )}
+          </Flex>
         </Flex>
-
-        <Button
-          variant="ghost"
-          onClick={() => {
-            mutateDuel((draft) => {
-              [draft.protagonist, draft.antagonist] = [
-                draft.antagonist,
-                draft.protagonist,
-              ];
-              pushTankopediaPath(draft.antagonist!.tank.id);
-            });
-          }}
-        >
-          <ShuffleIcon /> Swap
-        </Button>
-      </Flex>
-    </Card>
+      </Card>
+    </Flex>
   );
 }

src/app/tools/tankopedia/[id]/components/Characteristics/components/ConfigurationChildWrapper.tsx

@@ -1,5 +1,5 @@
+import { Flex } from '@radix-ui/themes';
 import { ReactNode } from 'react';
-import * as styles from '../../../../page.css';
 
 interface ConfigurationChildWrapperProps {
   children: ReactNode;
@@ -8,5 +8,9 @@ interface ConfigurationChildWrapperProps {
 export function ConfigurationChildWrapper({
   children,
 }: ConfigurationChildWrapperProps) {
-  return <div className={styles.configurationChild}>{children}</div>;
+  return (
+    <Flex gap="2" direction="column">
+      {children}
+    </Flex>
+  );
 }

src/app/tools/tankopedia/[id]/components/Characteristics/components/Consumables.tsx

@@ -1,8 +1,16 @@
-import { Flex, Heading } from '@radix-ui/themes';
+import { InfoCircledIcon } from '@radix-ui/react-icons';
+import {
+  Button,
+  Flex,
+  Heading,
+  IconButton,
+  Popover,
+  Text,
+} from '@radix-ui/themes';
 import { use } from 'react';
-import { ConsumableButton } from '../../../../../../../components/ModuleButtons/ConsumableButton';
-import { checkConsumableProvisionInclusivity } from '../../../../../../../core/blitzkrieg/checkConsumableProvisionInclusivity';
-import { consumableDefinitions } from '../../../../../../../core/blitzkrieg/consumableDefinitions';
+import { ConsumablesManager } from '../../../../../../../components/ConsumablesManager';
+import { checkConsumableProvisionInclusivity } from '../../../../../../../core/blitzkit/checkConsumableProvisionInclusivity';
+import { consumableDefinitions } from '../../../../../../../core/blitzkit/consumableDefinitions';
 import { useEquipment } from '../../../../../../../hooks/useEquipment';
 import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
 import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
@@ -27,49 +35,53 @@ export function Consumables() {
 
   return (
     <ConfigurationChildWrapper>
-      <Heading size="4">Consumables</Heading>
+      <Flex gap="4" align="center">
+        <Flex gap="2" align="center">
+          <Heading size="4">Consumables</Heading>
 
-      <Flex wrap="wrap">
-        {consumablesList.map((consumable, index) => {
-          const selected = consumables.includes(consumable.id);
+          <Popover.Root>
+            <Popover.Trigger>
+              <IconButton variant="ghost">
+                <InfoCircledIcon />
+              </IconButton>
+            </Popover.Trigger>
 
-          return (
-            <ConsumableButton
-              duration={
-                typeof consumable.duration === 'number'
-                  ? consumable.duration * (hasHighEndConsumables ? 0.7 : 1)
-                  : undefined
-              }
-              cooldown={
-                consumable.cooldown *
-                (hasConsumableDeliverySystem ? 0.85 : 1) *
-                (1 - cooldownBooster * 0.1)
-              }
-              key={consumable.id}
-              first={index === 0}
-              last={index === consumablesList.length - 1}
-              rowChild
-              disabled={
-                protagonist.tank.consumables === consumables.length && !selected
-              }
-              consumable={consumable.id}
-              selected={selected}
-              onClick={() => {
-                mutateDuel((draft) => {
-                  if (selected) {
-                    draft.protagonist!.consumables =
-                      draft.protagonist!.consumables.filter(
-                        (id) => id !== consumable.id,
-                      );
-                  } else {
-                    draft.protagonist!.consumables.push(consumable.id);
-                  }
-                });
-              }}
-            />
-          );
-        })}
+            <Popover.Content>
+              <Text>
+                <Text color="amber">Yellow consumables</Text> do not affect the
+                statistics.
+              </Text>
+            </Popover.Content>
+          </Popover.Root>
+        </Flex>
+
+        <Button
+          variant="ghost"
+          color="red"
+          onClick={() => {
+            mutateDuel((draft) => {
+              draft.protagonist!.consumables = [];
+            });
+          }}
+        >
+          Clear
+        </Button>
       </Flex>
+
+      <ConsumablesManager
+        consumables={consumablesList}
+        selected={consumables}
+        cooldownBooster={cooldownBooster}
+        disabled={protagonist.tank.consumables === consumables.length}
+        hasConsumableDeliverySystem={hasConsumableDeliverySystem}
+        hasHighEndConsumables={hasHighEndConsumables}
+        timers
+        onChange={(consumables) => {
+          mutateDuel((draft) => {
+            draft.protagonist!.consumables = consumables;
+          });
+        }}
+      />
     </ConfigurationChildWrapper>
   );
 }

src/app/tools/tankopedia/[id]/components/Characteristics/components/Equipment.tsx

@@ -0,0 +1,49 @@
+import { Button, Flex, Heading } from '@radix-ui/themes';
+import { use } from 'react';
+import { EquipmentManager } from '../../../../../../../components/EquipmentManager';
+import { equipmentDefinitions } from '../../../../../../../core/blitzkit/equipmentDefinitions';
+import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
+import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
+
+export function Equipment() {
+  const protagonist = useDuel((state) => state.protagonist!);
+  const awaitedEquipmentDefinitions = use(equipmentDefinitions);
+  const equipmentPreset =
+    awaitedEquipmentDefinitions.presets[protagonist.tank.equipment];
+  const equipmentMatrix = useDuel(
+    (state) => state.protagonist!.equipmentMatrix,
+  );
+
+  return (
+    <ConfigurationChildWrapper>
+      <Flex gap="4" align="center">
+        <Heading size="4">Equipment</Heading>
+        <Button
+          variant="ghost"
+          color="red"
+          onClick={() => {
+            mutateDuel((draft) => {
+              draft.protagonist!.equipmentMatrix.forEach((row) => {
+                row.forEach((_, index) => {
+                  row[index] = 0;
+                });
+              });
+            });
+          }}
+        >
+          Clear
+        </Button>
+      </Flex>
+
+      <EquipmentManager
+        matrix={equipmentMatrix}
+        preset={equipmentPreset}
+        onChange={(matrix) => {
+          mutateDuel((draft) => {
+            draft.protagonist!.equipmentMatrix = matrix;
+          });
+        }}
+      />
+    </ConfigurationChildWrapper>
+  );
+}

src/app/tools/tankopedia/[id]/components/Characteristics/components/Equipments.tsx

@@ -1,62 +0,0 @@
-import { Flex, Heading } from '@radix-ui/themes';
-import { use } from 'react';
-import { EquipmentButton } from '../../../../../../../components/ModuleButtons/EquipmentButton';
-import { equipmentDefinitions } from '../../../../../../../core/blitzkrieg/equipmentDefinitions';
-import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
-import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
-
-export function Equipments() {
-  const protagonist = useDuel((state) => state.protagonist!);
-  const awaitedEquipmentDefinitions = use(equipmentDefinitions);
-  const equipmentRows =
-    awaitedEquipmentDefinitions.presets[protagonist.tank.equipment];
-  const equipmentMatrix = useDuel((state) => state.protagonist!.equipment);
-
-  return (
-    <ConfigurationChildWrapper>
-      <Heading size="4">Equipments</Heading>
-
-      <Flex direction="column" gap="2">
-        {equipmentRows.map((equipmentRow, rowIndex) => (
-          <Flex gap="2" key={rowIndex}>
-            {equipmentRow.map((equipment, columnIndex) => (
-              <Flex key={columnIndex}>
-                <EquipmentButton
-                  equipment={equipment[0]}
-                  first
-                  rowChild
-                  selected={equipmentMatrix[rowIndex][columnIndex] === -1}
-                  onClick={() => {
-                    mutateDuel((draft) => {
-                      if (equipmentMatrix[rowIndex][columnIndex] === -1) {
-                        draft.protagonist!.equipment[rowIndex][columnIndex] = 0;
-                      } else {
-                        draft.protagonist!.equipment[rowIndex][columnIndex] =
-                          -1;
-                      }
-                    });
-                  }}
-                />
-                <EquipmentButton
-                  equipment={equipment[1]}
-                  last
-                  rowChild
-                  selected={equipmentMatrix[rowIndex][columnIndex] === 1}
-                  onClick={() => {
-                    mutateDuel((draft) => {
-                      if (equipmentMatrix[rowIndex][columnIndex] === 1) {
-                        draft.protagonist!.equipment[rowIndex][columnIndex] = 0;
-                      } else {
-                        draft.protagonist!.equipment[rowIndex][columnIndex] = 1;
-                      }
-                    });
-                  }}
-                />
-              </Flex>
-            ))}
-          </Flex>
-        ))}
-      </Flex>
-    </ConfigurationChildWrapper>
-  );
-}

src/app/tools/tankopedia/[id]/components/Characteristics/components/Miscellaneous.tsx

@@ -2,7 +2,7 @@ import { Flex, Heading, Slider, TextField } from '@radix-ui/themes';
 import { clamp, debounce } from 'lodash';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { GenericTankComponentButton } from '../../../../../../../components/ModuleButtons/GenericTankComponentButton';
-import { asset } from '../../../../../../../core/blitzkrieg/asset';
+import { asset } from '../../../../../../../core/blitzkit/asset';
 import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
 import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
 
@@ -87,36 +87,35 @@ export function Miscellaneous() {
             direction="column"
             gap="1"
             justify="end"
-            style={{ width: 180 }}
+            style={{ width: 120 }}
           >
-            <TextField.Root>
+            <TextField.Root
+              ref={crewInput}
+              defaultValue={Math.round(crewMastery * 100)}
+              style={{ textAlign: 'right' }}
+              onBlur={() => {
+                const newValue = Number(crewInput.current!.value) / 100;
+
+                if (isNaN(newValue)) {
+                  crewInput.current!.value = `${Math.round(crewMastery * 100)}`;
+                  return;
+                }
+
+                mutateDuel((draft) => {
+                  draft.protagonist!.crewMastery = clamp(
+                    newValue / 100,
+                    0.5,
+                    1,
+                  );
+                });
+              }}
+              onKeyUp={(event) => {
+                if (event.key === 'Enter') {
+                  crewInput.current?.blur();
+                }
+              }}
+            >
               <TextField.Slot>Crew</TextField.Slot>
-              <TextField.Input
-                ref={crewInput}
-                defaultValue={Math.round(crewMastery * 100)}
-                style={{ textAlign: 'right' }}
-                onBlur={() => {
-                  const newValue = Number(crewInput.current!.value) / 100;
-
-                  if (isNaN(newValue)) {
-                    crewInput.current!.value = `${Math.round(crewMastery * 100)}`;
-                    return;
-                  }
-
-                  mutateDuel((draft) => {
-                    draft.protagonist!.crewMastery = clamp(
-                      newValue / 100,
-                      0.5,
-                      1,
-                    );
-                  });
-                }}
-                onKeyUp={(event) => {
-                  if (event.key === 'Enter') {
-                    crewInput.current?.blur();
-                  }
-                }}
-              />
               <TextField.Slot>%</TextField.Slot>
             </TextField.Root>
 

src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx

@@ -1,108 +1,79 @@
-import { Flex, Heading } from '@radix-ui/themes';
-import { ModuleButton } from '../../../../../../../components/ModuleButtons/ModuleButton';
-import { TIER_ROMAN_NUMERALS } from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
+import { Button, Flex, Heading } from '@radix-ui/themes';
+import { ModuleManager } from '../../../../../../../components/ModuleManager';
 import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
 import { mutateTankopediaTemporary } from '../../../../../../../stores/tankopedia';
 import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
 
 export function Modules() {
   const protagonist = useDuel((state) => state.protagonist!);
+  const hasUpgrades =
+    protagonist.tank.turrets.length > 1 ||
+    protagonist.tank.turrets[0].guns.length > 1 ||
+    protagonist.tank.engines.length > 1 ||
+    protagonist.tank.tracks.length > 1;
 
   return (
     <ConfigurationChildWrapper>
-      <Heading size="4">Modules</Heading>
-
-      <Flex gap="2" wrap="wrap">
-        <Flex>
-          {protagonist.tank.turrets.map((turret, index) => {
-            return (
-              <ModuleButton
-                key={turret.id}
-                selected={protagonist.turret.id === turret.id}
-                module="turret"
-                discriminator={TIER_ROMAN_NUMERALS[turret.tier]}
-                first={index === 0}
-                last={index === protagonist.tank.turrets.length - 1}
-                rowChild
-                onClick={() => {
-                  mutateDuel((draft) => {
-                    draft.protagonist!.turret = turret;
-                    draft.protagonist!.gun = turret.guns.at(-1)!;
-                    draft.protagonist!.shell = turret.guns.at(-1)!.shells[0];
-                  });
-                  mutateTankopediaTemporary((draft) => {
-                    draft.shot = undefined;
-                  });
-                }}
-              />
-            );
-          })}
-        </Flex>
-
-        <Flex>
-          {protagonist.turret.guns.map((gun, index) => {
-            return (
-              <ModuleButton
-                key={gun.id}
-                module="gun"
-                discriminator={TIER_ROMAN_NUMERALS[gun.tier]}
-                selected={protagonist.gun.id === gun.id}
-                first={index === 0}
-                last={index === protagonist.turret.guns.length - 1}
-                rowChild
-                onClick={() => {
-                  mutateDuel((draft) => {
-                    draft.protagonist!.gun = gun;
-                    draft.protagonist!.shell = gun.shells[0];
-                  });
-                }}
-              />
-            );
-          })}
-        </Flex>
-
-        <Flex>
-          {protagonist.tank.engines.map((engine, index) => {
-            return (
-              <ModuleButton
-                key={engine.id}
-                module="engine"
-                discriminator={TIER_ROMAN_NUMERALS[engine.tier]}
-                selected={protagonist.engine.id === engine.id}
-                first={index === 0}
-                last={index === protagonist.tank.engines.length - 1}
-                rowChild
-                onClick={() => {
-                  mutateDuel((draft) => {
-                    draft.protagonist!.engine = engine;
-                  });
-                }}
-              />
-            );
-          })}
-        </Flex>
-
-        <Flex>
-          {protagonist.tank.tracks.map((track, index) => {
-            return (
-              <ModuleButton
-                key={track.id}
-                module="chassis"
-                discriminator={TIER_ROMAN_NUMERALS[track.tier]}
-                selected={protagonist.track.id === track.id}
-                first={index === 0}
-                last={index === protagonist.tank.tracks.length - 1}
-                rowChild
-                onClick={() => {
-                  mutateDuel((draft) => {
-                    draft.protagonist!.track = track;
-                  });
-                }}
-              />
-            );
-          })}
-        </Flex>
+      <Flex gap="4" align="center">
+        <Heading size="4">Modules</Heading>
+        {hasUpgrades && (
+          <>
+            <Button
+              variant="ghost"
+              color="red"
+              onClick={() => {
+                mutateDuel((draft) => {
+                  draft.protagonist!.turret =
+                    draft.protagonist!.tank.turrets[0];
+                  draft.protagonist!.gun = draft.protagonist!.turret.guns[0];
+                  draft.protagonist!.shell = draft.protagonist!.gun.shells[0];
+                  draft.protagonist!.engine =
+                    draft.protagonist!.tank.engines[0];
+                  draft.protagonist!.track = draft.protagonist!.tank.tracks[0];
+                });
+              }}
+            >
+              Stock
+            </Button>
+            <Button
+              variant="ghost"
+              onClick={() => {
+                mutateDuel((draft) => {
+                  draft.protagonist!.turret =
+                    draft.protagonist!.tank.turrets.at(-1)!;
+                  draft.protagonist!.gun =
+                    draft.protagonist!.turret.guns.at(-1)!;
+                  draft.protagonist!.shell =
+                    draft.protagonist!.gun.shells.at(-1)!;
+                  draft.protagonist!.engine =
+                    draft.protagonist!.tank.engines.at(-1)!;
+                  draft.protagonist!.track =
+                    draft.protagonist!.tank.tracks.at(-1)!;
+                });
+              }}
+            >
+              Upgrade
+            </Button>
+          </>
+        )}
       </Flex>
+
+      <ModuleManager
+        tank={protagonist.tank}
+        turret={protagonist.turret}
+        gun={protagonist.gun}
+        shell={protagonist.shell}
+        engine={protagonist.engine}
+        track={protagonist.track}
+        onChange={(modules) => {
+          mutateDuel((draft) => {
+            draft.protagonist = { ...draft.protagonist!, ...modules };
+          });
+          mutateTankopediaTemporary((draft) => {
+            draft.shot = undefined;
+          });
+        }}
+      />
     </ConfigurationChildWrapper>
   );
 }

src/app/tools/tankopedia/[id]/components/Characteristics/components/Provisions.tsx

@@ -1,8 +1,8 @@
-import { Flex, Heading } from '@radix-ui/themes';
+import { Button, Flex, Heading } from '@radix-ui/themes';
 import { use } from 'react';
-import { ProvisionButton } from '../../../../../../../components/ModuleButtons/ProvisionButton';
-import { availableProvisions } from '../../../../../../../core/blitzkrieg/availableProvisions';
-import { provisionDefinitions } from '../../../../../../../core/blitzkrieg/provisionDefinitions';
+import { ProvisionsManager } from '../../../../../../../components/ProvisionsManager';
+import { availableProvisions } from '../../../../../../../core/blitzkit/availableProvisions';
+import { provisionDefinitions } from '../../../../../../../core/blitzkit/provisionDefinitions';
 import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
 import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
 
@@ -18,37 +18,31 @@ export function Provisions() {
 
   return (
     <ConfigurationChildWrapper>
-      <Heading size="4">Provisions</Heading>
-
-      <Flex wrap="wrap">
-        {provisionsList.map((provision, index) => {
-          const selected = provisions.includes(provision.id);
-
-          return (
-            <ProvisionButton
-              key={provision.id}
-              first={index === 0}
-              last={index === provisionsList.length - 1}
-              rowChild
-              disabled={tank.provisions === provisions.length && !selected}
-              provision={provision.id}
-              selected={selected}
-              onClick={() => {
-                mutateDuel((draft) => {
-                  if (selected) {
-                    draft.protagonist!.provisions =
-                      draft.protagonist!.provisions.filter(
-                        (id) => id !== provision.id,
-                      );
-                  } else {
-                    draft.protagonist!.provisions.push(provision.id);
-                  }
-                });
-              }}
-            />
-          );
-        })}
+      <Flex gap="4" align="center">
+        <Heading size="4">Provisions</Heading>
+        <Button
+          variant="ghost"
+          color="red"
+          onClick={() => {
+            mutateDuel((draft) => {
+              draft.protagonist!.provisions = [];
+            });
+          }}
+        >
+          Clear
+        </Button>
       </Flex>
+
+      <ProvisionsManager
+        provisions={provisionsList.map((provision) => provision.id)}
+        selected={provisions}
+        disabled={tank.provisions === provisions.length}
+        onChange={(provisions) => {
+          mutateDuel((draft) => {
+            draft.protagonist!.provisions = provisions;
+          });
+        }}
+      />
     </ConfigurationChildWrapper>
   );
 }

src/app/tools/tankopedia/[id]/components/Characteristics/components/Skills/constants.tsx

@@ -0,0 +1,8 @@
+export const permanentSkills = [
+  'smooth_turn',
+  'soft_recoil',
+  'smooth_driving',
+  'smooth_turret',
+  'virtuoso',
+  'camouflage',
+];

src/app/tools/tankopedia/[id]/components/Characteristics/components/Skills/index.tsx

@@ -0,0 +1,98 @@
+import { InfoCircledIcon } from '@radix-ui/react-icons';
+import {
+  Button,
+  Flex,
+  Heading,
+  IconButton,
+  Kbd,
+  Popover,
+  Text,
+} from '@radix-ui/themes';
+import { use } from 'react';
+import { CrewSkillManager } from '../../../../../../../../components/CrewSkillManager';
+import { createDefaultSkills } from '../../../../../../../../core/blitzkit/createDefaultSkills';
+import { skillDefinitions } from '../../../../../../../../core/blitzkit/skillDefinitions';
+import {
+  mutateTankopediaTemporary,
+  useTankopediaTemporary,
+} from '../../../../../../../../stores/tankopedia';
+import { ConfigurationChildWrapper } from '../ConfigurationChildWrapper';
+
+export function Skills() {
+  const awaitedSkillDefinitions = use(skillDefinitions);
+  const skillLevels = useTankopediaTemporary((state) => state.skills);
+
+  if (Object.keys(skillLevels).length === 0) {
+    mutateTankopediaTemporary((draft) => {
+      draft.skills = createDefaultSkills(awaitedSkillDefinitions);
+    });
+
+    return null;
+  }
+
+  return (
+    <ConfigurationChildWrapper>
+      <Flex gap="4" align="center">
+        <Flex gap="2" align="center">
+          <Heading size="4">Crew skills</Heading>
+
+          <Popover.Root>
+            <Popover.Trigger>
+              <IconButton variant="ghost">
+                <InfoCircledIcon />
+              </IconButton>
+            </Popover.Trigger>
+
+            <Popover.Content>
+              <Flex direction="column" gap="2">
+                <Text>
+                  <Text color="amber">Yellow skills</Text> only apply under
+                  special circumstances.
+                </Text>
+
+                <Text>
+                  Hold <Kbd>Shift</Kbd> to quickly toggle between level 0 and 7.
+                </Text>
+              </Flex>
+            </Popover.Content>
+          </Popover.Root>
+        </Flex>
+
+        <Button
+          variant="ghost"
+          color="red"
+          onClick={() => {
+            mutateTankopediaTemporary((draft) => {
+              Object.keys(draft.skills).forEach((skill) => {
+                draft.skills[skill] = 0;
+              });
+            });
+          }}
+        >
+          Clear
+        </Button>
+        <Button
+          variant="ghost"
+          onClick={() => {
+            mutateTankopediaTemporary((draft) => {
+              Object.keys(draft.skills).forEach((skill) => {
+                draft.skills[skill] = 7;
+              });
+            });
+          }}
+        >
+          Maximize
+        </Button>
+      </Flex>
+
+      <CrewSkillManager
+        skillLevels={skillLevels}
+        onChange={(skills) => {
+          mutateTankopediaTemporary((draft) => {
+            draft.skills = skills;
+          });
+        }}
+      />
+    </ConfigurationChildWrapper>
+  );
+}

src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx

@@ -1,49 +1,66 @@
-import { AccessibilityIcon } from '@radix-ui/react-icons';
-import { Flex, Heading, Slider, Text, TextField } from '@radix-ui/themes';
+import { AccessibilityIcon, InfoCircledIcon } from '@radix-ui/react-icons';
+import {
+  Flex,
+  Heading,
+  IconButton,
+  Popover,
+  Slider,
+  Text,
+  TextField,
+} from '@radix-ui/themes';
 import { debounce } from 'lodash';
-import { use, useEffect, useRef, useState } from 'react';
+import { Fragment, use, useEffect, useRef, useState } from 'react';
 import { lerp } from 'three/src/math/MathUtils';
 import { ShellButton } from '../../../../../../components/ModuleButtons/ShellButton';
 import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits';
 import { isExplosive } from '../../../../../../core/blitz/isExplosive';
-import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
-import { coefficient } from '../../../../../../core/blitzkrieg/coefficient';
-import { degressiveStat } from '../../../../../../core/blitzkrieg/degressiveStat';
-import { modelDefinitions } from '../../../../../../core/blitzkrieg/modelDefinitions';
-import { normalizeBoundingBox } from '../../../../../../core/blitzkrieg/normalizeBoundingBox';
-import { progressiveStat } from '../../../../../../core/blitzkrieg/progressiveStat';
-import { resolveDpm } from '../../../../../../core/blitzkrieg/resolveDpm';
-import { sum } from '../../../../../../core/blitzkrieg/sum';
+import { coefficient } from '../../../../../../core/blitzkit/coefficient';
+import { equipmentDefinitions } from '../../../../../../core/blitzkit/equipmentDefinitions';
+import { modelDefinitions } from '../../../../../../core/blitzkit/modelDefinitions';
+import { provisionDefinitions } from '../../../../../../core/blitzkit/provisionDefinitions';
+import { tankCharacteristics } from '../../../../../../core/blitzkit/tankCharacteristics';
 import {
   CREW_MEMBER_NAMES,
   GUN_TYPE_NAMES,
   SHELL_NAMES,
-} from '../../../../../../core/blitzkrieg/tankDefinitions/constants';
-import { unionBoundingBox } from '../../../../../../core/blitzkrieg/unionBoundingBox';
-import { useConsumable } from '../../../../../../hooks/useConsumable';
+} from '../../../../../../core/blitzkit/tankDefinitions/constants';
 import { useEquipment } from '../../../../../../hooks/useEquipment';
-import { useProvision } from '../../../../../../hooks/useProvision';
-import { useProvisions } from '../../../../../../hooks/useProvisions';
+import { useFullScreen } from '../../../../../../hooks/useFullScreen';
 import { mutateDuel, useDuel } from '../../../../../../stores/duel';
+import { useTankopediaTemporary } from '../../../../../../stores/tankopedia';
 import { Info } from './components/Info';
 import { InfoWithDelta } from './components/InfoWithDelta';
 
 export function Characteristics() {
+  const awaitedEquipmentDefinitions = use(equipmentDefinitions);
   const awaitedModelDefinitions = use(modelDefinitions);
-  const { tank, turret, gun, engine, track, shell } = useDuel(
-    (state) => state.protagonist!,
-  );
+  const awaitedProvisionDefinitions = use(provisionDefinitions);
+  const crewSkills = useTankopediaTemporary((state) => state.skills);
+  const penetrationDistanceInput = useRef<HTMLInputElement>(null);
+  const isFullScreen = useFullScreen();
   const hasImprovedVentilation = useEquipment(102);
-  const provisions = useProvisions();
   const crewMastery = useDuel((state) => state.protagonist!.crewMastery);
+  const [penetrationDistance, setPenetrationDistance] = useState(250);
+
+  const provisions = useDuel((state) => state.protagonist!.provisions);
   const provisionCrewBonus =
     provisions.reduce(
       (total, provision) =>
-        provision.crew ? total + provision.crew / 100 : total,
+        awaitedProvisionDefinitions[provision].crew
+          ? total + awaitedProvisionDefinitions[provision].crew! / 100
+          : total,
       0,
     ) + (hasImprovedVentilation ? 0.05 : 0);
   const commanderMastery = crewMastery + provisionCrewBonus;
   const crewMemberMastery = commanderMastery * 1.1;
+  const consumables = useDuel((state) => state.protagonist!.consumables);
+  const camouflage = useDuel((state) => state.protagonist!.camouflage);
+  const equipmentMatrix = useDuel(
+    (state) => state.protagonist!.equipmentMatrix,
+  );
+  const { tank, turret, gun, engine, track, shell } = useDuel(
+    (state) => state.protagonist!,
+  );
   const stockEngine = tank.engines[0];
   const stockTrack = tank.tracks[0];
   const stockTurret = tank.turrets[0];
@@ -51,169 +68,46 @@ export function Characteristics() {
   const tankModelDefinition = awaitedModelDefinitions[tank.id];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
   const gunModelDefinition = turretModelDefinition.guns[gun.id];
-  const size = normalizeBoundingBox(
-    unionBoundingBox(
-      tankModelDefinition.boundingBox,
-      turretModelDefinition.boundingBox,
-    ),
+  const stats = tankCharacteristics(
+    {
+      tank,
+      camouflage,
+      consumables,
+      crewMastery,
+      crewSkills,
+      engine,
+      equipmentMatrix,
+      gun,
+      provisions,
+      shell,
+      turret,
+      track,
+      stockEngine,
+      stockGun,
+      stockTrack,
+      stockTurret,
+      applyReactive: false,
+      applyDynamicArmor: false,
+      applySpallLiner: false,
+    },
+    {
+      equipmentDefinitions: awaitedEquipmentDefinitions,
+      modelDefinitions: awaitedModelDefinitions,
+      provisionDefinitions: awaitedProvisionDefinitions,
+    },
   );
-  const gunDefaultPitch = tankModelDefinition.turretRotation?.pitch ?? 0;
-  const weight =
-    tank.weight + engine.weight + track.weight + turret.weight + gun.weight;
-  const weightTons = weight / 1000;
-  const stockWeight =
-    tank.weight +
-    stockEngine.weight +
-    stockTrack.weight +
-    stockTurret.weight +
-    stockGun.weight;
-  const [penetrationDistance, setPenetrationDistance] = useState(250);
-  const camouflage = useDuel((state) => state.protagonist!.camouflage);
-  const hasRammer = useEquipment(100);
-  const hasCalibratedShells = useEquipment(103);
-  const hasEnhancedGunLayingDrive = useEquipment(104);
-  const hasSupercharger = useEquipment(107);
-  const hasVerticalStabilizer = useEquipment(105);
-  const hasRefinedGun = useEquipment(106);
-  const hasImprovedAssembly = useEquipment(111);
-  const hasImprovedOptics = useEquipment(114);
-  const hasImprovedControl = useEquipment(116);
-  const hasEngineAccelerator = useEquipment(117);
-  const hasCamouflageNet = useEquipment(115);
-  const hasImprovedVerticalStabilizer = useEquipment(122);
-  const hasImprovedSuspension = useEquipment(123);
-  const penetrationDistanceInput = useRef<HTMLInputElement>(null);
-  const hasEnginePowerBoost = useConsumable(14);
-  const hasImprovedEnginePowerBoost = useConsumable(27);
-  const hasAdrenaline = useConsumable(18);
-  const hasTungsten = useConsumable(45);
-  const hasReticleCalibration = useConsumable(28);
-  const hasShellReloadBoost = useConsumable(29);
-  const hasStandardFuel = useProvision(18);
-  const hasImprovedFuel = useProvision(19);
-  const hasProtectiveKit = useProvision(22);
-  const hasSandbagArmor = useProvision(28);
-  const hasEnhancedSandbagArmor = useProvision(29);
-  const hasImprovedGunPowder = useProvision(46);
-  const hasGearOil = useProvision(44);
-  const hasImprovedGearOil = useProvision(45);
 
-  const healthCoefficient = coefficient(
-    [hasSandbagArmor, 0.03],
-    [hasEnhancedSandbagArmor, 0.06],
-    [hasImprovedAssembly, 0.06],
-  );
-  const reloadCoefficient =
-    (coefficient([hasRammer, -0.07]) *
-      coefficient([true, degressiveStat(crewMemberMastery)])) /
-    coefficient([hasAdrenaline && gun.type === 'regular', 0.2]);
+  const hasSupercharger = useEquipment(107);
+  const hasCalibratedShells = useEquipment(103);
+  const hasImprovedVerticalStabilizer = useEquipment(122);
   const penetrationCoefficient = coefficient([
     hasCalibratedShells,
     isExplosive(shell.type) ? 0.1 : 0.05,
   ]);
-  const damageCoefficient = coefficient(
-    // TODO: add max rolls
-    [hasTungsten, 0.15],
-  );
-  const intraClipCoefficient = coefficient([hasShellReloadBoost, -0.3]);
-  const shellVelocityCoefficient = coefficient(
-    [hasSupercharger, 0.3],
-    [hasImprovedGunPowder, 0.3],
-  );
   const penetrationLossOverDistanceCoefficient = coefficient([
     hasSupercharger,
     -0.5,
   ]);
-  const aimTimeCoefficient =
-    coefficient(
-      [hasEnhancedGunLayingDrive, -0.1],
-      [hasReticleCalibration, -0.4],
-    ) * coefficient([true, degressiveStat(crewMemberMastery)]);
-  const dispersionStillCoefficient =
-    coefficient([hasRefinedGun, -0.1], [hasReticleCalibration, -0.4]) *
-    coefficient([true, degressiveStat(crewMemberMastery)]);
-  const dispersionMovingCoefficient = coefficient([
-    hasVerticalStabilizer,
-    -0.15,
-  ]);
-  const enginePowerCoefficient = coefficient(
-    [
-      hasEngineAccelerator &&
-        (tank.class === 'lightTank' || tank.class === 'mediumTank'),
-      0.05,
-    ],
-    [
-      hasEngineAccelerator &&
-        (tank.class === 'heavyTank' || tank.class === 'AT-SPG'),
-      0.07,
-    ],
-    [hasEnginePowerBoost, 0.2],
-    [hasImprovedEnginePowerBoost, 0.4],
-    [hasStandardFuel, 0.03],
-    [hasImprovedFuel, 0.1],
-    [hasGearOil, 0.03],
-    [hasImprovedGearOil, 0.06],
-  );
-  const turretTraverseCoefficient =
-    coefficient([hasStandardFuel, 0.03], [hasImprovedFuel, 0.1]) *
-    coefficient([true, progressiveStat(crewMemberMastery)]);
-  const hullTraverseCoefficient =
-    coefficient(
-      [hasImprovedControl, 0.1],
-      [hasImprovedEnginePowerBoost, 0.05],
-    ) * coefficient([true, progressiveStat(crewMemberMastery)]);
-  const resistanceCoefficient = coefficient([hasImprovedSuspension, -0.25]);
-  const viewRangeCoefficient =
-    coefficient([
-      hasImprovedOptics,
-      tank.class === 'AT-SPG' ? 0.05 : tank.class === 'heavyTank' ? 0.07 : 0.1,
-    ]) * coefficient([true, progressiveStat(commanderMastery)]);
-  const fireChanceCoefficient = coefficient([hasProtectiveKit, -0.2]);
-
-  const speedForwardsSum = sum(
-    [hasImprovedEnginePowerBoost, 5],
-    [hasGearOil, 2],
-    [hasImprovedGearOil, 4],
-  );
-  const speedBackwardsSum = sum(
-    [hasImprovedEnginePowerBoost, 10],
-    [hasGearOil, 2],
-    [hasImprovedGearOil, 4],
-  );
-  const camouflageSumMoving = sum(
-    [
-      hasCamouflageNet,
-      tank.class === 'heavyTank' ? 0.03 : tank.class === 'AT-SPG' ? 0.07 : 0.05,
-    ],
-    [
-      camouflage,
-      tank.class === 'AT-SPG' ? 0.04 : tank.class === 'heavyTank' ? 0.03 : 0.02,
-    ],
-  );
-  const camouflageSumStill = sum(
-    [
-      hasCamouflageNet,
-      2 *
-        (tank.class === 'heavyTank'
-          ? 0.03
-          : tank.class === 'AT-SPG'
-            ? 0.07
-            : 0.05),
-    ],
-    [
-      camouflage,
-      tank.class === 'AT-SPG' ? 0.04 : tank.class === 'heavyTank' ? 0.03 : 0.02,
-    ],
-  );
-
-  const resolvedEnginePower = engine.power * enginePowerCoefficient;
-  const dpm = resolveDpm(
-    gun,
-    shell,
-    damageCoefficient,
-    reloadCoefficient,
-    intraClipCoefficient,
-  );
 
   useEffect(() => {
     if (penetrationDistanceInput.current) {
@@ -232,6 +126,8 @@ export function Characteristics() {
     });
   }, [hasImprovedVerticalStabilizer]);
 
+  if (isFullScreen) return null;
+
   return (
     <Flex direction="column" gap="8" style={{ width: '100%' }}>
       <Flex direction="column" gap="2">
@@ -259,22 +155,14 @@ export function Characteristics() {
             })}
           </Flex>
         </Flex>
-
         <Info name="Gun type">{GUN_TYPE_NAMES[gun.type]}</Info>
         <InfoWithDelta name="DPM" decimals={0} unit="hp / min">
-          {dpm}
+          {stats.dpm}
         </InfoWithDelta>
         {gun.type === 'autoReloader' && (
           <>
             <InfoWithDelta decimals={0} indent name="Maximum" unit="hp / min">
-              {gun.reload.at(-1)! < gun.reload.at(-2)!
-                ? ((damageCoefficient * shell.damage.armor) /
-                    (gun.reload.at(-1)! * reloadCoefficient +
-                      gun.intraClip * intraClipCoefficient)) *
-                  60
-                : ((damageCoefficient * shell.damage.armor) /
-                    (gun.reload[0] * reloadCoefficient)) *
-                  60}
+              {stats.dpmMaximum!}
             </InfoWithDelta>
             <InfoWithDelta
               decimals={0}
@@ -282,34 +170,14 @@ export function Characteristics() {
               name="Effective at 60s"
               unit="hp / min"
             >
-              {gun.reload.at(-1)! < gun.reload.at(-2)!
-                ? ((damageCoefficient * shell.damage.armor) /
-                    (gun.reload.at(-1)! * reloadCoefficient +
-                      gun.intraClip * intraClipCoefficient)) *
-                    (60 -
-                      (gun.reload.slice(0, -1).length - 1) *
-                        gun.intraClip *
-                        intraClipCoefficient) +
-                  damageCoefficient *
-                    shell.damage.armor *
-                    gun.reload.slice(0, -1).length
-                : ((damageCoefficient * shell.damage.armor) /
-                    (gun.reload[0] * reloadCoefficient +
-                      gun.intraClip * intraClipCoefficient)) *
-                    (60 -
-                      (gun.reload.slice(1).length - 1) *
-                        gun.intraClip *
-                        intraClipCoefficient) +
-                  damageCoefficient *
-                    shell.damage.armor *
-                    gun.reload.slice(1).length}
+              {stats.dpmEffective!}
             </InfoWithDelta>
             <Info
               indent
               name={
                 <a
                   target="_blank"
-                  href="https://tresabhi.github.io/blitzkrieg/guide/dpm.html"
+                  href="https://tresabhi.github.io/blitzkit/guide/dpm.html"
                 >
                   What's the difference?
                 </a>
@@ -317,14 +185,16 @@ export function Characteristics() {
             />
           </>
         )}
+        {gun.type !== 'regular' && (
+          <InfoWithDelta name="Shells">{stats.shells}</InfoWithDelta>
+        )}
         {gun.type === 'autoReloader' ? (
           <>
-            <InfoWithDelta name="Shells">{gun.reload.length}</InfoWithDelta>
             <Info indent name="Most optimal">
-              {gun.reload.at(-1)! < gun.reload.at(-2)! ? gun.reload.length : 1}
+              {stats.mostOptimalShellIndex}
             </Info>
             <Info name="Shell reloads" unit="s" />
-            {gun.reload.map((reload, index) => (
+            {stats.shellReloads!.map((reload, index) => (
               <InfoWithDelta
                 key={index}
                 indent
@@ -332,7 +202,7 @@ export function Characteristics() {
                 decimals={2}
                 deltaType="lowerIsBetter"
               >
-                {reload * reloadCoefficient}
+                {reload}
               </InfoWithDelta>
             ))}
           </>
@@ -343,26 +213,22 @@ export function Characteristics() {
             unit="s"
             deltaType="lowerIsBetter"
           >
-            {gun.reload * reloadCoefficient}
+            {stats.shellReload!}
+          </InfoWithDelta>
+        )}
+        {(gun.type === 'autoLoader' || gun.type === 'autoReloader') && (
+          <InfoWithDelta
+            indent
+            decimals={2}
+            name="Intra-clip"
+            unit="s"
+            deltaType="lowerIsBetter"
+          >
+            {stats.intraClip!}
           </InfoWithDelta>
         )}
-        {gun.type === 'autoLoader' ||
-          (gun.type === 'autoReloader' && (
-            <InfoWithDelta
-              indent
-              decimals={2}
-              name="Intra-clip"
-              unit="s"
-              deltaType="lowerIsBetter"
-            >
-              {gun.intraClip * intraClipCoefficient}
-            </InfoWithDelta>
-          ))}
-        <InfoWithDelta name="Caliber" decimals={0} unit="mm">
-          {shell.caliber}
-        </InfoWithDelta>
         <InfoWithDelta decimals={0} name="Penetration" unit="mm">
-          {resolveNearPenetration(shell.penetration) * penetrationCoefficient}
+          {stats.penetration}
         </InfoWithDelta>
         {typeof shell.penetration !== 'number' && (
           <>
@@ -390,37 +256,58 @@ export function Characteristics() {
                   setPenetrationDistance(value);
                 }, 500)}
               />
-              <TextField.Root style={{ width: 64 }}>
-                <TextField.Input
-                  ref={penetrationDistanceInput}
-                  defaultValue={penetrationDistance}
-                  onBlur={() => {
-                    setPenetrationDistance(
-                      Math.min(
-                        parseInt(penetrationDistanceInput.current!.value),
-                        500,
-                      ),
-                    );
-                  }}
-                  onKeyDown={(event) => {
-                    if (event.key === 'Enter') {
-                      event.currentTarget.blur();
-                    }
-                  }}
-                />
-                <TextField.Slot>m</TextField.Slot>
+              <TextField.Root
+                style={{ width: 64 }}
+                ref={penetrationDistanceInput}
+                defaultValue={penetrationDistance}
+                onBlur={() => {
+                  setPenetrationDistance(
+                    Math.min(
+                      parseInt(penetrationDistanceInput.current!.value),
+                      500,
+                    ),
+                  );
+                }}
+                onKeyDown={(event) => {
+                  if (event.key === 'Enter') {
+                    event.currentTarget.blur();
+                  }
+                }}
+              >
+                <TextField.Slot side="right">m</TextField.Slot>
               </TextField.Root>
             </Flex>
           </>
         )}
         <InfoWithDelta name="Damage" unit="hp" decimals={0}>
-          {shell.damage.armor * damageCoefficient}
+          {stats.damage}
         </InfoWithDelta>
         <InfoWithDelta name="Module damage" unit="hp" decimals={0}>
-          {shell.damage.module * damageCoefficient}
+          {stats.moduleDamage}
         </InfoWithDelta>
+        {isExplosive(shell.type) && (
+          <InfoWithDelta name="Splash radius" unit="m" decimals={0}>
+            {stats.explosionRadius!}
+          </InfoWithDelta>
+        )}
+        <InfoWithDelta name="Caliber" decimals={0} unit="mm">
+          {stats.caliber}
+        </InfoWithDelta>
+        <InfoWithDelta name="Normalization" decimals={0} unit="°">
+          {stats.shellNormalization}
+        </InfoWithDelta>
+        {shell.type !== 'he' && (
+          <InfoWithDelta
+            name="Ricochet"
+            decimals={0}
+            deltaType="lowerIsBetter"
+            unit="°"
+          >
+            {stats.shellRicochet!}
+          </InfoWithDelta>
+        )}
         <InfoWithDelta name="Shell velocity" unit="m/s" decimals={0}>
-          {shell.speed * shellVelocityCoefficient}
+          {stats.shellVelocity}
         </InfoWithDelta>
         <InfoWithDelta
           decimals={2}
@@ -428,7 +315,7 @@ export function Characteristics() {
           unit="s"
           deltaType="lowerIsBetter"
         >
-          {gun.aimTime * aimTimeCoefficient}
+          {stats.aimTime}
         </InfoWithDelta>
         <Info name="Dispersion at 100m" />
         <InfoWithDelta
@@ -438,7 +325,7 @@ export function Characteristics() {
           unit="m"
           deltaType="lowerIsBetter"
         >
-          {gun.dispersion.base * dispersionStillCoefficient}
+          {stats.dispersion}
         </InfoWithDelta>
         <InfoWithDelta
           prefix="+ "
@@ -447,7 +334,7 @@ export function Characteristics() {
           name="Moving"
           deltaType="lowerIsBetter"
         >
-          {track.dispersion.move * dispersionMovingCoefficient}
+          {stats.dispersionMoving}
         </InfoWithDelta>
         <InfoWithDelta
           decimals={3}
@@ -456,7 +343,7 @@ export function Characteristics() {
           name="Hull traversing"
           deltaType="lowerIsBetter"
         >
-          {track.dispersion.traverse * dispersionMovingCoefficient}
+          {stats.dispersionHullTraversing}
         </InfoWithDelta>
         <InfoWithDelta
           decimals={3}
@@ -465,7 +352,7 @@ export function Characteristics() {
           name="Turret traversing"
           deltaType="lowerIsBetter"
         >
-          {gun.dispersion.traverse * dispersionMovingCoefficient}
+          {stats.dispersionTurretTraversing}
         </InfoWithDelta>
         <InfoWithDelta
           decimals={3}
@@ -474,7 +361,7 @@ export function Characteristics() {
           name="After shooting"
           deltaType="lowerIsBetter"
         >
-          {gun.dispersion.shot * dispersionMovingCoefficient}
+          {stats.dispersionShooting}
         </InfoWithDelta>
         <InfoWithDelta
           decimals={1}
@@ -484,46 +371,42 @@ export function Characteristics() {
           unit="scalar"
           deltaType="lowerIsBetter"
         >
-          {gun.dispersion.damaged * dispersionMovingCoefficient}
+          {stats.dispersionGunDamaged}
         </InfoWithDelta>
         <Info name="Gun flexibility" unit="°" />
         <InfoWithDelta decimals={1} indent name="Depression">
-          {gunModelDefinition.pitch.max +
-            gunDefaultPitch +
-            (hasImprovedVerticalStabilizer ? 3 : 0)}
+          {stats.gunDepression}
         </InfoWithDelta>
         <InfoWithDelta decimals={1} indent name="Elevation">
-          {-gunModelDefinition.pitch.min -
-            gunDefaultPitch +
-            (hasImprovedVerticalStabilizer ? 3 : 0)}
+          {stats.gunElevation}
         </InfoWithDelta>
         {gunModelDefinition.pitch.front && (
           <>
             <InfoWithDelta decimals={1} indent name="Frontal depression">
-              {gunModelDefinition.pitch.front.max}
+              {stats.gunFrontalDepression!}
             </InfoWithDelta>
             <InfoWithDelta decimals={1} indent name="Frontal elevation">
-              {-gunModelDefinition.pitch.front.min}
+              {stats.gunFrontalElevation!}
             </InfoWithDelta>
           </>
         )}
         {gunModelDefinition.pitch.back && (
           <>
             <InfoWithDelta decimals={1} indent name="Rear depression">
-              {gunModelDefinition.pitch.back.max}
+              {stats.gunRearDepression!}
             </InfoWithDelta>
             <InfoWithDelta decimals={1} indent name="Rear elevation">
-              {-gunModelDefinition.pitch.back.min}
+              {stats.gunRearElevation!}
             </InfoWithDelta>
           </>
         )}
         {turretModelDefinition.yaw && (
           <>
             <InfoWithDelta decimals={1} indent name="Azimuth left">
-              {-turretModelDefinition.yaw.min}
+              {stats.azimuthLeft!}
             </InfoWithDelta>
             <InfoWithDelta decimals={1} indent name="Azimuth right">
-              {turretModelDefinition.yaw.max}
+              {stats.azimuthRight!}
             </InfoWithDelta>
           </>
         )}
@@ -533,29 +416,13 @@ export function Characteristics() {
         <Heading size="5">Maneuverability</Heading>
         <Info name="Speed" unit="km/hr" />
         <InfoWithDelta decimals={0} indent name="Forwards">
-          {tank.speed.forwards + speedForwardsSum}
+          {stats.speedForwards}
         </InfoWithDelta>
         <InfoWithDelta decimals={0} indent name="Backwards">
-          {tank.speed.backwards + speedBackwardsSum}
+          {stats.speedBackwards}
         </InfoWithDelta>
-        <InfoWithDelta decimals={0} name="Power" unit="hp">
-          {resolvedEnginePower}
-        </InfoWithDelta>
-        <Info name="Power to weight ratio" unit="hp/tn" />
-        <InfoWithDelta decimals={1} indent name="On hard terrain">
-          {resolvedEnginePower /
-            weightTons /
-            (track.resistance.hard * resistanceCoefficient)}
-        </InfoWithDelta>
-        <InfoWithDelta decimals={1} indent name="On medium terrain">
-          {resolvedEnginePower /
-            weightTons /
-            (track.resistance.medium * resistanceCoefficient)}
-        </InfoWithDelta>
-        <InfoWithDelta decimals={1} indent name="On soft terrain">
-          {resolvedEnginePower /
-            weightTons /
-            (track.resistance.soft * resistanceCoefficient)}
+        <InfoWithDelta decimals={0} name="Engine power" unit="hp">
+          {stats.enginePower}
         </InfoWithDelta>
         <InfoWithDelta
           decimals={1}
@@ -563,82 +430,104 @@ export function Characteristics() {
           unit="tn"
           deltaType="lowerIsBetter"
         >
-          {weightTons}
+          {stats.weight}
         </InfoWithDelta>
-        <InfoWithDelta name="Turret traverse speed" unit="°/s" decimals={0}>
-          {turret.traverseSpeed * turretTraverseCoefficient}
-        </InfoWithDelta>
-        <Info name="Effective traverse speed" unit="°/s" />
+        <Info name="Power to weight ratio" unit="hp/tn" />
         <InfoWithDelta decimals={1} indent name="On hard terrain">
-          {(resolvedEnginePower / stockEngine.power) *
-            track.traverseSpeed *
-            hullTraverseCoefficient *
-            (track.resistance.hard /
-              (track.resistance.hard * resistanceCoefficient)) *
-            (stockWeight / weight)}
+          {stats.powerToWeightRatioHardTerrain}
         </InfoWithDelta>
         <InfoWithDelta decimals={1} indent name="On medium terrain">
-          {(resolvedEnginePower / stockEngine.power) *
-            track.traverseSpeed *
-            hullTraverseCoefficient *
-            (track.resistance.hard /
-              (track.resistance.medium * resistanceCoefficient)) *
-            (stockWeight / weight)}
+          {stats.powerToWeightRatioMediumTerrain}
         </InfoWithDelta>
         <InfoWithDelta decimals={1} indent name="On soft terrain">
-          {(resolvedEnginePower / stockEngine.power) *
-            track.traverseSpeed *
-            hullTraverseCoefficient *
-            (track.resistance.hard /
-              (track.resistance.soft * resistanceCoefficient)) *
-            (stockWeight / weight)}
+          {stats.powerToWeightRatioSoftTerrain}
+        </InfoWithDelta>
+        <InfoWithDelta name="Turret traverse speed" unit="°/s" decimals={1}>
+          {stats.turretTraverseSpeed}
+        </InfoWithDelta>
+        <Info name="Hull traverse speed" unit="°/s" />
+        <InfoWithDelta decimals={1} indent name="On hard terrain">
+          {stats.hullTraverseHardTerrain}
+        </InfoWithDelta>
+        <InfoWithDelta decimals={1} indent name="On medium terrain">
+          {stats.hullTraverseMediumTerrain}
+        </InfoWithDelta>
+        <InfoWithDelta decimals={1} indent name="On soft terrain">
+          {stats.hullTraverseSoftTerrain}
         </InfoWithDelta>
       </Flex>
 
       <Flex direction="column" gap="2">
         <Heading size="5">Survivability</Heading>
         <InfoWithDelta name="Health" unit="hp" decimals={0}>
-          {(tank.health + turret.health) * healthCoefficient}
+          {stats.health}
         </InfoWithDelta>
-        <InfoWithDelta name="Fire chance" unit="%" deltaType="lowerIsBetter">
-          {Math.round(engine.fireChance * fireChanceCoefficient * 100)}
+        <InfoWithDelta
+          name="Fire chance"
+          unit="%"
+          deltaType="lowerIsBetter"
+          decimals={0}
+        >
+          {stats.fireChance * 100}
         </InfoWithDelta>
         <InfoWithDelta name="View range" unit="m" decimals={0}>
-          {turret.viewRange * viewRangeCoefficient}
+          {stats.viewRange}
         </InfoWithDelta>
         <Info name="Camouflage" unit="%" />
-        <InfoWithDelta indent name="Still" decimals={2}>
-          {(tank.camouflage.still + camouflageSumStill) * 100}
+        <InfoWithDelta indent name="Still" decimals={0}>
+          {stats.camouflageStill * 100}
         </InfoWithDelta>
-        <InfoWithDelta indent name="Moving" decimals={2}>
-          {(tank.camouflage.moving + camouflageSumMoving) * 100}
+        <InfoWithDelta indent name="Moving" decimals={0}>
+          {stats.camouflageMoving * 100}
         </InfoWithDelta>
-        <InfoWithDelta indent name="Shooting still" decimals={2}>
-          {(tank.camouflage.still * gun.camouflageLoss + camouflageSumStill) *
-            100}
+        <InfoWithDelta indent name="Shooting still" decimals={0}>
+          {stats.camouflageShootingStill * 100}
         </InfoWithDelta>
-        <InfoWithDelta indent name="Shooting on move" decimals={2}>
-          {(tank.camouflage.moving * gun.camouflageLoss + camouflageSumMoving) *
-            100}
+        <InfoWithDelta indent name="Shooting moving" decimals={0}>
+          {stats.camouflageShootingMoving * 100}
         </InfoWithDelta>
-        <InfoWithDelta indent name="Caught on fire" decimals={2}>
-          {(tank.camouflage.onFire * tank.camouflage.still +
-            camouflageSumStill) *
-            100}
+        <InfoWithDelta indent name="Caught on fire" decimals={0}>
+          {stats.camouflageCaughtOnFire * 100}
         </InfoWithDelta>
-        <Info name="Size" unit="m">
-          {size[0].toFixed(2)} x {size[2].toFixed(2)} x {size[1].toFixed(2)}
+        <Info name="Width" unit="m" decimals={0} deltaType="lowerIsBetter">
+          {stats.width}
+        </Info>
+        <Info name="Height" unit="m" decimals={0} deltaType="lowerIsBetter">
+          {stats.height}
+        </Info>
+        <Info name="Length" unit="m" decimals={0} deltaType="lowerIsBetter">
+          {stats.length}
+        </Info>
+        <Info name="Volume" unit="m" decimals={0} deltaType="lowerIsBetter">
+          {stats.volume}
         </Info>
       </Flex>
 
       <Flex direction="column" gap="2">
-        <Heading size="5">Crew training</Heading>
+        <Flex gap="2" align="center">
+          <Heading size="5">Crew training</Heading>
+
+          <Popover.Root>
+            <Popover.Trigger>
+              <IconButton variant="ghost">
+                <InfoCircledIcon />
+              </IconButton>
+            </Popover.Trigger>
+
+            <Popover.Content>
+              <Flex gap="1" align="center">
+                <AccessibilityIcon />
+                <Text>represents the other roles a crew member can take.</Text>
+              </Flex>
+            </Popover.Content>
+          </Popover.Root>
+        </Flex>
 
         {tank.crew.map((member) => {
           const count = member.count ?? 1;
 
           return (
-            <>
+            <Fragment key={member.type}>
               <InfoWithDelta
                 key={`${member.type}-root`}
                 name={`${CREW_MEMBER_NAMES[member.type]}${count > 1 ? ` x ${count}` : ''}`}
@@ -667,7 +556,7 @@ export function Characteristics() {
                   }
                 />
               )}
-            </>
+            </Fragment>
           );
         })}
       </Flex>

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

@@ -4,9 +4,9 @@ import { useEffect, useRef } from 'react';
 import { Vector3 } from 'three';
 import { OrbitControls as OrbitControlsClass } from 'three-stdlib';
 import { applyPitchYawLimits } from '../../../../../core/blitz/applyPitchYawLimits';
-import { hasEquipment } from '../../../../../core/blitzkrieg/hasEquipment';
-import { modelDefinitions } from '../../../../../core/blitzkrieg/modelDefinitions';
-import { Pose, poseEvent } from '../../../../../core/blitzkrieg/pose';
+import { hasEquipment } from '../../../../../core/blitzkit/hasEquipment';
+import { modelDefinitions } from '../../../../../core/blitzkit/modelDefinitions';
+import { Pose, poseEvent } from '../../../../../core/blitzkit/pose';
 import { useAwait } from '../../../../../hooks/useAwait';
 import { useDuel } from '../../../../../stores/duel';
 import { useTankopediaPersistent } from '../../../../../stores/tankopedia';
@@ -69,7 +69,12 @@ export function Controls() {
     );
 
     async function handlePoseEvent(event: Pose) {
-      const hasImprovedVerticalStabilizer = await hasEquipment(122);
+      const duel = useDuel.getState();
+      const hasImprovedVerticalStabilizer = await hasEquipment(
+        122,
+        duel.protagonist!.tank.equipment,
+        duel.protagonist!.equipmentMatrix,
+      );
 
       switch (event) {
         case Pose.HullDown: {

src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx

@@ -1,5 +1,5 @@
 import { LightningBoltIcon } from '@radix-ui/react-icons';
-import { Button, Card, Flex, Tabs, Theme } from '@radix-ui/themes';
+import { Button, Card, Flex, Tabs, Text, Theme } from '@radix-ui/themes';
 import { PerspectiveCamera } from '@react-three/drei';
 import { Canvas } from '@react-three/fiber';
 import { Suspense, use, useEffect, useRef, useState } from 'react';
@@ -7,12 +7,14 @@ import { isMobile } from 'react-device-detect';
 import { Armor } from '../../../../../../components/Armor';
 import { ShotDisplay } from '../../../../../../components/Armor/components/ShotDisplay';
 import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits';
-import { modelDefinitions } from '../../../../../../core/blitzkrieg/modelDefinitions';
-import { modelTransformEvent } from '../../../../../../core/blitzkrieg/modelTransform';
-import { Pose, poseEvent } from '../../../../../../core/blitzkrieg/pose';
-import { tankIcon } from '../../../../../../core/blitzkrieg/tankIcon';
+import { modelDefinitions } from '../../../../../../core/blitzkit/modelDefinitions';
+import { modelTransformEvent } from '../../../../../../core/blitzkit/modelTransform';
+import { Pose, poseEvent } from '../../../../../../core/blitzkit/pose';
+import { tankIcon } from '../../../../../../core/blitzkit/tankIcon';
 import { useEquipment } from '../../../../../../hooks/useEquipment';
+import { useFullScreen } from '../../../../../../hooks/useFullScreen';
 import { useWideFormat } from '../../../../../../hooks/useWideFormat';
+import { BlitzkitWide } from '../../../../../../icons/BlitzkitWide';
 import { mutateDuel, useDuel } from '../../../../../../stores/duel';
 import mutateTankopediaPersistent, {
   TankopediaMode,
@@ -33,7 +35,6 @@ export function TankSandbox() {
   const hasImprovedVerticalStabilizer = useEquipment(122);
   const awaitedModelDefinitions = use(modelDefinitions);
   const canvasWrapper = useRef<HTMLDivElement>(null);
-  const [isFullScreen, setIsFullScreen] = useState(false);
   const mode = useTankopediaPersistent((state) => state.mode);
   const protagonist = useDuel((state) => state.protagonist!);
   const tankModelDefinition = awaitedModelDefinitions[protagonist.tank.id];
@@ -43,6 +44,7 @@ export function TankSandbox() {
   const wideFormat = useWideFormat();
   const [loadModel, setLoadModel] = useState(wideFormat || !isMobile);
   const duel = useDuel();
+  const isFullScreen = useFullScreen();
 
   function handlePointerDown() {
     window.addEventListener('pointermove', handlePointerMove);
@@ -59,10 +61,6 @@ export function TankSandbox() {
   }
 
   useEffect(() => {
-    function handleFullScreenChange() {
-      setIsFullScreen(document.fullscreenElement !== null);
-    }
-
     function handlePoseEvent(pose: Pose) {
       switch (pose) {
         case Pose.HullDown: {
@@ -121,10 +119,8 @@ export function TankSandbox() {
     }
 
     poseEvent.on(handlePoseEvent);
-    document.addEventListener('fullscreenchange', handleFullScreenChange);
 
     return () => {
-      document.removeEventListener('fullscreenchange', handleFullScreenChange);
       poseEvent.off(handlePoseEvent);
     };
   });
@@ -145,117 +141,133 @@ export function TankSandbox() {
     <Theme radius={isFullScreen ? 'none' : undefined}>
       <Card
         style={{
-          position: 'relative',
+          position: isFullScreen ? 'fixed' : 'relative',
           border: isFullScreen ? 'none' : 'unset',
+          width: isFullScreen ? '100vw' : 'unset',
+          height: isFullScreen ? 'calc(100vh)' : 'unset',
+          top: isFullScreen ? 0 : 'unset',
+          left: isFullScreen ? 0 : 'unset',
+          zIndex: isFullScreen ? 2 : 'unset',
         }}
         ref={canvasWrapper}
       >
-        <Theme radius="full" style={{ height: '100%' }}>
-          <Flex
-            style={{
-              height: isFullScreen ? '100%' : '75vh',
-              maxHeight: isFullScreen ? 'unset' : 576,
+        <Flex
+          style={{
+            height: isFullScreen ? '100%' : '75vh',
+            maxHeight: isFullScreen ? 'unset' : 576,
+          }}
+          direction="column"
+          gap="2"
+        >
+          <Tabs.Root
+            value={mode}
+            onValueChange={(mode) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.mode = mode as TankopediaMode;
+              });
             }}
-            direction="column"
-            gap="2"
           >
-            <Tabs.Root
-              value={mode}
-              onValueChange={(mode) => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.mode = mode as TankopediaMode;
-                });
-              }}
-            >
-              <Tabs.List>
-                <Tabs.Trigger value="model">
-                  <Flex gap="2" align="center">
-                    Model
-                  </Flex>
-                </Tabs.Trigger>
-                <Tabs.Trigger value="armor">Armor</Tabs.Trigger>
-              </Tabs.List>
-            </Tabs.Root>
-
-            <div
-              style={{
-                height: 'calc(100% - 64px)',
-                position: 'absolute',
-                width: '100%',
-                bottom: 0,
-              }}
-            >
-              {loadModel ? (
-                <div style={{ width: '100%', height: '100%' }}>
-                  <Canvas
-                    shadows
-                    ref={canvas}
-                    onPointerDown={handlePointerDown}
-                    onPointerMissed={() => {
-                      mutateTankopediaTemporary((draft) => {
-                        draft.shot = undefined;
-                      });
-                    }}
-                  >
-                    <PerspectiveCamera makeDefault fov={25} far={32} />
-                    <Controls />
-                    <SceneProps />
-
-                    <Suspense fallback={<ModelLoader />}>
-                      {/* TODO: add rotation cube to the top right */}
-                      <Lighting />
-                      <TankModel />
-                      <Armor />
-                      <ShotDisplay />
-                    </Suspense>
-                  </Canvas>
-                </div>
-              ) : (
-                <Flex
-                  align="center"
-                  justify="center"
-                  style={{ height: '100%', position: 'relative' }}
-                >
-                  <Button
-                    style={{
-                      zIndex: 1,
-                    }}
-                    onClick={() => {
-                      setLoadModel(true);
-                    }}
-                  >
-                    <LightningBoltIcon /> Load model
-                  </Button>
-
-                  <Flex
-                    style={{
-                      filter: 'blur(16px)',
-                      width: 256,
-                      height: 128,
-                      display: 'flex',
-                      position: 'absolute',
-                      top: '50%',
-                      left: '50%',
-                      transformOrigin: 'center center',
-                      transform: 'translate(25%, -25%) scale(300%)',
-                    }}
-                  >
-                    <img src={tankIcon(duel.antagonist!.tank.id, 'big')} />
-                  </Flex>
+            <Tabs.List>
+              <Tabs.Trigger value="model">
+                <Flex gap="2" align="center">
+                  Model
                 </Flex>
-              )}
-            </div>
+              </Tabs.Trigger>
+              <Tabs.Trigger value="armor">Armor</Tabs.Trigger>
+            </Tabs.List>
+          </Tabs.Root>
 
-            <Options
-              canvasWrapper={canvasWrapper}
-              isFullScreen={isFullScreen}
-            />
+          {wideFormat && (
+            <Text
+              color="gray"
+              style={{
+                position: 'absolute',
+                left: '50%',
+                top: 16,
+              }}
+            >
+              <BlitzkitWide height={32} />
+            </Text>
+          )}
 
-            {isFullScreen && <AntagonistBar floating />}
+          <div
+            style={{
+              height: 'calc(100% - 64px)',
+              position: 'absolute',
+              width: '100%',
+              bottom: 0,
+            }}
+          >
+            {loadModel ? (
+              <div style={{ width: '100%', height: '100%' }}>
+                <Canvas
+                  gl={{
+                    clippingPlanes: Object.freeze([]),
+                    localClippingEnabled: true,
+                  }}
+                  shadows
+                  ref={canvas}
+                  onPointerDown={handlePointerDown}
+                  onPointerMissed={() => {
+                    mutateTankopediaTemporary((draft) => {
+                      draft.shot = undefined;
+                    });
+                  }}
+                >
+                  <PerspectiveCamera makeDefault fov={25} far={32} />
+                  <Controls />
+                  <SceneProps />
 
-            {loadModel && <RotationInputs isFullScreen={isFullScreen} />}
-          </Flex>
-        </Theme>
+                  <Suspense fallback={<ModelLoader />}>
+                    <Lighting />
+                    <TankModel />
+                    <Armor />
+                    <ShotDisplay />
+                  </Suspense>
+                </Canvas>
+              </div>
+            ) : (
+              <Flex
+                align="center"
+                justify="center"
+                style={{ height: '100%', position: 'relative' }}
+              >
+                <Button
+                  style={{
+                    zIndex: 1,
+                  }}
+                  onClick={() => {
+                    setLoadModel(true);
+                  }}
+                >
+                  <LightningBoltIcon /> Load model
+                </Button>
+
+                <Flex
+                  style={{
+                    filter: 'blur(16px)',
+                    width: 256,
+                    height: 128,
+                    display: 'flex',
+                    position: 'absolute',
+                    top: '50%',
+                    left: '50%',
+                    transformOrigin: 'center center',
+                    transform: 'translate(25%, -25%) scale(300%)',
+                  }}
+                >
+                  <img src={tankIcon(duel.antagonist!.tank.id, 'big')} />
+                </Flex>
+              </Flex>
+            )}
+          </div>
+
+          <Options canvasWrapper={canvasWrapper} isFullScreen={isFullScreen} />
+
+          {isFullScreen && <AntagonistBar floating />}
+
+          {loadModel && <RotationInputs isFullScreen={isFullScreen} />}
+        </Flex>
       </Card>
     </Theme>
   );

src/app/tools/tankopedia/[id]/components/Model/components/ModelLoader.tsx

@@ -1,17 +1,12 @@
 import { Html, useProgress } from '@react-three/drei';
-import { theme } from '../../../../../../../stitches.config';
-import { Loader } from '../../../../../components/Loader';
+import { Loader } from '../../../../../../../components/Loader';
 
 export function ModelLoader() {
   const { progress } = useProgress();
 
   return (
     <Html center position={[0, 1.5, 0]}>
-      <Loader
-        naked
-        color={theme.colors.textHighContrast_purple}
-        progress={progress / 100}
-      />
+      <Loader naked progress={progress / 100} />
     </Html>
   );
 }

src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx

@@ -6,7 +6,8 @@ import {
 } from '@radix-ui/react-icons';
 import { Button, DropdownMenu, Flex } from '@radix-ui/themes';
 import { RefObject } from 'react';
-import { Pose, poseEvent } from '../../../../../../../core/blitzkrieg/pose';
+import { Pose, poseEvent } from '../../../../../../../core/blitzkit/pose';
+import { useApp } from '../../../../../../../stores/app';
 import mutateTankopediaPersistent, {
   mutateTankopediaTemporary,
   useTankopediaPersistent,
@@ -18,7 +19,7 @@ interface OptionsProps {
   canvasWrapper: RefObject<HTMLElement>;
 }
 
-export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
+export function Options({ isFullScreen }: OptionsProps) {
   const showGrid = useTankopediaPersistent(
     (state) => state.model.visual.showGrid,
   );
@@ -40,6 +41,7 @@ export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
   const environment = useTankopediaPersistent(
     (state) => state.model.visual.environment,
   );
+  const developerMode = useApp((state) => state.developerMode);
 
   return (
     <Flex
@@ -50,66 +52,64 @@ export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
         right: 18,
       }}
     >
-      {!isFullScreen && (
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger>
-            <Button variant="ghost">
-              <EyeOpenIcon />
-            </Button>
-          </DropdownMenu.Trigger>
+      <DropdownMenu.Root>
+        <DropdownMenu.Trigger>
+          <Button variant="ghost">
+            <EyeOpenIcon />
+          </Button>
+        </DropdownMenu.Trigger>
 
-          <DropdownMenu.Content>
-            <DropdownMenu.Item onClick={() => poseEvent.emit(Pose.HullDown)}>
-              Hull down
-            </DropdownMenu.Item>
+        <DropdownMenu.Content>
+          <DropdownMenu.Item onClick={() => poseEvent.emit(Pose.HullDown)}>
+            Hull down
+          </DropdownMenu.Item>
 
-            <DropdownMenu.Item onClick={() => poseEvent.emit(Pose.FaceHug)}>
-              Face hug
-            </DropdownMenu.Item>
+          <DropdownMenu.Item onClick={() => poseEvent.emit(Pose.FaceHug)}>
+            Face hug
+          </DropdownMenu.Item>
 
-            <DropdownMenu.Item onClick={() => poseEvent.emit(Pose.Default)}>
-              Default
-            </DropdownMenu.Item>
-          </DropdownMenu.Content>
-        </DropdownMenu.Root>
-      )}
+          <DropdownMenu.Item onClick={() => poseEvent.emit(Pose.Default)}>
+            Default
+          </DropdownMenu.Item>
+        </DropdownMenu.Content>
+      </DropdownMenu.Root>
 
-      {!isFullScreen && (
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger>
-            <Button variant="ghost">
-              <GearIcon />
-            </Button>
-          </DropdownMenu.Trigger>
+      <DropdownMenu.Root>
+        <DropdownMenu.Trigger>
+          <Button variant="ghost">
+            <GearIcon />
+          </Button>
+        </DropdownMenu.Trigger>
 
-          <DropdownMenu.Content>
-            <DropdownMenu.Label>Armor</DropdownMenu.Label>
+        <DropdownMenu.Content>
+          <DropdownMenu.Label>Armor</DropdownMenu.Label>
 
-            <DropdownMenu.CheckboxItem
-              checked={showSpacedArmor}
-              onCheckedChange={(checked) => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.model.visual.showSpacedArmor = checked;
-                });
-                mutateTankopediaTemporary((draft) => {
-                  draft.shot = undefined;
-                });
-              }}
-            >
-              Spaced armor
-            </DropdownMenu.CheckboxItem>
+          <DropdownMenu.CheckboxItem
+            checked={showSpacedArmor}
+            onCheckedChange={(checked) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.model.visual.showSpacedArmor = checked;
+              });
+              mutateTankopediaTemporary((draft) => {
+                draft.shot = undefined;
+              });
+            }}
+          >
+            Spaced armor
+          </DropdownMenu.CheckboxItem>
 
-            <DropdownMenu.CheckboxItem
-              checked={greenPenetration}
-              onCheckedChange={(checked) => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.model.visual.greenPenetration = checked;
-                });
-              }}
-            >
-              Green penetration
-            </DropdownMenu.CheckboxItem>
+          <DropdownMenu.CheckboxItem
+            checked={greenPenetration}
+            onCheckedChange={(checked) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.model.visual.greenPenetration = checked;
+              });
+            }}
+          >
+            Green penetration
+          </DropdownMenu.CheckboxItem>
 
+          {developerMode && (
             <DropdownMenu.CheckboxItem
               checked={wireframe}
               onCheckedChange={(checked) => {
@@ -120,66 +120,66 @@ export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
             >
               Wireframe
             </DropdownMenu.CheckboxItem>
+          )}
 
-            <DropdownMenu.CheckboxItem
-              checked={opaque}
-              onCheckedChange={(checked) => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.model.visual.opaque = checked;
-                });
-              }}
-            >
-              Opaque
-            </DropdownMenu.CheckboxItem>
+          <DropdownMenu.CheckboxItem
+            checked={opaque}
+            onCheckedChange={(checked) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.model.visual.opaque = checked;
+              });
+            }}
+          >
+            Opaque
+          </DropdownMenu.CheckboxItem>
 
-            <DropdownMenu.Label>Environment</DropdownMenu.Label>
+          <DropdownMenu.Label>Environment</DropdownMenu.Label>
 
-            <DropdownMenu.CheckboxItem
-              checked={showGrid}
-              onCheckedChange={(checked) => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.model.visual.showGrid = checked;
-                });
-              }}
-            >
-              Show grid
-            </DropdownMenu.CheckboxItem>
+          <DropdownMenu.CheckboxItem
+            checked={showGrid}
+            onCheckedChange={(checked) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.model.visual.showGrid = checked;
+              });
+            }}
+          >
+            Show grid
+          </DropdownMenu.CheckboxItem>
 
-            <DropdownMenu.CheckboxItem
-              checked={showEnvironment}
-              onCheckedChange={(checked) => {
-                mutateTankopediaPersistent((draft) => {
-                  draft.model.visual.showEnvironment = checked;
-                });
-              }}
-            >
-              View environment
-            </DropdownMenu.CheckboxItem>
+          <DropdownMenu.CheckboxItem
+            checked={showEnvironment}
+            onCheckedChange={(checked) => {
+              mutateTankopediaPersistent((draft) => {
+                draft.model.visual.showEnvironment = checked;
+              });
+            }}
+          >
+            View environment
+          </DropdownMenu.CheckboxItem>
 
-            <DropdownMenu.Sub>
-              <DropdownMenu.SubTrigger>Lighting</DropdownMenu.SubTrigger>
+          <DropdownMenu.Sub>
+            <DropdownMenu.SubTrigger>Lighting</DropdownMenu.SubTrigger>
 
-              <DropdownMenu.SubContent>
-                <DropdownMenu.RadioGroup value={environment}>
-                  {ENVIRONMENTS.map((environment) => (
-                    <DropdownMenu.RadioItem
-                      key={environment}
-                      value={environment}
-                      onClick={() => {
-                        mutateTankopediaPersistent((draft) => {
-                          draft.model.visual.environment = environment;
-                        });
-                      }}
-                    >
-                      {environment[0].toUpperCase() + environment.slice(1)}
-                    </DropdownMenu.RadioItem>
-                  ))}
-                </DropdownMenu.RadioGroup>
-              </DropdownMenu.SubContent>
-            </DropdownMenu.Sub>
-          </DropdownMenu.Content>
-        </DropdownMenu.Root>
-      )}
+            <DropdownMenu.SubContent>
+              <DropdownMenu.RadioGroup value={environment}>
+                {ENVIRONMENTS.map((environment) => (
+                  <DropdownMenu.RadioItem
+                    key={environment}
+                    value={environment}
+                    onClick={() => {
+                      mutateTankopediaPersistent((draft) => {
+                        draft.model.visual.environment = environment;
+                      });
+                    }}
+                  >
+                    {environment[0].toUpperCase() + environment.slice(1)}
+                  </DropdownMenu.RadioItem>
+                ))}
+              </DropdownMenu.RadioGroup>
+            </DropdownMenu.SubContent>
+          </DropdownMenu.Sub>
+        </DropdownMenu.Content>
+      </DropdownMenu.Root>
 
       {fullScreenAvailable && (
         <Button
@@ -187,7 +187,7 @@ export function Options({ isFullScreen, canvasWrapper }: OptionsProps) {
           onClick={() => {
             if (isFullScreen) {
               document.exitFullscreen();
-            } else canvasWrapper.current?.requestFullscreen();
+            } else document.body.requestFullscreen();
           }}
         >
           {isFullScreen ? <ExitFullScreenIcon /> : <EnterFullScreenIcon />}

src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx

@@ -4,13 +4,13 @@ import { Euler, Group, Vector3 } from 'three';
 import { degToRad } from 'three/src/math/MathUtils';
 import { I_HAT, J_HAT, K_HAT } from '../../../../../../../constants/axis';
 import { applyPitchYawLimits } from '../../../../../../../core/blitz/applyPitchYawLimits';
-import { hasEquipment } from '../../../../../../../core/blitzkrieg/hasEquipment';
-import { jsxTree } from '../../../../../../../core/blitzkrieg/jsxTree';
-import { modelDefinitions } from '../../../../../../../core/blitzkrieg/modelDefinitions';
+import { hasEquipment } from '../../../../../../../core/blitzkit/hasEquipment';
+import { jsxTree } from '../../../../../../../core/blitzkit/jsxTree';
+import { modelDefinitions } from '../../../../../../../core/blitzkit/modelDefinitions';
 import {
   ModelTransformEventData,
   modelTransformEvent,
-} from '../../../../../../../core/blitzkrieg/modelTransform';
+} from '../../../../../../../core/blitzkit/modelTransform';
 import { normalizeAngleRad } from '../../../../../../../core/math/normalizeAngleRad';
 import { useAwait } from '../../../../../../../hooks/useAwait';
 import { useModel } from '../../../../../../../hooks/useModel';
@@ -124,11 +124,15 @@ export const TankModel = memo(() => {
           event.stopPropagation();
         }
 
-        return jsxTree(node, {
-          castShadow: true,
-          receiveShadow: true,
-          onPointerDown,
-        });
+        return jsxTree(
+          node,
+          {
+            castShadow: true,
+            receiveShadow: true,
+            onPointerDown,
+          },
+          node.uuid,
+        );
       })}
 
       <group ref={turretContainer}>
@@ -162,7 +166,12 @@ export const TankModel = memo(() => {
             }
           }
           async function handlePointerMove(event: PointerEvent) {
-            const hasImprovedVerticalStabilizer = await hasEquipment(122);
+            const duel = useDuel.getState();
+            const hasImprovedVerticalStabilizer = await hasEquipment(
+              122,
+              duel.protagonist!.tank.equipment,
+              duel.protagonist!.equipmentMatrix,
+            );
             [pitch, yaw] = applyPitchYawLimits(
               pitch,
               yaw + event.movementX * (Math.PI / canvas.width),
@@ -184,11 +193,15 @@ export const TankModel = memo(() => {
             window.removeEventListener('pointerup', handlePointerUp);
           }
 
-          return jsxTree(node, {
-            castShadow: true,
-            receiveShadow: true,
-            onPointerDown,
-          });
+          return jsxTree(
+            node,
+            {
+              castShadow: true,
+              receiveShadow: true,
+              onPointerDown,
+            },
+            node.uuid,
+          );
         })}
 
         <group ref={gunContainer}>
@@ -223,7 +236,12 @@ export const TankModel = memo(() => {
               window.addEventListener('pointerup', handlePointerUp);
             }
             async function handlePointerMove(event: PointerEvent) {
-              const hasImprovedVerticalStabilizer = await hasEquipment(122);
+              const duel = useDuel.getState();
+              const hasImprovedVerticalStabilizer = await hasEquipment(
+                122,
+                duel.protagonist!.tank.equipment,
+                duel.protagonist!.equipmentMatrix,
+              );
               [pitch, yaw] = applyPitchYawLimits(
                 pitch - event.movementY * (Math.PI / canvas.height),
                 yaw + event.movementX * (Math.PI / canvas.width),
@@ -245,11 +263,15 @@ export const TankModel = memo(() => {
               window.removeEventListener('pointerup', handlePointerUp);
             }
 
-            return jsxTree(node, {
-              castShadow: true,
-              receiveShadow: true,
-              onPointerDown,
-            });
+            return jsxTree(
+              node,
+              {
+                castShadow: true,
+                receiveShadow: true,
+                onPointerDown,
+              },
+              node.uuid,
+            );
           })}
         </group>
       </group>

src/app/tools/tankopedia/[id]/components/QuickInputs/components/QuickEquipmentButton.tsx

@@ -1,6 +1,6 @@
 import { Button } from '@radix-ui/themes';
 import { ComponentProps } from 'react';
-import { asset } from '../../../../../../../core/blitzkrieg/asset';
+import { asset } from '../../../../../../../core/blitzkit/asset';
 
 interface QuickEquipmentButtonProps extends ComponentProps<typeof Button> {
   equipment: number;

src/app/tools/tankopedia/[id]/components/QuickInputs/index.tsx

@@ -2,8 +2,8 @@ import { Flex, TextField } from '@radix-ui/themes';
 import { use, useEffect, useRef } from 'react';
 import { degToRad, radToDeg } from 'three/src/math/MathUtils';
 import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits';
-import { modelDefinitions } from '../../../../../../core/blitzkrieg/modelDefinitions';
-import { modelTransformEvent } from '../../../../../../core/blitzkrieg/modelTransform';
+import { modelDefinitions } from '../../../../../../core/blitzkit/modelDefinitions';
+import { modelTransformEvent } from '../../../../../../core/blitzkit/modelTransform';
 import { useEquipment } from '../../../../../../hooks/useEquipment';
 import { mutateDuel, useDuel } from '../../../../../../stores/duel';
 import { useTankopediaPersistent } from '../../../../../../stores/tankopedia';
@@ -46,19 +46,48 @@ export function RotationInputs({ isFullScreen }: RotationInputsProps) {
         position: 'absolute',
         left: 8,
         bottom: isFullScreen ? 80 : 8,
+        pointerEvents: 'none',
       }}
       gap="4"
     >
-      <Flex
-        gap="2"
-        style={{
-          width: 256,
-        }}
-      >
+      <Flex gap="2" style={{ width: 256, pointerEvents: 'auto' }}>
         <TextField.Root
+          radius="full"
           style={{
             flex: 1,
+            textAlign: 'right',
           }}
+          onBlur={() => {
+            const value = Number(turretYawInput.current!.value);
+            if (isNaN(value)) {
+              turretYawInput.current!.value = radToDeg(protagonist.yaw).toFixed(
+                1,
+              );
+              return;
+            }
+            const [pitch, yaw] = applyPitchYawLimits(
+              protagonist.pitch,
+              degToRad(value),
+              gunModelDefinition.pitch,
+              turretModelDefinition.yaw,
+              hasImprovedVerticalStabilizer,
+            );
+            modelTransformEvent.emit({ pitch, yaw });
+            mutateDuel((state) => {
+              state.protagonist!.pitch = pitch;
+              state.protagonist!.yaw = yaw;
+            });
+            turretYawInput.current!.value = radToDeg(protagonist.yaw).toFixed(
+              1,
+            );
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              turretYawInput.current?.blur();
+            }
+          }}
+          onFocus={() => turretYawInput.current?.focus()}
+          ref={turretYawInput}
         >
           <TextField.Slot
             style={{
@@ -67,46 +96,46 @@ export function RotationInputs({ isFullScreen }: RotationInputsProps) {
           >
             Yaw
           </TextField.Slot>
-          <TextField.Input
-            onBlur={() => {
-              const [pitch, yaw] = applyPitchYawLimits(
-                protagonist.pitch,
-                degToRad(Number(turretYawInput.current!.value)),
-                gunModelDefinition.pitch,
-                turretModelDefinition.yaw,
-                hasImprovedVerticalStabilizer,
-              );
-              modelTransformEvent.emit({ pitch, yaw });
-              mutateDuel((state) => {
-                state.protagonist!.pitch = pitch;
-                state.protagonist!.yaw = yaw;
-              });
-              turretYawInput.current!.value = radToDeg(protagonist.yaw).toFixed(
-                1,
-              );
-            }}
-            onKeyDown={(event) => {
-              if (event.key === 'Enter') {
-                turretYawInput.current?.blur();
-              }
-            }}
-            onFocus={() => turretYawInput.current?.focus()}
-            ref={turretYawInput}
-            style={{ textAlign: 'right' }}
-          />
-          <TextField.Slot
-            style={{
-              userSelect: 'none',
-            }}
-          >
-            °
-          </TextField.Slot>
+          <TextField.Slot style={{ userSelect: 'none' }}>°</TextField.Slot>
         </TextField.Root>
 
         <TextField.Root
+          radius="full"
           style={{
             flex: 1,
+            textAlign: 'right',
           }}
+          onBlur={() => {
+            const value = Number(gunPitchInput.current!.value);
+            if (isNaN(value)) {
+              gunPitchInput.current!.value = (
+                -radToDeg(protagonist.pitch) + initialGunPitch
+              ).toFixed(1);
+              return;
+            }
+            const [pitch, yaw] = applyPitchYawLimits(
+              degToRad(-value + initialGunPitch),
+              protagonist.yaw,
+              gunModelDefinition.pitch,
+              turretModelDefinition.yaw,
+              hasImprovedVerticalStabilizer,
+            );
+            modelTransformEvent.emit({ pitch, yaw });
+            mutateDuel((state) => {
+              state.protagonist!.pitch = pitch;
+              state.protagonist!.yaw = yaw;
+            });
+            gunPitchInput.current!.value = (
+              -radToDeg(protagonist.pitch) + initialGunPitch
+            ).toFixed(1);
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              gunPitchInput.current?.blur();
+            }
+          }}
+          onFocus={() => gunPitchInput.current?.focus()}
+          ref={gunPitchInput}
         >
           <TextField.Slot
             style={{
@@ -115,35 +144,6 @@ export function RotationInputs({ isFullScreen }: RotationInputsProps) {
           >
             Pitch
           </TextField.Slot>
-          <TextField.Input
-            onBlur={() => {
-              const [pitch, yaw] = applyPitchYawLimits(
-                degToRad(
-                  -Number(gunPitchInput.current!.value) + initialGunPitch,
-                ),
-                protagonist.yaw,
-                gunModelDefinition.pitch,
-                turretModelDefinition.yaw,
-                hasImprovedVerticalStabilizer,
-              );
-              modelTransformEvent.emit({ pitch, yaw });
-              mutateDuel((state) => {
-                state.protagonist!.pitch = pitch;
-                state.protagonist!.yaw = yaw;
-              });
-              gunPitchInput.current!.value = (
-                -radToDeg(protagonist.pitch) + initialGunPitch
-              ).toFixed(1);
-            }}
-            onKeyDown={(event) => {
-              if (event.key === 'Enter') {
-                gunPitchInput.current?.blur();
-              }
-            }}
-            onFocus={() => gunPitchInput.current?.focus()}
-            ref={gunPitchInput}
-            style={{ textAlign: 'right' }}
-          />
           <TextField.Slot
             style={{
               userSelect: 'none',
@@ -155,13 +155,15 @@ export function RotationInputs({ isFullScreen }: RotationInputsProps) {
       </Flex>
 
       {mode === 'armor' && (
-        <Flex gap="4">
+        <Flex gap="4" style={{ pointerEvents: 'auto' }}>
           <QuickEquipmentButton
             equipment={103}
             active={hasCalibratedShells}
             onClick={() => {
               mutateDuel((draft) => {
-                draft.antagonist!.equipment[0][0] = hasCalibratedShells ? 0 : 1;
+                draft.antagonist!.equipmentMatrix[0][0] = hasCalibratedShells
+                  ? 0
+                  : 1;
               });
             }}
           />
@@ -170,7 +172,9 @@ export function RotationInputs({ isFullScreen }: RotationInputsProps) {
             active={hasEnhancedArmor}
             onClick={() => {
               mutateDuel((draft) => {
-                draft.protagonist!.equipment[1][1] = hasEnhancedArmor ? 0 : -1;
+                draft.protagonist!.equipmentMatrix[1][1] = hasEnhancedArmor
+                  ? 0
+                  : -1;
               });
             }}
           />