Compare commits

..
16 Commits
Author SHA1 Message Date
TrèsAbhi bf61cb17de typo 2026-02-18 16:36:42 -06:00
TrèsAbhi c8ba6b1eca feat: 1.29.12 2026-02-18 16:36:12 -06:00
dependabot[bot] 1d8c823703 build(deps): bump bytes from 1.10.1 to 1.11.1 in /packages/app/src-tauri (#212)
Bumps [bytes](https://github.com/tokio-rs/bytes) from 1.10.1 to 1.11.1.
- [Release notes](https://github.com/tokio-rs/bytes/releases)
- [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/bytes/compare/v1.10.1...v1.11.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-02-16 09:57:06 -06:00
dependabot[bot] 3594c9a971 build(deps): bump time from 0.3.44 to 0.3.47 in /packages/app/src-tauri (#213)
Bumps [time](https://github.com/time-rs/time) from 0.3.44 to 0.3.47.
- [Release notes](https://github.com/time-rs/time/releases)
- [Changelog](https://github.com/time-rs/time/blob/main/CHANGELOG.md)
- [Commits](https://github.com/time-rs/time/compare/v0.3.44...v0.3.47)

---
updated-dependencies:
- dependency-name: time
  dependency-version: 0.3.47
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-02-16 09:56:52 -06:00
TrèsAbhi f478a08bd9 New Crowdin updates (#211)
* New translations en.json (Polish)

* New translations en.json (Russian)

* New translations en.json (Russian)
2026-02-13 07:25:48 -06:00
TrèsAbhi 115fa5acad Remove locale redirection logic
Removed locale redirection logic from LocaleRedirector component.
2026-02-12 07:14:11 -06:00
TrèsAbhi c24a2989fa Fix locale redirection logic in LocaleRedirector.astro 2026-02-12 06:31:43 -06:00
TrèsAbhi a6cfb522b3 fix: remove cue4parse 2026-02-11 15:22:30 -06:00
TrèsAbhi 12e645f6e2 fix: legacy redirector ensure props 2026-02-11 15:20:09 -06:00
TrèsAbhi 9a3f64fcd6 Refactor locale redirection logic in LocaleRedirector 2026-02-11 09:31:48 -06:00
TrèsAbhi 5dba69f30a New Crowdin updates (#210) 2026-02-03 15:00:55 -06:00
TrèsAbhi 023c348b0d New Crowdin updates (#209)
* New translations en.json (French)

* New translations en.json (French)

* New translations en.json (Russian)
2026-01-21 11:00:30 -06:00
TrèsAbhi 8313dd811d feat: logs 2026-01-16 19:31:53 -06:00
TrèsAbhi 3f7d10c2c6 fix: guesser sizing 2026-01-16 19:31:09 -06:00
TrèsAbhi 98e83d120a New translations en.json (Russian) (#208) 2026-01-16 18:46:33 -06:00
TrèsAbhi dd845d2784 New translations en.json (Chinese Simplified) (#207) 2026-01-12 22:06:59 -06:00
215 changed files with 3099 additions and 7052 deletions

No files matched your search

+82
View File
@@ -0,0 +1,82 @@
name: Assets
on:
push:
branches: main
workflow_dispatch:
inputs:
asset_repo:
type: choice
required: false
description: What asset repo to write to
options:
- blitzkit/assets
- blitzkit/assets-preview
- blitzkit/assets-dev
default: blitzkit/assets
asset_source:
type: string
required: false
description: "Archive URL or Steam to download (example: steam:APP_ID/DEPOT_ID or zip:URL_TO_ZIP)"
default: "steam:444200/444202"
schedule:
- cron: "0 2 * * *"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.asset_repo }}
cancel-in-progress: true
env:
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
WOTB_DLC_CDN: ${{ secrets.WOTB_DLC_CDN }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_REPO: ${{ github.event.inputs.asset_repo != '' && github.event.inputs.asset_repo || secrets.PUBLIC_ASSET_REPO }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: true
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
PUBLIC_PATREON_CLIENT_ID: ${{ secrets.PUBLIC_PATREON_CLIENT_ID }}
PUBLIC_PATREON_REDIRECT_URI: ${{ secrets.PUBLIC_PATREON_REDIRECT_URI }}
PATREON_CLIENT_SECRET: ${{ secrets.PATREON_CLIENT_SECRET }}
PUBLIC_NITROPAY_ID: ${{ secrets.PUBLIC_NITROPAY_ID }}
PUBLIC_DEBUG_MISSING_I18N: false
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_FAST_USER: blitzkit
PUBLIC_ASSET_FAST_REPO: assets
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
jobs:
build_assets:
name: Build assets
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- run: bun run setup
- name: AppArmor hack
run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
- name: Build assets
run: bun run build:assets --all-targets --source=${{ github.event.inputs.asset_source || 'steam:444200/444202' }}
+54
View File
@@ -0,0 +1,54 @@
name: Averages
on:
workflow_dispatch:
schedule:
- cron: "0 8 * * *"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Build averages
env:
PUBLIC_ASSET_BRANCH: main
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
VIDEOS_SHEET: ${{ secrets.VIDEOS_SHEET }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
run: bun run build:averages --production
+34
View File
@@ -0,0 +1,34 @@
name: Bot
on:
push:
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
name: Build bot
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Build bot
run: bun run build:bot
- name: Archive build
uses: actions/upload-artifact@v5
with:
name: bot
path: dist/bot
+36
View File
@@ -0,0 +1,36 @@
name: IDs
on:
workflow_dispatch:
schedule:
- cron: "0 0 * * 1"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Discover IDs
run: bun build:ids --production
+67
View File
@@ -0,0 +1,67 @@
name: Host
on:
push:
branches: main
schedule:
- cron: "0 */5 * * *"
workflow_dispatch:
release:
types: [created, published, released, edited]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
SERVICING: ${{ secrets.SERVICING }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- name: Download release assets
run: |
DOWNLOAD_URL=$(curl -s https://api.github.com/repos/blitzkit/blitzkit/releases/latest \
| grep "browser_download_url.*bot.zip" \
| cut -d : -f 2,3 \
| tr -d \")
curl -L -o bot.zip $DOWNLOAD_URL
mkdir -p dist/bot
unzip bot.zip -d dist/bot
- name: Install sharp
run: bun init -y && bun add sharp
- name: Move directories
run: mv dist/bot/prisma .
- name: Run bot
run: bun run dist/bot/main.js
+46
View File
@@ -0,0 +1,46 @@
name: Rating Asia
on:
workflow_dispatch:
schedule:
- cron: "0 17 * * *"
env:
PUBLIC_ASSET_BRANCH: main
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Generate leaderboard
run: bun build:ratingleaderboard --region=asia
+46
View File
@@ -0,0 +1,46 @@
name: Rating Europe
on:
workflow_dispatch:
schedule:
- cron: "0 23 * * *"
env:
PUBLIC_ASSET_BRANCH: main
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Generate leaderboard
run: bun build:ratingleaderboard --region=eu
+46
View File
@@ -0,0 +1,46 @@
name: Rating North America
on:
workflow_dispatch:
schedule:
- cron: "0 5 * * *"
env:
PUBLIC_ASSET_BRANCH: main
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: "true"
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs:
host:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Generate leaderboard
run: bun build:ratingleaderboard --region=com
+38
View File
@@ -0,0 +1,38 @@
name: Reviews
on:
workflow_dispatch:
schedule:
- cron: 0 0 * * 2
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
PUBLIC_ASSET_BRANCH: ${{ secrets.PUBLIC_ASSET_BRANCH }}
PUBLIC_ASSET_REPO: ${{ secrets.PUBLIC_ASSET_REPO }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
submodules: recursive
token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GH_TOKEN }}
- run: bun run setup
- name: Find reviews
run: bun run build:reviews
@@ -17,30 +17,36 @@ concurrency:
cancel-in-progress: ${{ github.ref == 'refs/heads/main' }} cancel-in-progress: ${{ github.ref == 'refs/heads/main' }}
env: env:
WOTB_SERVER: ${{ secrets.WOTB_SERVER }} PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
SERVICING: ${{ secrets.SERVICING }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
jobs: jobs:
build: build:
name: Build name: Build website
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
with: with:
submodules: recursive submodules: recursive
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
- uses: oven-sh/setup-bun@v2 - uses: oven-sh/setup-bun@v2
- uses: actions/setup-node@v6
with:
node-version: latest
- uses: arduino/setup-protoc@v3 - uses: arduino/setup-protoc@v3
with: with:
repo-token: ${{ secrets.GH_TOKEN }} repo-token: ${{ secrets.GH_TOKEN }}
- uses: actions/configure-pages@v5 - uses: actions/configure-pages@v5
- run: bun run setup - run: bun run setup
- name: Build website - name: Build website
@@ -52,7 +58,7 @@ jobs:
path: dist/website path: dist/website
deploy-github-pages: deploy-github-pages:
if: ${{ github.ref == 'refs/heads/ue' && github.repository == 'blitzkit/host-beta' }} if: ${{ github.ref == 'refs/heads/main' }}
name: Deploy to GitHub Pages name: Deploy to GitHub Pages
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build needs: build
+1 -1
View File
@@ -22,7 +22,7 @@ depots
public/sitemap* public/sitemap*
/firebase.json /firebase.json
target target
packages/website-ue/src/protos/*.ts # packages/core/src/protos/*.ts
/.vercel /.vercel
.astro .astro
.vercel .vercel
-3
View File
@@ -1,6 +1,3 @@
[submodule "packages/closed"] [submodule "packages/closed"]
path = packages/closed path = packages/closed
url = https://github.com/blitzkit/closed.git url = https://github.com/blitzkit/closed.git
[submodule "packages/cue4parse"]
path = packages/cue4parse
url = https://github.com/FabianFG/CUE4Parse.git
+2 -9
View File
@@ -17,6 +17,8 @@
"astrojs", "astrojs",
"astrolib", "astrolib",
"atgm", "atgm",
"Autoloader",
"Autoreloader",
"AYUV", "AYUV",
"battleresults", "battleresults",
"bbox", "bbox",
@@ -59,7 +61,6 @@
"Ddpf", "Ddpf",
"Ddsd", "Ddsd",
"deadrail", "deadrail",
"DEBUFF",
"debugflags", "debugflags",
"deburr", "deburr",
"decalmask", "decalmask",
@@ -145,7 +146,6 @@
"noout", "noout",
"normalmap", "normalmap",
"oneof", "oneof",
"Oodle",
"oopsies", "oopsies",
"Oopsy", "Oopsy",
"opentest", "opentest",
@@ -161,7 +161,6 @@
"playerachievements", "playerachievements",
"playerinfo", "playerinfo",
"playform", "playform",
"Playtest",
"pngjs", "pngjs",
"POSITIVEX", "POSITIVEX",
"POSITIVEY", "POSITIVEY",
@@ -178,7 +177,6 @@
"ratingleaderboard", "ratingleaderboard",
"raycaster", "raycaster",
"Redirector", "Redirector",
"REGEN",
"Relogin", "Relogin",
"researchable", "researchable",
"Resvg", "Resvg",
@@ -192,14 +190,11 @@
"searchplayers", "searchplayers",
"searchtanks", "searchtanks",
"SHAREDEXP", "SHAREDEXP",
"Skia",
"SKLLD", "SKLLD",
"sluggify",
"smoothstep", "smoothstep",
"Smri", "Smri",
"Specularity", "Specularity",
"SSAO", "SSAO",
"stackable",
"startcase", "startcase",
"statkit", "statkit",
"statsfull", "statsfull",
@@ -223,7 +218,6 @@
"tungstentip", "tungstentip",
"Turretless", "Turretless",
"TYPELESS", "TYPELESS",
"uasset",
"ubjson", "ubjson",
"Unicum", "Unicum",
"UNLOCALIZED", "UNLOCALIZED",
@@ -233,7 +227,6 @@
"unrotate", "unrotate",
"unwrapper", "unwrapper",
"userns", "userns",
"usmap",
"vercel", "vercel",
"vickers", "vickers",
"vitepress", "vitepress",
+429 -726
View File
File diff suppressed because it is too large. Load diff
+5
View File
@@ -0,0 +1,5 @@
# BlitzKit 1.29.11
## Fixes
- The Guesser game's toolbar now scales properly with screen size
+14
View File
@@ -0,0 +1,14 @@
# BlitzKit 1.29.12
## Fixes
- BlitzKit no longer uses BlitzStars for tank averages for some commands
- BlitzKit Performance was created to completely replace BlitzStars but BlitzStars was still used for some older commands
- But since BlitzStars keeps having downtime, it has been completely removed
- Upgraded all dependencies to the latest versions
- The replay command is now properly localized across all languages
- Special Chinese characters are now properly handled
- Commands are now registered synchronously, allowing errors to reveal their exact origins
- Error handling now properly exists the process after logging the error
- The bot now uses Discord's new `clientReady` instead of the ambiguous `ready` event
- Both the armor and model extractors now use the new BlitzKit `SteamVFS`
+9 -10
View File
@@ -1,42 +1,41 @@
{ {
"name": "blitzkit", "name": "blitzkit",
"version": "2.0.0-beta.2", "version": "1.29.12",
"license": "BlitzKit License", "license": "BlitzKit License",
"private": true, "private": true,
"scripts": { "scripts": {
"build:game": "cd packages/game && bun run build",
"build:assets": "cd packages/scripts && bun run build:assets", "build:assets": "cd packages/scripts && bun run build:assets",
"build:averages": "bun --filter=@blitzkit/scripts run build:averages", "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
"build:bot": "cd packages/scripts && bun run build:bot", "build:bot": "cd packages/scripts && bun run build:bot",
"build:website": "cd packages/website-ue && bun run build", "build:website": "cd packages/website && bun run build",
"build:prisma": "prisma generate", "build:prisma": "prisma generate",
"build:proxyclient": "cd packages/scripts && bun run build:proxyclient", "build:proxyclient": "cd packages/scripts && bun run build:proxyclient",
"build:catalogitemaccesssor": "cd packages/scripts && bun run build:catalogitemaccesssor", "build:catalogitemaccesssor": "cd packages/scripts && bun run build:catalogitemaccesssor",
"build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard", "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
"build:app": "cd packages/app && bun run build", "build:app": "cd packages/app && bun run build",
"dev:bot": "bun run build:bot --dev && bun start:bot", "dev:bot": "bun run build:bot --dev && bun start:bot --dev",
"start:bot": "bun dist/bot/main.js", "start:bot": "bun dist/bot/main.js",
"dev:docs": "vitepress dev docs", "dev:docs": "vitepress dev docs",
"dev:website": "cd packages/website-ue && bun run dev", "dev:website": "cd packages/website && bun run dev",
"dev:app": "cd packages/app && bun run dev", "dev:app": "cd packages/app && bun run dev",
"dev": "bun run dev:website", "dev": "bun run dev:website",
"dev:api": "bun --filter=@blitzkit/api run dev", "dev:api": "bun --filter=@blitzkit/api run dev",
"setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader", "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
"setup:patches": "bun --filter=@blitzkit/scripts run setup:patches", "setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
"start:website": "bun --filter=@blitzkit/website-ue run start", "start:website": "bun --filter=@blitzkit/website run start",
"host:docs": "vitepress preview docs", "host:docs": "vitepress preview docs",
"lint": "tsc", "lint": "tsc",
"lint:website": "cd packages/website-ue && bun run lint", "lint:website": "cd packages/website && bun run lint",
"format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"", "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
"update": "yarn upgrade --latest", "update": "yarn upgrade --latest",
"tunnel": "cloudflared tunnel --url http://localhost:3000", "tunnel": "cloudflared tunnel --url http://localhost:3000",
"discoverids": "scripts/discoverIds.ts", "discoverids": "scripts/discoverIds.ts",
"build:protos": "cd packages/scripts && bun run build:protos", "build:protos": "cd packages/scripts && bun run build:protos",
"preview:website": "cd packages/website-ue && bun run preview", "preview:website": "cd packages/website && bun run preview",
"build:reviews": "cd packages/scripts && bun build:reviews", "build:reviews": "cd packages/scripts && bun build:reviews",
"build:ids": "cd packages/scripts && bun build:ids", "build:ids": "cd packages/scripts && bun build:ids",
"prunestrings": "cd packages/scripts && bun prunestrings", "prunestrings": "cd packages/scripts && bun prunestrings",
"setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient && bun run build:catalogitemaccesssor", "setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient",
"patchnotes": "cd packages/scripts && bun run patchnotes" "patchnotes": "cd packages/scripts && bun run patchnotes"
}, },
"type": "module", "type": "module",
@@ -44,9 +43,9 @@
"packages/*" "packages/*"
], ],
"dependencies": { "dependencies": {
"@fontsource-variable/jetbrains-mono": "^5.2.8",
"@prisma/client": "^6.18.0", "@prisma/client": "^6.18.0",
"prisma": "^6.18.0", "prisma": "^6.18.0",
"sharp": "^0.34.5",
"typescript": "^5.9.3" "typescript": "^5.9.3"
} }
} }
+11 -11
View File
@@ -356,9 +356,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]] [[package]]
name = "bytes" name = "bytes"
version = "1.10.1" version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@@ -2105,9 +2105,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]] [[package]]
name = "num-conv" name = "num-conv"
version = "0.1.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
[[package]] [[package]]
name = "num-traits" name = "num-traits"
@@ -3907,30 +3907,30 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.44" version = "0.3.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
dependencies = [ dependencies = [
"deranged", "deranged",
"itoa", "itoa",
"num-conv", "num-conv",
"powerfmt", "powerfmt",
"serde", "serde_core",
"time-core", "time-core",
"time-macros", "time-macros",
] ]
[[package]] [[package]]
name = "time-core" name = "time-core"
version = "0.1.6" version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
[[package]] [[package]]
name = "time-macros" name = "time-macros"
version = "0.2.24" version = "0.2.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
dependencies = [ dependencies = [
"num-conv", "num-conv",
"time-core", "time-core",
+10 -9
View File
@@ -4,25 +4,26 @@
"@blitzkit/core": "workspace:*", "@blitzkit/core": "workspace:*",
"@blitzkit/i18n": "workspace:*", "@blitzkit/i18n": "workspace:*",
"@radix-ui/colors": "^3.0.0", "@radix-ui/colors": "^3.0.0",
"@radix-ui/themes": "^3.2.1", "@radix-ui/themes": "^3.3.0",
"@resvg/resvg-js": "^2.6.2", "@resvg/resvg-js": "^2.6.2",
"@types/adm-zip": "^0.5.7", "@types/adm-zip": "^0.5.7",
"@types/bun": "^1.3.9",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/markdown-escape": "^1.1.3", "@types/markdown-escape": "^1.1.3",
"@types/react": "^19.2.2", "@types/react": "^19.2.14",
"adm-zip": "^0.5.16", "adm-zip": "^0.5.16",
"bepaint": "^0.1.0-beta.3", "bepaint": "^0.1.0-beta.3",
"discord.js": "^14.22.1", "discord.js": "^14.25.1",
"dotenv": "^17.2.2", "dotenv": "^17.3.1",
"fuzzysort": "^3.1.0", "fuzzysort": "^3.1.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.23",
"markdown-escape": "^2.0.0", "markdown-escape": "^2.0.0",
"pickleparser": "^0.2.1", "pickleparser": "^0.2.1",
"prisma": "^6.17.1", "prisma": "^6.19.2",
"protobufjs": "^7.5.4", "protobufjs": "^7.5.4",
"react": "^19.2.0", "react": "^19.2.4",
"satori": "^0.18.3", "satori": "^0.18.4",
"sharp": "^0.34.4" "sharp": "^0.34.5"
}, },
"private": true, "private": true,
"scripts": { "scripts": {
+4 -4
View File
@@ -1,7 +1,7 @@
import { createLocalizedCommand } from "../core/discord/createLocalizedCommand"; import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
import { translator } from "../core/localization/translator"; import { translator } from "../core/localization/translator";
import { import {
COMMANDS_RAW, commandsArray,
type CommandRegistry, type CommandRegistry,
} from "../events/interactionCreate"; } from "../events/interactionCreate";
@@ -35,7 +35,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
if (subcommand === "commands") { if (subcommand === "commands") {
return `${strings.bot.commands.about.subcommands.commands.body}${( return `${strings.bot.commands.about.subcommands.commands.body}${(
await Promise.all(COMMANDS_RAW) await Promise.all(commandsArray)
) )
.sort((a, b) => .sort((a, b) =>
(a.command.name_localizations?.[interaction.locale] ?? (a.command.name_localizations?.[interaction.locale] ??
@@ -43,7 +43,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
(b.command.name_localizations?.[interaction.locale] ?? (b.command.name_localizations?.[interaction.locale] ??
b.command.name) b.command.name)
? -1 ? -1
: 1 : 1,
) )
.map( .map(
(registry) => (registry) =>
@@ -54,7 +54,7 @@ export const aboutCommand = new Promise<CommandRegistry>(async (resolve) => {
registry.command.description_localizations?.[ registry.command.description_localizations?.[
interaction.locale interaction.locale
] ?? registry.command.description ] ?? registry.command.description
}` }`,
) )
.join("\n")}`; .join("\n")}`;
} }
+32 -27
View File
@@ -15,11 +15,16 @@ import { CommandWrapper } from "../../components/CommandWrapper";
import { NoData } from "../../components/NoData"; import { NoData } from "../../components/NoData";
import { TitleBar } from "../../components/TitleBar"; import { TitleBar } from "../../components/TitleBar";
import { filtersToDescription } from "../../core/blitzkit/filtersToDescription"; import { filtersToDescription } from "../../core/blitzkit/filtersToDescription";
import { tankDefinitions } from "../../core/blitzkit/nonBlockingPromises"; import {
averageDefinitions,
tankDefinitions,
} from "../../core/blitzkit/nonBlockingPromises";
import { UserError } from "../../core/blitzkit/userError"; import { UserError } from "../../core/blitzkit/userError";
import { filterStats, type StatFilters } from "../../core/blitzstars/filterStats"; import {
filterStats,
type StatFilters,
} from "../../core/blitzstars/filterStats";
import { getStatsInPeriod } from "../../core/blitzstars/getStatsInPeriod"; import { getStatsInPeriod } from "../../core/blitzstars/getStatsInPeriod";
import { blitzStarsTankAverages } from "../../core/blitzstars/tankAverages";
import type { ResolvedPeriod } from "../../core/discord/resolvePeriodFromCommand"; import type { ResolvedPeriod } from "../../core/discord/resolvePeriodFromCommand";
import type { ResolvedPlayer } from "../../core/discord/resolvePlayerFromCommand"; import type { ResolvedPlayer } from "../../core/discord/resolvePlayerFromCommand";
import { translator } from "../../core/localization/translator"; import { translator } from "../../core/localization/translator";
@@ -31,11 +36,11 @@ export async function renderBreakdown(
{ region, id }: ResolvedPlayer, { region, id }: ResolvedPlayer,
{ start, end, name }: ResolvedPeriod, { start, end, name }: ResolvedPeriod,
filters: StatFilters, filters: StatFilters,
locale: Locale locale: Locale,
) { ) {
const { strings, unwrap } = translator(locale); const { strings, unwrap } = translator(locale);
const awaitedTankDefinitions = await tankDefinitions; const awaitedTankDefinitions = await tankDefinitions;
const awaitedTankAverages = await blitzStarsTankAverages; const awaitedTankAverages = await averageDefinitions;
const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale); const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale);
const { filteredOrder } = await filterStats(statsInPeriod, filters); const { filteredOrder } = await filterStats(statsInPeriod, filters);
const accountInfo = await getAccountInfo(region, id); const accountInfo = await getAccountInfo(region, id);
@@ -53,14 +58,14 @@ export async function renderBreakdown(
} }
filteredOrder.forEach((id) => { filteredOrder.forEach((id) => {
const tankAveragesEntry = awaitedTankAverages[id]; const tankAveragesEntry = awaitedTankAverages.averages[id];
const current = statsInPeriod.diff[id]; const current = statsInPeriod.diff[id];
const career = tankStats.find((tank) => tank.tank_id === id)!.all; const career = tankStats.find((tank) => tank.tank_id === id)!.all;
const currentWN8 = tankAveragesEntry const currentWN8 = tankAveragesEntry
? calculateWN8(tankAveragesEntry.all, current) ? calculateWN8(tankAveragesEntry.mu, current)
: undefined; : undefined;
const careerWN8 = tankAveragesEntry const careerWN8 = tankAveragesEntry
? calculateWN8(tankAveragesEntry.all, career) ? calculateWN8(tankAveragesEntry.mu, career)
: undefined; : undefined;
orderedCurrentStats.push(current); orderedCurrentStats.push(current);
@@ -69,65 +74,65 @@ export async function renderBreakdown(
orderedCareerWN8.push(careerWN8); orderedCareerWN8.push(careerWN8);
}); });
tankStats.forEach((tank) => { tankStats.forEach((tank) => {
const tankAveragesEntry = awaitedTankAverages[tank.tank_id]; const tankAveragesEntry = awaitedTankAverages.averages[tank.tank_id];
orderedCareerWN8Full.push( orderedCareerWN8Full.push(
tankAveragesEntry tankAveragesEntry
? calculateWN8(tankAveragesEntry.all, tank.all) ? calculateWN8(tankAveragesEntry.mu, tank.all)
: undefined : undefined,
); );
}); });
const currentBattles = orderedCurrentStats.reduce( const currentBattles = orderedCurrentStats.reduce(
(accumulator, current) => accumulator + current.battles, (accumulator, current) => accumulator + current.battles,
0 0,
); );
const careerBattles = tankStats.reduce( const careerBattles = tankStats.reduce(
(accumulator, current) => accumulator + current.all.battles, (accumulator, current) => accumulator + current.all.battles,
0 0,
); );
const currentWinrate = const currentWinrate =
orderedCurrentStats.reduce( orderedCurrentStats.reduce(
(accumulator, current) => accumulator + current.wins, (accumulator, current) => accumulator + current.wins,
0 0,
) / currentBattles; ) / currentBattles;
const careerWinrate = const careerWinrate =
tankStats.reduce( tankStats.reduce(
(accumulator, current) => accumulator + current.all.wins, (accumulator, current) => accumulator + current.all.wins,
0 0,
) / careerBattles; ) / careerBattles;
const currentWN8 = const currentWN8 =
orderedCurrentWN8.reduce<number>( orderedCurrentWN8.reduce<number>(
(accumulator, current, index) => (accumulator, current, index) =>
accumulator + (current ?? 0) * orderedCurrentStats[index].battles, accumulator + (current ?? 0) * orderedCurrentStats[index].battles,
0 0,
) / ) /
orderedCurrentStats.reduce( orderedCurrentStats.reduce(
(accumulator, current, index) => (accumulator, current, index) =>
accumulator + accumulator +
(orderedCurrentWN8[index] === undefined ? 0 : current.battles), (orderedCurrentWN8[index] === undefined ? 0 : current.battles),
0 0,
); );
const careerWN8 = const careerWN8 =
orderedCareerWN8Full.reduce<number>( orderedCareerWN8Full.reduce<number>(
(accumulator, current) => accumulator + (current ?? 0), (accumulator, current) => accumulator + (current ?? 0),
0 0,
) / ) /
tankStats.reduce( tankStats.reduce(
(accumulator, current, index) => (accumulator, current, index) =>
accumulator + accumulator +
(orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles), (orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles),
0 0,
); );
const currentDamage = const currentDamage =
orderedCurrentStats.reduce( orderedCurrentStats.reduce(
(accumulator, current) => accumulator + current.damage_dealt, (accumulator, current) => accumulator + current.damage_dealt,
0 0,
) / currentBattles; ) / currentBattles;
const careerDamage = const careerDamage =
tankStats.reduce( tankStats.reduce(
(accumulator, current) => accumulator + current.all.damage_dealt, (accumulator, current) => accumulator + current.all.damage_dealt,
0 0,
) / careerBattles; ) / careerBattles;
const children: React.JSX.Element[] = []; const children: React.JSX.Element[] = [];
@@ -172,7 +177,7 @@ export async function renderBreakdown(
delta: currentDamage - careerDamage, delta: currentDamage - careerDamage,
}, },
]} ]}
/> />,
); );
filteredOrder.forEach((id, index) => { filteredOrder.forEach((id, index) => {
@@ -206,7 +211,7 @@ export async function renderBreakdown(
{ {
title: strings.bot.commands.breakdown.body.winrate, title: strings.bot.commands.breakdown.body.winrate,
current: `${(100 * (current.wins / current.battles)).toFixed( current: `${(100 * (current.wins / current.battles)).toFixed(
2 2,
)}%`, )}%`,
career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`, career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`,
delta: delta:
@@ -230,24 +235,24 @@ export async function renderBreakdown(
{ {
title: strings.bot.commands.breakdown.body.damage, title: strings.bot.commands.breakdown.body.damage,
current: Math.round( current: Math.round(
current.damage_dealt / current.battles current.damage_dealt / current.battles,
).toLocaleString(), ).toLocaleString(),
career: Math.round( career: Math.round(
career.damage_dealt / career.battles career.damage_dealt / career.battles,
).toLocaleString(), ).toLocaleString(),
delta: delta:
current.damage_dealt / current.battles - current.damage_dealt / current.battles -
career.damage_dealt / career.battles, career.damage_dealt / career.battles,
}, },
]} ]}
/> />,
); );
}); });
} }
const pages = chunk( const pages = chunk(
children, children,
Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE) Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE),
); );
if (filteredOrder.length > 0) { if (filteredOrder.length > 0) {
+92 -77
View File
@@ -5,28 +5,29 @@ import {
idToRegion, idToRegion,
tankIcon, tankIcon,
TIER_ROMAN_NUMERALS, TIER_ROMAN_NUMERALS,
} from '@blitzkit/core'; } from "@blitzkit/core";
import { Locale } from 'discord.js'; import { Locale } from "discord.js";
import { clamp } from 'lodash-es'; import { clamp } from "lodash-es";
import { CommandWrapper } from '../components/CommandWrapper'; import { CommandWrapper } from "../components/CommandWrapper";
import { TitleBar } from '../components/TitleBar'; import { TitleBar } from "../components/TitleBar";
import { iconPng } from '../core/blitzkit/iconPng'; import { iconPng } from "../core/blitzkit/iconPng";
import { import {
averageDefinitions,
mapDefinitions, mapDefinitions,
tankDefinitions, tankDefinitions,
} from '../core/blitzkit/nonBlockingPromises'; } from "../core/blitzkit/nonBlockingPromises";
import { RenderConfiguration } from '../core/blitzkit/renderConfiguration'; import { RenderConfiguration } from "../core/blitzkit/renderConfiguration";
import { blitzStarsTankAverages } from '../core/blitzstars/tankAverages'; import { buttonLink } from "../core/discord/buttonLink";
import { buttonLink } from '../core/discord/buttonLink'; import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; import { localizationObject } from "../core/discord/localizationObject";
import { translator } from '../core/localization/translator'; import { translator } from "../core/localization/translator";
import { type CommandRegistry } from '../events/interactionCreate'; import { type CommandRegistry } from "../events/interactionCreate";
import { theme } from '../stitches.config'; import { theme } from "../stitches.config";
type WotInspectorReplaySubmission = type WotInspectorReplaySubmission =
| { status: 'error'; data: unknown; error: { message: string } } | { status: "error"; data: unknown; error: { message: string } }
| { | {
status: 'ok'; status: "ok";
data: { data: {
download_url: string; download_url: string;
view_url: string; view_url: string;
@@ -209,9 +210,9 @@ function stat(value: string | number, flex = 2) {
<div <div
style={{ style={{
flex, flex,
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
}} }}
> >
<span style={{ fontSize: 16 }}>{value}</span> <span style={{ fontSize: 16 }}>{value}</span>
@@ -227,15 +228,15 @@ async function playerListing(
recordingPlayer = false, recordingPlayer = false,
) { ) {
const { unwrap } = translator(locale); const { unwrap } = translator(locale);
const awaitedTankAverages = await blitzStarsTankAverages; const awaitedTankAverages = await averageDefinitions;
const awaitedTankDefinitions = await tankDefinitions; const awaitedTankDefinitions = await tankDefinitions;
const tank = awaitedTankDefinitions.tanks[player.vehicle_descr]; const tank = awaitedTankDefinitions.tanks[player.vehicle_descr];
const blockAccent = recordingPlayer ? '_amber' : ''; const blockAccent = recordingPlayer ? "_amber" : "";
const healthAccent = protagonistTeam const healthAccent = protagonistTeam
? recordingPlayer ? recordingPlayer
? '_amber' ? "_amber"
: '_green' : "_green"
: '_red'; : "_red";
// our turret ids are always off by 1 or 2 lol so imma just grab the closest // our turret ids are always off by 1 or 2 lol so imma just grab the closest
// TODO: 💀 // TODO: 💀
@@ -245,11 +246,11 @@ async function playerListing(
)[0]; )[0];
const totalHealth = turret.health + tank.health; const totalHealth = turret.health + tank.health;
const healthLeft = clamp(player.hitpoints_left / totalHealth, 0, 1); const healthLeft = clamp(player.hitpoints_left / totalHealth, 0, 1);
const tankAveragesEntry = awaitedTankAverages[player.vehicle_descr]; const tankAveragesEntry = awaitedTankAverages.averages[player.vehicle_descr];
const wn8 = const wn8 =
tankAveragesEntry === undefined tankAveragesEntry === undefined
? -1 ? -1
: calculateWN8(tankAveragesEntry.all, { : calculateWN8(tankAveragesEntry.mu, {
battles: 1, battles: 1,
damage_dealt: player.damage_made, damage_dealt: player.damage_made,
dropped_capture_points: player.base_defend_points, dropped_capture_points: player.base_defend_points,
@@ -262,8 +263,8 @@ async function playerListing(
<div <div
key={player.entity_id} key={player.entity_id}
style={{ style={{
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
gap: 8, gap: 8,
backgroundColor: theme.colors[`appBackground2${blockAccent}`], backgroundColor: theme.colors[`appBackground2${blockAccent}`],
padding: 8, padding: 8,
@@ -271,11 +272,11 @@ async function playerListing(
> >
<div <div
style={{ style={{
display: 'flex', display: "flex",
gap: 8, gap: 8,
flex: 1, flex: 1,
overflow: 'hidden', overflow: "hidden",
alignItems: 'center', alignItems: "center",
}} }}
> >
<img <img
@@ -284,22 +285,22 @@ async function playerListing(
style={{ style={{
width: 32, width: 32,
height: 32, height: 32,
objectFit: 'contain', objectFit: "contain",
}} }}
/> />
<div <div
style={{ style={{
display: 'flex', display: "flex",
flexDirection: 'column', flexDirection: "column",
// align // align
}} }}
> >
<div <div
style={{ style={{
display: 'flex', display: "flex",
gap: 4, gap: 4,
alignItems: 'center', alignItems: "center",
}} }}
> >
<span <span
@@ -324,23 +325,23 @@ async function playerListing(
style={{ style={{
fontSize: 16, fontSize: 16,
color: theme.colors[`textLowContrast${blockAccent}`], color: theme.colors[`textLowContrast${blockAccent}`],
whiteSpace: 'nowrap', whiteSpace: "nowrap",
}} }}
> >
{player.name} {player.name}
{player.clan_tag ? ` [${player.clan_tag}]` : ''} {player.clan_tag ? ` [${player.clan_tag}]` : ""}
</span> </span>
</div> </div>
</div> </div>
<div <div
style={{ style={{
display: 'flex', display: "flex",
flex: 1, flex: 1,
}} }}
> >
{stat(player.damage_made.toLocaleString())} {stat(player.damage_made.toLocaleString())}
{stat(wn8 === -1 ? '--' : Math.round(wn8).toLocaleString())} {stat(wn8 === -1 ? "--" : Math.round(wn8).toLocaleString())}
{stat(player.exp.toLocaleString())} {stat(player.exp.toLocaleString())}
{stat(player.enemies_destroyed, 1)} {stat(player.enemies_destroyed, 1)}
</div> </div>
@@ -349,15 +350,15 @@ async function playerListing(
style={{ style={{
borderRadius: 2, borderRadius: 2,
backgroundColor: theme.colors[`componentInteractive${healthAccent}`], backgroundColor: theme.colors[`componentInteractive${healthAccent}`],
display: 'flex', display: "flex",
width: 4, width: 4,
height: '100%', height: "100%",
transform: 'scaleY(-1)', transform: "scaleY(-1)",
}} }}
> >
<div <div
style={{ style={{
width: '100%', width: "100%",
height: `${healthLeft * 100}%`, height: `${healthLeft * 100}%`,
borderRadius: 2, borderRadius: 2,
backgroundColor: theme.colors[`solidBackground${healthAccent}`], backgroundColor: theme.colors[`solidBackground${healthAccent}`],
@@ -373,8 +374,8 @@ function Header() {
<div <div
style={{ style={{
padding: 8, padding: 8,
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
gap: 8, gap: 8,
}} }}
> >
@@ -382,16 +383,16 @@ function Header() {
<div <div
style={{ style={{
display: 'flex', display: "flex",
flex: 1, flex: 1,
}} }}
> >
<div <div
style={{ style={{
flex: 2, flex: 2,
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
}} }}
> >
<span <span
@@ -406,9 +407,9 @@ function Header() {
<div <div
style={{ style={{
flex: 2, flex: 2,
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
}} }}
> >
<span <span
@@ -423,9 +424,9 @@ function Header() {
<div <div
style={{ style={{
flex: 2, flex: 2,
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
}} }}
> >
<span <span
@@ -440,9 +441,9 @@ function Header() {
<div <div
style={{ style={{
flex: 1, flex: 1,
display: 'flex', display: "flex",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
}} }}
> >
<span <span
@@ -460,28 +461,42 @@ function Header() {
} }
export const replayCommand = new Promise<CommandRegistry>((resolve) => { export const replayCommand = new Promise<CommandRegistry>((resolve) => {
const { strings } = translator(Locale.EnglishUS);
resolve({ resolve({
command: createLocalizedCommand('replay').addAttachmentOption((option) => command: createLocalizedCommand("replay").addAttachmentOption((option) =>
option.setName('file').setDescription('Replay file').setRequired(true), option
.setName(strings.bot.commands.replay.options.file.name)
.setNameLocalizations(
localizationObject(
(strings) => strings.bot.commands.replay.options.file.name,
undefined,
true,
),
)
.setDescription(strings.bot.commands.replay.options.file.description)
.setDescriptionLocalizations(
localizationObject(
(strings) => strings.bot.commands.replay.options.file.description,
),
)
.setRequired(true),
), ),
async handler(interaction) { async handler(interaction) {
const awaitedMapDefinitions = await mapDefinitions; const awaitedMapDefinitions = await mapDefinitions;
const file = interaction.options.getAttachment('file')!; const file = interaction.options.getAttachment("file")!;
// const file = {
// url: 'https://cdn.discordapp.com/ephemeral-attachments/1232434891652861972/1232781496016834581/20240328_1530__TresAbhi_M60_1157057448155406708.wotbreplay?ex=662ab4bc&is=6629633c&hm=c784cd10e80232350ddaf291fa987b879c4d0a8083b78298c9eee4fa0d507f6c&',
// };
const submissionData = (await fetch( const submissionData = (await fetch(
`https://wotinspector.com/api/replay/upload/?url=${encodeURIComponent( `https://wotinspector.com/api/replay/upload/?url=${encodeURIComponent(
file.url, file.url,
)}`, )}`,
).then((response) => response.json())) as WotInspectorReplaySubmission; ).then((response) => response.json())) as WotInspectorReplaySubmission;
if (submissionData.status === 'error') { if (submissionData.status === "error") {
return `# Uh oh! WoT Inspector didn't like that.\n\nThere was an error processing your replay. Get help on [the official Discord server](https://discord.gg/nDt7AjGJQH).`; return `# Uh oh! WoT Inspector didn't like that.\n\nThere was an error processing your replay. Get help on [the official Discord server](https://discord.gg/nDt7AjGJQH).`;
} }
const replayId = submissionData.data.download_url.split('/').at(-1)!; const replayId = submissionData.data.download_url.split("/").at(-1)!;
const replayData = (await fetch( const replayData = (await fetch(
`https://api.wotinspector.com/v2/blitz/replays/${replayId}/`, `https://api.wotinspector.com/v2/blitz/replays/${replayId}/`,
).then((response) => response.json())) as WotInspectorReplay; ).then((response) => response.json())) as WotInspectorReplay;
@@ -493,7 +508,7 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
await getClanAccountInfo( await getClanAccountInfo(
idToRegion(replayData.protagonist), idToRegion(replayData.protagonist),
replayData.protagonist, replayData.protagonist,
['clan'], ["clan"],
) )
)?.clan; )?.clan;
const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined; const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
@@ -506,22 +521,22 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
image={clanImage} image={clanImage}
description={`${ description={`${
replayData.protagonist_team === replayData.winner_team replayData.protagonist_team === replayData.winner_team
? 'Victory' ? "Victory"
: 'Defeat' : "Defeat"
} • ${awaitedMapDefinitions.maps[replayData.map_id].name}`} } • ${awaitedMapDefinitions.maps[replayData.map_id].name}`}
/> />
<div <div
style={{ style={{
display: 'flex', display: "flex",
gap: 8, gap: 8,
}} }}
> >
<div <div
style={{ style={{
flex: 1, flex: 1,
display: 'flex', display: "flex",
flexDirection: 'column', flexDirection: "column",
gap: 4, gap: 4,
}} }}
> >
@@ -547,8 +562,8 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
<div <div
style={{ style={{
flex: 1, flex: 1,
display: 'flex', display: "flex",
flexDirection: 'column', flexDirection: "column",
gap: 4, gap: 4,
}} }}
> >
@@ -569,8 +584,8 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
</div> </div>
</div> </div>
</CommandWrapper>, </CommandWrapper>,
buttonLink(submissionData.data.view_url, 'WoT Inspector'), buttonLink(submissionData.data.view_url, "WoT Inspector"),
buttonLink(submissionData.data.download_url, 'Download'), buttonLink(submissionData.data.download_url, "Download"),
]; ];
}, },
}); });
@@ -1,11 +1,13 @@
import { import {
fetchAverageDefinitions,
fetchDiscoveredIdsDefinitions, fetchDiscoveredIdsDefinitions,
fetchGameDefinitions, fetchGameDefinitions,
fetchMapDefinitions, fetchMapDefinitions,
fetchTankDefinitions, fetchTankDefinitions,
fetchTankNames, fetchTankNames,
} from '@blitzkit/core'; } from "@blitzkit/core";
export const averageDefinitions = fetchAverageDefinitions();
export const tankDefinitions = fetchTankDefinitions(); export const tankDefinitions = fetchTankDefinitions();
export const gameDefinitions = fetchGameDefinitions(); export const gameDefinitions = fetchGameDefinitions();
export const tankNames = fetchTankNames(); export const tankNames = fetchTankNames();
+26 -18
View File
@@ -1,29 +1,37 @@
import { usersDatabase } from '../db/users'; import { usersDatabase } from "../db/users";
import { client } from '../discord/client'; import { client } from "../discord/client";
const EXIT_EVENTS = [ const EXIT_EVENTS = ["SIGINT", "SIGTERM", "SIGUSR1", "SIGUSR2"];
'beforeExit',
'exit',
'SIGINT',
'SIGTERM',
'SIGUSR1',
'SIGUSR2',
];
async function cleanup() { let cleaningUp = false;
console.log('Cleaning up...');
await Promise.all([usersDatabase.$disconnect(), client.destroy()]); async function cleanup(signal: string) {
if (cleaningUp) return;
cleaningUp = true;
console.log('Gracefully exiting...'); console.log(`Cleaning up... (${signal})`);
try {
await Promise.all([usersDatabase.$disconnect(), client.destroy()]);
} catch (err) {
console.error("Cleanup error:", err);
}
console.log("Gracefully exiting...");
EXIT_EVENTS.forEach((event) => process.off(event, cleanup));
process.exit(0); process.exit(0);
} }
export function registerProcesses() { export function registerProcesses() {
process.on('uncaughtException', console.error); process.on("uncaughtException", (err) => {
client.on('error', console.error); console.error("uncaughtException:", err);
});
EXIT_EVENTS.forEach((event) => process.on(event, cleanup)); process.on("unhandledRejection", (err) => {
console.error("unhandledRejection:", err);
});
client.on("error", console.error);
EXIT_EVENTS.forEach((event) => process.on(event, () => cleanup(event)));
} }
+15 -11
View File
@@ -3,8 +3,10 @@ import type { SupplementaryStats } from "@blitzkit/core/src/blitz/getAccountInfo
import { calculateWN8 } from "@blitzkit/core/src/statistics/calculateWN8"; import { calculateWN8 } from "@blitzkit/core/src/statistics/calculateWN8";
import type { BlitzStats } from "@blitzkit/core/src/statistics/compositeStats"; import type { BlitzStats } from "@blitzkit/core/src/statistics/compositeStats";
import { sumAllStats } from "@blitzkit/core/src/statistics/sumAllStats"; import { sumAllStats } from "@blitzkit/core/src/statistics/sumAllStats";
import { tankDefinitions } from "../blitzkit/nonBlockingPromises"; import {
import { blitzStarsTankAverages } from "./tankAverages"; averageDefinitions,
tankDefinitions,
} from "../blitzkit/nonBlockingPromises";
export interface StatFilters { export interface StatFilters {
nation?: string; nation?: string;
@@ -16,13 +18,13 @@ export interface StatFilters {
export async function filterStats( export async function filterStats(
{ diff, order }: DiffedTankStats, { diff, order }: DiffedTankStats,
filters: StatFilters filters: StatFilters,
) { ) {
// tank, if provided, takes priority over all other filters // tank, if provided, takes priority over all other filters
if (filters.tank) filters = { tank: filters.tank }; if (filters.tank) filters = { tank: filters.tank };
const awaitedTankDefinitions = await tankDefinitions; const awaitedTankDefinitions = await tankDefinitions;
const awaitedTankAverages = await blitzStarsTankAverages; const awaitedTankAverages = await averageDefinitions;
const filteredOrder = order.filter((id) => { const filteredOrder = order.filter((id) => {
const entry = awaitedTankDefinitions.tanks[id]; const entry = awaitedTankDefinitions.tanks[id];
@@ -44,26 +46,28 @@ export async function filterStats(
const stats = sumAllStats(filteredOrder.map((id) => diff[id])); const stats = sumAllStats(filteredOrder.map((id) => diff[id]));
const battlesOfTanksWithAverages = filteredOrder.reduce<number>( const battlesOfTanksWithAverages = filteredOrder.reduce<number>(
(accumulator, id) => (accumulator, id) =>
awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator, awaitedTankAverages.averages[id]
0 ? accumulator + diff[id].battles
: accumulator,
0,
); );
const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>( const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>(
(accumulator, id) => (accumulator, id) =>
awaitedTankDefinitions.tanks[id] awaitedTankDefinitions.tanks[id]
? accumulator + diff[id].battles ? accumulator + diff[id].battles
: accumulator, : accumulator,
0 0,
); );
const supplementary = { const supplementary = {
WN8: WN8:
filteredOrder.reduce<number>( filteredOrder.reduce<number>(
(accumulator, id) => (accumulator, id) =>
awaitedTankAverages[id] awaitedTankAverages.averages[id]
? accumulator + ? accumulator +
calculateWN8(awaitedTankAverages[id].all, diff[id]) * calculateWN8(awaitedTankAverages.averages[id].mu, diff[id]) *
diff[id].battles diff[id].battles
: accumulator, : accumulator,
0 0,
) / battlesOfTanksWithAverages, ) / battlesOfTanksWithAverages,
tier: tier:
filteredOrder.reduce<number>( filteredOrder.reduce<number>(
@@ -72,7 +76,7 @@ export async function filterStats(
? accumulator + ? accumulator +
awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles
: accumulator, : accumulator,
0 0,
) / battlesOfTanksWithTankDefinition, ) / battlesOfTanksWithTankDefinition,
} satisfies SupplementaryStats; } satisfies SupplementaryStats;
@@ -1,101 +0,0 @@
import { BlitzStats } from '@blitzkit/core';
import { context } from '@blitzkit/core/src/blitzkit/context';
interface SpecialStats {
winrate: number;
damageRatio: number;
kdr: number;
damagePerBattle: number;
killsPerBattle: number;
hitsPerBattle: number;
spotsPerBattle: number;
wpm: number;
dpm: number;
kpm: number;
hitRate: number;
survivalRate: number;
}
export type Percentiles = [
number,
number,
number,
number,
number,
number,
number,
number,
number,
];
export interface SpecialPercentiles {
winRate: Percentiles;
damageRatio: Percentiles;
kdr: Percentiles;
damagePerBattle: Percentiles;
killsPerBattle: Percentiles;
hitsPerBattle: Percentiles;
spotsPerBattle: Percentiles;
wpm: Percentiles;
dpm: Percentiles;
kpm: Percentiles;
hitRate: Percentiles;
survivalRate: Percentiles;
}
export interface MeanSd {
winrateMean: number;
winrateSd: number;
hitRateMean: number;
hitRateSd: number;
survivalRateMean: number;
survivalRateSd: number;
damageRatioMean: number;
damageRatioSd: number;
kdrMean: number;
kdrSd: number;
dpbMean: number;
dpbSd: number;
kpbMean: number;
kpbSd: number;
hpbMean: number;
hpbSd: number;
spbMean: number;
spbSd: number;
}
export interface IndividualTankAverage {
_id: number;
battle_life_time: number;
total_battle_life_time: number;
number_of_players: number;
tank_id: number;
all: BlitzStats;
special: SpecialStats;
percentiles: SpecialPercentiles;
percentiles_player_count: number;
meanSd: MeanSd;
shotEff: number;
last_update: number;
}
export type BlitzStarsTankAverages = Record<number, IndividualTankAverage>;
export const blitzStarsTankAverages = fetch(
'https://www.blitzstars.com/api/tankaverages.json',
)
.then((response) => response.json())
.then((json) => {
if (context === 'server') {
const partialTankAverages: BlitzStarsTankAverages = {};
(json as IndividualTankAverage[]).forEach((individualTankAverage) => {
partialTankAverages[individualTankAverage.tank_id] =
individualTankAverage;
});
return partialTankAverages;
} else {
return json as BlitzStarsTankAverages;
}
});
+5 -5
View File
@@ -1,9 +1,9 @@
import { Client, GatewayIntentBits } from 'discord.js'; import { Client, GatewayIntentBits } from "discord.js";
import { interactionCreate } from '../../events/interactionCreate'; import { interactionCreate } from "../../events/interactionCreate";
import { ready } from '../../events/ready'; import { ready } from "../../events/ready";
export const client = new Client({ export const client = new Client({
intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers], intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
}) })
.on('ready', ready) .on("clientReady", ready)
.on('interactionCreate', interactionCreate); .on("interactionCreate", interactionCreate);
@@ -22,11 +22,11 @@ export function createLocalizedCommand(
command: string, command: string,
sub?: sub?:
| CreateLocalizedCommandSubcommand[] | CreateLocalizedCommandSubcommand[]
| CreateLocalizedCommandSubcommandGroup[] | CreateLocalizedCommandSubcommandGroup[],
) { ) {
const commandPathItem = command.replaceAll( const commandPathItem = command.replaceAll(
"-", "-",
"_" "_",
) as keyof BlitzKitStrings["bot"]["commands"]; ) as keyof BlitzKitStrings["bot"]["commands"];
const { strings } = translator(Locale.EnglishUS); const { strings } = translator(Locale.EnglishUS);
const slashCommand = new SlashCommandBuilder() const slashCommand = new SlashCommandBuilder()
@@ -35,14 +35,14 @@ export function createLocalizedCommand(
localizationObject( localizationObject(
(strings) => strings.bot.commands[commandPathItem].name, (strings) => strings.bot.commands[commandPathItem].name,
undefined, undefined,
true true,
) ),
) )
.setDescription(strings.bot.commands[commandPathItem].description) .setDescription(strings.bot.commands[commandPathItem].description)
.setDescriptionLocalizations( .setDescriptionLocalizations(
localizationObject( localizationObject(
(strings) => strings.bot.commands[commandPathItem].description (strings) => strings.bot.commands[commandPathItem].description,
) ),
); );
if (sub) { if (sub) {
@@ -56,7 +56,7 @@ export function createLocalizedCommand(
} }
).subcommands[subItem.subcommand].name, ).subcommands[subItem.subcommand].name,
undefined, undefined,
true true,
); );
const subcommandDescriptionLocalizations = localizationObject( const subcommandDescriptionLocalizations = localizationObject(
(strings) => (strings) =>
@@ -64,7 +64,7 @@ export function createLocalizedCommand(
strings.bot.commands[commandPathItem] as unknown as { strings.bot.commands[commandPathItem] as unknown as {
subcommands: Record<string, { description: string }>; subcommands: Record<string, { description: string }>;
} }
).subcommands[subItem.subcommand].description ).subcommands[subItem.subcommand].description,
); );
slashCommand.addSubcommand((option) => { slashCommand.addSubcommand((option) => {
@@ -78,7 +78,7 @@ export function createLocalizedCommand(
strings.bot.commands[commandPathItem] as unknown as { strings.bot.commands[commandPathItem] as unknown as {
subcommands: Record<string, { description: string }>; subcommands: Record<string, { description: string }>;
} }
).subcommands[subItem.subcommand].description ).subcommands[subItem.subcommand].description,
) )
.setDescriptionLocalizations(subcommandDescriptionLocalizations); .setDescriptionLocalizations(subcommandDescriptionLocalizations);
}); });
@@ -91,7 +91,7 @@ export function createLocalizedCommand(
} }
).groups[subItem.group].name, ).groups[subItem.group].name,
undefined, undefined,
true true,
); );
const subcommandDescriptionLocalizations = localizationObject( const subcommandDescriptionLocalizations = localizationObject(
(strings) => (strings) =>
@@ -99,7 +99,7 @@ export function createLocalizedCommand(
strings.bot.commands[commandPathItem] as unknown as { strings.bot.commands[commandPathItem] as unknown as {
groups: Record<string, { description: string }>; groups: Record<string, { description: string }>;
} }
).groups[subItem.group].description ).groups[subItem.group].description,
); );
slashCommand.addSubcommandGroup((option) => { slashCommand.addSubcommandGroup((option) => {
@@ -113,7 +113,7 @@ export function createLocalizedCommand(
strings.bot.commands[commandPathItem] as unknown as { strings.bot.commands[commandPathItem] as unknown as {
groups: Record<string, { description: string }>; groups: Record<string, { description: string }>;
} }
).groups[subItem.group].description ).groups[subItem.group].description,
) )
.setDescriptionLocalizations(subcommandDescriptionLocalizations); .setDescriptionLocalizations(subcommandDescriptionLocalizations);
}); });
@@ -1,10 +1,10 @@
import { AutocompleteInteraction, CacheType } from 'discord.js'; import { AutocompleteInteraction, CacheType } from "discord.js";
import { commands } from '..'; import { commands } from "..";
export async function handleAutocomplete( export async function handleAutocomplete(
interaction: AutocompleteInteraction<CacheType>, interaction: AutocompleteInteraction<CacheType>,
) { ) {
const command = (await commands)[interaction.commandName]; const command = commands[interaction.commandName];
if (!command) { if (!command) {
console.error(`No command matching ${interaction.commandName} was found.`); console.error(`No command matching ${interaction.commandName} was found.`);
@@ -1,13 +1,13 @@
import { ButtonInteraction, CacheType } from 'discord.js'; import { ButtonInteraction, CacheType } from "discord.js";
import { commands } from '..'; import { commands } from "..";
import { normalizeInteractionReturnable } from '../../../core/discord/normalizeInteractionReturnable'; import { normalizeInteractionReturnable } from "../../../core/discord/normalizeInteractionReturnable";
export async function handleButton(interaction: ButtonInteraction<CacheType>) { export async function handleButton(interaction: ButtonInteraction<CacheType>) {
await interaction.deferUpdate(); await interaction.deferUpdate();
const url = new URL(`https://example.com/${interaction.customId}`); const url = new URL(`https://example.com/${interaction.customId}`);
const commandName = url.pathname.split('/')[1]; const commandName = url.pathname.split("/")[1];
const button = (await commands)[commandName]?.button; const button = commands[commandName]?.button;
if (!button) { if (!button) {
throw new Error(`Button handler not found for "${commandName}"`); throw new Error(`Button handler not found for "${commandName}"`);
@@ -16,7 +16,7 @@ export async function handleButton(interaction: ButtonInteraction<CacheType>) {
if (interaction.message.interaction?.user.id !== interaction.user.id) { if (interaction.message.interaction?.user.id !== interaction.user.id) {
interaction.followUp({ interaction.followUp({
ephemeral: true, ephemeral: true,
content: 'You are not the author of this command.', content: "You are not the author of this command.",
}); });
return; return;
} }
@@ -17,12 +17,11 @@ import { translator } from "../../../core/localization/translator";
import type { Writeable } from "../../../types/writable"; import type { Writeable } from "../../../types/writable";
export async function handleChatInputCommand( export async function handleChatInputCommand(
interaction: ChatInputCommandInteraction<CacheType> interaction: ChatInputCommandInteraction<CacheType>,
) { ) {
await interaction.deferReply(); await interaction.deferReply();
const awaitedCommands = await commands; const registry = commands[interaction.commandName];
const registry = awaitedCommands[interaction.commandName];
try { try {
const returnable = await registry.handler(interaction); const returnable = await registry.handler(interaction);
@@ -36,7 +35,7 @@ export async function handleChatInputCommand(
if (typeof object === "string") { if (typeof object === "string") {
chunks.push([object]); chunks.push([object]);
} else chunks.at(-1)?.push(object!); } else chunks.at(-1)?.push(object!);
} },
); );
let index = 0; let index = 0;
@@ -59,7 +58,7 @@ export async function handleChatInputCommand(
} else if (psa.data.type === "image") { } else if (psa.data.type === "image") {
if (!reply.files) reply.files = []; if (!reply.files) reply.files = [];
(reply.files as Writeable<typeof reply.files>).push( (reply.files as Writeable<typeof reply.files>).push(
new AttachmentBuilder(psa.data.image) new AttachmentBuilder(psa.data.image),
); );
reply.content = reply.content ?? psa.data.title; reply.content = reply.content ?? psa.data.title;
} }
@@ -72,7 +71,7 @@ export async function handleChatInputCommand(
( (
reply.components[0] as ActionRowBuilder<ButtonBuilder> reply.components[0] as ActionRowBuilder<ButtonBuilder>
).addComponents( ).addComponents(
psa.data.links.map(({ title, url }) => buttonLink(url, title)) psa.data.links.map(({ title, url }) => buttonLink(url, title)),
); );
} }
} }
@@ -103,7 +102,7 @@ export async function handleChatInputCommand(
} else if (psa.data.type === "image") { } else if (psa.data.type === "image") {
if (!followUp.files) followUp.files = []; if (!followUp.files) followUp.files = [];
(followUp.files as Writeable<typeof followUp.files>).push( (followUp.files as Writeable<typeof followUp.files>).push(
new AttachmentBuilder(psa.data.image) new AttachmentBuilder(psa.data.image),
); );
followUp.content = followUp.content ?? psa.data.title; followUp.content = followUp.content ?? psa.data.title;
} }
@@ -116,7 +115,7 @@ export async function handleChatInputCommand(
( (
followUp.components[0] as ActionRowBuilder<ButtonBuilder> followUp.components[0] as ActionRowBuilder<ButtonBuilder>
).addComponents( ).addComponents(
psa.data.links.map(({ title, url }) => buttonLink(url, title)) psa.data.links.map(({ title, url }) => buttonLink(url, title)),
); );
} }
@@ -133,7 +132,7 @@ export async function handleChatInputCommand(
new ButtonBuilder() new ButtonBuilder()
.setLabel(strings.bot.common.errors.get_help) .setLabel(strings.bot.common.errors.get_help)
.setURL("https://discord.gg/nDt7AjGJQH") .setURL("https://discord.gg/nDt7AjGJQH")
.setStyle(ButtonStyle.Link) .setStyle(ButtonStyle.Link),
), ),
]; ];
if (error instanceof UserError) { if (error instanceof UserError) {
@@ -72,13 +72,13 @@ interface CommandRegistryImplicit extends CommandRegistryBase {
interface CommandRegistryExplicit extends CommandRegistryBase { interface CommandRegistryExplicit extends CommandRegistryBase {
handlesInteraction?: false; handlesInteraction?: false;
handler: ( handler: (
interaction: ChatInputCommandInteraction<CacheType> interaction: ChatInputCommandInteraction<CacheType>,
) => InteractionReturnable; ) => InteractionReturnable;
} }
export type CommandRegistry = CommandRegistryImplicit | CommandRegistryExplicit; export type CommandRegistry = CommandRegistryImplicit | CommandRegistryExplicit;
export const COMMANDS_RAW: Promise<CommandRegistry>[] = [ export const commandsArray: Promise<CommandRegistry>[] = [
// auctionCommand, // auctionCommand,
permissionsCommand, permissionsCommand,
debugCommand, debugCommand,
@@ -101,34 +101,28 @@ export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
replayCommand, replayCommand,
]; ];
export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => { export const commands: Record<string, CommandRegistry> = {};
return rawCommands.reduce<Record<string, CommandRegistry>>( const commandsFulfilled: CommandRegistry[] = [];
(commands, registry, index) => {
if (registry.status === "rejected") { let index = 0;
console.warn( for (const registry of await Promise.allSettled(commandsArray)) {
`Command ${index} failed to load; skipping...`, if (registry.status === "rejected") {
registry.reason console.warn(`Command ${index} rejected`, registry.reason);
); continue;
return commands; }
}
return { ...commands, [registry.value.command.name]: registry.value }; commandsFulfilled.push(registry.value);
}, commands[registry.value.command.name] = registry.value;
{} index++;
); }
});
const rest = new REST().setToken(assertSecret(import.meta.env.DISCORD_TOKEN)); const rest = new REST().setToken(assertSecret(import.meta.env.DISCORD_TOKEN));
const body = commandsFulfilled.map((registry) => registry.command.toJSON());
const applicationCommandsRoute = Routes.applicationCommands(
assertSecret(import.meta.env.DISCORD_CLIENT_ID),
);
commands.then((awaitedCommands) => { await rest.put(applicationCommandsRoute, { body });
const body = Object.values(awaitedCommands).map((registry) =>
registry.command.toJSON()
);
rest.put(
Routes.applicationCommands(assertSecret(import.meta.env.DISCORD_CLIENT_ID)),
{ body }
);
});
export async function interactionCreate(interaction: Interaction<CacheType>) { export async function interactionCreate(interaction: Interaction<CacheType>) {
if (interaction.isAutocomplete()) { if (interaction.isAutocomplete()) {
+9 -9
View File
@@ -1,9 +1,9 @@
import { assertSecret } from '@blitzkit/core'; import { assertSecret } from "@blitzkit/core";
import { ActivityType, ShardingManager } from 'discord.js'; import { ActivityType, ShardingManager } from "discord.js";
import { import {
discoveredIdsDefinitions, discoveredIdsDefinitions,
tankDefinitions, tankDefinitions,
} from './core/blitzkit/nonBlockingPromises'; } from "./core/blitzkit/nonBlockingPromises";
let iteration = 0; let iteration = 0;
const interval = setInterval(async () => { const interval = setInterval(async () => {
@@ -11,15 +11,15 @@ const interval = setInterval(async () => {
console.log(`Attempting launch on iteration ${iteration}`); console.log(`Attempting launch on iteration ${iteration}`);
const manager = new ShardingManager('dist/bot/workers/bot.js', { const manager = new ShardingManager("dist/bot/workers/bot.js", {
token: assertSecret(import.meta.env.DISCORD_TOKEN), token: assertSecret(import.meta.env.DISCORD_TOKEN),
}); });
const shards = await manager const shards = await manager
.on('shardCreate', (shard) => { .on("shardCreate", (shard) => {
clearInterval(interval); clearInterval(interval);
console.log(`🟡 Launching shard ${shard.id}`); console.log(`🟡 Launching shard ${shard.id}`);
shard.on('ready', () => console.log(`🟢 Launched shard ${shard.id}`)); shard.on("ready", () => console.log(`🟢 Launched shard ${shard.id}`));
}) })
.spawn(); .spawn();
@@ -29,7 +29,7 @@ const interval = setInterval(async () => {
let users = 0; let users = 0;
for (const [, shard] of shards) { for (const [, shard] of shards) {
const guilds = (await shard.fetchClientValue('guilds.cache')) as any; const guilds = (await shard.fetchClientValue("guilds.cache")) as any;
servers += guilds.length; servers += guilds.length;
@@ -66,7 +66,7 @@ const interval = setInterval(async () => {
for (const guild of client.guilds.cache.values()) { for (const guild of client.guilds.cache.values()) {
try { try {
const botMember = await guild.members.fetch(client.user.id); const botMember = await guild.members.fetch(client.user.id);
await botMember.setNickname('BlitzKit'); await botMember.setNickname("BlitzKit");
} catch {} } catch {}
} }
}, },
@@ -74,7 +74,7 @@ const interval = setInterval(async () => {
); );
} catch (error) { } catch (error) {
console.warn( console.warn(
'An error occurred when setting up presence, ignoring to keep the process alive', "An error occurred when setting up presence, ignoring to keep the process alive",
error, error,
); );
} }
+3 -3
View File
@@ -1,6 +1,6 @@
import { assertSecret } from '@blitzkit/core'; import { assertSecret } from "@blitzkit/core";
import { registerProcesses } from '../core/blitzkit/processes'; import { registerProcesses } from "../core/blitzkit/processes";
import { client } from '../core/discord/client'; import { client } from "../core/discord/client";
console.log(`🟡 Launching bot ${client.shard?.ids[0]}`); console.log(`🟡 Launching bot ${client.shard?.ids[0]}`);
+41 -42
View File
@@ -1,50 +1,49 @@
export * from "./assertSecret"; export * from './assertSecret';
export * from "./asset"; export * from './asset';
export * from "./availableProvisions"; export * from './availableProvisions';
export * from "./averageDefinitions"; export * from './averageDefinitions';
// export * from './camouflageDefinitions'; // export * from './camouflageDefinitions';
// export * from './checkConsumableProvisionInclusivity'; // export * from './checkConsumableProvisionInclusivity';
export * from "./coefficient"; export * from './coefficient';
export * from "./consumableDefinitions"; export * from './consumableDefinitions';
// export * from './context'; // export * from './context';
export * from "./createDefaultSkills"; export * from './createDefaultSkills';
export * from "./degressiveStat"; export * from './degressiveStat';
export * from "./discoveredIdDefinitions"; export * from './discoveredIdDefinitions';
export * from "./emblemURL"; export * from './emblemURL';
export * from "./equipmentDefinitions"; export * from './equipmentDefinitions';
export * from "./eventManager"; export * from './eventManager';
export * from "./gameDefinitions"; export * from './gameDefinitions';
export * from "./getArchivedLatestSeasonNumber"; export * from './getArchivedLatestSeasonNumber';
// export * from './getArchivedRatingInfo'; // export * from './getArchivedRatingInfo';
export * from "./getArchivedRatingLeaderboard"; export * from './getArchivedRatingLeaderboard';
// export * from './getArchivedRatingMidnightLeaderboard'; // export * from './getArchivedRatingMidnightLeaderboard';
export * from "./getTimeDaysAgo"; export * from './getTimeDaysAgo';
export * from "./isExplosive"; export * from './isExplosive';
export * from "./mapDefinitions"; export * from './mapDefinitions';
export * from "./modelDefinitions"; export * from './modelDefinitions';
export * from "./normalizeBoundingBox"; export * from './normalizeBoundingBox';
// export * from './parseBkni'; // export * from './parseBkni';
// export * from './patientFetch'; // export * from './patientFetch';
export * from "./patientFetchJSON"; export * from './patientFetchJSON';
export * from "./progressiveStat"; export * from './progressiveStat';
export * from "./provisionDefinitions"; export * from './provisionDefinitions';
export * from "./resolveDpm"; export * from './resolveDpm';
export * from "./resolvePenetrationCoefficient"; export * from './resolvePenetrationCoefficient';
export * from "./reviews"; export * from './reviews';
export * from "./skillDefinitions"; export * from './skillDefinitions';
export * from "./sum"; export * from './sum';
export * from "./tankDefinitions"; export * from './tankDefinitions';
export * from "./tankIcon"; export * from './tankIcon';
export * from "./tankNames"; export * from './tankNames';
export * from "./unionBoundingBox"; export * from './unionBoundingBox';
export * from "./uniqueGuns"; export * from './uniqueGuns';
export * from "./unwrapBlitzkitResponse"; export * from './unwrapBlitzkitResponse';
export * from "./votes"; export * from './votes';
// export * from './withCORSProxy'; // export * from './withCORSProxy';
export * from "./createDefaultProvisions"; export * from './createDefaultProvisions';
export * from "./gallery"; export * from './gallery';
export * from "./metaSortTank"; export * from './metaSortTank';
export * from "./popularTanks"; export * from './popularTanks';
export * from "./romanize"; export * from './romanize';
export * from "./sluggify.ts"; export * from './youtubers';
export * from "./youtubers";
-16
View File
@@ -1,16 +0,0 @@
import { deburr } from "lodash-es";
const nonAlphanumericRegex = /[^a-z0-9]/g;
const multipleDashesRegex = /--+/g;
const trailingDashRegex = /-$/g;
const leadingDashRegex = /^-/g;
export function sluggify(value: string) {
let slug = deburr(value).toLowerCase();
slug = slug.replaceAll(nonAlphanumericRegex, "-");
slug = slug.replaceAll(multipleDashesRegex, "-");
slug = slug.replaceAll(trailingDashRegex, "");
slug = slug.replaceAll(leadingDashRegex, "");
return slug;
}
-1
View File
@@ -3,7 +3,6 @@ export * from "./fisherYates";
export * from "./formatCompact"; export * from "./formatCompact";
export * from "./isNumber"; export * from "./isNumber";
export * from "./NaNFallback"; export * from "./NaNFallback";
export * from "./normalizeAngleDeg";
export * from "./normalizeAngleRad"; export * from "./normalizeAngleRad";
export * from "./normalToEuler"; export * from "./normalToEuler";
export * from "./numberToRomanNumeral"; export * from "./numberToRomanNumeral";
@@ -1,6 +0,0 @@
export function normalizeAngleDeg(angle: number) {
const newAngle = angle % 360;
if (newAngle > 360) return newAngle - 360;
if (newAngle < -360) return newAngle + 360;
return newAngle;
}
-3
View File
@@ -1,3 +0,0 @@
[*.cs]
indent_style = space
indent_size = 2
-57
View File
@@ -1,57 +0,0 @@
## A streamlined .gitignore for modern .NET projects
## including temporary files, build results, and
## files generated by popular .NET tools. If you are
## developing with Visual Studio, the VS .gitignore
## https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
## has more thorough IDE-specific entries.
##
## Get latest from https://github.com/github/gitignore/blob/main/Dotnet.gitignore
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# dotenv environment variables file
.env
# Others
~$*
*~
CodeCoverage/
# MSBuild Binary and Structured Log
*.binlog
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
-70
View File
@@ -1,70 +0,0 @@
using BlitzKit.Game.Models;
using CUE4Parse_Conversion.Textures;
using CUE4Parse.UE4.Assets.Exports.Texture;
using CUE4Parse.UE4.Objects.Engine;
using CUE4Parse.UE4.Objects.UObject;
using Microsoft.JavaScript.NodeApi;
namespace BlitzKit.Game.JSExport;
[JSExport]
public class GameInterface
{
private readonly BlitzFileProvider provider;
public string[] files;
public string[] tanksDirectoryNations;
public GameInterface(string directory)
{
provider = new(directory);
files = [.. provider.Files.Keys];
var tanksBase = "Blitz/Content/Tanks/";
tanksDirectoryNations =
[
.. files
.Where(path => path.StartsWith(tanksBase))
.Select(path => path[tanksBase.Length..])
.Select(path => path.Split('/')[0])
.Where(nation => !nation.EndsWith(".uasset") && nation != "TankStub")
.Distinct(),
];
}
public string[] Files => files;
public string[] TanksDirectoryNations => tanksDirectoryNations;
public byte[] TankBigIcon(string tankId, string pdaName)
{
foreach (var nation in tanksDirectoryNations)
{
var path = $"Blitz/Content/Tanks/{nation}/{tankId}/{pdaName}.{pdaName}";
if (provider.TryLoadPackageObject<UPrimaryDataAsset>(path, out var pda))
{
try
{
return pda.Get<FSoftObjectPath>("BigIcon")
.Load<UTexture2D>()
.Decode(ETexturePlatform.DesktopMobile)!
.ToSkBitmap()
.Encode(SkiaSharp.SKEncodedImageFormat.Webp, 80)
.ToArray();
}
catch (Exception e)
{
Console.WriteLine(e);
throw;
}
}
else
{
continue;
}
}
throw new FileNotFoundException($"Tank {tankId}/{pdaName} not found in any nation");
}
}
-41
View File
@@ -1,41 +0,0 @@
using System.Runtime.InteropServices;
using CUE4Parse.Compression;
using CUE4Parse.FileProvider;
using CUE4Parse.MappingsProvider;
using CUE4Parse.UE4.Versions;
namespace BlitzKit.Game.Models;
public class BlitzFileProvider : DefaultFileProvider
{
public BlitzFileProvider(string directory)
: base(
directory: directory,
searchOption: SearchOption.AllDirectories,
versions: new(EGame.GAME_UE5_5),
pathComparer: StringComparer.OrdinalIgnoreCase
)
{
MappingsContainer = new FileUsmapTypeMappingsProvider("../../packages/closed/blitz.usmap");
Initialize();
Mount();
string libraryExtension;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
libraryExtension = "dll";
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
libraryExtension = "so";
}
else
{
throw new Exception("Unsupported OS");
}
OodleHelper.DownloadOodleDll($"../../temp/oodle.{libraryExtension}");
OodleHelper.Initialize($"../../temp/oodle.{libraryExtension}");
}
}
-17
View File
@@ -1,17 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>BlitzKit.Game</RootNamespace>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NodeApiAssemblyJSModuleType>esm</NodeApiAssemblyJSModuleType>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../cue4parse/CUE4Parse/CUE4Parse.csproj" />
<ProjectReference Include="../cue4parse/CUE4Parse-Conversion/CUE4Parse-Conversion.csproj" />
<PackageReference Include="Microsoft.JavaScript.NodeApi" Version="0.9.19" />
<PackageReference Include="Microsoft.JavaScript.NodeApi.Generator" Version="0.9.19" />
</ItemGroup>
</Project>
-12
View File
@@ -1,12 +0,0 @@
{
"name": "@blitzkit/game",
"private": true,
"type": "module",
"main": "src/index.ts",
"scripts": {
"build": "dotnet build"
},
"dependencies": {
"node-api-dotnet": "^0.9.19"
}
}
-1
View File
@@ -1 +0,0 @@
export * from "../bin/Debug/net9.0/win-x64/game";
+2
View File
@@ -1,2 +1,4 @@
export * from "./literals"; export * from "./literals";
export * from "./strings"; export * from "./strings";
export * from "./unwrapper";
export * from "./wrapper";
+67 -2
View File
@@ -1,3 +1,68 @@
import type en from "../strings/en.json"; import { merge } from "ts-deepmerge";
import locales from "../locales.json";
import en from "../strings/en.json";
import es from "../strings/es.json";
import fr from "../strings/fr.json";
import ja from "../strings/ja.json";
import pl from "../strings/pl.json";
import pt from "../strings/pt.json";
import ru from "../strings/ru.json";
import uk from "../strings/uk.json";
import zh from "../strings/zh.json";
export type Strings = typeof en; export type BlitzKitStrings = typeof en;
const stringsRaw: Record<string, TranslationTree> = {
en,
es,
fr,
ja,
pl,
pt,
ru,
uk,
zh,
};
export const STRINGS: Record<string, BlitzKitStrings> = {};
for (const locale in stringsRaw) {
if (locale === locales.default) {
STRINGS[locales.default] = stringsRaw[locales.default] as BlitzKitStrings;
continue;
}
const localeStrings = stringsRaw[locale];
STRINGS[locale] = merge(
stringsRaw[locales.default],
localeStrings,
) as BlitzKitStrings;
}
export const SUPPORTED_LOCALE_BLITZ_MAP: Record<string, string> = {
en: "en",
es: "es",
fr: "fr",
ja: "ja",
pt: "pt",
ru: "ru",
uk: "uk",
zh: "zh-Hans",
pl: "pl",
};
export const SUPPORTED_LOCALE_FLAGS: Record<string, string> = {
en: "🇺🇸",
es: "🇪🇸",
fr: "🇫🇷",
ja: "🇯🇵",
pt: "🇵🇹",
ru: "🇷🇺",
uk: "🇺🇦",
zh: "🇨🇳",
pl: "🇵🇱",
};
export type TranslationTree = { [key: string]: TranslationNode };
export type TranslationNode = string | TranslationTree;
+12
View File
@@ -0,0 +1,12 @@
import { I18nString } from "../../core/src";
import locales from "../locales.json";
export function unwrapper(locale = locales.default) {
return function (i18nString: I18nString) {
if (locale in i18nString.locales) {
return i18nString.locales[locale];
}
return i18nString.locales[locales.default];
};
}
+15
View File
@@ -0,0 +1,15 @@
import locales from "../locales.json";
import { type BlitzKitStrings, STRINGS } from "./strings";
export function wrapper(slicer: (strings: BlitzKitStrings) => string) {
const defaultString = slicer(STRINGS[locales.default] as BlitzKitStrings);
const object = { [locales.default]: defaultString };
for (const { locale } of locales.supported) {
const string = slicer(STRINGS[locale] as BlitzKitStrings);
if (string !== defaultString) object[locale] = string;
}
return object;
}
File diff suppressed because it is too large. Load diff
+92 -92
View File
@@ -1,7 +1,7 @@
{ {
"test": { "test": {
"default": "teste", "default": "teste",
"long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.", "long": "Ceci est une longue chaîne de test. Vous ne DEVEZ JAMAIS le voir dans l'interface utilisateur. Mon fruit préféré est {fruit}, car il a la couleur {color}. Je l'aime tellement que je vais dire son nom 3 fois ! {fruit}! {fruit}! {fruit} ! Encore une fois, c'est {color}, pas {not_color}.",
"fox": "Le renard brun et rapide saute par-dessus le chien paresseux." "fox": "Le renard brun et rapide saute par-dessus le chien paresseux."
}, },
"common": { "common": {
@@ -10,7 +10,7 @@
"m": "{value}m", "m": "{value}m",
"mm": "{value}mm", "mm": "{value}mm",
"deg": "{value}°", "deg": "{value}°",
"hp": "{value}hp", "hp": "{value}pv",
"x": "x{value}", "x": "x{value}",
"percentage": "{value}%", "percentage": "{value}%",
"deg_s": "{value}°/s", "deg_s": "{value}°/s",
@@ -187,11 +187,11 @@
"bot": { "bot": {
"common": { "common": {
"errors": { "errors": {
"clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.", "clan_not_found": "# Impossible de trouver le clan\nImpossible de trouver «{search} ». Essayez de sélectionner un clan dans le résultat de la recherche.",
"player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.", "player_not_found": "# Impossible de trouver l'utilisateur\nJe n'ai pas pu trouver l'utilisateur \"{search}\". Essayez de choisir un utilisateur dans le résultat de la recherche, en tapant un nom d'utilisateur valide, ou en utilisant la commande `/link`.",
"player_not_linked": "# Utilisez `/link` pour commencer\nJe ne sais pas qui vous êtes, mais vous pouvez me le dire aujourd'hui !", "player_not_linked": "# Utilisez `/link` pour commencer\nJe ne sais pas qui vous êtes, mais vous pouvez me le dire aujourd'hui !",
"tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".", "tank_name_not_found": "# Char introuvable\nImpossible de trouver le char sous le nom \"{search}\".",
"tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.", "tank_id_not_found": "# Char introuvable\nImpossible de trouver le char avec l'ID \"{search}\". Essayez de taper le nom du char au lieu d'un nombre.",
"no_tank_stats": "# Aucune statistique de tank disponible\nCe joueur n'a pas de statistiques disponibles. Ce n'est peut-être pas le joueur que vous cherchez.", "no_tank_stats": "# Aucune statistique de tank disponible\nCe joueur n'a pas de statistiques disponibles. Ce n'est peut-être pas le joueur que vous cherchez.",
"get_help": "Aidez le serveur Discord", "get_help": "Aidez le serveur Discord",
"uncaught_error": "# Blitzkit a rencontré une erreur !\nNous sommes désolés de cela. N'hésitez pas à [rejoindre le serveur officiel Discord](https://discord.gg/nDt7AjGJQH) pour obtenir de l'aide.", "uncaught_error": "# Blitzkit a rencontré une erreur !\nNous sommes désolés de cela. N'hésitez pas à [rejoindre le serveur officiel Discord](https://discord.gg/nDt7AjGJQH) pour obtenir de l'aide.",
@@ -285,19 +285,19 @@
"name": "rang", "name": "rang",
"description": "Rang", "description": "Rang",
"choices": { "choices": {
"tier": "Tier {tier_1} - {tier_2}" "tier": "Rang {tier_}1 - {tier_}2"
} }
} }
}, },
"periods": { "periods": {
"career": "Carrière", "career": "Carrière",
"today": "Aujourd'hui", "today": "Aujourd'hui",
"days": "{days} days", "days": "{days} jours",
"custom": "{day_1} - {day_2} days" "custom": "{day_1} - {day_2} jours"
}, },
"filters": { "filters": {
"none": "Aucun filtre", "none": "Aucun filtre",
"tier": "Tier {tier}" "tier": "Rang {tier}"
}, },
"no_data": { "no_data": {
"battles_in_period": "", "battles_in_period": "",
@@ -340,19 +340,19 @@
"body": { "body": {
"subtitle": "Recherche", "subtitle": "Recherche",
"total": "Total", "total": "Total",
"research": "Research: {cost}", "research": "Recherche : {cost}",
"upgrades": "Upgrades: {cost}", "upgrades": "Améliorations : {cost}",
"purchase": "Purchase: {cost}", "purchase": "Achat : {cost}",
"equipment": "Equipment: {cost}", "equipment": "Équipement : {cost}",
"estimation": "# Ceci est une estimation !\n\nCette liste peut inclure des chars déjà recherchés en raison de l'information inexacte fournie par Wargaming. Essayez de fournir un `char de départ` depuis la ligne lorsque vous utilisez la commande si vous le pouvez." "estimation": "# Ceci est une estimation !\n\nCette liste peut inclure des chars déjà recherchés en raison de l'information inexacte fournie par Wargaming. Essayez de fournir un `char de départ` depuis la ligne lorsque vous utilisez la commande si vous le pouvez."
}, },
"errors": { "errors": {
"non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.", "non_tech_tree": "# {tank} n'est pas dans l'arbre technologique\n\nVous ne pouvez pas rechercher un char premium/de collection.",
"tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.", "tier_1": "# {tank} est un char de rang I\n\nLe char de rang 1 sont déverrouillé gratuitement pour tous les joueurs.",
"already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.", "already_researched": "# {tank} est déjà recherché\n\nEssayez de fournir un `char de départ` en utilisant la commande pour voir la progression d'une lignée.",
"start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.", "start_end_equal": "# {tank} a été fourni deux fois\n\nAssurez-vous que `starting-tank` et `target-tank` sont différents.",
"tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.", "tanks_not_on_line": "{tank_}1 et {tank_}2 ne sont pas sur la même ligne \n\nAssurez-vous que `starting-tank` et `target-tank` sont sur la même ligne d'arbre technologique.",
"unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank." "unordered": "# {tank_1} niveau supérieur à {tank_2}\n\nAssurez-vous de fournir {tank_2} comme le `starting-tank` à la place car c'est le char de niveau inférieur."
} }
}, },
"about": { "about": {
@@ -395,7 +395,7 @@
"wn8": "WN8", "wn8": "WN8",
"winrate": "Taux de victoires", "winrate": "Taux de victoires",
"damage": "Dégâts", "damage": "Dégâts",
"unknown_tank": "Unknown tank {id}" "unknown_tank": "Char {id} inconnu"
} }
}, },
"debug": { "debug": {
@@ -431,12 +431,12 @@
"options": { "options": {
"threshold": { "threshold": {
"name": "seuil", "name": "seuil",
"description": "The number of days inactive (default: {days} days)" "description": "Le nombre de jours inactifs (par défaut: {days} jours)"
} }
}, },
"body": { "body": {
"subtitle": "Inactive for {days}+ days", "subtitle": "Inactif depuis plus de {days} jours",
"listing": "{days} days" "listing": "{days} jours"
} }
}, },
"full_stats": { "full_stats": {
@@ -479,7 +479,7 @@
"body": { "body": {
"accounts_linked": "Comptes liés", "accounts_linked": "Comptes liés",
"no_role_permissions": { "no_role_permissions": {
"title": "{name} failed to verify", "title": "La vérification de {name} a échouée",
"description": "Je n'ai pas l'autorisation de gérer les rôles." "description": "Je n'ai pas l'autorisation de gérer les rôles."
} }
}, },
@@ -494,11 +494,11 @@
"options": { "options": {
"limit": { "limit": {
"name": "limite", "name": "limite",
"description": "The max number of clan results (default: {limit})" "description": "Nombre maximum de résultats du clan (par défaut: {limit})"
} }
}, },
"body": { "body": {
"title": "Clan search for {search} in region {region}", "title": "Recherche de clan {search} dans la région {region}",
"no_results": "Pas de clan trouvé" "no_results": "Pas de clan trouvé"
} }
}, },
@@ -508,11 +508,11 @@
"options": { "options": {
"limit": { "limit": {
"name": "limite", "name": "limite",
"description": "The max number of player results (default: {limit})" "description": "Le nombre maximum de résultats de joueur (par défaut: {limit})"
} }
}, },
"body": { "body": {
"title": "Player search for {search} in region {region}", "title": "Recherche de {search} dans la région {region}",
"no_results": "Pas de joueur de trouvé" "no_results": "Pas de joueur de trouvé"
} }
}, },
@@ -532,13 +532,13 @@
"options": { "options": {
"limit": { "limit": {
"name": "limite", "name": "limite",
"description": "How many neighbors to display (default: {count})" "description": "Combien de voisins afficher (par défaut : {count})"
}, },
"season": { "season": {
"name": "saison", "name": "saison",
"description": "Numéro de saison (défaut : courant)", "description": "Numéro de saison (défaut : courant)",
"choices": { "choices": {
"current": "{season} (current)" "current": "{season} (actuel)"
} }
}, },
"league": { "league": {
@@ -547,12 +547,12 @@
} }
}, },
"body": { "body": {
"top_players": "Top {count} players", "top_players": "Top {count} joueurs",
"no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.", "no_participation": "# {player} n'a pas joué de cotées dans la saison {season}\n\nCe joueur n'a pas participé à cette saison ou n'a pas dépassé l'étalonnage.",
"no_ongoing_season": "Pas de saison en cours\n\nIl n'y a pas de saison de notation en cours actuellement.", "no_ongoing_season": "Pas de saison en cours\n\nIl n'y a pas de saison de notation en cours actuellement.",
"deleted_player": "Deleted {id}", "deleted_player": "{id} supprimé",
"neighbors": "évaluer les voisins", "neighbors": "évaluer les voisins",
"more": "+ {count} more" "more": "+ {count} plus"
} }
}, },
"today": { "today": {
@@ -567,7 +567,7 @@
"name": "chars possédés", "name": "chars possédés",
"description": "Affiche tous les chars d'un niveau", "description": "Affiche tous les chars d'un niveau",
"body": { "body": {
"title": "# {name}'s owned tier {tier} tanks\n\n" "title": "# Les chars du palier {tier} possédés par {name}"
} }
}, },
"permissions": { "permissions": {
@@ -603,96 +603,96 @@
"name": "info-joueur", "name": "info-joueur",
"description": "Informations de base sur un joueur", "description": "Informations de base sur un joueur",
"body": { "body": {
"title": "{name}'s information", "title": "Informations de {name}",
"nickname": "Nickname", "nickname": "Pseudo",
"battles": "Batailles", "battles": "Batailles",
"winrate": "Taux de victoires", "winrate": "Taux de victoires",
"account_id": "Account ID", "account_id": "Account ID",
"created": "Created", "created": "Créé",
"last_battle": "Last battle" "last_battle": "Dernière bataille"
} }
}, },
"rating": { "rating": {
"name": "côtée", "name": "côtée",
"description": "Rating player's statistics", "description": "Statistiques des batailles cotées du joueur",
"subcommands": { "subcommands": {
"today": { "today": {
"name": "aujourd'hui", "name": "aujourd'hui",
"description": "Today's rating statistics" "description": "Statistiques des batailles cotées d'aujourd'hui"
}, },
"season": { "season": {
"name": "saison", "name": "saison",
"description": "This season's rating statistics" "description": "Statistiques des batailles cotées de cette saison"
} }
}, },
"body": { "body": {
"subtitle": { "subtitle": {
"today": "Today's rating statistics", "today": "Statistiques de batailles cotées d'aujourd'hui",
"season": "This season's rating statistics" "season": "Statistiques de batailles cotées cette saison"
} }
}, },
"errors": { "errors": {
"no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.", "no_participation": "# {name} n’a pas joué en cotée\n\nCe joueur n’a pas participé au mode cotée cette saison.",
"unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours." "unrecorded_stats": "# Statistiques actuellement indisponibles\n\nWargaming rencontre peut-être une interruption de service.\nSi une saison est en cours, les statistiques devraient être disponibles sous 24 heures."
} }
} }
} }
}, },
"website": { "website": {
"redirect": { "redirect": {
"title": "301: moved permanently", "title": "301 : déplacé définitivement",
"body": "This page has moved. Redirecting..." "body": "Cette page a été déplacée. Redirection en cours…"
}, },
"settings": { "settings": {
"title": "Settings", "title": "Paramètres",
"description": "Change BlitzKit settings", "description": "Modifier les paramètres de BlitzKit",
"dev_mode": "Development mode", "dev_mode": "Mode développement",
"language": "Language" "language": "Langue"
}, },
"common": { "common": {
"player_search": { "player_search": {
"hint": "Search players...", "hint": "Recherche de joueurs...",
"no_results": "No results", "no_results": "Aucun résultat",
"searching": "Searching..." "searching": "Recherche..."
}, },
"copy_button": { "copy_button": {
"copied": "Copied!" "copied": "Copié !"
}, },
"tank_search": { "tank_search": {
"select_dialog_title": "Search for tanks", "select_dialog_title": "Recherche de chars",
"swap_dialog_title": "Swap tank", "swap_dialog_title": "Échanger le char",
"clear_filters": "Clear filters", "clear_filters": "Supprimer les filtres",
"login": "Login to use this", "login": "Connectez-vous pour utiliser ceci",
"search_bar_hint": "Search tanks...", "search_bar_hint": "Recherche des tanks...",
"recent": "Recently viewed", "recent": "Vu récemment",
"select_all": "Select all", "select_all": "Sélectionner tout",
"count_singular": "1 tank", "count_singular": "1 char",
"count_plural": "{count} tanks", "count_plural": "{count} chars",
"sorting_by": "Sorting by {name}", "sorting_by": "Trier par {name}",
"clear": "Clear", "clear": "Effacer",
"tier": "Tier {tier}", "tier": "Rang {tier}",
"passive": "{name} (Passive)", "passive": "{name} (Passif)",
"active": "{name} (Active)", "active": "{name} (actif)",
"no_tanks_found": { "no_tanks_found": {
"body": "No tanks found.", "body": "Aucun tank trouvé.",
"search_again": "Try searching again.", "search_again": "Essayez de chercher à nouveau.",
"clear_filters": "Try clearing filters." "clear_filters": "Essayez de supprimer les filtres."
}, },
"sort": { "sort": {
"meta.none": "none", "meta.none": "aucun",
"survivability.health": "health", "survivability.health": "santé",
"survivability.viewRange": "view range", "survivability.viewRange": "portée de vue",
"survivability.camouflageStill": "camouflage still", "survivability.camouflageStill": "camouflage à l’arrêt",
"survivability.camouflageMoving": "camouflage moving", "survivability.camouflageMoving": "camouflage en movement",
"survivability.camouflageShooting": "camouflage shooting", "survivability.camouflageShooting": "camouflage en tirant",
"survivability.volume": "volume", "survivability.volume": "volume",
"survivability.length": "length", "survivability.length": "longueur",
"fire.dpm": "standard DPM", "fire.dpm": "DPM standard",
"fire.dpmPremium": "premium DPM", "fire.dpmPremium": "DPM premium",
"fire.reload": "reload", "fire.reload": "rechargement",
"fire.caliber": "caliber", "fire.caliber": "calibration",
"fire.standardPenetration": "standard penetration", "fire.standardPenetration": "pénétration standard",
"fire.premiumPenetration": "premium penetration", "fire.premiumPenetration": "pénétration premium",
"fire.tertiaryPenetration": "tertiary penetration", "fire.tertiaryPenetration": "tertiary penetration",
"fire.damage": "damage", "fire.damage": "damage",
"fire.moduleDamage": "module damage", "fire.moduleDamage": "module damage",
@@ -817,7 +817,7 @@
"skip": "Skip", "skip": "Skip",
"guess": "Guess", "guess": "Guess",
"next": "Next", "next": "Next",
"no_results": "No results" "no_results": "Aucun résultat"
}, },
"stats": "{correct} / {total} guessed correctly", "stats": "{correct} / {total} guessed correctly",
"help": { "help": {
@@ -827,8 +827,8 @@
"reveal": "Reveal" "reveal": "Reveal"
}, },
"clear": "Clear", "clear": "Clear",
"select_all": "Select all", "select_all": "Sélectionner tout",
"tier": "Tier {tier}" "tier": "Rang {tier}"
}, },
"tankopedia": { "tankopedia": {
"search": "Search a stat...", "search": "Search a stat...",
@@ -1211,8 +1211,8 @@
"seo_description": "Track your stats in real time as you play World of Tanks Blitz", "seo_description": "Track your stats in real time as you play World of Tanks Blitz",
"search": { "search": {
"lookup": "Look up a player to get started", "lookup": "Look up a player to get started",
"hint": "Search players...", "hint": "Recherche de joueurs...",
"searching": "Searching...", "searching": "Recherche...",
"no_results": "Pas de joueur de trouvé" "no_results": "Pas de joueur de trouvé"
}, },
"controls": { "controls": {
+4 -4
View File
@@ -493,7 +493,7 @@
"description": "Search clans", "description": "Search clans",
"options": { "options": {
"limit": { "limit": {
"name": "limit", "name": "",
"description": "The max number of clan results (default: {limit})" "description": "The max number of clan results (default: {limit})"
} }
}, },
@@ -507,7 +507,7 @@
"description": "Search players", "description": "Search players",
"options": { "options": {
"limit": { "limit": {
"name": "limit", "name": "",
"description": "The max number of player results (default: {limit})" "description": "The max number of player results (default: {limit})"
} }
}, },
@@ -531,7 +531,7 @@
}, },
"options": { "options": {
"limit": { "limit": {
"name": "limit", "name": "",
"description": "How many neighbors to display (default: {count})" "description": "How many neighbors to display (default: {count})"
}, },
"season": { "season": {
@@ -675,7 +675,7 @@
"active": "{name} (Active)", "active": "{name} (Active)",
"no_tanks_found": { "no_tanks_found": {
"body": "No tanks found.", "body": "No tanks found.",
"search_again": "Try searching again.", "search_again": "",
"clear_filters": "Try clearing filters." "clear_filters": "Try clearing filters."
}, },
"sort": { "sort": {
+7 -7
View File
@@ -24,7 +24,7 @@
"shells": { "shells": {
"ap": "ББ", "ap": "ББ",
"ap_cr": "БП", "ap_cr": "БП",
"hc": "ОФ", "hc": "КС",
"he": "ОФ" "he": "ОФ"
}, },
"player_count_period": { "player_count_period": {
@@ -39,7 +39,7 @@
"branches": { "branches": {
"local": "dev", "local": "dev",
"dev": "бета", "dev": "бета",
"opentest": "открытый тест", "opentest": "общий тест",
"preview": "превью" "preview": "превью"
}, },
"locales": { "locales": {
@@ -297,7 +297,7 @@
}, },
"filters": { "filters": {
"none": "Без фильтров", "none": "Без фильтров",
"tier": " {tier} уровня" "tier": "{tier} уровень"
}, },
"no_data": { "no_data": {
"battles_in_period": "За этот период боёв не было", "battles_in_period": "За этот период боёв не было",
@@ -670,9 +670,9 @@
"count_plural": "Танков: {count}", "count_plural": "Танков: {count}",
"sorting_by": "Сортировать по {name}", "sorting_by": "Сортировать по {name}",
"clear": "Очистить", "clear": "Очистить",
"tier": " {tier} уровня", "tier": "{tier} уровень",
"passive": "{name} (Passive)", "passive": "{name} (Пассивный)",
"active": "{name} (Active)", "active": "{name} (Активный)",
"no_tanks_found": { "no_tanks_found": {
"body": "Танков не найдено.", "body": "Танков не найдено.",
"search_again": "Попробуйте повторить поиск.", "search_again": "Попробуйте повторить поиск.",
@@ -828,7 +828,7 @@
}, },
"clear": "Очистить", "clear": "Очистить",
"select_all": "Выбрать всё", "select_all": "Выбрать всё",
"tier": " {tier} уровня" "tier": "{tier} уровень"
}, },
"tankopedia": { "tankopedia": {
"search": "Поиск характеристик...", "search": "Поиск характеристик...",
+66 -66
View File
@@ -79,11 +79,11 @@
"10": "Супер винятковий" "10": "Супер винятковий"
}, },
"nations": { "nations": {
"ussr": "СРСР", "ussr": "С.Р.С.Р.",
"germany": "Німеччина", "germany": "Німеччина",
"usa": "ЗША", "usa": "С.Ш.А.",
"china": "Китай", "china": "Китай",
"uk": "Велика Британія", "uk": "Сполучене Королівство ",
"france": "Франція", "france": "Франція",
"japan": "Японія", "japan": "Японія",
"european": "Європейська нація", "european": "Європейська нація",
@@ -121,7 +121,7 @@
"3": "ПТ-САУ" "3": "ПТ-САУ"
}, },
"tree_type": { "tree_type": {
"-1": "не розпізнано", "-1": "не розпізнаний",
"0": "Звичайний", "0": "Звичайний",
"1": "Преміум", "1": "Преміум",
"2": "Колекційний" "2": "Колекційний"
@@ -341,18 +341,18 @@
"subtitle": "Дослідження", "subtitle": "Дослідження",
"total": "Загалом", "total": "Загалом",
"research": "Дослідження: {cost}", "research": "Дослідження: {cost}",
"upgrades": "Upgrades: {cost}", "upgrades": "Прокачування: {cost}",
"purchase": "Вартість: {cost}", "purchase": "Вартість: {cost}",
"equipment": "Спорядження: {cost}", "equipment": "Спорядження: {cost}",
"estimation": "# Це оцінка!\n\nЦей список може включати вже досліджені танки через неточну інформацію для вантажу. Спробуйте використати \"початковий танк\" з рядка за допомогою команди." "estimation": "# Це оцінка!\n\nЦей список може включати вже досліджені танки через неточну інформацію для вантажу. Спробуйте використати \"початковий танк\" з рядка за допомогою команди."
}, },
"errors": { "errors": {
"non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.", "non_tech_tree": "#{tank} відсутній в дереві дослідження\n\nВи не можете дослідити преміум/колеційний танк.",
"tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.", "tier_1": "#{tank} І рівня \n\nТанки І рівня завжди розблоковані для всіх гравців безкоштовно",
"already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.", "already_researched": "# {tank} вже було досліджено\n\nСпробуйте використати `початковий-танк` коли використовуєте команду для перегляду загальної гілки, яку ви вже дослідили",
"start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.", "start_end_equal": "#{tank} було введено двічі \n\nПереконайтесь що `початковий-танк` та `ціль-танк` різні",
"tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.", "tanks_not_on_line": "# {tank_1} та {tank_2} не в одній гілці\n\nПереконайтесь що `початковий-танк` та `ціль-танк` знаходяться в єдиній гілці дерева дослідження",
"unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank." "unordered": "# {tank_1} вище рівнем відносно {tank_2}\n\nОбов’язково вкажіть {tank_2} як `початковий-танк`, оскільки це танк нижчого рівня."
} }
}, },
"about": { "about": {
@@ -395,7 +395,7 @@
"wn8": "WN8", "wn8": "WN8",
"winrate": "Відсоток перемог", "winrate": "Відсоток перемог",
"damage": "Шкода", "damage": "Шкода",
"unknown_tank": "Unknown tank {id}" "unknown_tank": "Невідомий танк {id}"
} }
}, },
"debug": { "debug": {
@@ -431,11 +431,11 @@
"options": { "options": {
"threshold": { "threshold": {
"name": "поріг", "name": "поріг",
"description": "The number of days inactive (default: {days} days)" "description": "Кількість днів неактивності (за замовчуванням: {days} днів)"
} }
}, },
"body": { "body": {
"subtitle": "Inactive for {days}+ days", "subtitle": "Неактивний {days}+ днів",
"listing": "{days} днів" "listing": "{days} днів"
} }
}, },
@@ -479,7 +479,7 @@
"body": { "body": {
"accounts_linked": "Прив'язані акаунти", "accounts_linked": "Прив'язані акаунти",
"no_role_permissions": { "no_role_permissions": {
"title": "{name} failed to verify", "title": "{name} не вдалося перевірити",
"description": "У мене немає дозволу керувати ролями." "description": "У мене немає дозволу керувати ролями."
} }
}, },
@@ -494,11 +494,11 @@
"options": { "options": {
"limit": { "limit": {
"name": "ліміт", "name": "ліміт",
"description": "The max number of clan results (default: {limit})" "description": "Максимальна кількість результатів клану (за замовчуванням: {limit})"
} }
}, },
"body": { "body": {
"title": "Clan search for {search} in region {region}", "title": "Пошук клану для {search} в регіоні {region}",
"no_results": "Жодного клану не знайдено" "no_results": "Жодного клану не знайдено"
} }
}, },
@@ -508,11 +508,11 @@
"options": { "options": {
"limit": { "limit": {
"name": "ліміт", "name": "ліміт",
"description": "The max number of player results (default: {limit})" "description": "Максимальна кількість результатів гравця (за замовчуванням: {limit})"
} }
}, },
"body": { "body": {
"title": "Player search for {search} in region {region}", "title": "Пошук гравця для {search} у регіоні {region}",
"no_results": "Гравця не знайдено" "no_results": "Гравця не знайдено"
} }
}, },
@@ -521,8 +521,8 @@
"description": "Статистика рейтингових боїв", "description": "Статистика рейтингових боїв",
"subcommands": { "subcommands": {
"neighbors": { "neighbors": {
"name": "neighbors", "name": "сусіди",
"description": "Neighboring players on the leaderboard" "description": "Сусідуючі гравці в лідерборді"
}, },
"league": { "league": {
"name": "ліга", "name": "ліга",
@@ -532,32 +532,32 @@
"options": { "options": {
"limit": { "limit": {
"name": "ліміт", "name": "ліміт",
"description": "How many neighbors to display (default: {count})" "description": "Скільки сусідів відобразити (за замовчуванням: {count})"
}, },
"season": { "season": {
"name": "сезон", "name": "сезон",
"description": "Базова інформація про гравця", "description": "Базова інформація про гравця",
"choices": { "choices": {
"current": "{season} (current)" "current": "{season} (поточний)"
} }
}, },
"league": { "league": {
"name": "ліга", "name": "ліга",
"description": "The league to display" "description": "Ліга для відображення"
} }
}, },
"body": { "body": {
"top_players": "Top {count} players", "top_players": "Топ {count} гравців",
"no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.", "no_participation": "# {player} не грав у рейтингу в сезоні {season}\n\nЦей гравець не брав участь у цьому сезоні або не проходив калібрування",
"no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.", "no_ongoing_season": "# Немає поточного сезону\n\nВ даний час немає сезону рейтингу.",
"deleted_player": "", "deleted_player": "",
"neighbors": "Rating neighbors", "neighbors": "Сусіди по рейтингу",
"more": "+ {count} more" "more": "+ {count} ще"
} }
}, },
"today": { "today": {
"name": "сьогодні", "name": "сьогодні",
"description": "Today's played tanks and statistics" "description": "Сьогодні зіграні танки та статистика"
}, },
"stats": { "stats": {
"name": "статистика", "name": "статистика",
@@ -567,43 +567,43 @@
"name": "отримані танки", "name": "отримані танки",
"description": "Показує всі ваші танки даного рівня", "description": "Показує всі ваші танки даного рівня",
"body": { "body": {
"title": "# {name}'s owned tier {tier} tanks\n\n" "title": "# {name} отриманих рівнів {tier} танків\n\n"
} }
}, },
"permissions": { "permissions": {
"name": "дозволи", "name": "дозволи",
"description": "Checks wether the bot has the required permissions to function", "description": "Перевіряє чи бот має необхідні дозволи для роботи",
"body": { "body": {
"title": "# Permissions\n\n{body}", "title": "# Дозволи\n\n{body}",
"view_channels": "View channels: needed to find the message the refresh button was used on", "view_channels": "Перегляньте канали: необхідне для знаходження повідомлення, на якому використовувалася кнопка оновлення",
"read_message_history": "Read message history: needed to find the message to refresh", "read_message_history": "Прочитайте історію повідомлень: потрібно знайти повідомлення для оновлення",
"attach_files": "Attach files: needed to add images to image-based commands", "attach_files": "Закріпіть файли: потрібно для додавання зображень до команд на основі зображень",
"external_emojis": "External emojis: needed to add national flags and tank class emojis" "external_emojis": "Зовнішні емодзі: потрібні для додавання емодзі національних прапорів та класів техніки"
} }
}, },
"ping": { "ping": {
"name": "", "name": "",
"description": "Check wether the bot is alive.", "description": "Перевірити чи бот живий",
"body": { "body": {
"pong": "Pong 🏓", "pong": "Понг🏓",
"pong_with_time": "Pong 🏓 - {time}ms" "pong_with_time": "Понг🏓 - {time}мс"
}, },
"subcommands": { "subcommands": {
"blitzkit": { "blitzkit": {
"name": "blitzkit", "name": "BlitzKit",
"description": "Ping BlitzKit" "description": "Ping BlitzKit"
}, },
"wotb": { "wotb": {
"name": "wotb", "name": "WoTB",
"description": "Ping World of Tanks Blitz" "description": "Ping World of Tanks Blitz"
} }
} }
}, },
"player_info": { "player_info": {
"name": "player-info", "name": "інформація про гравця",
"description": "Базова інформація про гравця", "description": "Базова інформація про гравця",
"body": { "body": {
"title": "{name}'s information", "title": "інформація про {name}",
"nickname": "Нік", "nickname": "Нік",
"battles": "Бої", "battles": "Бої",
"winrate": "Відсоток перемог", "winrate": "Відсоток перемог",
@@ -614,33 +614,33 @@
}, },
"rating": { "rating": {
"name": "рейтинг", "name": "рейтинг",
"description": "Rating player's statistics", "description": "Статистика рейтингових боїв гравця ",
"subcommands": { "subcommands": {
"today": { "today": {
"name": "сьогодні", "name": "сьогодні",
"description": "Today's rating statistics" "description": "Сьогоднішня статистика рейтингових боїв"
}, },
"season": { "season": {
"name": "сезон", "name": "сезон",
"description": "This season's rating statistics" "description": "Статистика рейтингових боїв поточного сезону"
} }
}, },
"body": { "body": {
"subtitle": { "subtitle": {
"today": "Today's rating statistics", "today": "Сьогоднішня статистика рейтингових боїв",
"season": "This season's rating statistics" "season": "Статистика рейтингових боїв даного сезону"
} }
}, },
"errors": { "errors": {
"no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.", "no_participation": "# {name} не грав рейтингові бої\n\nЦей гравець не брав участь у рейтинговому режимі цього сезону.",
"unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours." "unrecorded_stats": "# Статистика на цей момент недоступна\n\nWargaming наразі зіткнулась з технічними несправностями. Якщо зараз проходить сезон, статистика буде доступною в найближчі 24 години."
} }
} }
} }
}, },
"website": { "website": {
"redirect": { "redirect": {
"title": "301: moved permanently", "title": "301: переміщено назавжди",
"body": "This page has moved. Redirecting..." "body": "This page has moved. Redirecting..."
}, },
"settings": { "settings": {
@@ -837,33 +837,33 @@
"description": "Танкова енциклопедія", "description": "Танкова енциклопедія",
"seo_description": "Характеристики, броня та інше для всіх танків WoT Blitz", "seo_description": "Характеристики, броня та інше для всіх танків WoT Blitz",
"tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)", "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
"tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.", "tank_seo_description": "{name} броня, характеристики, обладнання, амуніція і т.д. {dpm} шкода на хвилину, {alpha} разова шкода, {penetration}мм пробиття, {speed} км/год максимальна швидкість, {health} міцність.",
"visualizers": { "visualizers": {
"reload": { "reload": {
"skip": "Skip" "skip": "Пропустити"
}, },
"assault": { "assault": {
"title": "Assault shells" "title": "Штурмові снаряди"
}, },
"rotator": { "rotator": {
"hull": "Hull", "hull": "Корпус",
"turret": "Turret", "turret": "Башта",
"hard": "Hard", "hard": "Жорстко",
"medium": "Середній", "medium": "Середній",
"soft": "Soft", "soft": "Ніжно",
"effective": "Effective" "effective": "Ефективний"
}, },
"ricochet": { "ricochet": {
"angle": "Angle", "angle": "Кут",
"normalization": "Нормалізація", "normalization": "Нормалізація",
"effective_angle": "Effective angle", "effective_angle": "Ефективний кут",
"armor": "Броня", "armor": "Броня",
"no_ricochet": "Explosive shells don't ricochet" "no_ricochet": "Фугасні снаряди не рикошетять"
}, },
"view_range": { "view_range": {
"camo": "Camo", "camo": "Камуфляж",
"ghost_factory": "Ghost Factory", "ghost_factory": "Промзона",
"dead_rail": "Dead Rail" "dead_rail": "Ешелон"
}, },
"flexibility": { "flexibility": {
"yaw": "Yaw", "yaw": "Yaw",
+9 -9
View File
@@ -23,8 +23,8 @@
}, },
"shells": { "shells": {
"ap": "穿甲弹", "ap": "穿甲弹",
"ap_cr": "APCR", "ap_cr": "硬式复合穿甲弹",
"hc": "HEAT", "hc": "反战车高爆弹",
"he": "高爆弹" "he": "高爆弹"
}, },
"player_count_period": { "player_count_period": {
@@ -671,8 +671,8 @@
"sorting_by": "按 {name} 排序", "sorting_by": "按 {name} 排序",
"clear": "清除", "clear": "清除",
"tier": "{tier} 阶", "tier": "{tier} 阶",
"passive": "{name} (Passive)", "passive": "{name} (被动)",
"active": "{name} (Active)", "active": "{name} (主动)",
"no_tanks_found": { "no_tanks_found": {
"body": "找不到战车。", "body": "找不到战车。",
"search_again": "请尝试重新搜索。", "search_again": "请尝试重新搜索。",
@@ -821,10 +821,10 @@
}, },
"stats": "猜对了 {correct} / {total}", "stats": "猜对了 {correct} / {total}",
"help": { "help": {
"title": "Partially reveal tank?", "title": "显示坦克?",
"description": "Reveals the tank without showing the name. This round will be considered incorrect and break your streak!", "description": "显示坦克而不显示名字。这轮会被视为不正确,并打破你的连续记录!",
"cancel": "取消", "cancel": "取消",
"reveal": "Reveal" "reveal": "显示"
}, },
"clear": "清除", "clear": "清除",
"select_all": "全选", "select_all": "全选",
@@ -1150,11 +1150,11 @@
}, },
"provisions": { "provisions": {
"clear": "清除", "clear": "清除",
"clear_all": "Clear all tanks" "clear_all": "清除所有坦克"
}, },
"consumables": { "consumables": {
"clear": "清除", "clear": "清除",
"clear_all": "Clear all tanks" "clear_all": "清除所有坦克"
} }
} }
}, },
+4 -4
View File
@@ -44,9 +44,9 @@ for (const module of await readdir(`${modulesRoot}/@resvg`)) {
.map((file) => .map((file) =>
cp( cp(
`${modulesRoot}/@resvg/${module}/${file}`, `${modulesRoot}/@resvg/${module}/${file}`,
`${distRoot}/workers/${file}` `${distRoot}/workers/${file}`,
) ),
) ),
); );
} }
@@ -54,7 +54,7 @@ if (!dev) {
await cp(`${projectDir}/prisma`, `${distRoot}/prisma`, { recursive: true }); await cp(`${projectDir}/prisma`, `${distRoot}/prisma`, { recursive: true });
for (const file of await readdir(`${modulesRoot}/prisma`).then((files) => for (const file of await readdir(`${modulesRoot}/prisma`).then((files) =>
files.filter((file) => file.endsWith(".node")) files.filter((file) => file.endsWith(".node")),
)) { )) {
cp(`${modulesRoot}/prisma/${file}`, `${distRoot}/prisma/${file}`); cp(`${modulesRoot}/prisma/${file}`, `${distRoot}/prisma/${file}`);
} }
+11 -11
View File
@@ -6,7 +6,7 @@ import {
} from "@blitzkit/core"; } from "@blitzkit/core";
import { Accessor, Document, Node, Scene } from "@gltf-transform/core"; import { Accessor, Document, Node, Scene } from "@gltf-transform/core";
import { times } from "lodash-es"; import { times } from "lodash-es";
import { SteamVFS } from "../vfs/vfs"; import { SteamVFS } from "../vfs/steam";
import { import {
vertexAttributeGLTFName, vertexAttributeGLTFName,
vertexAttributeGltfVectorSizes, vertexAttributeGltfVectorSizes,
@@ -16,10 +16,10 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
const sc2Path = `Data/3d/Tanks/CollisionMeshes/${fileName}.sc2`; const sc2Path = `Data/3d/Tanks/CollisionMeshes/${fileName}.sc2`;
const scgPath = `Data/3d/Tanks/CollisionMeshes/${fileName}.scg`; const scgPath = `Data/3d/Tanks/CollisionMeshes/${fileName}.scg`;
const sc2 = new Sc2ReadStream( const sc2 = new Sc2ReadStream(
(await vfs.file(sc2Path)).buffer as ArrayBuffer (await vfs.file(sc2Path)).buffer as ArrayBuffer,
).sc2(); ).sc2();
const scg = new ScgReadStream( const scg = new ScgReadStream(
(await vfs.file(scgPath)).buffer as ArrayBuffer (await vfs.file(scgPath)).buffer as ArrayBuffer,
).scg(); ).scg();
const document = new Document(); const document = new Document();
const scene = document.createScene(); const scene = document.createScene();
@@ -29,7 +29,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
hierarchies.forEach((hierarchy) => { hierarchies.forEach((hierarchy) => {
const components = times( const components = times(
hierarchy.components.count, hierarchy.components.count,
(index) => hierarchy.components[index.toString().padStart(4, "0")] (index) => hierarchy.components[index.toString().padStart(4, "0")],
); );
components.forEach((component) => { components.forEach((component) => {
@@ -43,7 +43,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
if (!polygonGroup) { if (!polygonGroup) {
console.warn( console.warn(
`Missing polygon group ${batch["rb.datasource"]} (${hierarchy.name}); skipping...` `Missing polygon group ${batch["rb.datasource"]} (${hierarchy.name}); skipping...`,
); );
break; break;
@@ -73,7 +73,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
VertexAttribute.TANGENT, VertexAttribute.TANGENT,
attributes attributes
.get(VertexAttribute.TANGENT)! .get(VertexAttribute.TANGENT)!
.map((tangent) => [...tangent, 1]) .map((tangent) => [...tangent, 1]),
); );
} }
@@ -94,7 +94,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
hardJointIndices.forEach((hardJointIndex) => { hardJointIndices.forEach((hardJointIndex) => {
const node = document.createNode( const node = document.createNode(
`${hierarchy.name}_armor_${hardJointIndex}` `${hierarchy.name}_armor_${hardJointIndex}`,
); );
const mesh = document.createMesh(batch["##name"]); const mesh = document.createMesh(batch["##name"]);
const indicesAccessor = document const indicesAccessor = document
@@ -104,9 +104,9 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
new Uint16Array( new Uint16Array(
polygonGroup.indices.filter( polygonGroup.indices.filter(
(index) => (index) =>
vertexHardJointIndices.get(index) === hardJointIndex vertexHardJointIndices.get(index) === hardJointIndex,
) ),
) ),
) )
.setBuffer(buffer); .setBuffer(buffer);
const primitive = document const primitive = document
@@ -127,7 +127,7 @@ export async function extractArmor(vfs: SteamVFS, fileName: string) {
default: default:
throw new TypeError( throw new TypeError(
`Unhandled component type: ${component["comp.typename"]}` `Unhandled component type: ${component["comp.typename"]}`,
); );
} }
}); });
@@ -9,7 +9,7 @@ import { Document, Material, Node, Scene } from "@gltf-transform/core";
import { dedup, prune } from "@gltf-transform/functions"; import { dedup, prune } from "@gltf-transform/functions";
import { times } from "lodash-es"; import { times } from "lodash-es";
import { dirname } from "path"; import { dirname } from "path";
import { SteamVFS } from "../../vfs/vfs"; import { SteamVFS } from "../../vfs/steam";
import { readBaseColor } from "../readBaseColor"; import { readBaseColor } from "../readBaseColor";
import { readNormal } from "../readNormal"; import { readNormal } from "../readNormal";
import { readRoughnessMetallic } from "../readRoughnessMetallic"; import { readRoughnessMetallic } from "../readRoughnessMetallic";
@@ -29,10 +29,10 @@ export async function extractModel(vfs: SteamVFS, path: string) {
const sc2Path = `Data/3d/${path}.sc2`; const sc2Path = `Data/3d/${path}.sc2`;
const scgPath = `Data/3d/${path}.scg`; const scgPath = `Data/3d/${path}.scg`;
const sc2 = new Sc2ReadStream( const sc2 = new Sc2ReadStream(
(await vfs.file(sc2Path)).buffer as ArrayBuffer (await vfs.file(sc2Path)).buffer as ArrayBuffer,
).sc2(); ).sc2();
const scg = new ScgReadStream( const scg = new ScgReadStream(
(await vfs.file(scgPath)).buffer as ArrayBuffer (await vfs.file(scgPath)).buffer as ArrayBuffer,
).scg(); ).scg();
const document = new Document(); const document = new Document();
const scene = document.createScene(); const scene = document.createScene();
@@ -72,9 +72,9 @@ export async function extractModel(vfs: SteamVFS, path: string) {
}`, }`,
textures.miscMap textures.miscMap
? `Data/3d/${dirname(path)}/${textures.miscMap}` ? `Data/3d/${dirname(path)}/${textures.miscMap}`
: undefined : undefined,
) ),
) ),
); );
if (node.configCount) { if (node.configCount) {
@@ -103,9 +103,9 @@ export async function extractModel(vfs: SteamVFS, path: string) {
.setMimeType("image/webp") .setMimeType("image/webp")
.setImage( .setImage(
await readRoughnessMetallic( await readRoughnessMetallic(
`Data/3d/${dirname(path)}/${textures.baseRMMap}` `Data/3d/${dirname(path)}/${textures.baseRMMap}`,
) ),
) ),
); );
} }
@@ -121,9 +121,9 @@ export async function extractModel(vfs: SteamVFS, path: string) {
`Data/3d/${dirname(path)}/${ `Data/3d/${dirname(path)}/${
textures.baseNormalMap ?? textures.normalmap textures.baseNormalMap ?? textures.normalmap
}`, }`,
isBase isBase,
) ),
) ),
); );
} }
@@ -157,7 +157,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
const node = document.createNode(hierarchy.name); const node = document.createNode(hierarchy.name);
const components = times( const components = times(
hierarchy.components.count, hierarchy.components.count,
(index) => hierarchy.components[index.toString().padStart(4, "0")] (index) => hierarchy.components[index.toString().padStart(4, "0")],
); );
components.forEach((component) => { components.forEach((component) => {
@@ -194,7 +194,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
} }
if (polygonGroup === undefined) { if (polygonGroup === undefined) {
throw new Error( throw new Error(
`Missing polygon group ${batch["rb.datasource"]}` `Missing polygon group ${batch["rb.datasource"]}`,
); );
} }
@@ -255,7 +255,7 @@ export async function extractModel(vfs: SteamVFS, path: string) {
default: { default: {
if (ERROR_ON_UNKNOWN_COMPONENT) { if (ERROR_ON_UNKNOWN_COMPONENT) {
throw new Error( throw new Error(
`Unhandled component type: ${component["comp.typename"]}` `Unhandled component type: ${component["comp.typename"]}`,
); );
} }
} }
+40 -31
View File
@@ -1,16 +1,21 @@
import { execFile } from "child_process"; import { exec as execSync } from "child_process";
import { existsSync } from "fs"; import { existsSync } from "fs";
import { mkdir, readdir, rm, writeFile } from "fs/promises"; import { readdir, rm } from "fs/promises";
import { promisify } from "util";
const MAX_COMMAND_LENGTH = 2 ** 11;
const TS_PROTO_EXECUTABLE_LOCATIONS = [ const TS_PROTO_EXECUTABLE_LOCATIONS = [
"./node_modules/.bin/protoc-gen-ts_proto", "./node_modules/.bin/protoc-gen-ts_proto",
"../../node_modules/.bin/protoc-gen-ts_proto", "../../node_modules/.bin/protoc-gen-ts_proto",
]; ];
const ROOTS = [
const roots = [
// "../../packages/core/src/protos",
"../../packages/closed/protos", "../../packages/closed/protos",
"../../packages/website-ue/src/protos",
]; ];
const exec = promisify(execSync);
let tsProtoExecutableLocation: string | undefined = undefined; let tsProtoExecutableLocation: string | undefined = undefined;
for (const location of TS_PROTO_EXECUTABLE_LOCATIONS) { for (const location of TS_PROTO_EXECUTABLE_LOCATIONS) {
@@ -31,38 +36,42 @@ if (!tsProtoExecutableLocation) {
); );
} }
await mkdir("temp", { recursive: true }); for (const root of roots) {
for (const root of ROOTS) {
let args = "";
for (const include of ROOTS) {
args += `-I=${include}\n`;
}
args += `--plugin=${tsProtoExecutableLocation}\n`;
args += "--ts_proto_opt=esModuleInterop=true\n";
args += "--ts_proto_opt=oneof=unions-value\n";
args += "--ts_proto_opt=unrecognizedEnum=false\n";
args += "--ts_proto_opt=snakeToCamel=false\n";
args += `--ts_proto_out=${root}\n`;
const filesRaw = await readdir(`${root}`); const filesRaw = await readdir(`${root}`);
const files: string[] = []; const files: string[] = [];
for (const file of filesRaw) { for (const file of filesRaw) {
if (file.endsWith(".proto")) { if (file.endsWith(".proto")) files.push(file);
files.push(file);
args += `${root}/${file}\n`;
}
if (file.endsWith(".ts")) await rm(`${root}/${file}`); if (file.endsWith(".ts")) await rm(`${root}/${file}`);
} }
await writeFile("temp/protoc.txt", args); while (files.length > 0) {
execFile("protoc", ["@temp/protoc.txt"], (error, stdout, stderr) => { let command = [
if (error) throw new Error(error.message); "protoc",
if (stderr) console.error(stderr); `--plugin=${tsProtoExecutableLocation}`,
if (stdout) console.log(stdout); "--ts_proto_opt=esModuleInterop=true",
}); "--ts_proto_opt=oneof=unions-value",
// "--ts_proto_opt=removeEnumPrefix=true",
"--ts_proto_opt=unrecognizedEnum=false",
"--ts_proto_opt=snakeToCamel=false",
`--ts_proto_out=${root}`,
`-I=${root}`,
].join(" ");
while (true) {
if (files.length === 0) break;
const file = files.at(-1);
const newLine = ` ${root}/${file}`;
if (command.length + newLine.length < MAX_COMMAND_LENGTH) {
command += newLine;
files.pop();
} else {
break;
}
}
await exec(command);
}
} }
-104
View File
@@ -1,104 +0,0 @@
import node from "@astrojs/node";
import react from "@astrojs/react";
import locales from "@blitzkit/i18n/locales.json";
import strings from "@blitzkit/i18n/strings/en.json";
import { mauve, mauveDark } from "@radix-ui/colors";
import favicons from "astro-favicons";
import { defineConfig } from "astro/config";
import packageJSON from "../../package.json";
const POSSIBLE_TARGETS = ["app", "web"];
const target = process.env.PUBLIC_TARGET;
if (!target || !POSSIBLE_TARGETS.includes(target)) {
throw new Error("Invalid target");
}
export default defineConfig({
devToolbar: { enabled: false },
vite: {
server: { allowedHosts: [] },
esbuild: {
minifyIdentifiers: true,
minifySyntax: false,
minifyWhitespace: true,
},
},
output: target === "web" ? "static" : "server",
site: "https://blitzkit.app",
outDir: "../../dist/website",
prefetch: { defaultStrategy: "hover", prefetchAll: true },
build: { concurrency: 4 },
adapter: target === "app" ? node({ mode: "standalone" }) : undefined,
integrations: [
favicons({
name: strings.common.name,
short_name: strings.common.name,
background: mauveDark.mauve1,
themes: [mauve.mauve1, mauveDark.mauve1],
appleStatusBarStyle: "black-translucent",
version: packageJSON.version,
// shortcuts: Object.values(tools)
// .filter((tool) => !tool.disabled && !tool.href)
// .map((tool) => {
// const stringId = (tool.strings ??
// tool.id) as keyof typeof strings.website.tools;
// return {
// name: strings.website.tools[stringId].name,
// name_localized: wrapper(
// (strings) => strings.website.tools[stringId].name
// ),
// description: strings.website.tools[stringId].description,
// description_localized: wrapper(
// (strings) => strings.website.tools[stringId].description
// ),
// short_name: strings.website.tools[stringId].name,
// short_name_localized: wrapper(
// (strings) => strings.website.tools[stringId].name
// ),
// url: `/${tool.id}`,
// icon: `public/assets/tools/${tool.id}.webp`,
// };
// }),
manifest: {
// description: strings.website.home.seo_description,
// description_localized: wrapper(
// (strings) => strings.website.home.seo_description
// ),
dir: "ltr",
categories: ["utilities", "games", "developer", "developer tools"],
id: "com.tresabhi.blitzkit",
start_url: "/",
launch_handler: { client_mode: "navigate-new" },
display: "fullscreen",
display_override: ["fullscreen", "standalone", "minimal-ui"],
lang: locales.default,
orientation: "any",
},
icons: {
windows: true,
android: true,
appleIcon: true,
appleStartup: true,
favicons: true,
yandex: true,
},
}),
react(),
],
});
-55
View File
@@ -1,55 +0,0 @@
{
"name": "@blitzkit/website-ue",
"type": "module",
"scripts": {
"dev": "PUBLIC_TARGET=web astro dev",
"build": "PUBLIC_TARGET=web astro build",
"preview": "PUBLIC_TARGET=web astro preview",
"lint": "PUBLIC_TARGET=web astro check",
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/node": "^9.4.4",
"@astrojs/react": "^4.4.0",
"@astrolib/seo": "^1.0.0-beta.8",
"@blitzkit/closed": "workspace:*",
"@blitzkit/core": "workspace:*",
"@blitzkit/i18n": "workspace:*",
"@blitzkit/game": "workspace:*",
"@bufbuild/protobuf": "^2.10.2",
"@fontsource-variable/roboto-flex": "^5.2.8",
"@fontsource-variable/roboto-mono": "^5.2.8",
"@radix-ui/colors": "^3.0.0",
"@radix-ui/react-icons": "^1.3.2",
"@react-three/drei": "^10.7.6",
"@react-three/fiber": "^9.4.0",
"@types/lodash-es": "^4.17.12",
"@types/react": "^19.2.2",
"@types/react-dom": "^19.2.2",
"@types/three": "^0.180.0",
"@vite-pwa/astro": "^1.1.0",
"astro": "^5.14.4",
"astro-favicons": "^3.1.5",
"autoprefixer": "^10.4.23",
"cssnano": "^7.1.2",
"fuzzysort": "^3.1.0",
"immer": "^10.1.3",
"lodash-es": "^4.17.21",
"postcss": "^8.5.6",
"postcss-load-config": "^6.0.1",
"postcss-nested": "^7.0.2",
"postcss-preset-env": "^11.1.1",
"quicklime": "^1.2.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-promise-suspense": "^0.3.4",
"sharp": "^0.34.5",
"three": "^0.180.0",
"three-stdlib": "^2.36.0",
"typescript": "^5.9.3",
"varuna": "workspace:*",
"vite": "^7.1.9",
"yaml": "^2.8.1"
}
}
-18
View File
@@ -1,18 +0,0 @@
import cssnano from "cssnano";
import type { Config } from "postcss-load-config";
import postcssPresetEnv from "postcss-preset-env";
export default {
plugins: [
require("autoprefixer"),
require("postcss-nested"),
cssnano({
preset: "default",
}),
postcssPresetEnv({
features: {},
}),
],
} satisfies Config;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 481 KiB

@@ -1,3 +0,0 @@
<svg width="30" height="52" viewBox="0 0 30 52" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.8564 44V52H0V36L13.8564 44ZM30 52H16.1436V44L30 36V52ZM28.8564 18V34L15 42L1.14355 34V18L15 10L28.8564 18ZM13.8564 8L0 16V0H13.8564V8ZM30 16L16.1436 8V0H30V16Z" fill="#EEEEF0"/>
</svg>

Before

Width:  |  Height:  |  Size: 294 B

@@ -1,3 +0,0 @@
<svg width="70" height="35" viewBox="0 0 70 35" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M70 32L64 35H0L70 0V32ZM0 32V0H64L0 32Z" fill="#EEEEF0"/>
</svg>

Before

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 443 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 715 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 KiB

-46
View File
@@ -1,46 +0,0 @@
<svg width="426" height="426" viewBox="0 0 426 426" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M416.628 244.997L235.625 372.974C223.13 381.809 202.87 381.809 190.375 372.974L9.37173 244.997C3.1239 240.58 -3.95076e-06 234.79 0 229V196.6H426V229C426 234.79 422.876 240.58 416.628 244.997Z" fill="#0D2847"/>
<path d="M416.628 180.603L235.625 52.6262C223.13 43.7913 202.87 43.7913 190.375 52.6262L9.37172 180.603C-3.12391 189.438 -3.12391 203.762 9.37173 212.597L190.375 340.574C202.87 349.409 223.13 349.409 235.625 340.574L416.628 212.597C429.124 203.762 429.124 189.438 416.628 180.603Z" fill="#D9D9D9"/>
<path d="M416.628 180.603L235.625 52.6262C223.13 43.7913 202.87 43.7913 190.375 52.6262L9.37172 180.603C-3.12391 189.438 -3.12391 203.762 9.37173 212.597L190.375 340.574C202.87 349.409 223.13 349.409 235.625 340.574L416.628 212.597C429.124 203.762 429.124 189.438 416.628 180.603Z" fill="url(#paint0_linear_764_240)"/>
<path d="M416.628 180.603L235.625 52.6262C223.13 43.7913 202.87 43.7913 190.375 52.6262L9.37172 180.603C-3.12391 189.438 -3.12391 203.762 9.37173 212.597L190.375 340.574C202.87 349.409 223.13 349.409 235.625 340.574L416.628 212.597C429.124 203.762 429.124 189.438 416.628 180.603Z" fill="url(#paint1_linear_764_240)"/>
<g filter="url(#filter0_d_764_240)">
<path d="M197.056 150.108L201.368 153.051L290.596 213.945L306.6 202.599L310.832 199.599L289.153 184.23L288.86 177.31L335.236 182.298L351.706 170.622L359.102 165.378L288.049 158.111L286.355 118L263.968 133.871L265.867 167.722L217.292 135.762L197.056 150.108Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M192.905 289L74.2242 204.714L70 201.714L116.393 168.767C129.906 159.17 143.124 153.539 156.048 151.875C168.971 150.211 180.919 153.275 191.893 161.069C198.702 165.905 202.718 171.006 203.941 176.372C205.165 181.658 204.302 186.506 201.354 190.918L201.692 191.158C208.978 188.301 216.935 187.286 225.563 188.113C234.247 188.9 242.613 192.151 250.66 197.866C261.803 205.779 266.398 214.825 264.446 225.004C262.551 235.142 254.96 244.929 241.672 254.366L192.905 289ZM221.999 242.08L200.456 257.38L163.905 231.422L185.448 216.123C192.007 211.465 198.473 209.23 204.846 209.42C211.22 209.529 217.193 211.562 222.764 215.519C228.392 219.516 231.31 223.797 231.521 228.364C231.732 232.85 228.558 237.422 221.999 242.08ZM165.937 205.64L146.77 219.252L114.693 196.472L133.861 182.859C140.363 178.241 146.435 175.887 152.076 175.798C157.717 175.708 163.07 177.462 168.135 181.059C173.256 184.696 175.809 188.557 175.796 192.643C175.726 196.69 172.44 201.022 165.937 205.64Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path d="M197.056 156.108L290.596 219.945L310.832 205.599L306.6 202.599L289.153 190.23L288.86 183.31L335.236 188.298L359.102 171.378L351.706 170.622L288.049 164.111L286.355 124L263.968 139.871L265.867 173.722L217.292 141.762L201.368 153.051L197.056 156.108Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M192.905 295L70 207.714L74.2242 204.714L116.393 174.767C129.906 165.17 143.124 159.539 156.048 157.875C168.971 156.211 180.919 159.275 191.893 167.069C198.702 171.905 202.718 177.006 203.941 182.372C205.165 187.658 204.302 192.506 201.354 196.918L201.692 197.158C208.978 194.301 216.935 193.286 225.563 194.113C234.247 194.9 242.613 198.151 250.66 203.866C261.803 211.779 266.398 220.825 264.446 231.004C262.551 241.142 254.96 250.929 241.672 260.366L192.905 295ZM221.999 248.08L200.456 263.38L163.905 237.422L185.448 222.123C192.007 217.465 198.473 215.23 204.846 215.42C211.22 215.529 217.193 217.562 222.764 221.519C228.392 225.516 231.31 229.797 231.521 234.364C231.732 238.85 228.558 243.422 221.999 248.08ZM165.937 211.64L146.77 225.252L114.693 202.472L133.861 188.859C140.363 184.241 146.435 181.887 152.076 181.798C157.717 181.708 163.07 183.462 168.135 187.059C173.256 190.696 175.809 194.557 175.796 198.643C175.726 202.69 172.44 207.022 165.937 211.64Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path d="M310.832 199.599L306.6 202.599L310.832 205.599V199.599Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path d="M359.102 165.378L351.706 170.622L359.102 171.378V165.378Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path d="M201.368 153.051L197.056 150.108V156.108L201.368 153.051Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
<path d="M74.2242 204.714L70 201.714V207.714L74.2242 204.714Z" fill="#111927" fill-opacity="0.5" shape-rendering="crispEdges"/>
</g>
<path d="M197.056 150.108L290.596 213.945L310.832 199.599L289.153 184.23L288.86 177.31L335.236 182.298L359.102 165.378L288.049 158.111L286.355 118L263.968 133.871L265.867 167.722L217.292 135.762L197.056 150.108Z" fill="url(#paint2_linear_764_240)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M192.905 289L70 201.714L116.393 168.767C129.906 159.17 143.124 153.539 156.048 151.875C168.971 150.211 180.919 153.275 191.893 161.069C198.702 165.905 202.718 171.006 203.941 176.372C205.165 181.658 204.302 186.506 201.354 190.918L201.692 191.158C208.978 188.301 216.935 187.286 225.563 188.113C234.247 188.9 242.613 192.151 250.66 197.866C261.803 205.779 266.398 214.825 264.446 225.004C262.551 235.142 254.96 244.929 241.672 254.366L192.905 289ZM221.999 242.08L200.456 257.38L163.905 231.422L185.448 216.123C192.007 211.465 198.473 209.23 204.846 209.42C211.22 209.529 217.193 211.562 222.764 215.519C228.392 219.516 231.31 223.797 231.521 228.364C231.732 232.85 228.558 237.422 221.999 242.08ZM165.937 205.64L146.77 219.252L114.693 196.472L133.861 182.859C140.363 178.241 146.435 175.887 152.076 175.798C157.717 175.708 163.07 177.462 168.135 181.059C173.256 184.696 175.809 188.557 175.796 192.643C175.726 196.69 172.44 201.022 165.937 205.64Z" fill="url(#paint3_linear_764_240)"/>
<defs>
<filter id="filter0_d_764_240" x="66" y="116" width="297.103" height="185" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="2"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_764_240"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_764_240" result="shape"/>
</filter>
<linearGradient id="paint0_linear_764_240" x1="213" y1="46" x2="213" y2="347.2" gradientUnits="userSpaceOnUse">
<stop stop-color="#10243E"/>
<stop offset="1" stop-color="#0F1B2D"/>
</linearGradient>
<linearGradient id="paint1_linear_764_240" x1="127.008" y1="96.51" x2="241.48" y2="334.974" gradientUnits="userSpaceOnUse">
<stop stop-color="#262A65"/>
<stop offset="1" stop-color="#104D87"/>
</linearGradient>
<linearGradient id="paint2_linear_764_240" x1="215" y1="98.5" x2="299.5" y2="210.5" gradientUnits="userSpaceOnUse">
<stop offset="0.379808" stop-color="#C2E6FF"/>
<stop offset="0.706731" stop-color="#70B8FF"/>
</linearGradient>
<linearGradient id="paint3_linear_764_240" x1="215" y1="98.5" x2="299.5" y2="210.5" gradientUnits="userSpaceOnUse">
<stop offset="0.379808" stop-color="#C2E6FF"/>
<stop offset="0.706731" stop-color="#70B8FF"/>
</linearGradient>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 7.3 KiB

@@ -1,102 +0,0 @@
.card {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--space-4);
.series {
position: relative;
width: 100%;
aspect-ratio: 7 / 8;
.entry {
position: absolute;
border-radius: var(--space-3);
box-shadow: var(--shadow-interactive), var(--shadow-aggressive);
background-size: cover;
background-position: center;
&.skeleton {
top: 0;
left: 0;
width: 100%;
height: 100%;
}
}
.count {
position: absolute;
bottom: var(--space-3);
right: var(--space-3);
box-shadow: var(--shadow-aggressive);
}
}
.label {
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
.skeleton {
width: 100%;
}
}
}
.details {
display: flex;
gap: var(--space-5);
align-items: center;
.preview {
display: flex;
flex-direction: column;
align-items: center;
padding: var(--space-2);
&[data-grade="1"] .image {
outline: var(--space-2) solid var(--gray-9);
}
&[data-grade="2"] .image {
outline: var(--space-2) solid var(--blue-9);
box-shadow: 0 0 var(--space-3) var(--blue-9);
}
&[data-grade="3"] .image {
outline: var(--space-2) solid var(--purple-9);
box-shadow: 0 0 var(--space-4) var(--purple-9);
}
&[data-grade="4"] .image {
outline: var(--space-2) solid var(--amber-9);
box-shadow: 0 0 var(--space-5) var(--amber-9);
}
.image {
aspect-ratio: 7 / 8;
width: 8rem;
border-radius: var(--space-3);
background-size: cover;
background-position: center;
}
.grade {
margin-top: calc(var(--space-3) * -1);
}
}
.description {
display: flex;
flex-direction: column;
max-width: 20rem;
}
}
@@ -1,153 +0,0 @@
import { literals } from "@blitzkit/i18n";
import { Grade } from "@protos/blitz_static_standard_grades_enum";
import { DownloadIcon, StarFilledIcon } from "@radix-ui/react-icons";
import type { Color } from "../../core/ui/color";
import { useGameStrings } from "../../hooks/useGameStrings";
import { useStrings } from "../../hooks/useStrings";
import type { Avatar } from "../../protos/avatar";
import type { PropsWithSkeleton } from "../../types/propsWithSkeleton";
import { Badge } from "../Badge";
import { Button } from "../Button";
import { Dialog } from "../Dialog";
import { InlineSkeleton } from "../InlineSkeleton";
import { Link } from "../Link";
import { Skeleton } from "../Skeleton";
import { Text } from "../Text";
import styles from "./index.module.css";
interface Props {
name: string;
avatars: Avatar[];
}
const MAX_CARDS = 3;
const CARD_TRIM = "var(--space-3)";
export function AvatarCard(props: PropsWithSkeleton<Props>) {
const card = (
<div className={styles.card}>
<Series skeleton={props.skeleton} {...props} />
<Text align="center" className={styles.label}>
{props.skeleton ? <InlineSkeleton /> : props.name}
</Text>
</div>
);
if (props.skeleton) return card;
return (
<Dialog.Root>
<Dialog.Trigger>{card}</Dialog.Trigger>
<Dialog.Content>
<Text size="major" weight="bold">
{props.name}
</Text>
<Details avatars={props.avatars} />
</Dialog.Content>
</Dialog.Root>
);
}
interface DetailsProps {
avatars: Avatar[];
}
const gradeColors: Record<Grade, Color> = {
[Grade.GRADE_UNSPECIFIED]: "gray",
[Grade.GRADE_COMMON]: "gray",
[Grade.GRADE_RARE]: "blue",
[Grade.GRADE_EPIC]: "purple",
[Grade.GRADE_LEGENDARY]: "amber",
};
function Details({ avatars }: DetailsProps) {
const gameStrings = useGameStrings("ProfileAvatarEntity");
const strings = useStrings();
return [...avatars].reverse().map((avatar) => {
const description = gameStrings[avatar.stuff_ui!.description];
const obtaining = gameStrings[avatar.stuff_ui!.obtaining_methods];
const hasDescription = description || obtaining;
return (
<div className={styles.details}>
<div className={styles.preview} data-grade={avatar.stuff_ui!.grade}>
<div
className={styles.image}
style={{
backgroundImage: `url(/api/avatars/${avatar.name}.webp)`,
}}
/>
<Badge
color={gradeColors[avatar.stuff_ui!.grade]}
className={styles.grade}
>
<StarFilledIcon />
{strings.grades[avatar.stuff_ui!.grade]}
</Badge>
</div>
<div className={styles.description}>
<Text>
{hasDescription ? (
<>
{description} {obtaining}
</>
) : (
strings.avatars.no_description
)}
</Text>
<Link
underline="never"
href={`/api/avatars/${avatar.name}.webp`}
download
>
<Button>
<DownloadIcon /> {strings.avatars.download}
</Button>
</Link>
</div>
</div>
);
});
}
interface SeriesProps {
avatars: Avatar[];
}
function Series(props: PropsWithSkeleton<SeriesProps>) {
const count = Math.min(props.skeleton ? 0 : props.avatars.length, MAX_CARDS);
const strings = useStrings();
return (
<div className={styles.series}>
{!props.skeleton &&
props.avatars.slice(-MAX_CARDS).map((avatar, index) => (
<div
key={avatar.name}
className={styles.entry}
style={{
filter: `brightness(${(index + 1) / count})`,
top: `calc(${index} * ${CARD_TRIM})`,
left: `calc(${index} * ${CARD_TRIM})`,
width: `calc(100% - ${CARD_TRIM} * ${count - 1})`,
height: `calc(100% - ${CARD_TRIM} * ${count - 1})`,
backgroundImage: `url(/api/avatars/${avatar.name}.webp)`,
}}
/>
))}
{!props.skeleton && props.avatars.length > 1 && (
<Badge color="gray" highContrast className={styles.count}>
{literals(strings.units.x, { value: props.avatars.length })}
</Badge>
)}
{props.skeleton && <Skeleton className={styles.entry} />}
</div>
);
}
@@ -1,7 +0,0 @@
.avatar-controls {
display: flex;
.search {
flex: 1;
}
}
@@ -1,40 +0,0 @@
import { MagnifyingGlassIcon } from "@radix-ui/react-icons";
import { useCallback, useEffect, useRef } from "react";
import { useStrings } from "../../hooks/useStrings";
import { Avatars } from "../../stores/avatars";
import { TextField } from "../TextField";
import "./index.css";
export function AvatarControls() {
const strings = useStrings();
const search = useRef<HTMLInputElement>(null);
const onChange = useCallback(() => {
if (!search.current) return;
const trimmed = search.current.value.trim();
Avatars.mutate((draft) => {
if (trimmed.length === 0) {
draft.search = null;
} else {
draft.search = trimmed;
}
});
}, []);
useEffect(onChange, []);
return (
<div className="avatar-controls">
<TextField
ref={search}
className="search"
placeholder={strings.avatars.search}
onChange={onChange}
>
<MagnifyingGlassIcon />
</TextField>
</div>
);
}
@@ -1,9 +0,0 @@
.avatars-list {
display: grid;
gap: var(--space-5) var(--space-4);
grid-template-columns: repeat(auto-fill, minmax(6rem, 1fr));
@media (min-width: 32rem) {
grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
}
}
@@ -1,85 +0,0 @@
import fuzzysort from "fuzzysort";
import { useMemo } from "react";
import { api } from "../../core/api/dynamic";
import { useAwait } from "../../hooks/useAwait";
import { useGameStrings } from "../../hooks/useGameStrings";
import { useLocale } from "../../hooks/useLocale";
import type { Avatar } from "../../protos/avatar";
import { Avatars } from "../../stores/avatars";
import { AvatarCard } from "../AvatarCard";
import { IncrementalLoader } from "../IncrementalLoader";
import "./index.css";
const { go } = fuzzysort;
const indexingPattern = /.+_(\d+)$/;
export function AvatarsList() {
const locale = useLocale();
const search = Avatars.use((state) => state.search);
const { avatars } = useAwait(() => api.avatars(), "avatars");
const gameStrings = useGameStrings("ProfileAvatarEntity");
const groups = useMemo(() => {
const groups = new Map<string, Avatar[]>();
for (const avatar of avatars) {
const name =
gameStrings[avatar.stuff_ui!.display_name] ??
avatar.stuff_ui!.display_name;
if (groups.has(name)) {
groups.get(name)!.push(avatar);
} else {
groups.set(name, [avatar]);
}
}
return groups;
}, []);
const ordered = useMemo(() => {
const array = Array.from(groups.entries());
return array
.sort((a, b) => a[0].localeCompare(b[0], locale))
.map(([name, avatars]) => ({
key: name,
name,
avatars: avatars.sort((a, b) => {
const gradeA = a.stuff_ui!.grade;
const gradeB = b.stuff_ui!.grade;
let diff = gradeA - gradeB;
if (diff === 0) {
const matchesA = a.name.match(indexingPattern);
const matchesB = b.name.match(indexingPattern);
if (matchesA && matchesB) {
const indexA = Number(matchesA[1]);
const indexB = Number(matchesB[1]);
diff = indexA - indexB;
}
}
return diff;
}),
}));
}, []);
const filtered = useMemo(() => {
if (search === null) return ordered;
const searched = go(search, ordered, { keys: ["name"] });
return searched.map((result) => result.obj);
}, [search]);
return (
<div className="avatars-list">
<IncrementalLoader
initial={7 * 5}
intermediate={7 * 3}
data={filtered}
Component={AvatarCard}
/>
</div>
);
}
@@ -1,17 +0,0 @@
.badge {
border-radius: var(--max-size);
padding: var(--space-2) var(--space-3);
font-size: var(--font-size-minor);
font-weight: var(--weight-medium);
display: flex;
align-items: center;
gap: var(--space-2);
.svg {
width: 1em;
height: 1em;
}
}
@@ -1,32 +0,0 @@
import type { ComponentProps } from "react";
import { classNames } from "../../core/ui/classNames";
import type { Color } from "../../core/ui/color";
import { LIGHT_TEXT_COLORS } from "../Button";
import styles from "./index.module.css";
export interface BadgeProps extends ComponentProps<"div"> {
color?: Color | "accent";
highContrast?: boolean;
}
export function Badge({
className,
style,
color = "accent",
highContrast,
...props
}: BadgeProps) {
const lightText = LIGHT_TEXT_COLORS.has(color as Color);
return (
<div
className={classNames(styles.badge, className)}
style={{
backgroundColor: `var(--${color}-${highContrast ? 12 : 9})`,
color: `var(--gray-${highContrast || lightText ? 1 : 12})`,
...style,
}}
{...props}
/>
);
}
@@ -1,3 +0,0 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="sitemap" href="/sitemap-index.xml" />
@@ -1,85 +0,0 @@
---
import "@fontsource-variable/jetbrains-mono";
import "@fontsource-variable/roboto-flex";
---
<style>
:root {
--space-0: 0.0625rem;
--space-1: 0.125rem;
--space-2: 0.25rem;
--space-3: 0.5rem;
--space-4: 1rem;
--space-5: 2rem;
--space-6: 4rem;
--space-7: 8rem;
--space-8: 16rem;
--space-9: 32rem;
--page-width: 64rem;
--max-size: max(100vw, 100vh);
--font-size-regular: 1rem;
--font-size-minor: 0.75rem;
--font-size-major: 1.25rem;
--font-size-heading-1: 3rem;
--font-size-heading-2: 2rem;
--font-size-heading-3: 1.5rem;
--font-size-heading-4: 1.25rem;
--font-size-heading-5: 1rem;
--font-size-heading-6: 0.75rem;
--font-family-regular: "Roboto Flex Variable", sans-serif;
--font-family-mono: "JetBrains Mono Variable", monospace;
--color-regular: var(--gray-12);
--color-low-contrast: var(--gray-11);
--weight-light: 300;
--weight-regular: 400;
--weight-medium: 500;
--weight-bold: 700;
--weight-black: 900;
--outline-focus: var(--space-1) solid var(--accent-6);
--shadow-cavity:
inset calc(var(--space-1) * sin(45deg)) calc(var(--space-1) * sin(45deg))
var(--space-1) var(--black-a3),
inset calc(var(--space-1) * sin(45deg) * -1)
calc(var(--space-1) * sin(45deg) * -1) var(--space-1) var(--white-a1);
--shadow-bump:
inset calc(var(--space-1) * sin(45deg)) calc(var(--space-1) * sin(45deg))
var(--space-1) var(--white-a3),
inset calc(var(--space-1) * sin(45deg) * -1)
calc(var(--space-1) * sin(45deg) * -1) var(--space-1) var(--black-a3);
--shadow-outline-width: 1.5px;
--shadow-outline-width-negative: calc(var(--shadow-outline-width) * -1);
--shadow-interactive-background: 0 0 0 var(--shadow-outline-width)
var(--gray-6);
--shadow-interactive-shine: var(--shadow-outline-width-negative)
var(--shadow-outline-width-negative) var(--shadow-outline-width)
var(--white-a1);
--shadow-interactive-shadow: var(--shadow-outline-width)
var(--shadow-outline-width) var(--shadow-outline-width) var(--black-a4);
--shadow-interactive:
var(--shadow-interactive-shine), var(--shadow-interactive-shadow),
var(--shadow-interactive-background);
--shadow-aggressive: var(--space-1) var(--space-1) var(--space-4)
var(--black-a11);
--shadow-subtle: 0 var(--space-1) var(--space-3) var(--black-a5);
--shadow-none: 0 0 0 transparent;
--blur-glass: blur(4rem);
--blur-tint: blur(8rem);
--duration-brief: 200ms;
--duration-subtle: 2s;
}
</style>
@@ -1,26 +0,0 @@
.button {
display: flex;
align-items: center;
justify-content: center;
gap: var(--space-2);
border-radius: var(--max-size);
padding: var(--space-3) var(--space-4);
background-color: var(--accent-9);
border: none;
font-family: var(--font-family-regular);
font-size: var(--font-size-minor);
color: var(--gray-1);
font-weight: var(--weight-medium);
.svg {
width: 1em;
height: 1em;
}
&[data-light-text="true"] {
color: var(--gray-12);
}
}
@@ -1,46 +0,0 @@
import type { ComponentProps } from "react";
import { classNames } from "../../core/ui/classNames";
import type { Color } from "../../core/ui/color";
import styles from "./index.module.css";
export interface ButtonProps extends ComponentProps<"button"> {
color?: Color;
variant?: "solid";
}
export const LIGHT_TEXT_COLORS = new Set<Color>([
"gold",
"bronze",
"teal",
"grass",
"amber",
"plum",
"pink",
"brown",
"crimson",
"jade",
"blue",
"tomato",
]);
export function Button({
className,
color,
variant = "solid",
style,
...props
}: ButtonProps) {
return (
<button
className={classNames(styles.button, className)}
data-color={color}
data-variant={variant}
data-light-text={variant === "solid"}
style={{
backgroundColor: color ? `var(--${color}-9)` : undefined,
...style,
}}
{...props}
/>
);
}
@@ -1,3 +0,0 @@
.code {
font-family: var(--font-family-mono);
}
@@ -1,9 +0,0 @@
import type { ComponentProps } from "react";
import { classNames } from "../../core/ui/classNames";
import "./index.css";
export interface CodeProps extends ComponentProps<"code"> {}
export function Code({ className, ...props }: CodeProps) {
return <code className={classNames("code", className)} {...props} />;
}
Loaded 100 of 215 files, more files were not shown because too many files have changed in this diff. Show more