Compare commits

..
127 Commits
Author SHA1 Message Date
TrèsAbhi d041b353c9 feat: logs 2024-04-23 10:25:59 -05:00
TrèsAbhi 77575168a0 feat: better message 2024-04-23 10:24:00 -05:00
TrèsAbhi 051997d2d3 feat: kit 3 2024-04-23 10:19:32 -05:00
TrèsAbhi e53bdd8e19 fix: core 2024-04-23 09:57:59 -05:00
TrèsAbhi 4013192faa feat: kit 2 2024-04-23 09:51:32 -05:00
TrèsAbhi 3da009f859 feat: kit 2024-04-23 09:42:08 -05:00
TrèsAbhi 2a5888c033 feat: hero 2024-04-22 12:51:46 -05:00
TrèsAbhi ded98d78d4 fix: link 2024-04-22 12:48:07 -05:00
TrèsAbhi f4b231de10 fix: more paths 2024-04-22 12:46:47 -05:00
TrèsAbhi 9fda3c6861 fix: videos 2024-04-22 12:46:15 -05:00
TrèsAbhi d3f58d9cda Merge pull request #111 from tresabhi/dev-rinth 2024-04-22 12:43:26 -05:00
TrèsAbhi 3ef793a776 fix: rinth package 2024-04-22 12:43:23 -05:00
TrèsAbhi 13a901c839 Merge branch 'main' into dev-rinth 2024-04-22 12:43:22 -05:00
TrèsAbhi 5ede2324b3 Update Party3.tsx 2024-04-22 12:27:43 -05:00
TrèsAbhi 4e8f1a4a71 fix: ? 2024-04-22 10:27:46 -05:00
TrèsAbhi eae9cbf971 feat: stop excessive tank armor and model name spam 2024-04-22 10:07:23 -05:00
TrèsAbhi 0eac25f1c8 Merge pull request #108 from tresabhi/imgbot 2024-04-22 10:01:36 -05:00
TrèsAbhi c281e9b66f feat: cumulative video indexing 2024-04-22 09:38:00 -05:00
TrèsAbhi eb7fc62e00 Merge pull request #110 from tresabhi/main 2024-04-22 09:09:54 -05:00
TrèsAbhi d5f83c444e feat; gap 2024-04-21 19:45:47 -05:00
TrèsAbhi c890bfa8bd feat: move up 2024-04-21 19:41:42 -05:00
TrèsAbhi 9ead3eb627 feat: automatic videos 2024-04-21 19:40:38 -05:00
TrèsAbhi b8db78c328 fix: secrets 2024-04-21 18:26:15 -05:00
TrèsAbhi 8b65b94851 feat: force 2024-04-21 18:01:02 -05:00
TrèsAbhi 9da723ed31 feat: logs 2024-04-21 17:40:04 -05:00
TrèsAbhi 2f48dbc25c feat: more shell properties 2024-04-21 17:39:24 -05:00
TrèsAbhi 730d6f2bb8 feat: logs 2024-04-21 17:25:35 -05:00
TrèsAbhi 335ae4493f fix: render normal armor 2024-04-21 17:16:25 -05:00
TrèsAbhi eb83039967 feat: include lower part of barrel 2024-04-21 17:15:23 -05:00
TrèsAbhi 6e91810565 fix: select all rows 2024-04-21 17:05:35 -05:00
TrèsAbhi a55c259205 feat: videos automation 2024-04-21 17:05:07 -05:00
TrèsAbhi b5188331bd feat: remove textual reference 2024-04-21 12:17:33 -05:00
TrèsAbhi 2b354770c7 fix: fragment key 2024-04-21 11:16:46 -05:00
TrèsAbhi 11e4009303 fix: skill keys 2024-04-21 11:13:32 -05:00
TrèsAbhi 9bce5e5d75 fix: duplicate keys 2024-04-21 11:12:52 -05:00
TrèsAbhi 8e8d68a5b5 fix: antagonist bar keys 2024-04-21 11:10:44 -05:00
TrèsAbhi 2c6fcdf21f fix: navbar menu key 2024-04-21 11:09:53 -05:00
TrèsAbhi abb72fb674 fix: jsx tree node uuids 2024-04-21 11:09:24 -05:00
TrèsAbhi b805c2e3b4 fix: video key 2024-04-21 11:07:19 -05:00
TrèsAbhi 7e6aa41ebb fix: no undefined clipping planes 2024-04-21 11:06:40 -05:00
TrèsAbhi a2cfbda932 feat: start work of text 2024-04-21 11:05:42 -05:00
TrèsAbhi 0b222be6ef Merge pull request #109 from tresabhi/main 2024-04-21 10:50:25 -05:00
TrèsAbhi 1548813a21 feat: horizontal ad 2024-04-21 10:41:51 -05:00
TrèsAbhi c615284d87 feat: re-enable adsense 2024-04-21 10:37:44 -05:00
TrèsAbhi 6a48638171 fix: use client 2024-04-21 10:26:08 -05:00
TrèsAbhi 0b4829abd3 fix: use use effect 2024-04-21 10:25:43 -05:00
TrèsAbhi 57cd3aae50 feat: pub ads 2024-04-21 10:21:52 -05:00
TrèsAbhi 6298d6230f Update ads.txt 2024-04-21 09:13:56 -05:00
TrèsAbhi df7a5bb8a0 fix: fullscreen card 2024-04-20 21:40:41 -05:00
TrèsAbhi dd41cac3ac feat: videos 2024-04-20 21:01:28 -05:00
TrèsAbhi f17b275aa7 feat: add blitzkrieg name to older logs 2024-04-20 12:09:23 -05:00
TrèsAbhi 4a04f8a8f3 feat: generalized asset repo 2024-04-20 12:08:43 -05:00
TrèsAbhi 0f7d682782 feat: logos 2024-04-20 12:07:20 -05:00
TrèsAbhi 14cecdebe3 feat: reset asset name to krieg temporarily 2024-04-20 12:02:33 -05:00
TrèsAbhi c2b936c925 feat: rename to blitzrinth 2024-04-20 12:00:48 -05:00
TrèsAbhi 0fd17d9c96 feat: logs 2024-04-20 11:50:16 -05:00
TrèsAbhi b0645c39a0 fix: high end consumables increase 2024-04-20 11:45:41 -05:00
TrèsAbhi 1d947399ab fix: intra-clip for auto loaders 2024-04-20 11:43:15 -05:00
TrèsAbhi 659dddbe8e feat: aggressive donate button 2024-04-20 11:40:10 -05:00
TrèsAbhi a5c1223f7d feat: simpler footer 2024-04-20 11:20:52 -05:00
TrèsAbhi dc084f8d34 feat: compare button 2024-04-19 10:08:00 -05:00
TrèsAbhi 44b5907435 feat: tankopedia button 2024-04-19 09:59:21 -05:00
ImgBotApp 052fbec628 [ImgBot] Optimize images
*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]>
2024-04-19 14:37:54 +00:00
TrèsAbhi 23d8c54366 feat: super duper secret map 2024-04-19 09:26:53 -05:00
TrèsAbhi dd88d42884 feat: logs 2024-04-19 09:17:22 -05:00
TrèsAbhi ed676f73b2 feat: og descs 2024-04-19 09:14:22 -05:00
TrèsAbhi adb0a9af64 fix: title 2024-04-19 09:11:36 -05:00
TrèsAbhi ccded1b2f8 feat: hide statistics 2024-04-19 09:10:33 -05:00
TrèsAbhi 89d43b4791 feat: better titles 2024-04-19 09:09:12 -05:00
TrèsAbhi 2226ac9852 feat: gutted some navbar features 2024-04-19 09:03:45 -05:00
TrèsAbhi 29bace875e fix: remove commit 2024-04-18 20:27:48 -05:00
TrèsAbhi 04107c10b7 feat: hamburger meny 2024-04-18 20:26:35 -05:00
TrèsAbhi 0a1e823ce4 feat: first developer mode enabling 2024-04-18 19:16:30 -05:00
TrèsAbhi c656d31618 feat: a few settings 2024-04-18 19:11:50 -05:00
TrèsAbhi 7eda4825ea feat: more navbar buttons 2024-04-18 18:42:57 -05:00
TrèsAbhi 60f0eb9a3c feat: tankopedia title 2024-04-18 18:29:29 -05:00
TrèsAbhi ce5c9f4afa feat: page exclusive titles 2024-04-18 18:28:46 -05:00
TrèsAbhi e834d31d92 feat: use lz4js types instead of home brewed 2024-04-18 18:23:23 -05:00
TrèsAbhi b679393b8a Merge branch 'main' into dev 2024-04-17 10:16:31 -05:00
TrèsAbhi eb5f79228b fix: bring back test tanks button 2024-04-17 09:52:15 -05:00
TrèsAbhi 6082576b60 feat: start of a meny 2024-04-17 09:50:46 -05:00
TrèsAbhi 92e9073939 things 2024-04-17 09:31:47 -05:00
TrèsAbhi d6669a84d6 Update index.ts 2024-04-17 08:34:20 -05:00
TrèsAbhi 0c4debe327 Update index.ts 2024-04-17 08:18:56 -05:00
TrèsAbhi 9f41bab28a feat: disabled stats 2024-04-16 22:13:21 -05:00
TrèsAbhi b906b42998 feat: search bar 2024-04-16 22:12:51 -05:00
TrèsAbhi 728a11efa4 feat: reduced gap 2024-04-16 22:06:24 -05:00
TrèsAbhi c35916c291 feat: colors 2024-04-16 22:05:36 -05:00
TrèsAbhi 2fd2e93f55 feat: shadows 2024-04-16 21:58:08 -05:00
TrèsAbhi b566d5982c feat: better icons 2024-04-16 21:49:30 -05:00
TrèsAbhi bef43e9ae6 feat: tank icons 2024-04-16 19:36:49 -05:00
TrèsAbhi e6404d5c77 feat: better spacing 2024-04-16 19:07:06 -05:00
TrèsAbhi f4d58015f5 feat: somethings 2024-04-16 19:03:37 -05:00
TrèsAbhi cd77d24dc6 feat: statistics 2024-04-16 18:51:20 -05:00
TrèsAbhi e25a3cd868 feat: title 2024-04-16 13:53:01 -05:00
TrèsAbhi 68923fe800 feat: icons 2024-04-16 13:49:33 -05:00
TrèsAbhi ccc6ddd5c9 Merge branch 'main' of https://github.com/tresabhi/blitzkrieg 2024-04-16 13:45:33 -05:00
TrèsAbhi 1c28b33da3 Merge branch 'dev' of https://github.com/tresabhi/blitzkrieg into dev 2024-04-16 13:45:18 -05:00
TrèsAbhi 900337f3ce feat: log 2024-04-16 13:45:17 -05:00
TrèsAbhi fae9f8bded feat: time in manifest 2024-04-16 13:45:03 -05:00
TrèsAbhi a0d78f89ff fix: remove logo on small screens 2024-04-16 13:45:03 -05:00
TrèsAbhi 6853d63bbb feat: change to utc 2024-04-16 13:45:03 -05:00
TrèsAbhi 2b27954a3b fix: max dpm on double shot auto reloaders 2024-04-16 13:45:03 -05:00
TrèsAbhi 7aa0b65d1d feat: null handling 2024-04-16 13:45:03 -05:00
TrèsAbhi 3e7a73c528 feat: cleaner fetch blitz func 2024-04-16 13:45:02 -05:00
TrèsAbhi 076785a9ad feat: more efficient 2024-04-16 13:45:02 -05:00
TrèsAbhi 74828e3c45 feat: rts 2024-04-16 13:45:02 -05:00
TrèsAbhi 310640c1ec feat: base work 2024-04-16 13:45:02 -05:00
TrèsAbhi c49c56fba3 Merge pull request #107 from tresabhi/dev 2024-04-16 13:44:16 -05:00
TrèsAbhi cc744f6154 Merge branch 'main' into dev 2024-04-16 13:44:09 -05:00
TrèsAbhi 93bf4a4742 Dev (#106) 2024-04-16 13:43:44 -05:00
TrèsAbhi badeb588dd feat: time in manifest 2024-04-16 09:42:48 -05:00
TrèsAbhi 5876bf35b4 fix: remove logo on small screens 2024-04-16 09:35:10 -05:00
TrèsAbhi 73903114c9 feat: change to utc 2024-04-16 09:28:01 -05:00
TrèsAbhi b29f7ca7f5 fix: max dpm on double shot auto reloaders 2024-04-16 09:24:28 -05:00
TrèsAbhi 9d715c23e5 redacted 2024-04-16 09:18:12 -05:00
TrèsAbhi 4ff5f7cdeb feat: null handling 2024-04-15 13:25:35 -05:00
TrèsAbhi dccfe3d652 feat: cleaner fetch blitz func 2024-04-15 13:19:25 -05:00
TrèsAbhi d780d32291 feat: more efficient 2024-04-15 09:27:59 -05:00
TrèsAbhi ebbdbc53a4 feat: rts 2024-04-13 22:13:57 -05:00
TrèsAbhi 9bc1635680 feat: base work 2024-04-13 18:20:49 -05:00
TrèsAbhi d7d19a0b50 Merge branch 'main' of https://github.com/tresabhi/blitzkrieg 2024-04-13 10:43:20 -05:00
TrèsAbhi 1b6845abf8 fix: grammar 2024-04-13 10:43:09 -05:00
TrèsAbhi 545ee70cd0 feat: logs 2 2024-04-13 10:42:31 -05:00
TrèsAbhi c92729d0e0 feat: logs 2024-04-13 10:42:17 -05:00
TrèsAbhi 71c3b5d2ef feat: undefined mask handling 2024-04-13 10:38:13 -05:00
TrèsAbhi 7372075ba3 fix: remove duplicate mantlets 2024-04-13 10:36:13 -05:00
276 changed files with 2574 additions and 1615 deletions

No files matched your search

+2
View File
@@ -62,4 +62,6 @@ jobs:
$env:GH_TOKEN = "${{ secrets.GH_TOKEN }}"
$env:DISCORD_TOKEN = "${{ secrets.DISCORD_TOKEN }}"
$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' || '' }}
+1 -1
View File
@@ -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 \")
+2 -1
View File
@@ -18,4 +18,5 @@ temp/
/.VSCodeCounter
/.yarn
depots
public/sitemap*
public/sitemap*
/firebase.json
+3 -3
View File
@@ -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
+10
View File
@@ -18,7 +18,11 @@
"BINORMAL",
"Binormals",
"BKRL",
"BKRTS",
"BKRTSMANIFEST",
"bkwd",
"blitzkit",
"blitzrinth",
"blitzstars",
"Camo",
"CDON",
@@ -76,10 +80,12 @@
"loadouts",
"loddist",
"lods",
"mantlets",
"metallicness",
"minitelrose",
"Minotauro",
"MIPMAPCOUNT",
"mišek",
"modeltransform",
"MURICA",
"NEGATIVEX",
@@ -106,7 +112,10 @@
"raycaster",
"researchable",
"Resvg",
"rizz",
"roboto",
"rtsc",
"RTSM",
"SCPG",
"scroller",
"searchclans",
@@ -157,6 +166,7 @@
"xkdkw",
"XMLDVPL",
"YAMLDVPL",
"youtubers",
"zustand"
],
"deno.enable": false,
+7 -7
View File
@@ -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)
+3 -3
View File
@@ -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' },
],
},
});
+1 -1
View File
@@ -1,4 +1,4 @@
# 1.19.0
# Blitzkrieg 1.19.0
Introducing the Blitzkrieg Compare tool!
+11
View File
@@ -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) |
+6
View File
@@ -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
+13
View File
@@ -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
+18
View File
@@ -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
+19
View File
@@ -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
+3
View File
@@ -0,0 +1,3 @@
# BlitzKit 1.19.6
Renamed Blitzkrieg to BlitzKit.
+2 -2
View File
@@ -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;
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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.
+71
View File
@@ -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;
}
```
+4 -4
View File
@@ -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.
---
+4 -8
View File
@@ -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
+3 -3
View File
@@ -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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 KiB

After

Width:  |  Height:  |  Size: 35 KiB

+5 -3
View File
@@ -1,6 +1,6 @@
{
"name": "blitzkrieg",
"version": "1.19.0",
"name": "blitzkit",
"version": "1.19.6",
"description": "🎉 Tools for everything World of Tanks Blitz",
"main": "src/server.ts",
"type": "module",
@@ -12,7 +12,7 @@
"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",
"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",
@@ -52,6 +52,7 @@
"express": "^4.18.2",
"false": "^0.0.4",
"fuzzysort": "^2.0.4",
"googleapis": "^134.0.0",
"immer": "^10.0.2",
"js-yaml": "^4.1.0",
"lodash": "^4.17.21",
@@ -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",
+2
View File
@@ -1 +1,3 @@
google.com, pub-1289406790225052, DIRECT, f08c47fec0942fa0
appnexus.com, 14163, RESELLER
pubcenter.microsoft.com, 253617120, DIRECT
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 921 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

+3 -3
View File
@@ -1,7 +1,7 @@
User-agent: *
Allow: /
Host: https://blitz-krieg.vercel.app
Host: https://blitzkit.vercel.app
Sitemap: https://blitz-krieg.vercel.app/sitemap.txt
Sitemap: https://blitz-krieg.vercel.app/sitemap.xml
Sitemap: https://blitzkit.vercel.app/sitemap.txt
Sitemap: https://blitzkit.vercel.app/sitemap.xml
+1 -1
View File
@@ -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';
+2 -2
View File
@@ -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) {
+2 -2
View File
@@ -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) {
+2 -2
View File
@@ -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) {
@@ -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';
+2 -2
View File
@@ -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 = [
+27 -15
View File
@@ -7,24 +7,24 @@ 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';
import { GameDefinitions } from '../../src/core/blitzkrieg/gameDefinitions';
} 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 { SkillDefinitions } from '../../src/core/blitzkrieg/skillDefinitions';
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,
@@ -33,12 +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 =
@@ -325,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',
@@ -334,7 +334,7 @@ const blitzShellKindToBLitzkrieg: Record<ShellKind, ShellType> = {
const missingStrings: Record<string, string> = {
'#artefacts:tungstentip/name': 'Tungsten Shells',
};
const botPattern = /^.+((tutorial_bot(\d+)?)|(TU(R?)))$/;
export const botPattern = /^.+((tutorial_bot(\d+)?)|(TU(R?)))$/;
export async function definitions(production: boolean) {
console.log('Building definitions...');
@@ -361,12 +361,12 @@ export async function definitions(production: boolean) {
(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`,
);
@@ -739,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)
@@ -788,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
@@ -840,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
+2 -2
View File
@@ -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';
+2
View File
@@ -24,11 +24,13 @@ 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,
videos,
scratchedFlags,
currencies,
skillIcons,
+2 -2
View File
@@ -1,8 +1,8 @@
import { readdir } from 'fs/promises';
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, POI } from './constants';
export async function moduleIcons(production: boolean) {
+2 -2
View File
@@ -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) {
+2 -2
View File
@@ -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) {
+2 -2
View File
@@ -2,8 +2,8 @@ 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/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';
interface SkillIcon {
+2 -5
View File
@@ -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({
+16 -2
View File
@@ -5,8 +5,8 @@ import { NATION_IDS } from '../../src/constants/nations';
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';
@@ -26,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) {
+2 -5
View File
@@ -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`,
);
+124
View File
@@ -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,
);
}
+4 -4
View File
@@ -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,
+3 -3
View File
@@ -1,4 +1,4 @@
import { tankDefinitions } from '../src/core/blitzkrieg/tankDefinitions';
import { tankDefinitions } from '../src/core/blitzkit/tankDefinitions';
// random vercel bug forces require import
const { writeFileSync } = require('fs');
@@ -8,14 +8,14 @@ console.log('Building sitemap...');
const awaitedTankDefinitions = await tankDefinitions;
const values = Object.values(awaitedTankDefinitions);
const txt = values
.map((tank) => `https://blitz-krieg.vercel.app/tools/tankopedia/${tank.id}/`)
.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://blitz-krieg.vercel.app/tools/tankopedia/${tank.id}/</loc></url>`,
`<url><loc>https://blitzkit.vercel.app/tools/tankopedia/${tank.id}/</loc></url>`,
)
.join('\n')}
</urlset>`;
+96
View File
@@ -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,
);
}
+8 -9
View File
@@ -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
+31 -14
View File
@@ -5,12 +5,13 @@ 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 { Google } from '../components/Google';
import { ReactNode, Suspense, useEffect, useState } from 'react';
import { Footer } from '../components/Footer';
import { Loader } from '../components/Loader';
import Navbar from '../components/Navbar';
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';
@@ -30,6 +31,8 @@ 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();
@@ -45,13 +48,19 @@ 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"
/>
{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" />
<Google />
<Party3 />
</head>
<body
@@ -61,7 +70,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
}}
>
<Theme
appearance="dark"
appearance={darkMode ? 'dark' : 'light'}
panelBackground="solid"
radius="full"
suppressHydrationWarning
@@ -69,7 +78,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
>
<Flex
direction="column"
style={{ minHeight: '100vh', paddingTop: isEmbed ? undefined : 52 }}
style={{ minHeight: '100vh', paddingTop: isEmbed ? undefined : 64 }}
>
{!isEmbed && <Navbar />}
<AlertDialog.Root open={showDevBuildAlert}>
@@ -81,7 +90,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
the official Discord server
</a>
. Also consider using{' '}
<a href="https://blitz-krieg.vercel.app/">
<a href="https://blitzkit.vercel.app/">
the more stable release version
</a>
. You will be asked again in 8 days.
@@ -101,7 +110,15 @@ export default function RootLayout({ children }: RootLayoutProps) {
</AlertDialog.Content>
</AlertDialog.Root>
{children}
<Suspense
fallback={
<div style={{ flex: 1 }}>
<Loader />
</div>
}
>
{children}
</Suspense>
{!isEmbed && !isFullScreen && <Footer />}
</Flex>
+20 -8
View File
@@ -1,22 +1,35 @@
'use client';
import { CaretRightIcon } from '@radix-ui/react-icons';
import { Flex } from '@radix-ui/themes';
import { Button, Flex, Link as LinkRadix } from '@radix-ui/themes';
import Link from 'next/link';
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() {
return (
<PageWrapper>
<Flex direction="column" gap="4" justify="center" style={{ flex: 1 }}>
{/* <TextField.Root placeholder="Search anything...">
<TextField.Slot>
<MagnifyingGlassIcon height="16" width="16" />
</TextField.Slot>
</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">
{TOOLS.map((tool) => (
@@ -43,7 +56,6 @@ export default function Page() {
alignItems: 'flex-start',
justifyContent: 'flex-end',
padding: 16,
gap: 4,
transition: `box-shadow ${theme.durations.regular}`,
}}
onClick={(event) => {
+48
View File
@@ -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>
);
}
@@ -1,16 +1,18 @@
import { LoopIcon, TrashIcon } from '@radix-ui/react-icons';
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/blitzkrieg/provisionDefinitions';
import { tankToCompareMember } from '../../../../core/blitzkrieg/tankToCompareMember';
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 }: TankControlProps) {
export function TankControl({ index, id }: TankControlProps) {
const awaitedProvisionDefinitions = use(provisionDefinitions);
const [switchTankDialogOpen, setSwitchTankDialogOpen] = useState(false);
@@ -27,6 +29,7 @@ export function TankControl({ index }: TankControlProps) {
>
<TrashIcon />
</IconButton>
<Dialog.Root
open={switchTankDialogOpen}
onOpenChange={setSwitchTankDialogOpen}
@@ -62,6 +65,12 @@ export function TankControl({ index }: TankControlProps) {
</Flex>
</Dialog.Content>
</Dialog.Root>
<Link href={`/tools/tankopedia/${id}`}>
<IconButton variant="ghost">
<ExternalLinkIcon />
</IconButton>
</Link>
</Flex>
);
}
+28 -17
View File
@@ -31,23 +31,23 @@ import { EquipmentManager } from '../../../components/EquipmentManager';
import { ModuleManager } from '../../../components/ModuleManager';
import PageWrapper from '../../../components/PageWrapper';
import { ProvisionsManager } from '../../../components/ProvisionsManager';
import { asset } from '../../../core/blitzkrieg/asset';
import { availableProvisions } from '../../../core/blitzkrieg/availableProvisions';
import { checkConsumableProvisionInclusivity } from '../../../core/blitzkrieg/checkConsumableProvisionInclusivity';
import { consumableDefinitions } from '../../../core/blitzkrieg/consumableDefinitions';
import { createDefaultSkills } from '../../../core/blitzkrieg/createDefaultSkills';
import { equipmentDefinitions } from '../../../core/blitzkrieg/equipmentDefinitions';
import { modelDefinitions } from '../../../core/blitzkrieg/modelDefinitions';
import { provisionDefinitions } from '../../../core/blitzkrieg/provisionDefinitions';
import { skillDefinitions } from '../../../core/blitzkrieg/skillDefinitions';
import { tankCharacteristics } from '../../../core/blitzkrieg/tankCharacteristics';
import { asset } from '../../../core/blitzkit/asset';
import { availableProvisions } from '../../../core/blitzkit/availableProvisions';
import { checkConsumableProvisionInclusivity } from '../../../core/blitzkit/checkConsumableProvisionInclusivity';
import { consumableDefinitions } from '../../../core/blitzkit/consumableDefinitions';
import { createDefaultSkills } from '../../../core/blitzkit/createDefaultSkills';
import { equipmentDefinitions } from '../../../core/blitzkit/equipmentDefinitions';
import { modelDefinitions } from '../../../core/blitzkit/modelDefinitions';
import { provisionDefinitions } from '../../../core/blitzkit/provisionDefinitions';
import { skillDefinitions } from '../../../core/blitzkit/skillDefinitions';
import { tankCharacteristics } from '../../../core/blitzkit/tankCharacteristics';
import {
TankDefinition,
tankDefinitions,
} from '../../../core/blitzkrieg/tankDefinitions';
import { tankIcon } from '../../../core/blitzkrieg/tankIcon';
import { tankToCompareMember } from '../../../core/blitzkrieg/tankToCompareMember';
import { BlitzkriegButtonWatermark } from '../../../icons/BlitzkriegButtonWatermark';
} from '../../../core/blitzkit/tankDefinitions';
import { tankIcon } from '../../../core/blitzkit/tankIcon';
import { tankToCompareMember } from '../../../core/blitzkit/tankToCompareMember';
import { BlitzkitButtonWatermark } from '../../../icons/BlitzkitButtonWatermark';
import { theme } from '../../../stitches.config';
import {
DeltaMode,
@@ -447,7 +447,7 @@ export default function Page() {
gap="2"
style={{ height: '100%' }}
>
<TankControl index={index} key={tank.id} />
<TankControl index={index} key={tank.id} id={tank.id} />
<Flex
ref={draggable}
@@ -648,7 +648,7 @@ export default function Page() {
align="center"
justify="center"
>
<BlitzkriegButtonWatermark width={64} height={64} />
<BlitzkitButtonWatermark width={64} height={64} />
<InsertionMarker index={0} />
</Flex>
</Table.ColumnHeaderCell>
@@ -1233,10 +1233,21 @@ export default function Page() {
<Row name="Shells" value="shells" decimals={0} />
</>
)}
<Row name="Caliber" value="caliber" decimals={0} />
<Row name="Penetration" value="penetration" decimals={0} />
<Row name="Damage" value="damage" decimals={0} />
<Row name="Module damage" value="moduleDamage" decimals={0} />
<Row name="Caliber" value="caliber" decimals={0} />
<Row
name="Normalization"
value="shellNormalization"
decimals={0}
/>
<Row
name="Ricochet"
value="shellRicochet"
deltaType="lowerIsBetter"
decimals={0}
/>
<Row name="Shell velocity" value="shellVelocity" decimals={0} />
<Row
name="Aim time"
+21 -19
View File
@@ -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,21 +14,32 @@ 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.pageDescription !== undefined && (
<meta name="description" content={tool.pageDescription} />
)}
{isToolRoot && (
<>
<title>{tool.title}</title>
<meta
property="og:image"
content={`/assets/banners/${toolId}.webp`}
/>
<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}
/>
</>
)}
</>
)}
</>
)}
@@ -85,15 +95,7 @@ export default function ToolsLayout({ children }: ToolsLayoutProps) {
</div>
)}
<Suspense
fallback={
<div style={{ flex: 1 }}>
<Loader />
</div>
}
>
{children}
</Suspense>
{children}
</>
);
}
+6 -5
View File
@@ -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';
@@ -818,7 +817,9 @@ export default function Page() {
} else {
setSearchLoading(true);
const accountList = await fetchBlitz<AccountList>(
`https://api.wotblitz.${region}/wotb/account/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${encodedSearch}`,
region,
'account/list',
{ search: encodedSearch },
);
const playerKeys = Object.keys(
leaderboard[region][season],
+2 -2
View File
@@ -23,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';
+107
View File
@@ -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>
))}
</>
);
}
+40
View File
@@ -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>
);
}
@@ -5,11 +5,11 @@ import { ModuleButton } from '../../../../../components/ModuleButtons/ModuleButt
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,
@@ -191,6 +191,7 @@ export function AntagonistBar({ floating }: AntagonistBarProps) {
<Flex>
{antagonist.turret.guns.map((gun, index) => (
<ModuleButton
key={gun.id}
rowChild
first={index === 0}
last={
@@ -9,8 +9,8 @@ import {
} from '@radix-ui/themes';
import { use } from 'react';
import { ConsumablesManager } from '../../../../../../../components/ConsumablesManager';
import { checkConsumableProvisionInclusivity } from '../../../../../../../core/blitzkrieg/checkConsumableProvisionInclusivity';
import { consumableDefinitions } from '../../../../../../../core/blitzkrieg/consumableDefinitions';
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';
@@ -1,7 +1,7 @@
import { Button, Flex, Heading } from '@radix-ui/themes';
import { use } from 'react';
import { EquipmentManager } from '../../../../../../../components/EquipmentManager';
import { equipmentDefinitions } from '../../../../../../../core/blitzkrieg/equipmentDefinitions';
import { equipmentDefinitions } from '../../../../../../../core/blitzkit/equipmentDefinitions';
import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
@@ -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';
@@ -1,8 +1,8 @@
import { Button, Flex, Heading } from '@radix-ui/themes';
import { use } from 'react';
import { ProvisionsManager } from '../../../../../../../components/ProvisionsManager';
import { availableProvisions } from '../../../../../../../core/blitzkrieg/availableProvisions';
import { provisionDefinitions } from '../../../../../../../core/blitzkrieg/provisionDefinitions';
import { availableProvisions } from '../../../../../../../core/blitzkit/availableProvisions';
import { provisionDefinitions } from '../../../../../../../core/blitzkit/provisionDefinitions';
import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';
@@ -10,8 +10,8 @@ import {
} from '@radix-ui/themes';
import { use } from 'react';
import { CrewSkillManager } from '../../../../../../../../components/CrewSkillManager';
import { createDefaultSkills } from '../../../../../../../../core/blitzkrieg/createDefaultSkills';
import { skillDefinitions } from '../../../../../../../../core/blitzkrieg/skillDefinitions';
import { createDefaultSkills } from '../../../../../../../../core/blitzkit/createDefaultSkills';
import { skillDefinitions } from '../../../../../../../../core/blitzkit/skillDefinitions';
import {
mutateTankopediaTemporary,
useTankopediaTemporary,
@@ -9,21 +9,21 @@ import {
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 { coefficient } from '../../../../../../core/blitzkrieg/coefficient';
import { equipmentDefinitions } from '../../../../../../core/blitzkrieg/equipmentDefinitions';
import { modelDefinitions } from '../../../../../../core/blitzkrieg/modelDefinitions';
import { provisionDefinitions } from '../../../../../../core/blitzkrieg/provisionDefinitions';
import { tankCharacteristics } from '../../../../../../core/blitzkrieg/tankCharacteristics';
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';
} from '../../../../../../core/blitzkit/tankDefinitions/constants';
import { useEquipment } from '../../../../../../hooks/useEquipment';
import { useFullScreen } from '../../../../../../hooks/useFullScreen';
import { mutateDuel, useDuel } from '../../../../../../stores/duel';
@@ -155,7 +155,6 @@ export function Characteristics() {
})}
</Flex>
</Flex>
<Info name="Gun type">{GUN_TYPE_NAMES[gun.type]}</Info>
<InfoWithDelta name="DPM" decimals={0} unit="hp / min">
{stats.dpm}
@@ -178,7 +177,7 @@ export function Characteristics() {
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>
@@ -189,7 +188,6 @@ export function Characteristics() {
{gun.type !== 'regular' && (
<InfoWithDelta name="Shells">{stats.shells}</InfoWithDelta>
)}
{gun.type === 'autoReloader' ? (
<>
<Info indent name="Most optimal">
@@ -218,21 +216,17 @@ export function Characteristics() {
{stats.shellReload!}
</InfoWithDelta>
)}
{gun.type === 'autoLoader' ||
(gun.type === 'autoReloader' && (
<InfoWithDelta
indent
decimals={2}
name="Intra-clip"
unit="s"
deltaType="lowerIsBetter"
>
{stats.intraClip!}
</InfoWithDelta>
))}
<InfoWithDelta name="Caliber" decimals={0} unit="mm">
{stats.caliber}
</InfoWithDelta>
{(gun.type === 'autoLoader' || gun.type === 'autoReloader') && (
<InfoWithDelta
indent
decimals={2}
name="Intra-clip"
unit="s"
deltaType="lowerIsBetter"
>
{stats.intraClip!}
</InfoWithDelta>
)}
<InfoWithDelta decimals={0} name="Penetration" unit="mm">
{stats.penetration}
</InfoWithDelta>
@@ -296,6 +290,22 @@ export function Characteristics() {
{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}>
{stats.shellVelocity}
</InfoWithDelta>
@@ -517,7 +527,7 @@ export function Characteristics() {
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}` : ''}`}
@@ -546,7 +556,7 @@ export function Characteristics() {
}
/>
)}
</>
</Fragment>
);
})}
</Flex>
@@ -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';
@@ -7,14 +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 { BlitzkriegWormWide } from '../../../../../../icons/BlitzkriegWormWide';
import { BlitzkitWide } from '../../../../../../icons/BlitzkitWide';
import { mutateDuel, useDuel } from '../../../../../../stores/duel';
import mutateTankopediaPersistent, {
TankopediaMode,
@@ -177,16 +177,18 @@ export function TankSandbox() {
</Tabs.List>
</Tabs.Root>
<Text
color="gray"
style={{
position: 'absolute',
left: '50%',
top: 11,
}}
>
<BlitzkriegWormWide height={32} />
</Text>
{wideFormat && (
<Text
color="gray"
style={{
position: 'absolute',
left: '50%',
top: 16,
}}
>
<BlitzkitWide height={32} />
</Text>
)}
<div
style={{
@@ -199,6 +201,10 @@ export function TankSandbox() {
{loadModel ? (
<div style={{ width: '100%', height: '100%' }}>
<Canvas
gl={{
clippingPlanes: Object.freeze([]),
localClippingEnabled: true,
}}
shadows
ref={canvas}
onPointerDown={handlePointerDown}
@@ -1,5 +1,5 @@
import { Html, useProgress } from '@react-three/drei';
import { Loader } from '../../../../../components/Loader';
import { Loader } from '../../../../../../../components/Loader';
export function ModelLoader() {
const { progress } = useProgress();
@@ -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,
@@ -40,6 +41,7 @@ export function Options({ isFullScreen }: OptionsProps) {
const environment = useTankopediaPersistent(
(state) => state.model.visual.environment,
);
const developerMode = useApp((state) => state.developerMode);
return (
<Flex
@@ -107,16 +109,18 @@ export function Options({ isFullScreen }: OptionsProps) {
Green penetration
</DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem
checked={wireframe}
onCheckedChange={(checked) => {
mutateTankopediaPersistent((draft) => {
draft.model.visual.wireframe = checked;
});
}}
>
Wireframe
</DropdownMenu.CheckboxItem>
{developerMode && (
<DropdownMenu.CheckboxItem
checked={wireframe}
onCheckedChange={(checked) => {
mutateTankopediaPersistent((draft) => {
draft.model.visual.wireframe = checked;
});
}}
>
Wireframe
</DropdownMenu.CheckboxItem>
)}
<DropdownMenu.CheckboxItem
checked={opaque}
@@ -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}>
@@ -189,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}>
@@ -255,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>
@@ -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;
@@ -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';
@@ -1,19 +1,31 @@
import { UpdateIcon } from '@radix-ui/react-icons';
import { CaretRightIcon, UpdateIcon } from '@radix-ui/react-icons';
import { Button, Dialog, Flex, Heading } from '@radix-ui/themes';
import Link from 'next/link';
import { useState } from 'react';
import { TREE_TYPE_ICONS } from '../../../../../components/Tanks/components/Item/constants';
import { assignDuelMember } from '../../../../../core/blitzkrieg/assignDuelMember';
import { pushTankopediaPath } from '../../../../../core/blitzkrieg/pushTankopediaPath';
import { assignDuelMember } from '../../../../../core/blitzkit/assignDuelMember';
import { pushTankopediaPath } from '../../../../../core/blitzkit/pushTankopediaPath';
import { useDuel } from '../../../../../stores/duel';
import { TankSearch } from '../../components/TankSearch';
export function Title() {
const protagonist = useDuel((state) => state.protagonist!);
const antagonist = useDuel((state) => state.antagonist!);
const compareTanks =
protagonist.tank.id === antagonist.tank.id
? [protagonist.tank.id]
: [protagonist.tank.id, antagonist.tank.id];
const [changeTankDialogOpen, setChangeTankDialogOpen] = useState(false);
return (
<>
<Flex gap="6" justify="center" align="center" style={{ padding: 16 }}>
<Flex
gap="6"
justify="center"
align="center"
style={{ padding: 16 }}
wrap="wrap"
>
<Flex gap="2" align="center">
<Heading
color={
@@ -41,36 +53,44 @@ export function Title() {
</Heading>
</Flex>
<Dialog.Root
open={changeTankDialogOpen}
onOpenChange={setChangeTankDialogOpen}
>
<Dialog.Trigger>
<Button variant="ghost">
Change <UpdateIcon />
</Button>
</Dialog.Trigger>
<Flex gap="6">
<Dialog.Root
open={changeTankDialogOpen}
onOpenChange={setChangeTankDialogOpen}
>
<Dialog.Trigger>
<Button variant="ghost">
Change <UpdateIcon />
</Button>
</Dialog.Trigger>
<Dialog.Content>
<Flex gap="4" direction="column">
<Flex
direction="column"
gap="4"
style={{ flex: 1 }}
justify="center"
>
<TankSearch
compact
onSelect={(tank) => {
assignDuelMember('protagonist', tank.id);
setChangeTankDialogOpen(false);
pushTankopediaPath(tank.id);
}}
/>
<Dialog.Content>
<Flex gap="4" direction="column">
<Flex
direction="column"
gap="4"
style={{ flex: 1 }}
justify="center"
>
<TankSearch
compact
onSelect={(tank) => {
assignDuelMember('protagonist', tank.id);
setChangeTankDialogOpen(false);
pushTankopediaPath(tank.id);
}}
/>
</Flex>
</Flex>
</Flex>
</Dialog.Content>
</Dialog.Root>
</Dialog.Content>
</Dialog.Root>
<Link href={`/tools/compare?tanks=${compareTanks.join('%2C')}`}>
<Button variant="ghost">
Compare <CaretRightIcon />
</Button>
</Link>
</Flex>
</Flex>
</>
);
@@ -0,0 +1,74 @@
import { InfoCircledIcon, PlusIcon } from '@radix-ui/react-icons';
import { Callout, Card, Flex, Heading, Link, Text } from '@radix-ui/themes';
import { use } from 'react';
import { videoDefinitions } from '../../../../../core/blitzkit/videos';
import { useFullScreen } from '../../../../../hooks/useFullScreen';
import { useDuel } from '../../../../../stores/duel';
export function Videos() {
const isFullScreen = useFullScreen();
const tank = useDuel((state) => state.protagonist!.tank);
const awaitedVideoDefinitions = use(videoDefinitions);
const videos = awaitedVideoDefinitions[tank.id]?.videos ?? [];
if (isFullScreen) return null;
return (
<Flex direction="column" gap="4" mt="4" align="start">
<Heading size="6">Review videos</Heading>
<Callout.Root>
<Callout.Icon>
<InfoCircledIcon />
</Callout.Icon>
<Callout.Text>
Some YouTubers may not have videos on the {tank.name} leading to
off-topic videos.
</Callout.Text>
</Callout.Root>
<Flex gap="3" wrap="wrap">
{videos.map((video) => (
<Link
key={video}
href={`https://www.youtube.com/watch?v=${video}`}
target="_blank"
>
<img
src={`https://i.ytimg.com/vi/${video}/hqdefault.jpg`}
style={{
aspectRatio: '16 / 9',
objectFit: 'cover',
height: 128,
borderRadius: 8,
}}
/>
</Link>
))}
<Link href="https://discord.gg/nDt7AjGJQH" target="_blank">
<Card
style={{
aspectRatio: '16 / 9',
height: 128,
}}
>
<Flex
align="center"
justify="center"
gap="1"
style={{
width: '100%',
height: '100%',
}}
>
<Text color="purple">
{videos.length === 0 ? 'Suggest' : 'Suggest more'} <PlusIcon />
</Text>
</Flex>
</Card>
</Link>
</Flex>
</Flex>
);
}
+12 -7
View File
@@ -1,6 +1,8 @@
import { ReactNode } from 'react';
import { tankDefinitions } from '../../../../core/blitzkrieg/tankDefinitions';
import { tankIcon } from '../../../../core/blitzkrieg/tankIcon';
import { tankDefinitions } from '../../../../core/blitzkit/tankDefinitions';
import { TIER_ROMAN_NUMERALS } from '../../../../core/blitzkit/tankDefinitions/constants';
import { tankIcon } from '../../../../core/blitzkit/tankIcon';
import strings from '../../../../lang/en-US.json';
interface TankopediaLayoutProps {
children: ReactNode;
@@ -14,15 +16,18 @@ export default async function TankopediaLayout({
const id = Number(params.id);
const awaitedTankDefinitions = await tankDefinitions;
const tank = awaitedTankDefinitions[id];
const title = `${tank.name} - Tier ${TIER_ROMAN_NUMERALS[tank.tier]} ${
(strings.common.nations as Record<string, string>)[tank.nation]
} ${strings.common.tank_class_short[tank.class]}`;
const description = `Statistics, armor profiles, and equipment for ${tank.name}`;
return (
<>
<title>{tank.name}</title>
<meta
name="description"
content={`Statistics, armor profiles, equipment, and more about ${tank.name}`}
/>
<title>{title}</title>
<meta name="description" content={description} />
<meta property="og:title" content={title} />
<meta property="og:image" content={tankIcon(id)} />
<meta property="og:description" content={description} />
{children}
</>
+5 -3
View File
@@ -3,7 +3,7 @@
import { Flex } from '@radix-ui/themes';
import { useEffect } from 'react';
import PageWrapper from '../../../../components/PageWrapper';
import { assignDuelMember } from '../../../../core/blitzkrieg/assignDuelMember';
import { assignDuelMember } from '../../../../core/blitzkit/assignDuelMember';
import { useWideFormat } from '../../../../hooks/useWideFormat';
import { mutateDuel, useDuel } from '../../../../stores/duel';
import { mutateTankopediaTemporary } from '../../../../stores/tankopedia';
@@ -17,6 +17,7 @@ import { Provisions } from './components/Characteristics/components/Provisions';
import { Skills } from './components/Characteristics/components/Skills';
import { TankSandbox } from './components/Model/TankSandbox';
import { Title } from './components/Title';
import { Videos } from './components/Videos';
export default function Page({ params }: { params: { id: string } }) {
const initialId = parseInt(params.id);
@@ -83,7 +84,7 @@ export default function Page({ params }: { params: { id: string } }) {
style={{
flex: 1,
width: '100%',
top: 64,
top: 64 + 16,
position: wideFormat ? 'sticky' : undefined,
}}
>
@@ -91,7 +92,6 @@ export default function Page({ params }: { params: { id: string } }) {
<TankSandbox />
<AntagonistBar />
</Flex>
<Flex gap="5" wrap="wrap">
<Modules />
<Provisions />
@@ -110,6 +110,8 @@ export default function Page({ params }: { params: { id: string } }) {
<Characteristics />
</Flex>
</Flex>
<Videos />
</>
)}
</PageWrapper>
@@ -1,7 +1,7 @@
import { CaretLeftIcon, CaretRightIcon } from '@radix-ui/react-icons';
import { Button, Flex, TextField } from '@radix-ui/themes';
import { useEffect, useRef } from 'react';
import { TankDefinition } from '../../../../core/blitzkrieg/tankDefinitions';
import { TankDefinition } from '../../../../core/blitzkit/tankDefinitions';
import mutateTankopediaPersistent, {
useTankopediaPersistent,
} from '../../../../stores/tankopedia';
@@ -1,7 +1,7 @@
import { Button, Flex, Text } from '@radix-ui/themes';
import { SmallTankIcon } from '../../../../../../components/SmallTankIcon';
import { TankDefinition } from '../../../../../../core/blitzkrieg/tankDefinitions';
import { TIER_ROMAN_NUMERALS } from '../../../../../../core/blitzkrieg/tankDefinitions/constants';
import { TankDefinition } from '../../../../../../core/blitzkit/tankDefinitions';
import { TIER_ROMAN_NUMERALS } from '../../../../../../core/blitzkit/tankDefinitions/constants';
interface CompactSearchResultRowProps {
tanks: TankDefinition[];
@@ -11,11 +11,11 @@ import {
TREE_TYPE_ICONS,
TREE_TYPE_IMAGES,
} from '../../../../../../../components/Tanks/components/Item/constants';
import { NATIONS } from '../../../../../../../core/blitzkrieg/tankDefinitions';
import { NATIONS } from '../../../../../../../core/blitzkit/tankDefinitions';
import {
TIERS,
TIER_ROMAN_NUMERALS,
} from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
} from '../../../../../../../core/blitzkit/tankDefinitions/constants';
import mutateTankopediaPersistent, {
TankopediaTestTankDisplay,
useTankopediaPersistent,
@@ -28,32 +28,6 @@ export function Options() {
return (
<Flex gap="2" wrap="wrap" justify="center">
<DropdownMenu.Root>
<DropdownMenu.Trigger>
<Button variant="soft" color="gray">
Test tanks
<CaretDownIcon />
</Button>
</DropdownMenu.Trigger>
<DropdownMenu.Content>
<DropdownMenu.RadioGroup
value={filters.test}
onValueChange={(value) =>
mutateTankopediaPersistent((draft) => {
draft.filters.test = value as TankopediaTestTankDisplay;
})
}
>
<DropdownMenu.RadioItem value="include">
Include
</DropdownMenu.RadioItem>
<DropdownMenu.RadioItem value="exclude">
Exclude
</DropdownMenu.RadioItem>
<DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
</DropdownMenu.RadioGroup>
</DropdownMenu.Content>
</DropdownMenu.Root>
<Flex>
{TREE_TYPES.map((type, index) => (
<Button
@@ -334,6 +308,32 @@ export function Options() {
))}
</Flex>
</Flex>
<DropdownMenu.Root>
<DropdownMenu.Trigger>
<Button variant="soft" color="gray">
Test tanks
<CaretDownIcon />
</Button>
</DropdownMenu.Trigger>
<DropdownMenu.Content>
<DropdownMenu.RadioGroup
value={filters.test}
onValueChange={(value) =>
mutateTankopediaPersistent((draft) => {
draft.filters.test = value as TankopediaTestTankDisplay;
})
}
>
<DropdownMenu.RadioItem value="include">
Include
</DropdownMenu.RadioItem>
<DropdownMenu.RadioItem value="exclude">
Exclude
</DropdownMenu.RadioItem>
<DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
</DropdownMenu.RadioGroup>
</DropdownMenu.Content>
</DropdownMenu.Root>
</Flex>
);
}
@@ -21,24 +21,24 @@ import { use, useEffect, useMemo, useRef, useState } from 'react';
import { TreeType } from '../../../../../components/Tanks';
import { TANK_CLASSES } from '../../../../../components/Tanks/components/Item/constants';
import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
import { asset } from '../../../../../core/blitzkrieg/asset';
import { modelDefinitions } from '../../../../../core/blitzkrieg/modelDefinitions';
import { normalizeBoundingBox } from '../../../../../core/blitzkrieg/normalizeBoundingBox';
import { resolveDpm } from '../../../../../core/blitzkrieg/resolveDpm';
import { resolveReload } from '../../../../../core/blitzkrieg/resolveReload';
import { asset } from '../../../../../core/blitzkit/asset';
import { modelDefinitions } from '../../../../../core/blitzkit/modelDefinitions';
import { normalizeBoundingBox } from '../../../../../core/blitzkit/normalizeBoundingBox';
import { resolveDpm } from '../../../../../core/blitzkit/resolveDpm';
import { resolveReload } from '../../../../../core/blitzkit/resolveReload';
import {
NATIONS,
TankDefinition,
tanksDefinitionsArray,
} from '../../../../../core/blitzkrieg/tankDefinitions';
} from '../../../../../core/blitzkit/tankDefinitions';
import {
TANK_ICONS,
TANK_ICONS_COLLECTOR,
TANK_ICONS_PREMIUM,
TIER_ROMAN_NUMERALS,
} from '../../../../../core/blitzkrieg/tankDefinitions/constants';
import { tankIcon } from '../../../../../core/blitzkrieg/tankIcon';
import { unionBoundingBox } from '../../../../../core/blitzkrieg/unionBoundingBox';
} from '../../../../../core/blitzkit/tankDefinitions/constants';
import { tankIcon } from '../../../../../core/blitzkit/tankIcon';
import { unionBoundingBox } from '../../../../../core/blitzkit/unionBoundingBox';
import { theme } from '../../../../../stitches.config';
import mutateTankopediaPersistent, {
SORT_NAMES,
+29
View File
@@ -0,0 +1,29 @@
'use client';
import { Flex, Link } from '@radix-ui/themes';
import { use } from 'react';
import { AdHorizontal } from '../../../../components/Ads/Horizontal';
import PageWrapper from '../../../../components/PageWrapper';
import { tankDefinitions } from '../../../../core/blitzkit/tankDefinitions';
export default function Page() {
const awaitedTankDefinitions = use(tankDefinitions);
return (
<PageWrapper>
<title>Super duper secret map for SEO</title>
<AdHorizontal />
<Flex direction="column" align="center">
{Object.values(awaitedTankDefinitions)
.sort((a, b) => b.tier - a.tier)
.map((tank) => (
<Link href={`./${tank.id}`} key={tank.id}>
{tank.name}
</Link>
))}
</Flex>
</PageWrapper>
);
}
+6
View File
@@ -1,5 +1,7 @@
'use client';
import { Flex } from '@radix-ui/themes';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import PageWrapper from '../../../components/PageWrapper';
import { TankSearch } from './components/TankSearch';
@@ -14,6 +16,10 @@ export default function Page() {
router.push(`./tankopedia/${tank.id}`);
}}
/>
<Flex justify="center" mt="4">
<Link href="/tools/tankopedia/map">Super duper secret map</Link>
</Flex>
</PageWrapper>
);
}
+2 -2
View File
@@ -1,5 +1,5 @@
import { registerProcesses } from './core/blitzkrieg/processes';
import { secrets } from './core/blitzkrieg/secrets';
import { registerProcesses } from './core/blitzkit/processes';
import { secrets } from './core/blitzkit/secrets';
import { client } from './core/discord/client';
// console.log(`🟡 Launching bot ${client.shard?.ids[0]}`);
+1 -1
View File
@@ -60,7 +60,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
.join('\n')}`;
}
const url = `https://raw.githubusercontent.com/tresabhi/blitzkrieg/main/docs/${DOCS[subcommand as Subcommand]}.md`;
const url = `https://raw.githubusercontent.com/tresabhi/blitzkit/main/docs/${DOCS[subcommand as Subcommand]}.md`;
const content = fetch(url).then((response) => response.text());
return content;
+8 -3
View File
@@ -7,11 +7,11 @@ import TitleBar from '../../components/TitleBar';
import { AllStats, getAccountInfo } from '../../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../../core/blitz/getClanAccountInfo';
import getTankStats from '../../core/blitz/getTankStats';
import { filtersToDescription } from '../../core/blitzkrieg/filtersToDescription';
import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
import {
TankDefinition,
tankDefinitions,
} from '../../core/blitzkrieg/tankDefinitions';
} from '../../core/blitzkit/tankDefinitions';
import getStatsInPeriod from '../../core/blitzstars/getStatsInPeriod';
import { tankAverages } from '../../core/blitzstars/tankAverages';
import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
@@ -20,6 +20,7 @@ import { translator } from '../../core/localization/translator';
import calculateWN8 from '../../core/statistics/calculateWN8';
import { StatFilters, filterStats } from '../../core/statistics/filterStats';
import getWN8Percentile from '../../core/statistics/getWN8Percentile';
import { UserError } from '../../hooks/userError';
const ROWS_PER_PAGE = 8;
const MAX_PAGES = 9;
@@ -37,7 +38,7 @@ export async function renderBreakdown(
const { filteredOrder } = await filterStats(statsInPeriod, filters);
const accountInfo = await getAccountInfo(region, id);
const clanData = await getClanAccountInfo(region, id, ['clan']);
const tankStats = await getTankStats(region, id, locale);
const tankStats = await getTankStats(region, id);
const filterDescriptions = await filtersToDescription(filters, locale);
const orderedCurrentStats: AllStats[] = [];
const orderedCareerStats: AllStats[] = [];
@@ -45,6 +46,10 @@ export async function renderBreakdown(
const orderedCareerWN8: (number | undefined)[] = [];
const orderedCareerWN8Full: (number | undefined)[] = [];
if (tankStats === null) {
throw new UserError(t`bot.common.errors.no_tank_stats`);
}
filteredOrder.forEach((id) => {
const tankAveragesEntry = awaitedTankAverages[id];
const current = statsInPeriod.diff[id];
+1 -1
View File
@@ -84,7 +84,7 @@
// embedWarning(
// 'This is an approximation!',
// "Wargaming provides very little information about platoons publicly. Caveats:\n- Players in two different clans platooning artificially inflates the total count\n- Game-mode battles aren't counted since Wargaming doesn't publicly share that data\n- This command is also subject to Blitzkrieg's reset times (use `/about timezones` for more info)",
// "Wargaming provides very little information about platoons publicly. Caveats:\n- Players in two different clans platooning artificially inflates the total count\n- Game-mode battles aren't counted since Wargaming doesn't publicly share that data\n- This command is also subject to Blitzkit's reset times (use `/about timezones` for more info)",
// ),
// ];
// },
+3 -3
View File
@@ -7,9 +7,9 @@
// import { SlashCommandBuilder } from 'discord.js';
// import { getAccountInfo } from '../core/blitz/getAccountInfo';
// import getPeriodNow from '../core/blitzkrieg/getPeriodNow';
// import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
// import { tankDefinitions } from '../core/blitzkrieg/tankDefinitions';
// import getPeriodNow from '../core/blitzkit/getPeriodNow';
// import getTimeDaysAgo from '../core/blitzkit/getTimeDaysAgo';
// import { tankDefinitions } from '../core/blitzkit/tankDefinitions';
// import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
// import { tankAverages } from '../core/blitzstars/tankAverages';
// import addUsernameChoices from '../core/discord/addUsernameChoices';
+2 -2
View File
@@ -7,8 +7,8 @@ import TitleBar from '../components/TitleBar';
import { getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
import resolveTankId from '../core/blitz/resolveTankId';
import { emblemURL } from '../core/blitzkrieg/emblemURL';
import getTankHistories from '../core/blitzkrieg/getTankHistories';
import { emblemURL } from '../core/blitzkit/emblemURL';
import getTankHistories from '../core/blitzkit/getTankHistories';
import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
import getPlayerHistories from '../core/blitzstars/getPlayerHistories';
import { addPeriodSubCommands } from '../core/discord/addPeriodSubCommands';
+2 -2
View File
@@ -6,8 +6,8 @@ import TierWeights from '../components/TierWeights';
import TitleBar from '../components/TitleBar';
import { getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
import { emblemURL } from '../core/blitzkrieg/emblemURL';
import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
import { emblemURL } from '../core/blitzkit/emblemURL';
import { filtersToDescription } from '../core/blitzkit/filtersToDescription';
import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
import addPeriodicFilterOptions from '../core/discord/addPeriodicFilterOptions';
+1 -1
View File
@@ -6,7 +6,7 @@ import { Glow } from '../components/AllStatsOverview/components/HeroStat/compone
import CommandWrapper from '../components/CommandWrapper';
import { getAccountInfo } from '../core/blitz/getAccountInfo';
import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
import { linkBlitzAndDiscord } from '../core/blitzkrieg/discordBlitzLink';
import { linkBlitzAndDiscord } from '../core/blitzkit/discordBlitzLink';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteUsername from '../core/discord/autocompleteUsername';
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
+9 -4
View File
@@ -9,8 +9,8 @@ import {
Tier,
flags,
tankDefinitions,
} from '../core/blitzkrieg/tankDefinitions';
import { TIER_ROMAN_NUMERALS } from '../core/blitzkrieg/tankDefinitions/constants';
} from '../core/blitzkit/tankDefinitions';
import { TIER_ROMAN_NUMERALS } from '../core/blitzkit/tankDefinitions/constants';
import addTierChoices from '../core/discord/addTierChoices';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteUsername from '../core/discord/autocompleteUsername';
@@ -31,11 +31,16 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
.addStringOption(addUsernameChoices),
async handler(interaction) {
const { translate } = translator(interaction.locale);
const { t, translate } = translator(interaction.locale);
const tier = Number(interaction.options.getString('tier'));
const { id, region } = await resolvePlayerFromCommand(interaction);
const accountInfo = await getAccountInfo(region, id);
const tankStats = await getTankStats(region, id, interaction.locale);
const tankStats = await getTankStats(region, id);
if (tankStats === null) {
return t`bot.common.errors.no_tank_stats`;
}
const filteredTanks = (
await Promise.all(
tankStats.map(async (tankData) => ({
+2 -2
View File
@@ -9,7 +9,7 @@ export const pingCommand = new Promise<CommandRegistry>((resolve) => {
handlesInteraction: true,
command: createLocalizedCommand('ping', [
{ subcommand: 'blitzkrieg' },
{ subcommand: 'blitzkit' },
{ subcommand: 'wotb' },
]),
@@ -18,7 +18,7 @@ export const pingCommand = new Promise<CommandRegistry>((resolve) => {
const subcommand = interaction.options.getSubcommand();
const executionStart = Date.now();
if (subcommand === 'blitzkrieg') {
if (subcommand === 'blitzkit') {
await interaction.editReply(t`bot.commands.ping.body.pong`);
} else {
await fetch('https://api.wotblitz.com/');
+3 -3
View File
@@ -9,9 +9,9 @@ import { getLeagueFromScore } from '../core/blitz/getLeagueFromScore';
import getRatingInfo from '../core/blitz/getRatingInfo';
import { getRatingNeighbors } from '../core/blitz/getRatingNeighbors';
import { normalizeLeagueIcon } from '../core/blitz/normalizeLeagueIcon';
import { emblemURL } from '../core/blitzkrieg/emblemURL';
import getArchivedRatingMidnightLeaderboard from '../core/blitzkrieg/getArchivedRatingMidnightLeaderboard';
import { webpToPng } from '../core/blitzkrieg/iconPng';
import { emblemURL } from '../core/blitzkit/emblemURL';
import getArchivedRatingMidnightLeaderboard from '../core/blitzkit/getArchivedRatingMidnightLeaderboard';
import { webpToPng } from '../core/blitzkit/iconPng';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
+4 -4
View File
@@ -17,10 +17,10 @@ import getRatingInfo from '../core/blitz/getRatingInfo';
import { getRatingLeague } from '../core/blitz/getRatingLeague';
import { getRatingNeighbors } from '../core/blitz/getRatingNeighbors';
import { isOnGoingRatingSeason } from '../core/blitz/isOnGoingRatingSeason';
import { getArchivedLatestSeasonNumber } from '../core/blitzkrieg/getArchivedLatestSeasonNumber';
import getArchivedRatingInfo from '../core/blitzkrieg/getArchivedRatingInfo';
import { getArchivedRatingLeaderboard } from '../core/blitzkrieg/getArchivedRatingLeaderboard';
import getArchivedRatingMidnightLeaderboard from '../core/blitzkrieg/getArchivedRatingMidnightLeaderboard';
import { getArchivedLatestSeasonNumber } from '../core/blitzkit/getArchivedLatestSeasonNumber';
import getArchivedRatingInfo from '../core/blitzkit/getArchivedRatingInfo';
import { getArchivedRatingLeaderboard } from '../core/blitzkit/getArchivedRatingLeaderboard';
import getArchivedRatingMidnightLeaderboard from '../core/blitzkit/getArchivedRatingMidnightLeaderboard';
import addRegionChoices from '../core/discord/addRegionChoices';
import addUsernameChoices from '../core/discord/addUsernameChoices';
import autocompleteUsername from '../core/discord/autocompleteUsername';
Loaded 100 of 276 files, more files were not shown because too many files have changed in this diff. Show more