From 88643d366d79ccb641d7c7942777f2be15cabbeb Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Wed, 23 Sep 2026 08:21:16 +1200 Subject: [PATCH 01/97] Fix: skip session delta entries with no tank definition or average The /session/ page crashed when a tracked player's tank stats included a tank with no matching tank definition or no average stats (WN8 baseline). The delta memo dereferenced `tank.id` on a possibly missing definition and forced `average?.mu!` through as non-null, so a missing average threw inside `compositeStats`/`calculateWN8` uncaught, breaking the page on every load while the bad state persisted in localStorage. Skip those entries instead of crashing: entries with no tank definition or no average `mu` are dropped from the delta via `flatMap`, so the rest of the session table still renders. --- .../[...chunk_default]/[...locale]/session/_index.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx index 5706a3ace..5625af9e7 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx @@ -90,15 +90,19 @@ function Content() { session.tracking && tankStatsB ? deltaTankStats(session.player.stats, tankStatsB) .sort((a, b) => b.last_battle_time - a.last_battle_time) - .map((entry) => { + .flatMap((entry) => { const tank = tankDefinitions.tanks[entry.tank_id]; + if (!tank) return []; + const average = averageDefinitions.averages[tank.id]; + if (!average?.mu) return []; + const composite = compositeStats( { ...entry.all, battle_life_time: entry.battle_life_time }, - average?.mu!, + average.mu, ); - return { tank, composite }; + return [{ tank, composite }]; }) : undefined, [session.tracking && session.player, tankStatsB], From 9e388154756d1ad3206a1b42b970137762950df6 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Tue, 14 Jul 2026 10:31:14 +1200 Subject: [PATCH 02/97] Add Spall Liner toggle to Tankopedia model viewer --- packages/i18n/strings/en.json | 4 + .../SpacedArmorSceneComponent/index.tsx | 11 ++ .../Options/components/SpallLinerSwitcher.tsx | 103 ++++++++++++++++++ .../HeroSection/components/Options/index.tsx | 3 + .../website/src/core/blitzkit/spallLiner.ts | 8 ++ .../src/core/blitzkit/tankCharacteristics.ts | 6 +- 6 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx create mode 100644 packages/website/src/core/blitzkit/spallLiner.ts diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 534e2fa8d..9ac4145ee 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -527,6 +527,10 @@ "label": "Edit", "reset": "Reset" } + }, + + "spall_liner": { + "swap_prompt": "Spall Liner will replace one of your active provisions. Choose which one to remove:" } }, diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx index f2c770593..784836464 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx @@ -18,6 +18,10 @@ import { import { degToRad } from "three/src/math/MathUtils.js"; import { hasEquipment } from "../../../../core/blitzkit/hasEquipment"; import { jsxTree } from "../../../../core/blitzkit/jsxTree"; +import { + SPALL_LINER_HE_DAMAGE_DELTA, + SPALL_LINER_PROVISION_ID, +} from "../../../../core/blitzkit/spallLiner"; import { defaultEqualizer } from "../../../../core/blitzkit/tankToDuelMember"; import { discardClippingPlane } from "../../../../core/three/discardClippingPlane"; import { Duel } from "../../../../stores/duel"; @@ -384,6 +388,13 @@ export function SpacedArmorSceneComponent({ shot.damage *= antagonistEqualizer.damage; + const hasSpallLiner = Duel.state.protagonist.provisions.includes( + SPALL_LINER_PROVISION_ID, + ); + if (hasSpallLiner && shell.type === ShellType.SHELL_TYPE_HE) { + shot.damage *= 1 + SPALL_LINER_HE_DAMAGE_DELTA; + } + return shot; }, [camera], diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx new file mode 100644 index 000000000..3b66d75dc --- /dev/null +++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx @@ -0,0 +1,103 @@ +import { alias, availableProvisions } from "@blitzkit/core"; +import { Flex, IconButton, Popover, Text } from "@radix-ui/themes"; +import { api } from "../../../../../../core/blitzkit/api"; +import { SPALL_LINER_PROVISION_ID } from "../../../../../../core/blitzkit/spallLiner"; +import { useLocale } from "../../../../../../hooks/useLocale"; +import { Duel } from "../../../../../../stores/duel"; +import { Tankopedia } from "../../../../../../stores/tankopedia"; +import { ProvisionButton } from "../../../../../ModuleButtons/ProvisionButton"; + +const provisionDefinitions = await api.provisionDefinitions(); + +export function SpallLinerSwitcher() { + const { tank, gun, provisions } = Duel.use((state) => state.protagonist); + const { strings, unwrap } = useLocale(); + const isSpallLinerActive = provisions.includes(SPALL_LINER_PROVISION_ID); + const hasSlotAvailable = provisions.length < tank.max_provisions; + + const canEquipSpallLiner = availableProvisions( + tank, + gun, + provisionDefinitions, + ).some((provision) => provision.id === SPALL_LINER_PROVISION_ID); + + if (!canEquipSpallLiner) return null; + + function equip(replacing?: number) { + Duel.mutate((draft) => { + if (replacing !== undefined) { + const provisions = draft.protagonist.provisions; + provisions[provisions.indexOf(replacing)] = SPALL_LINER_PROVISION_ID; + } else { + draft.protagonist.provisions.push(SPALL_LINER_PROVISION_ID); + } + }); + Tankopedia.mutate((draft) => { + draft.shot = undefined; + }); + } + + function unequip() { + Duel.mutate((draft) => { + draft.protagonist.provisions = draft.protagonist.provisions.filter( + (id) => id !== SPALL_LINER_PROVISION_ID, + ); + }); + Tankopedia.mutate((draft) => { + draft.shot = undefined; + }); + } + + const button = ( + { + if (isSpallLinerActive) { + unequip(); + } else if (hasSlotAvailable) { + equip(); + } + }} + > + {unwrap(provisionDefinitions.provisions[SPALL_LINER_PROVISION_ID].name!)} + + ); + + if (isSpallLinerActive || hasSlotAvailable) return button; + + return ( + + {button} + + + + + {strings.website.tools.tankopedia.sandbox.spall_liner.swap_prompt} + + + + {provisions.map((id) => ( + + equip(id)} + /> + + ))} + + + + + ); +} diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx index 05fc67d92..5856c66d0 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx @@ -46,6 +46,7 @@ import { TankSearch } from "../../../../TankSearch"; import { CustomShellButton } from "./components/CustomShellButton"; import { DynamicArmorSwitcher } from "./components/DynamicArmorSwitcher"; import { QuickInputs } from "./components/QuickInputs"; +import { SpallLinerSwitcher } from "./components/SpallLinerSwitcher"; import { Thicknesses } from "./components/Thicknesses"; type OptionsProps = MaybeSkeletonComponentProps & { @@ -278,6 +279,8 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) { }} /> + + {!skeleton && ( diff --git a/packages/website/src/core/blitzkit/spallLiner.ts b/packages/website/src/core/blitzkit/spallLiner.ts new file mode 100644 index 000000000..80598d5c1 --- /dev/null +++ b/packages/website/src/core/blitzkit/spallLiner.ts @@ -0,0 +1,8 @@ +export const SPALL_LINER_PROVISION_ID = 101; + +/** + * Matches the in-game reduction Spall Liner grants against HE splash + * damage. Shared between the characteristics panel and the Dynamic + * Armor 3D viewer's damage readout so the figure isn't duplicated. + */ +export const SPALL_LINER_HE_DAMAGE_DELTA = -0.2; diff --git a/packages/website/src/core/blitzkit/tankCharacteristics.ts b/packages/website/src/core/blitzkit/tankCharacteristics.ts index d9d041098..f03bbf3e7 100644 --- a/packages/website/src/core/blitzkit/tankCharacteristics.ts +++ b/packages/website/src/core/blitzkit/tankCharacteristics.ts @@ -22,6 +22,7 @@ import { } from "@blitzkit/core"; import { coefficient } from "@blitzkit/core/src/blitzkit/coefficient"; import type { EquipmentMatrix } from "../../stores/duel"; +import { SPALL_LINER_HE_DAMAGE_DELTA } from "./spallLiner"; import { defaultEqualizer } from "./tankToDuelMember"; export type TankCharacteristics = ReturnType; @@ -170,7 +171,10 @@ export function tankCharacteristics( coefficient( [applyReactiveArmor && shell.type !== ShellType.SHELL_TYPE_HE, -0.27], [applyDynamicArmor, -0.1], - [applySpallLiner && shell.type === ShellType.SHELL_TYPE_HE, -0.2], + [ + applySpallLiner && shell.type === ShellType.SHELL_TYPE_HE, + SPALL_LINER_HE_DAMAGE_DELTA, + ], ); const assaultDamageCoefficient = gun.assault_ranges && gun.assault_ranges.types.includes(shell.type) From 347efa75fe6cb013e509cc2db0fe5c54b5abb447 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:31:35 -0500 Subject: [PATCH 03/97] add compatibility for string game mode ids --- .../blitzkit/api/server/1_tankDefinitions.ts | 8 +- .../blitzkit/api/server/9_gameDefinitions.ts | 4 +- .../core/src/protos/average_definitions.ts | 121 ++--- .../core/src/protos/camouflage_definitions.ts | 39 +- .../core/src/protos/consumable_definitions.ts | 31 +- .../core/src/protos/equipment_definitions.ts | 42 +- packages/core/src/protos/gallery.ts | 4 +- .../core/src/protos/game_definitions.proto | 2 +- packages/core/src/protos/game_definitions.ts | 77 ++- packages/core/src/protos/i18n.ts | 34 +- packages/core/src/protos/map_definitions.ts | 34 +- packages/core/src/protos/model_definitions.ts | 153 +++--- packages/core/src/protos/popular_tanks.ts | 4 +- .../core/src/protos/provision_definitions.ts | 31 +- .../core/src/protos/rating_leaderboard.ts | 4 +- packages/core/src/protos/reviews.ts | 42 +- packages/core/src/protos/skill_definitions.ts | 34 +- .../core/src/protos/tank_definitions.proto | 2 +- packages/core/src/protos/tank_definitions.ts | 445 +++++------------- .../TankSearch/components/FilterControl.tsx | 14 +- .../components/Tankopedia/GameModeSection.tsx | 3 +- .../gamemodes/[id]/banner.webp.ts | 6 +- 22 files changed, 394 insertions(+), 740 deletions(-) diff --git a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts index 3e894b43d..ee3f69a58 100644 --- a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts @@ -50,10 +50,11 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { async tankDefinitions() { const tankDefinitions = TankDefinitions.create(); - const gameModeNativeNames: Record = {}; + const gameModeNativeNames: Record = {}; + const squadBattleTypeGameModeNativeNameMatches = this.squadBattleTypeStyles!.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll( - /"(\d+)" -> "(battleType\/([a-zA-Z]+))"/g, + /eGameMode\.(\w+) -> "(battleType\/([a-zA-Z]+))"/g, ); const gameTypeGameModeNativeNameMatches = this.gameTypeSelectorStyles!.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll( @@ -61,8 +62,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { ); for (const match of squadBattleTypeGameModeNativeNameMatches) { - const id = Number(match[1]); - gameModeNativeNames[match[3]] = id; + gameModeNativeNames[match[3]] = match[1]; } for (const match of gameTypeGameModeNativeNameMatches) { diff --git a/packages/core/src/blitzkit/api/server/9_gameDefinitions.ts b/packages/core/src/blitzkit/api/server/9_gameDefinitions.ts index 683c126a5..2803df1b6 100644 --- a/packages/core/src/blitzkit/api/server/9_gameDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/9_gameDefinitions.ts @@ -27,9 +27,9 @@ export abstract class ServerBlitzKitAPI9 extends ServerBlitzKitAPI8 { ).available_nations; for (const match of this.squadBattleTypeStyles!.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll( - /"(\d+)" -> "(battleType\/([a-zA-Z]+))"/g, + /eGameMode\.(\w+) -> "(battleType\/([a-zA-Z]+))"/g, )) { - const id = Number(match[1]); + const id = match[1]; const name = this.getString(match[2]); gameDefinitions.gameModes[id] = { diff --git a/packages/core/src/protos/average_definitions.ts b/packages/core/src/protos/average_definitions.ts index 32a76b863..a9c044921 100644 --- a/packages/core/src/protos/average_definitions.ts +++ b/packages/core/src/protos/average_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: average_definitions.proto /* eslint-disable */ @@ -64,7 +64,7 @@ function createBaseAverageDefinitions(): AverageDefinitions { export const AverageDefinitions: MessageFns = { encode(message: AverageDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.averages).forEach(([key, value]: [string, AverageDefinitionsEntry]) => { + Object.entries(message.averages).forEach(([key, value]) => { AverageDefinitions_AveragesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); if (message.samples !== undefined) { @@ -122,13 +122,10 @@ export const AverageDefinitions: MessageFns = { fromJSON(object: any): AverageDefinitions { return { averages: isObject(object.averages) - ? (globalThis.Object.entries(object.averages) as [string, any][]).reduce( - (acc: { [key: number]: AverageDefinitionsEntry }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = AverageDefinitionsEntry.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.averages).reduce<{ [key: number]: AverageDefinitionsEntry }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = AverageDefinitionsEntry.fromJSON(value); + return acc; + }, {}) : {}, samples: isSet(object.samples) ? Samples.fromJSON(object.samples) : undefined, time: isSet(object.time) ? globalThis.Number(object.time) : 0, @@ -138,7 +135,7 @@ export const AverageDefinitions: MessageFns = { toJSON(message: AverageDefinitions): unknown { const obj: any = {}; if (message.averages) { - const entries = globalThis.Object.entries(message.averages) as [string, AverageDefinitionsEntry][]; + const entries = Object.entries(message.averages); if (entries.length > 0) { obj.averages = {}; entries.forEach(([k, v]) => { @@ -160,8 +157,8 @@ export const AverageDefinitions: MessageFns = { }, fromPartial, I>>(object: I): AverageDefinitions { const message = createBaseAverageDefinitions(); - message.averages = (globalThis.Object.entries(object.averages ?? {}) as [string, AverageDefinitionsEntry][]).reduce( - (acc: { [key: number]: AverageDefinitionsEntry }, [key, value]: [string, AverageDefinitionsEntry]) => { + message.averages = Object.entries(object.averages ?? {}).reduce<{ [key: number]: AverageDefinitionsEntry }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = AverageDefinitionsEntry.fromPartial(value); } @@ -620,59 +617,25 @@ export const AverageDefinitionsAllStats: MessageFns fromJSON(object: any): AverageDefinitionsAllStats { return { battles: isSet(object.battles) ? globalThis.Number(object.battles) : 0, - capture_points: isSet(object.capturePoints) - ? globalThis.Number(object.capturePoints) - : isSet(object.capture_points) - ? globalThis.Number(object.capture_points) - : 0, - damage_dealt: isSet(object.damageDealt) - ? globalThis.Number(object.damageDealt) - : isSet(object.damage_dealt) - ? globalThis.Number(object.damage_dealt) - : 0, - damage_received: isSet(object.damageReceived) - ? globalThis.Number(object.damageReceived) - : isSet(object.damage_received) - ? globalThis.Number(object.damage_received) - : 0, - dropped_capture_points: isSet(object.droppedCapturePoints) - ? globalThis.Number(object.droppedCapturePoints) - : isSet(object.dropped_capture_points) + capture_points: isSet(object.capture_points) ? globalThis.Number(object.capture_points) : 0, + damage_dealt: isSet(object.damage_dealt) ? globalThis.Number(object.damage_dealt) : 0, + damage_received: isSet(object.damage_received) ? globalThis.Number(object.damage_received) : 0, + dropped_capture_points: isSet(object.dropped_capture_points) ? globalThis.Number(object.dropped_capture_points) : 0, frags: isSet(object.frags) ? globalThis.Number(object.frags) : 0, frags8p: isSet(object.frags8p) ? globalThis.Number(object.frags8p) : 0, hits: isSet(object.hits) ? globalThis.Number(object.hits) : 0, losses: isSet(object.losses) ? globalThis.Number(object.losses) : 0, - max_frags: isSet(object.maxFrags) - ? globalThis.Number(object.maxFrags) - : isSet(object.max_frags) - ? globalThis.Number(object.max_frags) - : 0, - max_xp: isSet(object.maxXp) - ? globalThis.Number(object.maxXp) - : isSet(object.max_xp) - ? globalThis.Number(object.max_xp) - : 0, + max_frags: isSet(object.max_frags) ? globalThis.Number(object.max_frags) : 0, + max_xp: isSet(object.max_xp) ? globalThis.Number(object.max_xp) : 0, shots: isSet(object.shots) ? globalThis.Number(object.shots) : 0, spotted: isSet(object.spotted) ? globalThis.Number(object.spotted) : 0, - survived_battles: isSet(object.survivedBattles) - ? globalThis.Number(object.survivedBattles) - : isSet(object.survived_battles) - ? globalThis.Number(object.survived_battles) - : 0, - win_and_survived: isSet(object.winAndSurvived) - ? globalThis.Number(object.winAndSurvived) - : isSet(object.win_and_survived) - ? globalThis.Number(object.win_and_survived) - : 0, + survived_battles: isSet(object.survived_battles) ? globalThis.Number(object.survived_battles) : 0, + win_and_survived: isSet(object.win_and_survived) ? globalThis.Number(object.win_and_survived) : 0, wins: isSet(object.wins) ? globalThis.Number(object.wins) : 0, xp: isSet(object.xp) ? globalThis.Number(object.xp) : 0, - battle_life_time: isSet(object.battleLifeTime) - ? globalThis.Number(object.battleLifeTime) - : isSet(object.battle_life_time) - ? globalThis.Number(object.battle_life_time) - : 0, + battle_life_time: isSet(object.battle_life_time) ? globalThis.Number(object.battle_life_time) : 0, }; }, @@ -682,16 +645,16 @@ export const AverageDefinitionsAllStats: MessageFns obj.battles = message.battles; } if (message.capture_points !== 0) { - obj.capturePoints = message.capture_points; + obj.capture_points = message.capture_points; } if (message.damage_dealt !== 0) { - obj.damageDealt = message.damage_dealt; + obj.damage_dealt = message.damage_dealt; } if (message.damage_received !== 0) { - obj.damageReceived = message.damage_received; + obj.damage_received = message.damage_received; } if (message.dropped_capture_points !== 0) { - obj.droppedCapturePoints = message.dropped_capture_points; + obj.dropped_capture_points = message.dropped_capture_points; } if (message.frags !== 0) { obj.frags = message.frags; @@ -706,10 +669,10 @@ export const AverageDefinitionsAllStats: MessageFns obj.losses = message.losses; } if (message.max_frags !== 0) { - obj.maxFrags = message.max_frags; + obj.max_frags = message.max_frags; } if (message.max_xp !== 0) { - obj.maxXp = message.max_xp; + obj.max_xp = message.max_xp; } if (message.shots !== 0) { obj.shots = message.shots; @@ -718,10 +681,10 @@ export const AverageDefinitionsAllStats: MessageFns obj.spotted = message.spotted; } if (message.survived_battles !== 0) { - obj.survivedBattles = message.survived_battles; + obj.survived_battles = message.survived_battles; } if (message.win_and_survived !== 0) { - obj.winAndSurvived = message.win_and_survived; + obj.win_and_survived = message.win_and_survived; } if (message.wins !== 0) { obj.wins = message.wins; @@ -730,7 +693,7 @@ export const AverageDefinitionsAllStats: MessageFns obj.xp = message.xp; } if (message.battle_life_time !== 0) { - obj.battleLifeTime = message.battle_life_time; + obj.battle_life_time = message.battle_life_time; } return obj; }, @@ -866,16 +829,12 @@ export const Samples: MessageFns = { fromJSON(object: any): Samples { return { - d_1: isSet(object.d1) ? globalThis.Number(object.d1) : isSet(object.d_1) ? globalThis.Number(object.d_1) : 0, - d_7: isSet(object.d7) ? globalThis.Number(object.d7) : isSet(object.d_7) ? globalThis.Number(object.d_7) : 0, - d_30: isSet(object.d30) ? globalThis.Number(object.d30) : isSet(object.d_30) ? globalThis.Number(object.d_30) : 0, - d_60: isSet(object.d60) ? globalThis.Number(object.d60) : isSet(object.d_60) ? globalThis.Number(object.d_60) : 0, - d_90: isSet(object.d90) ? globalThis.Number(object.d90) : isSet(object.d_90) ? globalThis.Number(object.d_90) : 0, - d_120: isSet(object.d120) - ? globalThis.Number(object.d120) - : isSet(object.d_120) - ? globalThis.Number(object.d_120) - : 0, + d_1: isSet(object.d_1) ? globalThis.Number(object.d_1) : 0, + d_7: isSet(object.d_7) ? globalThis.Number(object.d_7) : 0, + d_30: isSet(object.d_30) ? globalThis.Number(object.d_30) : 0, + d_60: isSet(object.d_60) ? globalThis.Number(object.d_60) : 0, + d_90: isSet(object.d_90) ? globalThis.Number(object.d_90) : 0, + d_120: isSet(object.d_120) ? globalThis.Number(object.d_120) : 0, total: isSet(object.total) ? globalThis.Number(object.total) : 0, }; }, @@ -883,22 +842,22 @@ export const Samples: MessageFns = { toJSON(message: Samples): unknown { const obj: any = {}; if (message.d_1 !== 0) { - obj.d1 = Math.round(message.d_1); + obj.d_1 = Math.round(message.d_1); } if (message.d_7 !== 0) { - obj.d7 = Math.round(message.d_7); + obj.d_7 = Math.round(message.d_7); } if (message.d_30 !== 0) { - obj.d30 = Math.round(message.d_30); + obj.d_30 = Math.round(message.d_30); } if (message.d_60 !== 0) { - obj.d60 = Math.round(message.d_60); + obj.d_60 = Math.round(message.d_60); } if (message.d_90 !== 0) { - obj.d90 = Math.round(message.d_90); + obj.d_90 = Math.round(message.d_90); } if (message.d_120 !== 0) { - obj.d120 = Math.round(message.d_120); + obj.d_120 = Math.round(message.d_120); } if (message.total !== 0) { obj.total = Math.round(message.total); diff --git a/packages/core/src/protos/camouflage_definitions.ts b/packages/core/src/protos/camouflage_definitions.ts index a7776e39f..ca6c2f9fa 100644 --- a/packages/core/src/protos/camouflage_definitions.ts +++ b/packages/core/src/protos/camouflage_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: camouflage_definitions.proto /* eslint-disable */ @@ -32,7 +32,7 @@ function createBaseCamouflageDefinitions(): CamouflageDefinitions { export const CamouflageDefinitions: MessageFns = { encode(message: CamouflageDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.camouflages).forEach(([key, value]: [string, Camouflage]) => { + Object.entries(message.camouflages).forEach(([key, value]) => { CamouflageDefinitions_CamouflagesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -68,13 +68,10 @@ export const CamouflageDefinitions: MessageFns = { fromJSON(object: any): CamouflageDefinitions { return { camouflages: isObject(object.camouflages) - ? (globalThis.Object.entries(object.camouflages) as [string, any][]).reduce( - (acc: { [key: number]: Camouflage }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = Camouflage.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.camouflages).reduce<{ [key: number]: Camouflage }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Camouflage.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -82,7 +79,7 @@ export const CamouflageDefinitions: MessageFns = { toJSON(message: CamouflageDefinitions): unknown { const obj: any = {}; if (message.camouflages) { - const entries = globalThis.Object.entries(message.camouflages) as [string, Camouflage][]; + const entries = Object.entries(message.camouflages); if (entries.length > 0) { obj.camouflages = {}; entries.forEach(([k, v]) => { @@ -98,8 +95,8 @@ export const CamouflageDefinitions: MessageFns = { }, fromPartial, I>>(object: I): CamouflageDefinitions { const message = createBaseCamouflageDefinitions(); - message.camouflages = (globalThis.Object.entries(object.camouflages ?? {}) as [string, Camouflage][]).reduce( - (acc: { [key: number]: Camouflage }, [key, value]: [string, Camouflage]) => { + message.camouflages = Object.entries(object.camouflages ?? {}).reduce<{ [key: number]: Camouflage }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = Camouflage.fromPartial(value); } @@ -266,16 +263,8 @@ export const Camouflage: MessageFns = { return { id: isSet(object.id) ? globalThis.Number(object.id) : 0, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, - tank_name: isSet(object.tankName) - ? I18nString.fromJSON(object.tankName) - : isSet(object.tank_name) - ? I18nString.fromJSON(object.tank_name) - : undefined, - tank_name_full: isSet(object.tankNameFull) - ? I18nString.fromJSON(object.tankNameFull) - : isSet(object.tank_name_full) - ? I18nString.fromJSON(object.tank_name_full) - : undefined, + tank_name: isSet(object.tank_name) ? I18nString.fromJSON(object.tank_name) : undefined, + tank_name_full: isSet(object.tank_name_full) ? I18nString.fromJSON(object.tank_name_full) : undefined, }; }, @@ -288,10 +277,10 @@ export const Camouflage: MessageFns = { obj.name = I18nString.toJSON(message.name); } if (message.tank_name !== undefined) { - obj.tankName = I18nString.toJSON(message.tank_name); + obj.tank_name = I18nString.toJSON(message.tank_name); } if (message.tank_name_full !== undefined) { - obj.tankNameFull = I18nString.toJSON(message.tank_name_full); + obj.tank_name_full = I18nString.toJSON(message.tank_name_full); } return obj; }, diff --git a/packages/core/src/protos/consumable_definitions.ts b/packages/core/src/protos/consumable_definitions.ts index c3957b11e..9e36defd2 100644 --- a/packages/core/src/protos/consumable_definitions.ts +++ b/packages/core/src/protos/consumable_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: consumable_definitions.proto /* eslint-disable */ @@ -88,7 +88,7 @@ function createBaseConsumableDefinitions(): ConsumableDefinitions { export const ConsumableDefinitions: MessageFns = { encode(message: ConsumableDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.consumables).forEach(([key, value]: [string, Consumable]) => { + Object.entries(message.consumables).forEach(([key, value]) => { ConsumableDefinitions_ConsumablesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -124,13 +124,10 @@ export const ConsumableDefinitions: MessageFns = { fromJSON(object: any): ConsumableDefinitions { return { consumables: isObject(object.consumables) - ? (globalThis.Object.entries(object.consumables) as [string, any][]).reduce( - (acc: { [key: number]: Consumable }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = Consumable.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.consumables).reduce<{ [key: number]: Consumable }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Consumable.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -138,7 +135,7 @@ export const ConsumableDefinitions: MessageFns = { toJSON(message: ConsumableDefinitions): unknown { const obj: any = {}; if (message.consumables) { - const entries = globalThis.Object.entries(message.consumables) as [string, Consumable][]; + const entries = Object.entries(message.consumables); if (entries.length > 0) { obj.consumables = {}; entries.forEach(([k, v]) => { @@ -154,8 +151,8 @@ export const ConsumableDefinitions: MessageFns = { }, fromPartial, I>>(object: I): ConsumableDefinitions { const message = createBaseConsumableDefinitions(); - message.consumables = (globalThis.Object.entries(object.consumables ?? {}) as [string, Consumable][]).reduce( - (acc: { [key: number]: Consumable }, [key, value]: [string, Consumable]) => { + message.consumables = Object.entries(object.consumables ?? {}).reduce<{ [key: number]: Consumable }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = Consumable.fromPartial(value); } @@ -357,11 +354,7 @@ export const Consumable: MessageFns = { name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, cooldown: isSet(object.cooldown) ? globalThis.Number(object.cooldown) : 0, duration: isSet(object.duration) ? globalThis.Number(object.duration) : 0, - game_mode_exclusive: isSet(object.gameModeExclusive) - ? globalThis.Boolean(object.gameModeExclusive) - : isSet(object.game_mode_exclusive) - ? globalThis.Boolean(object.game_mode_exclusive) - : false, + game_mode_exclusive: isSet(object.game_mode_exclusive) ? globalThis.Boolean(object.game_mode_exclusive) : false, include: globalThis.Array.isArray(object?.include) ? object.include.map((e: any) => ConsumableTankFilter.fromJSON(e)) : [], @@ -386,7 +379,7 @@ export const Consumable: MessageFns = { obj.duration = message.duration; } if (message.game_mode_exclusive !== false) { - obj.gameModeExclusive = message.game_mode_exclusive; + obj.game_mode_exclusive = message.game_mode_exclusive; } if (message.include?.length) { obj.include = message.include.map((e) => ConsumableTankFilter.toJSON(e)); diff --git a/packages/core/src/protos/equipment_definitions.ts b/packages/core/src/protos/equipment_definitions.ts index 8f14ae14a..68e31f243 100644 --- a/packages/core/src/protos/equipment_definitions.ts +++ b/packages/core/src/protos/equipment_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: equipment_definitions.proto /* eslint-disable */ @@ -45,10 +45,10 @@ function createBaseEquipmentDefinitions(): EquipmentDefinitions { export const EquipmentDefinitions: MessageFns = { encode(message: EquipmentDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.presets).forEach(([key, value]: [string, EquipmentPreset]) => { + Object.entries(message.presets).forEach(([key, value]) => { EquipmentDefinitions_PresetsEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); - globalThis.Object.entries(message.equipments).forEach(([key, value]: [string, Equipment]) => { + Object.entries(message.equipments).forEach(([key, value]) => { EquipmentDefinitions_EquipmentsEntry.encode({ key: key as any, value }, writer.uint32(18).fork()).join(); }); return writer; @@ -95,22 +95,16 @@ export const EquipmentDefinitions: MessageFns = { fromJSON(object: any): EquipmentDefinitions { return { presets: isObject(object.presets) - ? (globalThis.Object.entries(object.presets) as [string, any][]).reduce( - (acc: { [key: string]: EquipmentPreset }, [key, value]: [string, any]) => { - acc[key] = EquipmentPreset.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.presets).reduce<{ [key: string]: EquipmentPreset }>((acc, [key, value]) => { + acc[key] = EquipmentPreset.fromJSON(value); + return acc; + }, {}) : {}, equipments: isObject(object.equipments) - ? (globalThis.Object.entries(object.equipments) as [string, any][]).reduce( - (acc: { [key: number]: Equipment }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = Equipment.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.equipments).reduce<{ [key: number]: Equipment }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Equipment.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -118,7 +112,7 @@ export const EquipmentDefinitions: MessageFns = { toJSON(message: EquipmentDefinitions): unknown { const obj: any = {}; if (message.presets) { - const entries = globalThis.Object.entries(message.presets) as [string, EquipmentPreset][]; + const entries = Object.entries(message.presets); if (entries.length > 0) { obj.presets = {}; entries.forEach(([k, v]) => { @@ -127,7 +121,7 @@ export const EquipmentDefinitions: MessageFns = { } } if (message.equipments) { - const entries = globalThis.Object.entries(message.equipments) as [string, Equipment][]; + const entries = Object.entries(message.equipments); if (entries.length > 0) { obj.equipments = {}; entries.forEach(([k, v]) => { @@ -143,8 +137,8 @@ export const EquipmentDefinitions: MessageFns = { }, fromPartial, I>>(object: I): EquipmentDefinitions { const message = createBaseEquipmentDefinitions(); - message.presets = (globalThis.Object.entries(object.presets ?? {}) as [string, EquipmentPreset][]).reduce( - (acc: { [key: string]: EquipmentPreset }, [key, value]: [string, EquipmentPreset]) => { + message.presets = Object.entries(object.presets ?? {}).reduce<{ [key: string]: EquipmentPreset }>( + (acc, [key, value]) => { if (value !== undefined) { acc[key] = EquipmentPreset.fromPartial(value); } @@ -152,8 +146,8 @@ export const EquipmentDefinitions: MessageFns = { }, {}, ); - message.equipments = (globalThis.Object.entries(object.equipments ?? {}) as [string, Equipment][]).reduce( - (acc: { [key: number]: Equipment }, [key, value]: [string, Equipment]) => { + message.equipments = Object.entries(object.equipments ?? {}).reduce<{ [key: number]: Equipment }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = Equipment.fromPartial(value); } diff --git a/packages/core/src/protos/gallery.ts b/packages/core/src/protos/gallery.ts index fe58e48ca..16cb06336 100644 --- a/packages/core/src/protos/gallery.ts +++ b/packages/core/src/protos/gallery.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: gallery.proto /* eslint-disable */ diff --git a/packages/core/src/protos/game_definitions.proto b/packages/core/src/protos/game_definitions.proto index 9b7417a74..e612cdc01 100644 --- a/packages/core/src/protos/game_definitions.proto +++ b/packages/core/src/protos/game_definitions.proto @@ -7,7 +7,7 @@ import "i18n.proto"; message GameDefinitions { required string version = 1; repeated string nations = 2; - map gameModes = 3; + map gameModes = 3; map roles = 4; } diff --git a/packages/core/src/protos/game_definitions.ts b/packages/core/src/protos/game_definitions.ts index 91afcb2be..11f13b79f 100644 --- a/packages/core/src/protos/game_definitions.ts +++ b/packages/core/src/protos/game_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: game_definitions.proto /* eslint-disable */ @@ -13,12 +13,12 @@ export const protobufPackage = "blitzkit"; export interface GameDefinitions { version: string; nations: string[]; - gameModes: { [key: number]: GameMode }; + gameModes: { [key: string]: GameMode }; roles: { [key: number]: GameModeRole }; } export interface GameDefinitions_GameModesEntry { - key: number; + key: string; value: GameMode | undefined; } @@ -48,10 +48,10 @@ export const GameDefinitions: MessageFns = { for (const v of message.nations) { writer.uint32(18).string(v!); } - globalThis.Object.entries(message.gameModes).forEach(([key, value]: [string, GameMode]) => { + Object.entries(message.gameModes).forEach(([key, value]) => { GameDefinitions_GameModesEntry.encode({ key: key as any, value }, writer.uint32(26).fork()).join(); }); - globalThis.Object.entries(message.roles).forEach(([key, value]: [string, GameModeRole]) => { + Object.entries(message.roles).forEach(([key, value]) => { GameDefinitions_RolesEntry.encode({ key: key as any, value }, writer.uint32(34).fork()).join(); }); return writer; @@ -116,22 +116,16 @@ export const GameDefinitions: MessageFns = { version: isSet(object.version) ? globalThis.String(object.version) : "", nations: globalThis.Array.isArray(object?.nations) ? object.nations.map((e: any) => globalThis.String(e)) : [], gameModes: isObject(object.gameModes) - ? (globalThis.Object.entries(object.gameModes) as [string, any][]).reduce( - (acc: { [key: number]: GameMode }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = GameMode.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.gameModes).reduce<{ [key: string]: GameMode }>((acc, [key, value]) => { + acc[key] = GameMode.fromJSON(value); + return acc; + }, {}) : {}, roles: isObject(object.roles) - ? (globalThis.Object.entries(object.roles) as [string, any][]).reduce( - (acc: { [key: number]: GameModeRole }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = GameModeRole.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.roles).reduce<{ [key: number]: GameModeRole }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = GameModeRole.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -145,7 +139,7 @@ export const GameDefinitions: MessageFns = { obj.nations = message.nations; } if (message.gameModes) { - const entries = globalThis.Object.entries(message.gameModes) as [string, GameMode][]; + const entries = Object.entries(message.gameModes); if (entries.length > 0) { obj.gameModes = {}; entries.forEach(([k, v]) => { @@ -154,7 +148,7 @@ export const GameDefinitions: MessageFns = { } } if (message.roles) { - const entries = globalThis.Object.entries(message.roles) as [string, GameModeRole][]; + const entries = Object.entries(message.roles); if (entries.length > 0) { obj.roles = {}; entries.forEach(([k, v]) => { @@ -172,36 +166,33 @@ export const GameDefinitions: MessageFns = { const message = createBaseGameDefinitions(); message.version = object.version ?? ""; message.nations = object.nations?.map((e) => e) || []; - message.gameModes = (globalThis.Object.entries(object.gameModes ?? {}) as [string, GameMode][]).reduce( - (acc: { [key: number]: GameMode }, [key, value]: [string, GameMode]) => { + message.gameModes = Object.entries(object.gameModes ?? {}).reduce<{ [key: string]: GameMode }>( + (acc, [key, value]) => { if (value !== undefined) { - acc[globalThis.Number(key)] = GameMode.fromPartial(value); - } - return acc; - }, - {}, - ); - message.roles = (globalThis.Object.entries(object.roles ?? {}) as [string, GameModeRole][]).reduce( - (acc: { [key: number]: GameModeRole }, [key, value]: [string, GameModeRole]) => { - if (value !== undefined) { - acc[globalThis.Number(key)] = GameModeRole.fromPartial(value); + acc[key] = GameMode.fromPartial(value); } return acc; }, {}, ); + message.roles = Object.entries(object.roles ?? {}).reduce<{ [key: number]: GameModeRole }>((acc, [key, value]) => { + if (value !== undefined) { + acc[globalThis.Number(key)] = GameModeRole.fromPartial(value); + } + return acc; + }, {}); return message; }, }; function createBaseGameDefinitions_GameModesEntry(): GameDefinitions_GameModesEntry { - return { key: 0, value: undefined }; + return { key: "", value: undefined }; } export const GameDefinitions_GameModesEntry: MessageFns = { encode(message: GameDefinitions_GameModesEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - if (message.key !== 0) { - writer.uint32(8).uint32(message.key); + if (message.key !== "") { + writer.uint32(10).string(message.key); } if (message.value !== undefined) { GameMode.encode(message.value, writer.uint32(18).fork()).join(); @@ -217,11 +208,11 @@ export const GameDefinitions_GameModesEntry: MessageFns>> 3) { case 1: { - if (tag !== 8) { + if (tag !== 10) { break; } - message.key = reader.uint32(); + message.key = reader.string(); continue; } case 2: { @@ -243,15 +234,15 @@ export const GameDefinitions_GameModesEntry: MessageFns = { encode(message: I18nString, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.locales).forEach(([key, value]: [string, string]) => { + Object.entries(message.locales).forEach(([key, value]) => { I18nString_LocalesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -60,13 +60,10 @@ export const I18nString: MessageFns = { fromJSON(object: any): I18nString { return { locales: isObject(object.locales) - ? (globalThis.Object.entries(object.locales) as [string, any][]).reduce( - (acc: { [key: string]: string }, [key, value]: [string, any]) => { - acc[key] = globalThis.String(value); - return acc; - }, - {}, - ) + ? Object.entries(object.locales).reduce<{ [key: string]: string }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, }; }, @@ -74,7 +71,7 @@ export const I18nString: MessageFns = { toJSON(message: I18nString): unknown { const obj: any = {}; if (message.locales) { - const entries = globalThis.Object.entries(message.locales) as [string, string][]; + const entries = Object.entries(message.locales); if (entries.length > 0) { obj.locales = {}; entries.forEach(([k, v]) => { @@ -90,15 +87,12 @@ export const I18nString: MessageFns = { }, fromPartial, I>>(object: I): I18nString { const message = createBaseI18nString(); - message.locales = (globalThis.Object.entries(object.locales ?? {}) as [string, string][]).reduce( - (acc: { [key: string]: string }, [key, value]: [string, string]) => { - if (value !== undefined) { - acc[key] = globalThis.String(value); - } - return acc; - }, - {}, - ); + message.locales = Object.entries(object.locales ?? {}).reduce<{ [key: string]: string }>((acc, [key, value]) => { + if (value !== undefined) { + acc[key] = globalThis.String(value); + } + return acc; + }, {}); return message; }, }; diff --git a/packages/core/src/protos/map_definitions.ts b/packages/core/src/protos/map_definitions.ts index 8590e15b5..e4f45572d 100644 --- a/packages/core/src/protos/map_definitions.ts +++ b/packages/core/src/protos/map_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: map_definitions.proto /* eslint-disable */ @@ -30,7 +30,7 @@ function createBaseMapDefinitions(): MapDefinitions { export const MapDefinitions: MessageFns = { encode(message: MapDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.maps).forEach(([key, value]: [string, MapDefinition]) => { + Object.entries(message.maps).forEach(([key, value]) => { MapDefinitions_MapsEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -66,13 +66,10 @@ export const MapDefinitions: MessageFns = { fromJSON(object: any): MapDefinitions { return { maps: isObject(object.maps) - ? (globalThis.Object.entries(object.maps) as [string, any][]).reduce( - (acc: { [key: number]: MapDefinition }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = MapDefinition.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.maps).reduce<{ [key: number]: MapDefinition }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = MapDefinition.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -80,7 +77,7 @@ export const MapDefinitions: MessageFns = { toJSON(message: MapDefinitions): unknown { const obj: any = {}; if (message.maps) { - const entries = globalThis.Object.entries(message.maps) as [string, MapDefinition][]; + const entries = Object.entries(message.maps); if (entries.length > 0) { obj.maps = {}; entries.forEach(([k, v]) => { @@ -96,15 +93,12 @@ export const MapDefinitions: MessageFns = { }, fromPartial, I>>(object: I): MapDefinitions { const message = createBaseMapDefinitions(); - message.maps = (globalThis.Object.entries(object.maps ?? {}) as [string, MapDefinition][]).reduce( - (acc: { [key: number]: MapDefinition }, [key, value]: [string, MapDefinition]) => { - if (value !== undefined) { - acc[globalThis.Number(key)] = MapDefinition.fromPartial(value); - } - return acc; - }, - {}, - ); + message.maps = Object.entries(object.maps ?? {}).reduce<{ [key: number]: MapDefinition }>((acc, [key, value]) => { + if (value !== undefined) { + acc[globalThis.Number(key)] = MapDefinition.fromPartial(value); + } + return acc; + }, {}); return message; }, }; diff --git a/packages/core/src/protos/model_definitions.ts b/packages/core/src/protos/model_definitions.ts index 7fdd45a7a..a08ce9b55 100644 --- a/packages/core/src/protos/model_definitions.ts +++ b/packages/core/src/protos/model_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: model_definitions.proto /* eslint-disable */ @@ -116,7 +116,7 @@ function createBaseModelDefinitions(): ModelDefinitions { export const ModelDefinitions: MessageFns = { encode(message: ModelDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.models).forEach(([key, value]: [string, ModelDefinition]) => { + Object.entries(message.models).forEach(([key, value]) => { ModelDefinitions_ModelsEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -152,13 +152,10 @@ export const ModelDefinitions: MessageFns = { fromJSON(object: any): ModelDefinitions { return { models: isObject(object.models) - ? (globalThis.Object.entries(object.models) as [string, any][]).reduce( - (acc: { [key: number]: ModelDefinition }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = ModelDefinition.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.models).reduce<{ [key: number]: ModelDefinition }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = ModelDefinition.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -166,7 +163,7 @@ export const ModelDefinitions: MessageFns = { toJSON(message: ModelDefinitions): unknown { const obj: any = {}; if (message.models) { - const entries = globalThis.Object.entries(message.models) as [string, ModelDefinition][]; + const entries = Object.entries(message.models); if (entries.length > 0) { obj.models = {}; entries.forEach(([k, v]) => { @@ -182,8 +179,8 @@ export const ModelDefinitions: MessageFns = { }, fromPartial, I>>(object: I): ModelDefinitions { const message = createBaseModelDefinitions(); - message.models = (globalThis.Object.entries(object.models ?? {}) as [string, ModelDefinition][]).reduce( - (acc: { [key: number]: ModelDefinition }, [key, value]: [string, ModelDefinition]) => { + message.models = Object.entries(object.models ?? {}).reduce<{ [key: number]: ModelDefinition }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = ModelDefinition.fromPartial(value); } @@ -295,10 +292,10 @@ export const ModelDefinition: MessageFns = { if (message.initial_turret_rotation !== undefined) { InitialTurretRotation.encode(message.initial_turret_rotation, writer.uint32(26).fork()).join(); } - globalThis.Object.entries(message.turrets).forEach(([key, value]: [string, TurretModelDefinition]) => { + Object.entries(message.turrets).forEach(([key, value]) => { ModelDefinition_TurretsEntry.encode({ key: key as any, value }, writer.uint32(34).fork()).join(); }); - globalThis.Object.entries(message.tracks).forEach(([key, value]: [string, TrackModelDefinition]) => { + Object.entries(message.tracks).forEach(([key, value]) => { ModelDefinition_TracksEntry.encode({ key: key as any, value }, writer.uint32(42).fork()).join(); }); if (message.bounding_box !== undefined) { @@ -380,39 +377,23 @@ export const ModelDefinition: MessageFns = { fromJSON(object: any): ModelDefinition { return { armor: isSet(object.armor) ? Armor.fromJSON(object.armor) : undefined, - turret_origin: isSet(object.turretOrigin) - ? Vector3.fromJSON(object.turretOrigin) - : isSet(object.turret_origin) - ? Vector3.fromJSON(object.turret_origin) - : undefined, - initial_turret_rotation: isSet(object.initialTurretRotation) - ? InitialTurretRotation.fromJSON(object.initialTurretRotation) - : isSet(object.initial_turret_rotation) + turret_origin: isSet(object.turret_origin) ? Vector3.fromJSON(object.turret_origin) : undefined, + initial_turret_rotation: isSet(object.initial_turret_rotation) ? InitialTurretRotation.fromJSON(object.initial_turret_rotation) : undefined, turrets: isObject(object.turrets) - ? (globalThis.Object.entries(object.turrets) as [string, any][]).reduce( - (acc: { [key: number]: TurretModelDefinition }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = TurretModelDefinition.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.turrets).reduce<{ [key: number]: TurretModelDefinition }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = TurretModelDefinition.fromJSON(value); + return acc; + }, {}) : {}, tracks: isObject(object.tracks) - ? (globalThis.Object.entries(object.tracks) as [string, any][]).reduce( - (acc: { [key: number]: TrackModelDefinition }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = TrackModelDefinition.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.tracks).reduce<{ [key: number]: TrackModelDefinition }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = TrackModelDefinition.fromJSON(value); + return acc; + }, {}) : {}, - bounding_box: isSet(object.boundingBox) - ? BoundingBox.fromJSON(object.boundingBox) - : isSet(object.bounding_box) - ? BoundingBox.fromJSON(object.bounding_box) - : undefined, + bounding_box: isSet(object.bounding_box) ? BoundingBox.fromJSON(object.bounding_box) : undefined, }; }, @@ -422,13 +403,13 @@ export const ModelDefinition: MessageFns = { obj.armor = Armor.toJSON(message.armor); } if (message.turret_origin !== undefined) { - obj.turretOrigin = Vector3.toJSON(message.turret_origin); + obj.turret_origin = Vector3.toJSON(message.turret_origin); } if (message.initial_turret_rotation !== undefined) { - obj.initialTurretRotation = InitialTurretRotation.toJSON(message.initial_turret_rotation); + obj.initial_turret_rotation = InitialTurretRotation.toJSON(message.initial_turret_rotation); } if (message.turrets) { - const entries = globalThis.Object.entries(message.turrets) as [string, TurretModelDefinition][]; + const entries = Object.entries(message.turrets); if (entries.length > 0) { obj.turrets = {}; entries.forEach(([k, v]) => { @@ -437,7 +418,7 @@ export const ModelDefinition: MessageFns = { } } if (message.tracks) { - const entries = globalThis.Object.entries(message.tracks) as [string, TrackModelDefinition][]; + const entries = Object.entries(message.tracks); if (entries.length > 0) { obj.tracks = {}; entries.forEach(([k, v]) => { @@ -446,7 +427,7 @@ export const ModelDefinition: MessageFns = { } } if (message.bounding_box !== undefined) { - obj.boundingBox = BoundingBox.toJSON(message.bounding_box); + obj.bounding_box = BoundingBox.toJSON(message.bounding_box); } return obj; }, @@ -464,8 +445,8 @@ export const ModelDefinition: MessageFns = { (object.initial_turret_rotation !== undefined && object.initial_turret_rotation !== null) ? InitialTurretRotation.fromPartial(object.initial_turret_rotation) : undefined; - message.turrets = (globalThis.Object.entries(object.turrets ?? {}) as [string, TurretModelDefinition][]).reduce( - (acc: { [key: number]: TurretModelDefinition }, [key, value]: [string, TurretModelDefinition]) => { + message.turrets = Object.entries(object.turrets ?? {}).reduce<{ [key: number]: TurretModelDefinition }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = TurretModelDefinition.fromPartial(value); } @@ -473,8 +454,8 @@ export const ModelDefinition: MessageFns = { }, {}, ); - message.tracks = (globalThis.Object.entries(object.tracks ?? {}) as [string, TrackModelDefinition][]).reduce( - (acc: { [key: number]: TrackModelDefinition }, [key, value]: [string, TrackModelDefinition]) => { + message.tracks = Object.entries(object.tracks ?? {}).reduce<{ [key: number]: TrackModelDefinition }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = TrackModelDefinition.fromPartial(value); } @@ -651,7 +632,7 @@ function createBaseArmor(): Armor { export const Armor: MessageFns = { encode(message: Armor, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.thickness).forEach(([key, value]: [string, number]) => { + Object.entries(message.thickness).forEach(([key, value]) => { Armor_ThicknessEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); for (const v of message.spaced) { @@ -708,13 +689,10 @@ export const Armor: MessageFns = { fromJSON(object: any): Armor { return { thickness: isObject(object.thickness) - ? (globalThis.Object.entries(object.thickness) as [string, any][]).reduce( - (acc: { [key: number]: number }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = globalThis.Number(value); - return acc; - }, - {}, - ) + ? Object.entries(object.thickness).reduce<{ [key: number]: number }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Number(value); + return acc; + }, {}) : {}, spaced: globalThis.Array.isArray(object?.spaced) ? object.spaced.map((e: any) => globalThis.Number(e)) : [], }; @@ -723,7 +701,7 @@ export const Armor: MessageFns = { toJSON(message: Armor): unknown { const obj: any = {}; if (message.thickness) { - const entries = globalThis.Object.entries(message.thickness) as [string, number][]; + const entries = Object.entries(message.thickness); if (entries.length > 0) { obj.thickness = {}; entries.forEach(([k, v]) => { @@ -742,8 +720,8 @@ export const Armor: MessageFns = { }, fromPartial, I>>(object: I): Armor { const message = createBaseArmor(); - message.thickness = (globalThis.Object.entries(object.thickness ?? {}) as [string, number][]).reduce( - (acc: { [key: number]: number }, [key, value]: [string, number]) => { + message.thickness = Object.entries(object.thickness ?? {}).reduce<{ [key: number]: number }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = globalThis.Number(value); } @@ -1034,7 +1012,7 @@ export const TurretModelDefinition: MessageFns = { if (message.gun_origin !== undefined) { Vector3.encode(message.gun_origin, writer.uint32(34).fork()).join(); } - globalThis.Object.entries(message.guns).forEach(([key, value]: [string, GunModelDefinition]) => { + Object.entries(message.guns).forEach(([key, value]) => { TurretModelDefinition_GunsEntry.encode({ key: key as any, value }, writer.uint32(42).fork()).join(); }); if (message.yaw !== undefined) { @@ -1112,30 +1090,15 @@ export const TurretModelDefinition: MessageFns = { fromJSON(object: any): TurretModelDefinition { return { - bounding_box: isSet(object.boundingBox) - ? BoundingBox.fromJSON(object.boundingBox) - : isSet(object.bounding_box) - ? BoundingBox.fromJSON(object.bounding_box) - : undefined, + bounding_box: isSet(object.bounding_box) ? BoundingBox.fromJSON(object.bounding_box) : undefined, armor: isSet(object.armor) ? Armor.fromJSON(object.armor) : undefined, - model_id: isSet(object.modelId) - ? globalThis.Number(object.modelId) - : isSet(object.model_id) - ? globalThis.Number(object.model_id) - : 0, - gun_origin: isSet(object.gunOrigin) - ? Vector3.fromJSON(object.gunOrigin) - : isSet(object.gun_origin) - ? Vector3.fromJSON(object.gun_origin) - : undefined, + model_id: isSet(object.model_id) ? globalThis.Number(object.model_id) : 0, + gun_origin: isSet(object.gun_origin) ? Vector3.fromJSON(object.gun_origin) : undefined, guns: isObject(object.guns) - ? (globalThis.Object.entries(object.guns) as [string, any][]).reduce( - (acc: { [key: number]: GunModelDefinition }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = GunModelDefinition.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.guns).reduce<{ [key: number]: GunModelDefinition }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = GunModelDefinition.fromJSON(value); + return acc; + }, {}) : {}, yaw: isSet(object.yaw) ? YawLimits.fromJSON(object.yaw) : undefined, }; @@ -1144,19 +1107,19 @@ export const TurretModelDefinition: MessageFns = { toJSON(message: TurretModelDefinition): unknown { const obj: any = {}; if (message.bounding_box !== undefined) { - obj.boundingBox = BoundingBox.toJSON(message.bounding_box); + obj.bounding_box = BoundingBox.toJSON(message.bounding_box); } if (message.armor !== undefined) { obj.armor = Armor.toJSON(message.armor); } if (message.model_id !== 0) { - obj.modelId = Math.round(message.model_id); + obj.model_id = Math.round(message.model_id); } if (message.gun_origin !== undefined) { - obj.gunOrigin = Vector3.toJSON(message.gun_origin); + obj.gun_origin = Vector3.toJSON(message.gun_origin); } if (message.guns) { - const entries = globalThis.Object.entries(message.guns) as [string, GunModelDefinition][]; + const entries = Object.entries(message.guns); if (entries.length > 0) { obj.guns = {}; entries.forEach(([k, v]) => { @@ -1183,8 +1146,8 @@ export const TurretModelDefinition: MessageFns = { message.gun_origin = (object.gun_origin !== undefined && object.gun_origin !== null) ? Vector3.fromPartial(object.gun_origin) : undefined; - message.guns = (globalThis.Object.entries(object.guns ?? {}) as [string, GunModelDefinition][]).reduce( - (acc: { [key: number]: GunModelDefinition }, [key, value]: [string, GunModelDefinition]) => { + message.guns = Object.entries(object.guns ?? {}).reduce<{ [key: number]: GunModelDefinition }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = GunModelDefinition.fromPartial(value); } @@ -1591,11 +1554,7 @@ export const GunModelDefinition: MessageFns = { return { armor: isSet(object.armor) ? Armor.fromJSON(object.armor) : undefined, thickness: isSet(object.thickness) ? globalThis.Number(object.thickness) : 0, - model_id: isSet(object.modelId) - ? globalThis.Number(object.modelId) - : isSet(object.model_id) - ? globalThis.Number(object.model_id) - : 0, + model_id: isSet(object.model_id) ? globalThis.Number(object.model_id) : 0, pitch: isSet(object.pitch) ? PitchLimits.fromJSON(object.pitch) : undefined, mask: isSet(object.mask) ? globalThis.Number(object.mask) : 0, }; @@ -1610,7 +1569,7 @@ export const GunModelDefinition: MessageFns = { obj.thickness = message.thickness; } if (message.model_id !== 0) { - obj.modelId = Math.round(message.model_id); + obj.model_id = Math.round(message.model_id); } if (message.pitch !== undefined) { obj.pitch = PitchLimits.toJSON(message.pitch); diff --git a/packages/core/src/protos/popular_tanks.ts b/packages/core/src/protos/popular_tanks.ts index be64b0052..c502b56ca 100644 --- a/packages/core/src/protos/popular_tanks.ts +++ b/packages/core/src/protos/popular_tanks.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: popular_tanks.proto /* eslint-disable */ diff --git a/packages/core/src/protos/provision_definitions.ts b/packages/core/src/protos/provision_definitions.ts index 7baea8f18..e1a4acd5c 100644 --- a/packages/core/src/protos/provision_definitions.ts +++ b/packages/core/src/protos/provision_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: provision_definitions.proto /* eslint-disable */ @@ -35,7 +35,7 @@ function createBaseProvisionDefinitions(): ProvisionDefinitions { export const ProvisionDefinitions: MessageFns = { encode(message: ProvisionDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.provisions).forEach(([key, value]: [string, Provision]) => { + Object.entries(message.provisions).forEach(([key, value]) => { ProvisionDefinitions_ProvisionsEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -71,13 +71,10 @@ export const ProvisionDefinitions: MessageFns = { fromJSON(object: any): ProvisionDefinitions { return { provisions: isObject(object.provisions) - ? (globalThis.Object.entries(object.provisions) as [string, any][]).reduce( - (acc: { [key: number]: Provision }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = Provision.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.provisions).reduce<{ [key: number]: Provision }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Provision.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -85,7 +82,7 @@ export const ProvisionDefinitions: MessageFns = { toJSON(message: ProvisionDefinitions): unknown { const obj: any = {}; if (message.provisions) { - const entries = globalThis.Object.entries(message.provisions) as [string, Provision][]; + const entries = Object.entries(message.provisions); if (entries.length > 0) { obj.provisions = {}; entries.forEach(([k, v]) => { @@ -101,8 +98,8 @@ export const ProvisionDefinitions: MessageFns = { }, fromPartial, I>>(object: I): ProvisionDefinitions { const message = createBaseProvisionDefinitions(); - message.provisions = (globalThis.Object.entries(object.provisions ?? {}) as [string, Provision][]).reduce( - (acc: { [key: number]: Provision }, [key, value]: [string, Provision]) => { + message.provisions = Object.entries(object.provisions ?? {}).reduce<{ [key: number]: Provision }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = Provision.fromPartial(value); } @@ -292,11 +289,7 @@ export const Provision: MessageFns = { id: isSet(object.id) ? globalThis.Number(object.id) : 0, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, crew: isSet(object.crew) ? globalThis.Number(object.crew) : 0, - game_mode_exclusive: isSet(object.gameModeExclusive) - ? globalThis.Boolean(object.gameModeExclusive) - : isSet(object.game_mode_exclusive) - ? globalThis.Boolean(object.game_mode_exclusive) - : false, + game_mode_exclusive: isSet(object.game_mode_exclusive) ? globalThis.Boolean(object.game_mode_exclusive) : false, include: globalThis.Array.isArray(object?.include) ? object.include.map((e: any) => ConsumableTankFilter.fromJSON(e)) : [], @@ -318,7 +311,7 @@ export const Provision: MessageFns = { obj.crew = message.crew; } if (message.game_mode_exclusive !== false) { - obj.gameModeExclusive = message.game_mode_exclusive; + obj.game_mode_exclusive = message.game_mode_exclusive; } if (message.include?.length) { obj.include = message.include.map((e) => ConsumableTankFilter.toJSON(e)); diff --git a/packages/core/src/protos/rating_leaderboard.ts b/packages/core/src/protos/rating_leaderboard.ts index dce0d903e..108f95dca 100644 --- a/packages/core/src/protos/rating_leaderboard.ts +++ b/packages/core/src/protos/rating_leaderboard.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: rating_leaderboard.proto /* eslint-disable */ diff --git a/packages/core/src/protos/reviews.ts b/packages/core/src/protos/reviews.ts index 57a9a7bc3..4981454dc 100644 --- a/packages/core/src/protos/reviews.ts +++ b/packages/core/src/protos/reviews.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: reviews.proto /* eslint-disable */ @@ -34,7 +34,7 @@ function createBaseReviews(): Reviews { export const Reviews: MessageFns = { encode(message: Reviews, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.reviews).forEach(([key, value]: [string, Review]) => { + Object.entries(message.reviews).forEach(([key, value]) => { Reviews_ReviewsEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -70,13 +70,10 @@ export const Reviews: MessageFns = { fromJSON(object: any): Reviews { return { reviews: isObject(object.reviews) - ? (globalThis.Object.entries(object.reviews) as [string, any][]).reduce( - (acc: { [key: number]: Review }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = Review.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.reviews).reduce<{ [key: number]: Review }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Review.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -84,7 +81,7 @@ export const Reviews: MessageFns = { toJSON(message: Reviews): unknown { const obj: any = {}; if (message.reviews) { - const entries = globalThis.Object.entries(message.reviews) as [string, Review][]; + const entries = Object.entries(message.reviews); if (entries.length > 0) { obj.reviews = {}; entries.forEach(([k, v]) => { @@ -100,15 +97,12 @@ export const Reviews: MessageFns = { }, fromPartial, I>>(object: I): Reviews { const message = createBaseReviews(); - message.reviews = (globalThis.Object.entries(object.reviews ?? {}) as [string, Review][]).reduce( - (acc: { [key: number]: Review }, [key, value]: [string, Review]) => { - if (value !== undefined) { - acc[globalThis.Number(key)] = Review.fromPartial(value); - } - return acc; - }, - {}, - ); + message.reviews = Object.entries(object.reviews ?? {}).reduce<{ [key: number]: Review }>((acc, [key, value]) => { + if (value !== undefined) { + acc[globalThis.Number(key)] = Review.fromPartial(value); + } + return acc; + }, {}); return message; }, }; @@ -240,11 +234,7 @@ export const Review: MessageFns = { fromJSON(object: any): Review { return { - last_updated: isSet(object.lastUpdated) - ? globalThis.Number(object.lastUpdated) - : isSet(object.last_updated) - ? globalThis.Number(object.last_updated) - : 0, + last_updated: isSet(object.last_updated) ? globalThis.Number(object.last_updated) : 0, videos: globalThis.Array.isArray(object?.videos) ? object.videos.map((e: any) => Video.fromJSON(e)) : [], }; }, @@ -252,7 +242,7 @@ export const Review: MessageFns = { toJSON(message: Review): unknown { const obj: any = {}; if (message.last_updated !== 0) { - obj.lastUpdated = message.last_updated; + obj.last_updated = message.last_updated; } if (message.videos?.length) { obj.videos = message.videos.map((e) => Video.toJSON(e)); diff --git a/packages/core/src/protos/skill_definitions.ts b/packages/core/src/protos/skill_definitions.ts index a5714cd3c..f3d4303b6 100644 --- a/packages/core/src/protos/skill_definitions.ts +++ b/packages/core/src/protos/skill_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: skill_definitions.proto /* eslint-disable */ @@ -29,7 +29,7 @@ function createBaseSkillDefinitions(): SkillDefinitions { export const SkillDefinitions: MessageFns = { encode(message: SkillDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.classes).forEach(([key, value]: [string, Skill]) => { + Object.entries(message.classes).forEach(([key, value]) => { SkillDefinitions_ClassesEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -65,13 +65,10 @@ export const SkillDefinitions: MessageFns = { fromJSON(object: any): SkillDefinitions { return { classes: isObject(object.classes) - ? (globalThis.Object.entries(object.classes) as [string, any][]).reduce( - (acc: { [key: number]: Skill }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = Skill.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.classes).reduce<{ [key: number]: Skill }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = Skill.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -79,7 +76,7 @@ export const SkillDefinitions: MessageFns = { toJSON(message: SkillDefinitions): unknown { const obj: any = {}; if (message.classes) { - const entries = globalThis.Object.entries(message.classes) as [string, Skill][]; + const entries = Object.entries(message.classes); if (entries.length > 0) { obj.classes = {}; entries.forEach(([k, v]) => { @@ -95,15 +92,12 @@ export const SkillDefinitions: MessageFns = { }, fromPartial, I>>(object: I): SkillDefinitions { const message = createBaseSkillDefinitions(); - message.classes = (globalThis.Object.entries(object.classes ?? {}) as [string, Skill][]).reduce( - (acc: { [key: number]: Skill }, [key, value]: [string, Skill]) => { - if (value !== undefined) { - acc[globalThis.Number(key)] = Skill.fromPartial(value); - } - return acc; - }, - {}, - ); + message.classes = Object.entries(object.classes ?? {}).reduce<{ [key: number]: Skill }>((acc, [key, value]) => { + if (value !== undefined) { + acc[globalThis.Number(key)] = Skill.fromPartial(value); + } + return acc; + }, {}); return message; }, }; diff --git a/packages/core/src/protos/tank_definitions.proto b/packages/core/src/protos/tank_definitions.proto index 475be1259..0c15d59f1 100644 --- a/packages/core/src/protos/tank_definitions.proto +++ b/packages/core/src/protos/tank_definitions.proto @@ -11,7 +11,7 @@ message TankDefinitions { message TankDefinition { required uint32 id = 1; required string slug = 2; - map roles = 3; + map roles = 3; required bool fixed_camouflage = 5; repeated int32 camouflages = 6; repeated int32 ancestors = 7; diff --git a/packages/core/src/protos/tank_definitions.ts b/packages/core/src/protos/tank_definitions.ts index 6416ca442..302424353 100644 --- a/packages/core/src/protos/tank_definitions.ts +++ b/packages/core/src/protos/tank_definitions.ts @@ -1,7 +1,7 @@ // Code generated by protoc-gen-ts_proto. DO NOT EDIT. // versions: -// protoc-gen-ts_proto v2.11.2 -// protoc v5.28.2 +// protoc-gen-ts_proto v2.7.7 +// protoc v3.19.6 // source: tank_definitions.proto /* eslint-disable */ @@ -262,7 +262,7 @@ export interface TankDefinitions_TanksEntry { export interface TankDefinition { id: number; slug: string; - roles: { [key: number]: number }; + roles: { [key: string]: number }; fixed_camouflage: boolean; camouflages: number[]; ancestors: number[]; @@ -295,7 +295,7 @@ export interface TankDefinition { } export interface TankDefinition_RolesEntry { - key: number; + key: string; value: number; } @@ -463,7 +463,7 @@ function createBaseTankDefinitions(): TankDefinitions { export const TankDefinitions: MessageFns = { encode(message: TankDefinitions, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - globalThis.Object.entries(message.tanks).forEach(([key, value]: [string, TankDefinition]) => { + Object.entries(message.tanks).forEach(([key, value]) => { TankDefinitions_TanksEntry.encode({ key: key as any, value }, writer.uint32(10).fork()).join(); }); return writer; @@ -499,13 +499,10 @@ export const TankDefinitions: MessageFns = { fromJSON(object: any): TankDefinitions { return { tanks: isObject(object.tanks) - ? (globalThis.Object.entries(object.tanks) as [string, any][]).reduce( - (acc: { [key: number]: TankDefinition }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = TankDefinition.fromJSON(value); - return acc; - }, - {}, - ) + ? Object.entries(object.tanks).reduce<{ [key: number]: TankDefinition }>((acc, [key, value]) => { + acc[globalThis.Number(key)] = TankDefinition.fromJSON(value); + return acc; + }, {}) : {}, }; }, @@ -513,7 +510,7 @@ export const TankDefinitions: MessageFns = { toJSON(message: TankDefinitions): unknown { const obj: any = {}; if (message.tanks) { - const entries = globalThis.Object.entries(message.tanks) as [string, TankDefinition][]; + const entries = Object.entries(message.tanks); if (entries.length > 0) { obj.tanks = {}; entries.forEach(([k, v]) => { @@ -529,8 +526,8 @@ export const TankDefinitions: MessageFns = { }, fromPartial, I>>(object: I): TankDefinitions { const message = createBaseTankDefinitions(); - message.tanks = (globalThis.Object.entries(object.tanks ?? {}) as [string, TankDefinition][]).reduce( - (acc: { [key: number]: TankDefinition }, [key, value]: [string, TankDefinition]) => { + message.tanks = Object.entries(object.tanks ?? {}).reduce<{ [key: number]: TankDefinition }>( + (acc, [key, value]) => { if (value !== undefined) { acc[globalThis.Number(key)] = TankDefinition.fromPartial(value); } @@ -665,7 +662,7 @@ export const TankDefinition: MessageFns = { if (message.slug !== "") { writer.uint32(18).string(message.slug); } - globalThis.Object.entries(message.roles).forEach(([key, value]: [string, number]) => { + Object.entries(message.roles).forEach(([key, value]) => { TankDefinition_RolesEntry.encode({ key: key as any, value }, writer.uint32(26).fork()).join(); }); if (message.fixed_camouflage !== false) { @@ -1068,19 +1065,12 @@ export const TankDefinition: MessageFns = { id: isSet(object.id) ? globalThis.Number(object.id) : 0, slug: isSet(object.slug) ? globalThis.String(object.slug) : "", roles: isObject(object.roles) - ? (globalThis.Object.entries(object.roles) as [string, any][]).reduce( - (acc: { [key: number]: number }, [key, value]: [string, any]) => { - acc[globalThis.Number(key)] = globalThis.Number(value); - return acc; - }, - {}, - ) + ? Object.entries(object.roles).reduce<{ [key: string]: number }>((acc, [key, value]) => { + acc[key] = Number(value); + return acc; + }, {}) : {}, - fixed_camouflage: isSet(object.fixedCamouflage) - ? globalThis.Boolean(object.fixedCamouflage) - : isSet(object.fixed_camouflage) - ? globalThis.Boolean(object.fixed_camouflage) - : false, + fixed_camouflage: isSet(object.fixed_camouflage) ? globalThis.Boolean(object.fixed_camouflage) : false, camouflages: globalThis.Array.isArray(object?.camouflages) ? object.camouflages.map((e: any) => globalThis.Number(e)) : [], @@ -1090,23 +1080,13 @@ export const TankDefinition: MessageFns = { successors: globalThis.Array.isArray(object?.successors) ? object.successors.map((e: any) => globalThis.Number(e)) : [], - crew: globalThis.Array.isArray(object?.crew) - ? object.crew.map((e: any) => Crew.fromJSON(e)) - : [], + crew: globalThis.Array.isArray(object?.crew) ? object.crew.map((e: any) => Crew.fromJSON(e)) : [], health: isSet(object.health) ? globalThis.Number(object.health) : 0, nation: isSet(object.nation) ? globalThis.String(object.nation) : "", name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, type: isSet(object.type) ? tankTypeFromJSON(object.type) : 0, - max_consumables: isSet(object.maxConsumables) - ? globalThis.Number(object.maxConsumables) - : isSet(object.max_consumables) - ? globalThis.Number(object.max_consumables) - : 0, - max_provisions: isSet(object.maxProvisions) - ? globalThis.Number(object.maxProvisions) - : isSet(object.max_provisions) - ? globalThis.Number(object.max_provisions) - : 0, + max_consumables: isSet(object.max_consumables) ? globalThis.Number(object.max_consumables) : 0, + max_provisions: isSet(object.max_provisions) ? globalThis.Number(object.max_provisions) : 0, tier: isSet(object.tier) ? globalThis.Number(object.tier) : 0, class: isSet(object.class) ? tankClassFromJSON(object.class) : 0, testing: isSet(object.testing) ? globalThis.Boolean(object.testing) : false, @@ -1121,47 +1101,15 @@ export const TankDefinition: MessageFns = { ? object.tracks.map((e: any) => TrackDefinition.fromJSON(e)) : [], price: isSet(object.price) ? TankPrice.fromJSON(object.price) : undefined, - research_cost: isSet(object.researchCost) - ? ResearchCost.fromJSON(object.researchCost) - : isSet(object.research_cost) - ? ResearchCost.fromJSON(object.research_cost) - : undefined, - speed_forwards: isSet(object.speedForwards) - ? globalThis.Number(object.speedForwards) - : isSet(object.speed_forwards) - ? globalThis.Number(object.speed_forwards) - : 0, - speed_backwards: isSet(object.speedBackwards) - ? globalThis.Number(object.speedBackwards) - : isSet(object.speed_backwards) - ? globalThis.Number(object.speed_backwards) - : 0, - camouflage_still: isSet(object.camouflageStill) - ? globalThis.Number(object.camouflageStill) - : isSet(object.camouflage_still) - ? globalThis.Number(object.camouflage_still) - : 0, - camouflage_moving: isSet(object.camouflageMoving) - ? globalThis.Number(object.camouflageMoving) - : isSet(object.camouflage_moving) - ? globalThis.Number(object.camouflage_moving) - : 0, - camouflage_on_fire: isSet(object.camouflageOnFire) - ? globalThis.Number(object.camouflageOnFire) - : isSet(object.camouflage_on_fire) - ? globalThis.Number(object.camouflage_on_fire) - : 0, - equipment_preset: isSet(object.equipmentPreset) - ? globalThis.String(object.equipmentPreset) - : isSet(object.equipment_preset) - ? globalThis.String(object.equipment_preset) - : "", + research_cost: isSet(object.research_cost) ? ResearchCost.fromJSON(object.research_cost) : undefined, + speed_forwards: isSet(object.speed_forwards) ? globalThis.Number(object.speed_forwards) : 0, + speed_backwards: isSet(object.speed_backwards) ? globalThis.Number(object.speed_backwards) : 0, + camouflage_still: isSet(object.camouflage_still) ? globalThis.Number(object.camouflage_still) : 0, + camouflage_moving: isSet(object.camouflage_moving) ? globalThis.Number(object.camouflage_moving) : 0, + camouflage_on_fire: isSet(object.camouflage_on_fire) ? globalThis.Number(object.camouflage_on_fire) : 0, + equipment_preset: isSet(object.equipment_preset) ? globalThis.String(object.equipment_preset) : "", weight: isSet(object.weight) ? globalThis.Number(object.weight) : 0, - dev_name: isSet(object.devName) - ? globalThis.String(object.devName) - : isSet(object.dev_name) - ? globalThis.String(object.dev_name) - : "", + dev_name: isSet(object.dev_name) ? globalThis.String(object.dev_name) : "", equalizer: isSet(object.equalizer) ? Equalizer.fromJSON(object.equalizer) : undefined, }; }, @@ -1175,7 +1123,7 @@ export const TankDefinition: MessageFns = { obj.slug = message.slug; } if (message.roles) { - const entries = globalThis.Object.entries(message.roles) as [string, number][]; + const entries = Object.entries(message.roles); if (entries.length > 0) { obj.roles = {}; entries.forEach(([k, v]) => { @@ -1184,7 +1132,7 @@ export const TankDefinition: MessageFns = { } } if (message.fixed_camouflage !== false) { - obj.fixedCamouflage = message.fixed_camouflage; + obj.fixed_camouflage = message.fixed_camouflage; } if (message.camouflages?.length) { obj.camouflages = message.camouflages.map((e) => Math.round(e)); @@ -1211,10 +1159,10 @@ export const TankDefinition: MessageFns = { obj.type = tankTypeToJSON(message.type); } if (message.max_consumables !== 0) { - obj.maxConsumables = Math.round(message.max_consumables); + obj.max_consumables = Math.round(message.max_consumables); } if (message.max_provisions !== 0) { - obj.maxProvisions = Math.round(message.max_provisions); + obj.max_provisions = Math.round(message.max_provisions); } if (message.tier !== 0) { obj.tier = Math.round(message.tier); @@ -1241,31 +1189,31 @@ export const TankDefinition: MessageFns = { obj.price = TankPrice.toJSON(message.price); } if (message.research_cost !== undefined) { - obj.researchCost = ResearchCost.toJSON(message.research_cost); + obj.research_cost = ResearchCost.toJSON(message.research_cost); } if (message.speed_forwards !== 0) { - obj.speedForwards = message.speed_forwards; + obj.speed_forwards = message.speed_forwards; } if (message.speed_backwards !== 0) { - obj.speedBackwards = message.speed_backwards; + obj.speed_backwards = message.speed_backwards; } if (message.camouflage_still !== 0) { - obj.camouflageStill = message.camouflage_still; + obj.camouflage_still = message.camouflage_still; } if (message.camouflage_moving !== 0) { - obj.camouflageMoving = message.camouflage_moving; + obj.camouflage_moving = message.camouflage_moving; } if (message.camouflage_on_fire !== 0) { - obj.camouflageOnFire = message.camouflage_on_fire; + obj.camouflage_on_fire = message.camouflage_on_fire; } if (message.equipment_preset !== "") { - obj.equipmentPreset = message.equipment_preset; + obj.equipment_preset = message.equipment_preset; } if (message.weight !== 0) { obj.weight = Math.round(message.weight); } if (message.dev_name !== "") { - obj.devName = message.dev_name; + obj.dev_name = message.dev_name; } if (message.equalizer !== undefined) { obj.equalizer = Equalizer.toJSON(message.equalizer); @@ -1280,15 +1228,12 @@ export const TankDefinition: MessageFns = { const message = createBaseTankDefinition(); message.id = object.id ?? 0; message.slug = object.slug ?? ""; - message.roles = (globalThis.Object.entries(object.roles ?? {}) as [string, number][]).reduce( - (acc: { [key: number]: number }, [key, value]: [string, number]) => { - if (value !== undefined) { - acc[globalThis.Number(key)] = globalThis.Number(value); - } - return acc; - }, - {}, - ); + message.roles = Object.entries(object.roles ?? {}).reduce<{ [key: string]: number }>((acc, [key, value]) => { + if (value !== undefined) { + acc[key] = globalThis.Number(value); + } + return acc; + }, {}); message.fixed_camouflage = object.fixed_camouflage ?? false; message.camouflages = object.camouflages?.map((e) => e) || []; message.ancestors = object.ancestors?.map((e) => e) || []; @@ -1331,13 +1276,13 @@ export const TankDefinition: MessageFns = { }; function createBaseTankDefinition_RolesEntry(): TankDefinition_RolesEntry { - return { key: 0, value: 0 }; + return { key: "", value: 0 }; } export const TankDefinition_RolesEntry: MessageFns = { encode(message: TankDefinition_RolesEntry, writer: BinaryWriter = new BinaryWriter()): BinaryWriter { - if (message.key !== 0) { - writer.uint32(8).uint32(message.key); + if (message.key !== "") { + writer.uint32(10).string(message.key); } if (message.value !== 0) { writer.uint32(16).uint32(message.value); @@ -1353,11 +1298,11 @@ export const TankDefinition_RolesEntry: MessageFns = const tag = reader.uint32(); switch (tag >>> 3) { case 1: { - if (tag !== 8) { + if (tag !== 10) { break; } - message.key = reader.uint32(); + message.key = reader.string(); continue; } case 2: { @@ -1379,15 +1324,15 @@ export const TankDefinition_RolesEntry: MessageFns = fromJSON(object: any): TankDefinition_RolesEntry { return { - key: isSet(object.key) ? globalThis.Number(object.key) : 0, + key: isSet(object.key) ? globalThis.String(object.key) : "", value: isSet(object.value) ? globalThis.Number(object.value) : 0, }; }, toJSON(message: TankDefinition_RolesEntry): unknown { const obj: any = {}; - if (message.key !== 0) { - obj.key = Math.round(message.key); + if (message.key !== "") { + obj.key = message.key; } if (message.value !== 0) { obj.value = Math.round(message.value); @@ -1400,7 +1345,7 @@ export const TankDefinition_RolesEntry: MessageFns = }, fromPartial, I>>(object: I): TankDefinition_RolesEntry { const message = createBaseTankDefinition_RolesEntry(); - message.key = object.key ?? 0; + message.key = object.key ?? ""; message.value = object.value ?? 0; return message; }, @@ -1490,11 +1435,7 @@ export const Equalizer: MessageFns = { return { health: isSet(object.health) ? globalThis.Number(object.health) : 0, penetration: isSet(object.penetration) ? globalThis.Number(object.penetration) : 0, - module_health: isSet(object.moduleHealth) - ? globalThis.Number(object.moduleHealth) - : isSet(object.module_health) - ? globalThis.Number(object.module_health) - : 0, + module_health: isSet(object.module_health) ? globalThis.Number(object.module_health) : 0, damage: isSet(object.damage) ? globalThis.Number(object.damage) : 0, armor: isSet(object.armor) ? globalThis.Number(object.armor) : 0, }; @@ -1509,7 +1450,7 @@ export const Equalizer: MessageFns = { obj.penetration = message.penetration; } if (message.module_health !== 0) { - obj.moduleHealth = message.module_health; + obj.module_health = message.module_health; } if (message.damage !== 0) { obj.damage = message.damage; @@ -1590,8 +1531,6 @@ export const ResearchCost: MessageFns = { return { research_cost_type: isSet(object.xp) ? { $case: "xp", value: globalThis.Number(object.xp) } - : isSet(object.seasonalTokens) - ? { $case: "seasonal_tokens", value: ResearchCostSeasonalTokens.fromJSON(object.seasonalTokens) } : isSet(object.seasonal_tokens) ? { $case: "seasonal_tokens", value: ResearchCostSeasonalTokens.fromJSON(object.seasonal_tokens) } : undefined, @@ -1603,7 +1542,7 @@ export const ResearchCost: MessageFns = { if (message.research_cost_type?.$case === "xp") { obj.xp = Math.round(message.research_cost_type.value); } else if (message.research_cost_type?.$case === "seasonal_tokens") { - obj.seasonalTokens = ResearchCostSeasonalTokens.toJSON(message.research_cost_type.value); + obj.seasonal_tokens = ResearchCostSeasonalTokens.toJSON(message.research_cost_type.value); } return obj; }, @@ -1962,44 +1901,14 @@ export const TrackDefinition: MessageFns = { tier: isSet(object.tier) ? globalThis.Number(object.tier) : 0, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, weight: isSet(object.weight) ? globalThis.Number(object.weight) : 0, - traverse_speed: isSet(object.traverseSpeed) - ? globalThis.Number(object.traverseSpeed) - : isSet(object.traverse_speed) - ? globalThis.Number(object.traverse_speed) - : 0, - research_cost: isSet(object.researchCost) - ? ResearchCost.fromJSON(object.researchCost) - : isSet(object.research_cost) - ? ResearchCost.fromJSON(object.research_cost) - : undefined, - dispersion_move: isSet(object.dispersionMove) - ? globalThis.Number(object.dispersionMove) - : isSet(object.dispersion_move) - ? globalThis.Number(object.dispersion_move) - : 0, - dispersion_traverse: isSet(object.dispersionTraverse) - ? globalThis.Number(object.dispersionTraverse) - : isSet(object.dispersion_traverse) - ? globalThis.Number(object.dispersion_traverse) - : 0, - resistance_hard: isSet(object.resistanceHard) - ? globalThis.Number(object.resistanceHard) - : isSet(object.resistance_hard) - ? globalThis.Number(object.resistance_hard) - : 0, - resistance_medium: isSet(object.resistanceMedium) - ? globalThis.Number(object.resistanceMedium) - : isSet(object.resistance_medium) - ? globalThis.Number(object.resistance_medium) - : 0, - resistance_soft: isSet(object.resistanceSoft) - ? globalThis.Number(object.resistanceSoft) - : isSet(object.resistance_soft) - ? globalThis.Number(object.resistance_soft) - : 0, - unlocks: globalThis.Array.isArray(object?.unlocks) - ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) - : [], + traverse_speed: isSet(object.traverse_speed) ? globalThis.Number(object.traverse_speed) : 0, + research_cost: isSet(object.research_cost) ? ResearchCost.fromJSON(object.research_cost) : undefined, + dispersion_move: isSet(object.dispersion_move) ? globalThis.Number(object.dispersion_move) : 0, + dispersion_traverse: isSet(object.dispersion_traverse) ? globalThis.Number(object.dispersion_traverse) : 0, + resistance_hard: isSet(object.resistance_hard) ? globalThis.Number(object.resistance_hard) : 0, + resistance_medium: isSet(object.resistance_medium) ? globalThis.Number(object.resistance_medium) : 0, + resistance_soft: isSet(object.resistance_soft) ? globalThis.Number(object.resistance_soft) : 0, + unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [], }; }, @@ -2018,25 +1927,25 @@ export const TrackDefinition: MessageFns = { obj.weight = Math.round(message.weight); } if (message.traverse_speed !== 0) { - obj.traverseSpeed = message.traverse_speed; + obj.traverse_speed = message.traverse_speed; } if (message.research_cost !== undefined) { - obj.researchCost = ResearchCost.toJSON(message.research_cost); + obj.research_cost = ResearchCost.toJSON(message.research_cost); } if (message.dispersion_move !== 0) { - obj.dispersionMove = message.dispersion_move; + obj.dispersion_move = message.dispersion_move; } if (message.dispersion_traverse !== 0) { - obj.dispersionTraverse = message.dispersion_traverse; + obj.dispersion_traverse = message.dispersion_traverse; } if (message.resistance_hard !== 0) { - obj.resistanceHard = message.resistance_hard; + obj.resistance_hard = message.resistance_hard; } if (message.resistance_medium !== 0) { - obj.resistanceMedium = message.resistance_medium; + obj.resistance_medium = message.resistance_medium; } if (message.resistance_soft !== 0) { - obj.resistanceSoft = message.resistance_soft; + obj.resistance_soft = message.resistance_soft; } if (message.unlocks?.length) { obj.unlocks = message.unlocks.map((e) => Unlock.toJSON(e)); @@ -2195,17 +2104,9 @@ export const EngineDefinition: MessageFns = { return { id: isSet(object.id) ? globalThis.Number(object.id) : 0, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, - research_cost: isSet(object.researchCost) - ? ResearchCost.fromJSON(object.researchCost) - : isSet(object.research_cost) - ? ResearchCost.fromJSON(object.research_cost) - : undefined, + research_cost: isSet(object.research_cost) ? ResearchCost.fromJSON(object.research_cost) : undefined, tier: isSet(object.tier) ? globalThis.Number(object.tier) : 0, - fire_chance: isSet(object.fireChance) - ? globalThis.Number(object.fireChance) - : isSet(object.fire_chance) - ? globalThis.Number(object.fire_chance) - : 0, + fire_chance: isSet(object.fire_chance) ? globalThis.Number(object.fire_chance) : 0, power: isSet(object.power) ? globalThis.Number(object.power) : 0, weight: isSet(object.weight) ? globalThis.Number(object.weight) : 0, unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [], @@ -2221,13 +2122,13 @@ export const EngineDefinition: MessageFns = { obj.name = I18nString.toJSON(message.name); } if (message.research_cost !== undefined) { - obj.researchCost = ResearchCost.toJSON(message.research_cost); + obj.research_cost = ResearchCost.toJSON(message.research_cost); } if (message.tier !== 0) { obj.tier = Math.round(message.tier); } if (message.fire_chance !== 0) { - obj.fireChance = message.fire_chance; + obj.fire_chance = message.fire_chance; } if (message.power !== 0) { obj.power = Math.round(message.power); @@ -2412,27 +2313,13 @@ export const TurretDefinition: MessageFns = { return { id: isSet(object.id) ? globalThis.Number(object.id) : 0, health: isSet(object.health) ? globalThis.Number(object.health) : 0, - view_range: isSet(object.viewRange) - ? globalThis.Number(object.viewRange) - : isSet(object.view_range) - ? globalThis.Number(object.view_range) - : 0, - traverse_speed: isSet(object.traverseSpeed) - ? globalThis.Number(object.traverseSpeed) - : isSet(object.traverse_speed) - ? globalThis.Number(object.traverse_speed) - : 0, - research_cost: isSet(object.researchCost) - ? ResearchCost.fromJSON(object.researchCost) - : isSet(object.research_cost) - ? ResearchCost.fromJSON(object.research_cost) - : undefined, + view_range: isSet(object.view_range) ? globalThis.Number(object.view_range) : 0, + traverse_speed: isSet(object.traverse_speed) ? globalThis.Number(object.traverse_speed) : 0, + research_cost: isSet(object.research_cost) ? ResearchCost.fromJSON(object.research_cost) : undefined, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, tier: isSet(object.tier) ? globalThis.Number(object.tier) : 0, weight: isSet(object.weight) ? globalThis.Number(object.weight) : 0, - guns: globalThis.Array.isArray(object?.guns) - ? object.guns.map((e: any) => GunDefinition.fromJSON(e)) - : [], + guns: globalThis.Array.isArray(object?.guns) ? object.guns.map((e: any) => GunDefinition.fromJSON(e)) : [], unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [], }; }, @@ -2446,13 +2333,13 @@ export const TurretDefinition: MessageFns = { obj.health = Math.round(message.health); } if (message.view_range !== 0) { - obj.viewRange = Math.round(message.view_range); + obj.view_range = Math.round(message.view_range); } if (message.traverse_speed !== 0) { - obj.traverseSpeed = message.traverse_speed; + obj.traverse_speed = message.traverse_speed; } if (message.research_cost !== undefined) { - obj.researchCost = ResearchCost.toJSON(message.research_cost); + obj.research_cost = ResearchCost.toJSON(message.research_cost); } if (message.name !== undefined) { obj.name = I18nString.toJSON(message.name); @@ -2768,75 +2655,29 @@ export const GunDefinition: MessageFns = { return { gun_type: isSet(object.regular) ? { $case: "regular", value: GunDefinitionRegular.fromJSON(object.regular) } - : isSet(object.autoLoader) - ? { $case: "auto_loader", value: GunDefinitionAutoLoader.fromJSON(object.autoLoader) } : isSet(object.auto_loader) ? { $case: "auto_loader", value: GunDefinitionAutoLoader.fromJSON(object.auto_loader) } - : isSet(object.autoReloader) - ? { $case: "auto_reloader", value: GunDefinitionAutoReloader.fromJSON(object.autoReloader) } : isSet(object.auto_reloader) ? { $case: "auto_reloader", value: GunDefinitionAutoReloader.fromJSON(object.auto_reloader) } : undefined, id: isSet(object.id) ? globalThis.Number(object.id) : 0, - rotation_speed: isSet(object.rotationSpeed) - ? globalThis.Number(object.rotationSpeed) - : isSet(object.rotation_speed) - ? globalThis.Number(object.rotation_speed) - : 0, - research_cost: isSet(object.researchCost) - ? ResearchCost.fromJSON(object.researchCost) - : isSet(object.research_cost) - ? ResearchCost.fromJSON(object.research_cost) - : undefined, + rotation_speed: isSet(object.rotation_speed) ? globalThis.Number(object.rotation_speed) : 0, + research_cost: isSet(object.research_cost) ? ResearchCost.fromJSON(object.research_cost) : undefined, weight: isSet(object.weight) ? globalThis.Number(object.weight) : 0, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, tier: isSet(object.tier) ? globalThis.Number(object.tier) : 0, shells: globalThis.Array.isArray(object?.shells) ? object.shells.map((e: any) => ShellDefinition.fromJSON(e)) : [], - camouflage_loss: isSet(object.camouflageLoss) - ? globalThis.Number(object.camouflageLoss) - : isSet(object.camouflage_loss) - ? globalThis.Number(object.camouflage_loss) - : 0, - aim_time: isSet(object.aimTime) - ? globalThis.Number(object.aimTime) - : isSet(object.aim_time) - ? globalThis.Number(object.aim_time) - : 0, - dispersion_base: isSet(object.dispersionBase) - ? globalThis.Number(object.dispersionBase) - : isSet(object.dispersion_base) - ? globalThis.Number(object.dispersion_base) - : 0, - dispersion_traverse: isSet(object.dispersionTraverse) - ? globalThis.Number(object.dispersionTraverse) - : isSet(object.dispersion_traverse) - ? globalThis.Number(object.dispersion_traverse) - : 0, - dispersion_shot: isSet(object.dispersionShot) - ? globalThis.Number(object.dispersionShot) - : isSet(object.dispersion_shot) - ? globalThis.Number(object.dispersion_shot) - : 0, - dispersion_damaged: isSet(object.dispersionDamaged) - ? globalThis.Number(object.dispersionDamaged) - : isSet(object.dispersion_damaged) - ? globalThis.Number(object.dispersion_damaged) - : 0, - unlocks: globalThis.Array.isArray(object?.unlocks) - ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) - : [], - shell_capacity: isSet(object.shellCapacity) - ? globalThis.Number(object.shellCapacity) - : isSet(object.shell_capacity) - ? globalThis.Number(object.shell_capacity) - : 0, - assault_ranges: isSet(object.assaultRanges) - ? AssaultRanges.fromJSON(object.assaultRanges) - : isSet(object.assault_ranges) - ? AssaultRanges.fromJSON(object.assault_ranges) - : undefined, + camouflage_loss: isSet(object.camouflage_loss) ? globalThis.Number(object.camouflage_loss) : 0, + aim_time: isSet(object.aim_time) ? globalThis.Number(object.aim_time) : 0, + dispersion_base: isSet(object.dispersion_base) ? globalThis.Number(object.dispersion_base) : 0, + dispersion_traverse: isSet(object.dispersion_traverse) ? globalThis.Number(object.dispersion_traverse) : 0, + dispersion_shot: isSet(object.dispersion_shot) ? globalThis.Number(object.dispersion_shot) : 0, + dispersion_damaged: isSet(object.dispersion_damaged) ? globalThis.Number(object.dispersion_damaged) : 0, + unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [], + shell_capacity: isSet(object.shell_capacity) ? globalThis.Number(object.shell_capacity) : 0, + assault_ranges: isSet(object.assault_ranges) ? AssaultRanges.fromJSON(object.assault_ranges) : undefined, burst: isSet(object.burst) ? Burst.fromJSON(object.burst) : undefined, }; }, @@ -2846,18 +2687,18 @@ export const GunDefinition: MessageFns = { if (message.gun_type?.$case === "regular") { obj.regular = GunDefinitionRegular.toJSON(message.gun_type.value); } else if (message.gun_type?.$case === "auto_loader") { - obj.autoLoader = GunDefinitionAutoLoader.toJSON(message.gun_type.value); + obj.auto_loader = GunDefinitionAutoLoader.toJSON(message.gun_type.value); } else if (message.gun_type?.$case === "auto_reloader") { - obj.autoReloader = GunDefinitionAutoReloader.toJSON(message.gun_type.value); + obj.auto_reloader = GunDefinitionAutoReloader.toJSON(message.gun_type.value); } if (message.id !== 0) { obj.id = Math.round(message.id); } if (message.rotation_speed !== 0) { - obj.rotationSpeed = message.rotation_speed; + obj.rotation_speed = message.rotation_speed; } if (message.research_cost !== undefined) { - obj.researchCost = ResearchCost.toJSON(message.research_cost); + obj.research_cost = ResearchCost.toJSON(message.research_cost); } if (message.weight !== 0) { obj.weight = Math.round(message.weight); @@ -2872,31 +2713,31 @@ export const GunDefinition: MessageFns = { obj.shells = message.shells.map((e) => ShellDefinition.toJSON(e)); } if (message.camouflage_loss !== 0) { - obj.camouflageLoss = message.camouflage_loss; + obj.camouflage_loss = message.camouflage_loss; } if (message.aim_time !== 0) { - obj.aimTime = message.aim_time; + obj.aim_time = message.aim_time; } if (message.dispersion_base !== 0) { - obj.dispersionBase = message.dispersion_base; + obj.dispersion_base = message.dispersion_base; } if (message.dispersion_traverse !== 0) { - obj.dispersionTraverse = message.dispersion_traverse; + obj.dispersion_traverse = message.dispersion_traverse; } if (message.dispersion_shot !== 0) { - obj.dispersionShot = message.dispersion_shot; + obj.dispersion_shot = message.dispersion_shot; } if (message.dispersion_damaged !== 0) { - obj.dispersionDamaged = message.dispersion_damaged; + obj.dispersion_damaged = message.dispersion_damaged; } if (message.unlocks?.length) { obj.unlocks = message.unlocks.map((e) => Unlock.toJSON(e)); } if (message.shell_capacity !== 0) { - obj.shellCapacity = Math.round(message.shell_capacity); + obj.shell_capacity = Math.round(message.shell_capacity); } if (message.assault_ranges !== undefined) { - obj.assaultRanges = AssaultRanges.toJSON(message.assault_ranges); + obj.assault_ranges = AssaultRanges.toJSON(message.assault_ranges); } if (message.burst !== undefined) { obj.burst = Burst.toJSON(message.burst); @@ -3080,34 +2921,22 @@ export const GunDefinitionAutoLoader: MessageFns = { fromJSON(object: any): GunDefinitionAutoLoader { return { - clip_reload: isSet(object.clipReload) - ? globalThis.Number(object.clipReload) - : isSet(object.clip_reload) - ? globalThis.Number(object.clip_reload) - : 0, - intra_clip: isSet(object.intraClip) - ? globalThis.Number(object.intraClip) - : isSet(object.intra_clip) - ? globalThis.Number(object.intra_clip) - : 0, - shell_count: isSet(object.shellCount) - ? globalThis.Number(object.shellCount) - : isSet(object.shell_count) - ? globalThis.Number(object.shell_count) - : 0, + clip_reload: isSet(object.clip_reload) ? globalThis.Number(object.clip_reload) : 0, + intra_clip: isSet(object.intra_clip) ? globalThis.Number(object.intra_clip) : 0, + shell_count: isSet(object.shell_count) ? globalThis.Number(object.shell_count) : 0, }; }, toJSON(message: GunDefinitionAutoLoader): unknown { const obj: any = {}; if (message.clip_reload !== 0) { - obj.clipReload = message.clip_reload; + obj.clip_reload = message.clip_reload; } if (message.intra_clip !== 0) { - obj.intraClip = message.intra_clip; + obj.intra_clip = message.intra_clip; } if (message.shell_count !== 0) { - obj.shellCount = message.shell_count; + obj.shell_count = message.shell_count; } return obj; }, @@ -3270,34 +3099,24 @@ export const GunDefinitionAutoReloader: MessageFns = fromJSON(object: any): GunDefinitionAutoReloader { return { - shell_reloads: globalThis.Array.isArray(object?.shellReloads) - ? object.shellReloads.map((e: any) => globalThis.Number(e)) - : globalThis.Array.isArray(object?.shell_reloads) + shell_reloads: globalThis.Array.isArray(object?.shell_reloads) ? object.shell_reloads.map((e: any) => globalThis.Number(e)) : [], - intra_clip: isSet(object.intraClip) - ? globalThis.Number(object.intraClip) - : isSet(object.intra_clip) - ? globalThis.Number(object.intra_clip) - : 0, - shell_count: isSet(object.shellCount) - ? globalThis.Number(object.shellCount) - : isSet(object.shell_count) - ? globalThis.Number(object.shell_count) - : 0, + intra_clip: isSet(object.intra_clip) ? globalThis.Number(object.intra_clip) : 0, + shell_count: isSet(object.shell_count) ? globalThis.Number(object.shell_count) : 0, }; }, toJSON(message: GunDefinitionAutoReloader): unknown { const obj: any = {}; if (message.shell_reloads?.length) { - obj.shellReloads = message.shell_reloads; + obj.shell_reloads = message.shell_reloads; } if (message.intra_clip !== 0) { - obj.intraClip = message.intra_clip; + obj.intra_clip = message.intra_clip; } if (message.shell_count !== 0) { - obj.shellCount = message.shell_count; + obj.shell_count = message.shell_count; } return obj; }, @@ -3663,27 +3482,15 @@ export const ShellDefinition: MessageFns = { id: isSet(object.id) ? globalThis.Number(object.id) : 0, name: isSet(object.name) ? I18nString.fromJSON(object.name) : undefined, velocity: isSet(object.velocity) ? globalThis.Number(object.velocity) : 0, - armor_damage: isSet(object.armorDamage) - ? globalThis.Number(object.armorDamage) - : isSet(object.armor_damage) - ? globalThis.Number(object.armor_damage) - : 0, - module_damage: isSet(object.moduleDamage) - ? globalThis.Number(object.moduleDamage) - : isSet(object.module_damage) - ? globalThis.Number(object.module_damage) - : 0, + armor_damage: isSet(object.armor_damage) ? globalThis.Number(object.armor_damage) : 0, + module_damage: isSet(object.module_damage) ? globalThis.Number(object.module_damage) : 0, caliber: isSet(object.caliber) ? globalThis.Number(object.caliber) : 0, icon: isSet(object.icon) ? globalThis.String(object.icon) : "", penetration: isSet(object.penetration) ? ShellPenetration.fromJSON(object.penetration) : undefined, type: isSet(object.type) ? shellTypeFromJSON(object.type) : 0, normalization: isSet(object.normalization) ? globalThis.Number(object.normalization) : 0, ricochet: isSet(object.ricochet) ? globalThis.Number(object.ricochet) : 0, - explosion_radius: isSet(object.explosionRadius) - ? globalThis.Number(object.explosionRadius) - : isSet(object.explosion_radius) - ? globalThis.Number(object.explosion_radius) - : 0, + explosion_radius: isSet(object.explosion_radius) ? globalThis.Number(object.explosion_radius) : 0, range: isSet(object.range) ? globalThis.Number(object.range) : 0, }; }, @@ -3700,10 +3507,10 @@ export const ShellDefinition: MessageFns = { obj.velocity = Math.round(message.velocity); } if (message.armor_damage !== 0) { - obj.armorDamage = Math.round(message.armor_damage); + obj.armor_damage = Math.round(message.armor_damage); } if (message.module_damage !== 0) { - obj.moduleDamage = Math.round(message.module_damage); + obj.module_damage = Math.round(message.module_damage); } if (message.caliber !== 0) { obj.caliber = message.caliber; @@ -3724,7 +3531,7 @@ export const ShellDefinition: MessageFns = { obj.ricochet = message.ricochet; } if (message.explosion_radius !== undefined && message.explosion_radius !== 0) { - obj.explosionRadius = message.explosion_radius; + obj.explosion_radius = message.explosion_radius; } if (message.range !== 0) { obj.range = Math.round(message.range); diff --git a/packages/website/src/components/TankSearch/components/FilterControl.tsx b/packages/website/src/components/TankSearch/components/FilterControl.tsx index ee16888ae..ac7bde3b8 100644 --- a/packages/website/src/components/TankSearch/components/FilterControl.tsx +++ b/packages/website/src/components/TankSearch/components/FilterControl.tsx @@ -45,14 +45,13 @@ const consumableDefinitions = await api.consumableDefinitions(); const provisionDefinitions = await api.provisionDefinitions(); const tankDefinitions = await api.tankDefinitions(); -const gameModeRoleSets: Record> = {}; +const gameModeRoleSets: Record> = {}; for (const tankIdString in tankDefinitions.tanks) { const gameMode = tankDefinitions.tanks[tankIdString]; - for (const gameModeIdString in gameMode.roles) { - const role = gameMode.roles[gameModeIdString]; - const gameModeId = Number(gameModeIdString); + for (const gameModeId in gameMode.roles) { + const role = gameMode.roles[gameModeId]; if (gameModeId in gameModeRoleSets) { gameModeRoleSets[gameModeId].add(role); @@ -63,7 +62,7 @@ for (const tankIdString in tankDefinitions.tanks) { } const gameModeRoles: { - gameModeId: number; + gameModeId: string; consumables: number[]; provisions: number[]; }[] = []; @@ -72,8 +71,7 @@ const allGameModeConsumables = new Set(); const allGameModeProvisions = new Set(); for (const gameModeIdString in gameModeRoleSets) { - const gameModeId = Number(gameModeIdString); - const roles = gameModeRoleSets[gameModeId]; + const roles = gameModeRoleSets[gameModeIdString]; const consumables = new Set(); const provisions = new Set(); @@ -116,7 +114,7 @@ for (const gameModeIdString in gameModeRoleSets) { } gameModeRoles.push({ - gameModeId: gameModeId, + gameModeId: gameModeIdString, consumables: Array.from(consumables.values()), provisions: Array.from(provisions.values()), }); diff --git a/packages/website/src/components/Tankopedia/GameModeSection.tsx b/packages/website/src/components/Tankopedia/GameModeSection.tsx index 41ea483b4..00456adfe 100644 --- a/packages/website/src/components/Tankopedia/GameModeSection.tsx +++ b/packages/website/src/components/Tankopedia/GameModeSection.tsx @@ -25,8 +25,7 @@ export function GameModeSection() { - {roles.map(([key, value]) => { - const id = Number(key); + {roles.map(([id, value]) => { const gameMode = gameDefinitions.gameModes[id]; return ( diff --git a/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts b/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts index e0383102d..5805e2c51 100644 --- a/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts +++ b/packages/website/src/pages/[...chunk_api]/gamemodes/[id]/banner.webp.ts @@ -17,15 +17,15 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { const bannerMatches: { name: string; path: string }[] = []; for (const match of gameTypeSelectorStyles.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll( - /eGameMode\.([a-zA-Z]+) -> "~res:([^"]+)"/g, + /eGameMode\.(\w+) -> "~res:([^"]+)"/g, )) { bannerMatches.push({ name: match[1], path: match[2] }); } for (const match of squadBattleTypeStyles.Prototypes[0].components.UIDataLocalBindingsComponent.data[1][2].matchAll( - /"(\d+)" -> "battleType\/([a-zA-Z]+)"/g, + /eGameMode\.(\w+) -> "battleType\/([a-zA-Z]+)"/g, )) { - const id = Number(match[1]); + const id = match[1]; const name = match[2]; let path = bannerMatches.find( (bannerMatch) => bannerMatch.name.toLowerCase() === name.toLowerCase(), From 8af41b91b5e00c9690fe23fdaf35103aff8efe04 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 23 Sep 2026 16:32:19 -0500 Subject: [PATCH 04/97] logs --- docs/changelogs/1.31.3.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 docs/changelogs/1.31.3.md diff --git a/docs/changelogs/1.31.3.md b/docs/changelogs/1.31.3.md new file mode 100644 index 000000000..faf65aca5 --- /dev/null +++ b/docs/changelogs/1.31.3.md @@ -0,0 +1,3 @@ +# BlitzKit 1.31.3 + +This update updates BlitzKit to work with the game's new ID system for game modes. diff --git a/package.json b/package.json index f9457b0a7..212536f91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blitzkit", - "version": "1.31.2", + "version": "1.31.3", "license": "BlitzKit License", "private": true, "scripts": { From 424d9944ad28c1ef91d55f0f38a917af99fba720 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 23 Sep 2026 17:12:53 -0500 Subject: [PATCH 05/97] smarter trigger --- .github/workflows/website.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index e080b5c4e..5ada3d32f 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -139,7 +139,14 @@ jobs: - name: Trigger deployment - if: ${{ github.ref == 'refs/heads/production' }} + # Deploy if: + # 1. Running cron from main using content from production to target production + # 2. Running manually and targeting non-production + if: >- + ${{ + github.ref == 'refs/heads/production' || + (inputs.environment != '' && inputs.environment != 'production') + }} env: TOKEN: ${{ secrets.GH_NODE_DEPLOY_TOKEN }} From f7ca622906026ad8afa571ae953a690895378963 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Thu, 24 Sep 2026 16:07:12 -0500 Subject: [PATCH 06/97] correct assertions --- .../[...chunk_default]/[...locale]/session/_index.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx index 5625af9e7..28fbf6529 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx @@ -91,15 +91,17 @@ function Content() { ? deltaTankStats(session.player.stats, tankStatsB) .sort((a, b) => b.last_battle_time - a.last_battle_time) .flatMap((entry) => { + if (!(entry.tank_id in tankDefinitions.tanks)) return []; + const tank = tankDefinitions.tanks[entry.tank_id]; - if (!tank) return []; + + if (!(tank.id in averageDefinitions.averages)) return []; const average = averageDefinitions.averages[tank.id]; - if (!average?.mu) return []; const composite = compositeStats( { ...entry.all, battle_life_time: entry.battle_life_time }, - average.mu, + average.mu!, ); return [{ tank, composite }]; From 281e4abec77d0ed481d61b6f731d97fd03c2f790 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Tue, 14 Jul 2026 21:33:30 +1200 Subject: [PATCH 07/97] Add peekaboo DPM stat to Tankopedia firepower Adds a **Peekaboo DPM** entry nested under DPM for single-shot guns, estimating damage per minute when only firing after resetting camouflage (or waiting out the reload, whichever is slower), assuming at least 10 seconds between shots. - Shots per minute are capped at `60/10` for reloads faster than 10s, and fall back to `60/reload` otherwise - The result is multiplied by the currently selected shell's damage and rounded - An (i) icon next to the label opens a popover explaining the calculation - The row is hidden for auto-loader/auto-reloader guns - No percentile ranking bar is shown, since no dataset exists yet for this new stat --- packages/i18n/strings/en.json | 2 + .../Characteristics/components/Firepower.tsx | 44 ++++++++++++++++++- .../src/core/blitzkit/tankCharacteristics.ts | 5 +++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 534e2fa8d..ffb6ef7fe 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -631,6 +631,8 @@ "shellRicochet": "Ricochet", "dpm": "DPM", "dpmEffective": "Effective at 60s", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) \u2014 at least 10 seconds between shots.", "shells": "Shells", "mostOptimalShellIndex": "Most optimal shell", "shellReloads": "Reloads", diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx index bcebbf061..c1efdc8b4 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx @@ -1,6 +1,14 @@ import { alias, isExplosive } from "@blitzkit/core"; import { literals } from "@blitzkit/i18n"; -import { Flex, Heading, IconButton, Tooltip } from "@radix-ui/themes"; +import { InfoCircledIcon } from "@radix-ui/react-icons"; +import { + Flex, + Heading, + IconButton, + Popover, + Text, + Tooltip, +} from "@radix-ui/themes"; import { useLocale } from "../../../../../../hooks/useLocale"; import { useTankModelDefinition } from "../../../../../../hooks/useTankModelDefinition"; import { Duel } from "../../../../../../stores/duel"; @@ -77,6 +85,40 @@ export function Firepower({ {strings.common.gun_types[gun.gun_type!.$case]} + {gun.gun_type!.$case === "regular" && ( + + { + strings.website.tools.tankopedia.characteristics.values + .peekabooDpm + } + + + + + + + + + + + { + strings.website.tools.tankopedia.characteristics.values + .peekabooDpmInfo + } + + + + + } + value={(tank) => tank.peekabooDpm} + /> + )} {gun.gun_type!.$case !== "regular" && ( diff --git a/packages/website/src/core/blitzkit/tankCharacteristics.ts b/packages/website/src/core/blitzkit/tankCharacteristics.ts index d9d041098..0cc72302e 100644 --- a/packages/website/src/core/blitzkit/tankCharacteristics.ts +++ b/packages/website/src/core/blitzkit/tankCharacteristics.ts @@ -418,6 +418,10 @@ export function tankCharacteristics( : (gun.gun_type!.$case === "regular" ? gun.gun_type!.value.reload : gun.gun_type!.value.clip_reload) * reloadCoefficient; + const peekabooDpm = + gun.gun_type!.$case === "regular" + ? Math.round(damage * (60 / Math.max(shellReload!, 10))) + : undefined; const caliber = shell.caliber; const penetration = shell.penetration!.near * penetrationCoefficient; const clipDamage = @@ -545,6 +549,7 @@ export function tankCharacteristics( shellRicochet, dpm, dpmEffective, + peekabooDpm, shells, mostOptimalShellIndex, shellReloads, From 763ecf22b09f5b41512da69a2547db9c093ae442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Thu, 24 Sep 2026 14:25:00 -0700 Subject: [PATCH 08/97] New Crowdin updates (#266) --- packages/i18n/strings/uk.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/i18n/strings/uk.json b/packages/i18n/strings/uk.json index ffe6e497f..c8bf56162 100644 --- a/packages/i18n/strings/uk.json +++ b/packages/i18n/strings/uk.json @@ -13,7 +13,7 @@ "hp": "{value}од", "x": "x{value}", "percentage": "{value}%", - "deg_s": "{value}град/c", + "deg_s": "{value}°/c", "plus": "+{value}" }, "gun_types": { @@ -37,8 +37,8 @@ "d_1": "Вчора" }, "branches": { - "beta": "Beta", - "development": "Development", + "beta": "Бета", + "development": "Розробка", "opentest": "Відкритий тест", "preview": "Preview", "production": "Production" @@ -340,8 +340,8 @@ }, "mixer": { "name": "Mixer", - "button": "Mix and match", - "description": "Mix tank modules", + "button": "Змішувати та поєднувати", + "description": "Змішані танкові модулі", "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz", "screenshot": "Знімок екрану", "randomize": "Рандомізувати" @@ -501,11 +501,11 @@ "tech_tree": { "title": "Звичайний", "battle": "1 бій", - "battles": "{count} battles", + "battles": "{count} битви", "route": "Route {index} of {count}" }, "game_modes": { - "title": "Game mode abilities" + "title": "Здібності ігрового режиму" }, "review": { "title": "Review videos", @@ -626,7 +626,7 @@ "camouflageShootingStill": "Нерухомо", "camouflageShootingMoving": "У русі", "camouflageCaughtOnFire": "Caught on fire", - "width": "Width", + "width": "Ширина", "height": "Height", "length": "Length", "volume": "Volume", @@ -740,7 +740,7 @@ } }, "gallery": { - "name": "Gallery", + "name": "Галерея", "button": "Browse all", "description": "Blitz player avatars", "seo_description": "Усі World of Tanks Blitz аватари гравців", @@ -843,7 +843,7 @@ "breakdown": { "name": "Breakdown", "options": { - "width": "Width", + "width": "Ширина", "height": "Height", "showTotal": "Show total", "listGap": "List gap", From 85b8c7057d040de7fa72d786c8fb83af3e76c1ef Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sat, 26 Sep 2026 19:45:17 +1200 Subject: [PATCH 09/97] Redesign Spall Liner swap popover with icons Replace wordy swap prompt with compact icon row (spall liner icon, swap icon, current provisions) and drop unused ProvisionButton tooltip that flashed on popover open. --- packages/i18n/strings/en.json | 4 -- .../Options/components/SpallLinerSwitcher.tsx | 49 ++++++++++++++----- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 9ac4145ee..534e2fa8d 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -527,10 +527,6 @@ "label": "Edit", "reset": "Reset" } - }, - - "spall_liner": { - "swap_prompt": "Spall Liner will replace one of your active provisions. Choose which one to remove:" } }, diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx index 3b66d75dc..34ecffe18 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx @@ -1,17 +1,17 @@ import { alias, availableProvisions } from "@blitzkit/core"; -import { Flex, IconButton, Popover, Text } from "@radix-ui/themes"; +import { ShuffleIcon } from "@radix-ui/react-icons"; +import { Flex, IconButton, Popover } from "@radix-ui/themes"; import { api } from "../../../../../../core/blitzkit/api"; import { SPALL_LINER_PROVISION_ID } from "../../../../../../core/blitzkit/spallLiner"; import { useLocale } from "../../../../../../hooks/useLocale"; import { Duel } from "../../../../../../stores/duel"; import { Tankopedia } from "../../../../../../stores/tankopedia"; -import { ProvisionButton } from "../../../../../ModuleButtons/ProvisionButton"; const provisionDefinitions = await api.provisionDefinitions(); export function SpallLinerSwitcher() { const { tank, gun, provisions } = Duel.use((state) => state.protagonist); - const { strings, unwrap } = useLocale(); + const { unwrap } = useLocale(); const isSpallLinerActive = provisions.includes(SPALL_LINER_PROVISION_ID); const hasSlotAvailable = provisions.length < tank.max_provisions; @@ -80,19 +80,44 @@ export function SpallLinerSwitcher() { {button} - - - {strings.website.tools.tankopedia.sandbox.spall_liner.swap_prompt} - + + + {unwrap( + - + + + {provisions.map((id) => ( - equip(id)} - /> + > + {unwrap(provisionDefinitions.provisions[id].name!)} + ))} From ee146b8ed9bfa5a7df4014dcc56e44953ee646fc Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 30 Sep 2026 13:51:13 -0500 Subject: [PATCH 10/97] fix wgpkg dirs --- packages/scripts/src/downloadClient/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/scripts/src/downloadClient/index.ts b/packages/scripts/src/downloadClient/index.ts index 07a978327..e3412bffe 100644 --- a/packages/scripts/src/downloadClient/index.ts +++ b/packages/scripts/src/downloadClient/index.ts @@ -78,7 +78,8 @@ if (provider === "steam") { console.log(`Downloading ${urls.length} packages...`); - await rm(WGPKG_DIR, { recursive: true }); + await rm(WGPKG_DIR, { recursive: true, force: true }); + await mkdir(WGPKG_DIR, { recursive: true }); const inputContent = urls .map((url) => { From 4d57b43912a9927d1e4b876fe73e8c50104b583c Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 30 Sep 2026 15:41:08 -0500 Subject: [PATCH 11/97] logs --- docs/changelogs/1.31.4.md | 14 ++++++++++++++ package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 docs/changelogs/1.31.4.md diff --git a/docs/changelogs/1.31.4.md b/docs/changelogs/1.31.4.md new file mode 100644 index 000000000..229fd754d --- /dev/null +++ b/docs/changelogs/1.31.4.md @@ -0,0 +1,14 @@ +# BlitzKit 1.31.4 + +Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update. + +## Fixes + +- [Mark Greene] BlitzKit Session now properly handles tanks removed from the game + +## Technical Fixes + +- BlitzKit now handles the new ID system for game-modes in WoTB +- The directory which preview versions of the game are downloaded to are now created properly + - This was the last bug standing in the way of BlitzKit Previews + - Welcome back, BlitzKit Previews! diff --git a/package.json b/package.json index 212536f91..979a37799 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blitzkit", - "version": "1.31.3", + "version": "1.31.4", "license": "BlitzKit License", "private": true, "scripts": { From 8793c9a9c95265bbe90175135ac4628e9c9b8fe4 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 30 Sep 2026 15:44:51 -0500 Subject: [PATCH 12/97] simplify readme --- README.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/README.md b/README.md index da6ce8ef5..cc7f8f283 100644 --- a/README.md +++ b/README.md @@ -5,37 +5,3 @@ Tools for everything and anything, World of Tanks Blitz. This GitHub repository contains the code for BlitzKit and all its services. If you are here, looking to use BlitzKit, go to https://blitzkit.app/. If you intend to contribute to the code, note that you may need to check out sensitive, closed-source submodules to locally develop certain aspects of BlitzKit. Communicate with `@tresabhi` on Discord to get started or discuss sensitive content, such as environment variables or submodules. - -## Packages - -| Package | Title | Source | Memo | -| ------------------------------------ | -------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -| [packages/core](packages/core) | | | Mutual internal code shared between all other packages. | -| [packages/i18n](packages/i18n) | | [Crowdin](https://crowdin.com/project/blitzkrieg) | Translations served as JSON shared across all other packages, including some utility code. | -| [packages/scripts](packages/scripts) | | | CLI utilities for the development and deployment of BlitzKit services. | -| [packages/varuna](packages/varuna) | Varuna | [NPM](https://www.npmjs.com/package/varuna) | React and Astro-oriented state management library, awaiting separation from BlitzKit. Unavailable from NPM at this time. | -| [packages/website](packages/website) | BlitzKit | https://blitzkit.app | The BlitzKit website provides a wide range of tools, APIs, and interconnects all other services. | - -## Submodules - -| Submodule | Title | Source | Memo | -| ------------------------------------------------------ | --------- | ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [submodules/blitzkit-closed](packages/blitzkit-closed) | ClosedKit | [blitzkit/closed](https://github.com/blitzkit/closed) | Closed source, sensitive code hidden from the public to prevent bad actors from abusing the game. Discuss with `@tresabhi` on Discord for **special permission** to access. | - -## Environment Variables - -| Name | Source | BlitzKit Default | Memo | -| ------------------------------------------------------------- | -------------------------------------------------------------------------------- | ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | -| `PUBLIC_WARGAMING_APPLICATION_ID` | [Wargaming Developer's Room](https://developers.wargaming.net/) | | Application ID needed to communicate with Wargaming APIs. | -| `PUBLIC_PROMOTE_OPENTEST` | | `false` | Optional boolean dictating whether the website advertises [the opentest subdomain of BlitzKit](https://opentest.blitzkit.app/). | -| `WOTB_GLOSSARY`, `WOTB_GLOSSARY_DOMAIN`, `WOTB_GLOSSARY_PATH` | | | | -| `PUBLIC_GOOGLE_TAG_MANAGER_ID` | [Google Tag Manager](https://tagmanager.google.com/) | `G-GL2JVHCGPQ` | Google Tag Manager's unique identifier for analytical purposes. | -| `PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID` | [Google Analytics](https://analytics.google.com/) | `430711767` | Google Analytics' unique property ID for [BlitzKit's apex domain](https://blitzkit.app/) and subdomains. | -| `GOOGLE_APPLICATION_CREDENTIALS` | [Google Cloud](https://cloud.google.com/) | | Google Cloud's API key, primarily used for ranking popular tanks and finding relevant tank review videos in Tankopedia. | -| `PUBLIC_DISCORD_SERVER_ID` | [BlitzKit Discord Server](https://discord.gg/nDt7AjGJQH) | `734786591205359697` | BlitzKit Discord Server's id. | -| `PUBLIC_ASSET_BASE` | [blitzkit/assets](https://github.com/blitzkit/assets) | `https://blitzkit.github.io/assets` | The root domain and path that serves the external assets like tank models and icons. | -| `PUBLIC_GUIDE_WEBSITE` | [GuidesBlitz](https://guidesblitz.com/) | `https://guidesblitz.com` | The website that serves the encyclopedia-like content in BlitzKit. | -| `SERVICING` | | `false` | Wether the website is down for servicing. | -| `GH_TOKEN` | [GitHub Fine-Grained Tokens](https://github.com/settings/personal-access-tokens) | | The GitHub API key used for checking out private submodules and pushing content to the asset repository. | -| `DATABASE_URL` | [CockroachDB](https://www.cockroachlabs.com/) | | The CockroachDB-SQL database URL used to link Wargaming and Discord users. | -| `WOTB_DLC_CDN` | | | | From 953734966479c25cc32aa76b8457195a2091d17b Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 30 Sep 2026 15:49:19 -0500 Subject: [PATCH 13/97] add dependabot --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..e71304349 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "bun" + directory: "/" + schedule: + interval: "daily" From 7f9ee1f90719aef09094b368cb9e4b7c63b7434a Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 2 Oct 2026 18:27:10 +1300 Subject: [PATCH 14/97] Remove equalizer beta badge --- .../CharacteristicsSection/components/Equalizer.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx index 5a79c3feb..a5e2bfa1a 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx @@ -1,5 +1,5 @@ import { alias } from "@blitzkit/core"; -import { Badge, Box, Flex, Heading, Switch, Text } from "@radix-ui/themes"; +import { Box, Flex, Heading, Switch, Text } from "@radix-ui/themes"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { Tankopedia } from "../../../../stores/tankopedia"; @@ -12,12 +12,7 @@ export function Equalizer() { return ( - - {strings.website.tools.tankopedia.configuration.equalizer.title}{" "} - - {strings.website.tools.tankopedia.configuration.equalizer.beta} - - + {strings.website.tools.tankopedia.configuration.equalizer.title} Date: Fri, 2 Oct 2026 18:34:50 +1300 Subject: [PATCH 15/97] Fix contact shadows growing across modes Armor left gl.autoClear off after its frame, so ContactShadows accumulated onto an uncleared target. Restore it at the end of the frame. --- packages/website/src/components/Armor/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/Armor/index.tsx b/packages/website/src/components/Armor/index.tsx index 69da794dd..a87a864f7 100644 --- a/packages/website/src/components/Armor/index.tsx +++ b/packages/website/src/components/Armor/index.tsx @@ -27,8 +27,6 @@ export const Armor = memo(() => { const newRenderSize = new Vector2(); useFrame(({ gl, camera, scene }) => { - gl.autoClear = true; - gl.getSize(newRenderSize).multiplyScalar(gl.getPixelRatio()); if (!newRenderSize.equals(renderSize)) { @@ -50,6 +48,8 @@ export const Armor = memo(() => { gl.clearDepth(); gl.render(primaryArmorScene, camera); + + gl.autoClear = true; }, 1); return ( From d44c18402551882884da8549dbc54bacb9b22eed Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 2 Oct 2026 18:49:23 +1300 Subject: [PATCH 16/97] Clarify shooting camo labels --- packages/i18n/strings/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 534e2fa8d..06823f9bc 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -682,8 +682,8 @@ "viewRange": "View range", "camouflageStill": "Camouflage still", "camouflageMoving": "Moving", - "camouflageShootingStill": "Still", - "camouflageShootingMoving": "Moving", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "Caught on fire", "width": "Width", "height": "Height", From 0941c23a3c0738a88a1b0e425bfb771be5ade276 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 2 Oct 2026 19:24:43 +1300 Subject: [PATCH 17/97] Fix dynamic armor overlay vanishing on re-render PrimaryArmorSceneComponent rebuilt its ShaderMaterial every render with null uniforms that were only set once on mount. Create it once with useState instead. --- .../PrimaryArmorSceneComponent/index.tsx | 89 ++++++++++--------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx index d54a2f70e..656d77858 100644 --- a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx @@ -5,7 +5,7 @@ import { } from "@blitzkit/core"; import { invalidate, useFrame } from "@react-three/fiber"; import type { QuicklimeEvent } from "quicklime"; -import { useEffect } from "react"; +import { useEffect, useState } from "react"; import { MeshBasicMaterial, NormalBlending, @@ -43,42 +43,45 @@ export function PrimaryArmorSceneComponent({ node, thickness, }: PrimaryArmorSceneComponentProps) { - const material = new ShaderMaterial({ - fragmentShader, - vertexShader, + const [material] = useState( + () => + new ShaderMaterial({ + fragmentShader, + vertexShader, - fog: true, - transparent: true, + fog: true, + transparent: true, - blending: isHalloween ? SubtractiveBlending : NormalBlending, + blending: isHalloween ? SubtractiveBlending : NormalBlending, - uniforms: UniformsUtils.merge([ - UniformsLib.common, - UniformsLib.fog, + uniforms: UniformsUtils.merge([ + UniformsLib.common, + UniformsLib.fog, - { - thickness: { value: null }, - penetration: { value: null }, - caliber: { value: null }, - ricochet: { value: null }, - normalization: { value: null }, - isExplosive: { value: null }, - canSplash: { value: null }, - damage: { value: null }, - explosionRadius: { value: null }, - greenPenetration: { value: null }, - advancedHighlighting: { value: null }, - opaque: { value: null }, + { + thickness: { value: null }, + penetration: { value: null }, + caliber: { value: null }, + ricochet: { value: null }, + normalization: { value: null }, + isExplosive: { value: null }, + canSplash: { value: null }, + damage: { value: null }, + explosionRadius: { value: null }, + greenPenetration: { value: null }, + advancedHighlighting: { value: null }, + opaque: { value: null }, - inverseProjectionMatrix: { value: null }, - resolution: { value: new Vector2() }, - spacedArmorBuffer: { value: null }, - spacedArmorDepth: { value: null }, + inverseProjectionMatrix: { value: null }, + resolution: { value: new Vector2() }, + spacedArmorBuffer: { value: null }, + spacedArmorDepth: { value: null }, - opacity: { value: 0 }, - }, - ]), - }); + opacity: { value: 0 }, + }, + ]), + }) + ); useEffect(() => { function handleShellChange() { @@ -88,10 +91,10 @@ export function PrimaryArmorSceneComponent({ material.uniforms.caliber.value = shell.caliber; material.uniforms.ricochet.value = degToRad( - isExplosive(shell.type) ? 90 : shell.ricochet!, + isExplosive(shell.type) ? 90 : shell.ricochet! ); material.uniforms.normalization.value = degToRad( - shell.normalization ?? 0, + shell.normalization ?? 0 ); material.uniforms.isExplosive.value = isExplosive(shell.type); material.uniforms.canSplash.value = canSplash(shell.type); @@ -121,7 +124,7 @@ export function PrimaryArmorSceneComponent({ const hasEnhancedArmor = hasEquipment( 110, Duel.state.protagonist.tank.equipment_preset, - equipment, + equipment ); const equalizer = (Duel.state.equalize @@ -142,7 +145,7 @@ export function PrimaryArmorSceneComponent({ const hasCalibratedShells = hasEquipment( 103, Duel.state.antagonist.tank.equipment_preset, - equipment, + equipment ); material.uniforms.penetration.value = @@ -151,7 +154,7 @@ export function PrimaryArmorSceneComponent({ hasCalibratedShells, Duel.state.equalize, shell.type, - Duel.state.antagonist.tank.equalizer, + Duel.state.antagonist.tank.equalizer ); if (!noInvalidate) invalidate(); @@ -164,7 +167,7 @@ export function PrimaryArmorSceneComponent({ handleShellChange(); handleGreenPenetrationChange(TankopediaPersistent.state.greenPenetration); handleAdvancedHighlightingChange( - TankopediaPersistent.state.advancedHighlighting, + TankopediaPersistent.state.advancedHighlighting ); handleOpaqueChange(TankopediaPersistent.state.opaque); handleWireframeChange(TankopediaPersistent.state.wireframe); @@ -178,27 +181,27 @@ export function PrimaryArmorSceneComponent({ Tankopedia.on((state) => state.customShell, handleShellChange), TankopediaPersistent.on( (state) => state.greenPenetration, - handleGreenPenetrationChange, + handleGreenPenetrationChange ), TankopediaPersistent.on( (state) => state.advancedHighlighting, - handleAdvancedHighlightingChange, + handleAdvancedHighlightingChange ), TankopediaPersistent.on((state) => state.opaque, handleOpaqueChange), Duel.on( (state) => state.protagonist.equipmentMatrix, - () => handleProtagonistEquipmentChange(), + () => handleProtagonistEquipmentChange() ), Duel.on( (state) => state.antagonist.equipmentMatrix, - () => handleAntagonistEquipmentChange(), + () => handleAntagonistEquipmentChange() ), Duel.on( (state) => state.equalize, () => { handleProtagonistEquipmentChange(); handleAntagonistEquipmentChange(); - }, + } ), () => transitionEvent.off(handleTransitionEvent), ]; @@ -210,7 +213,7 @@ export function PrimaryArmorSceneComponent({ useFrame(({ gl, camera }) => { gl.getSize(material.uniforms.resolution.value).multiplyScalar( - gl.getPixelRatio(), + gl.getPixelRatio() ); material.uniforms.spacedArmorBuffer.value = spacedArmorRenderTarget.texture; material.uniforms.spacedArmorDepth.value = From f7db1280cf2eb33efad6529a967e59f2b68e9d67 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 16:34:12 -0500 Subject: [PATCH 18/97] use useRef instead of useState --- .../PrimaryArmorSceneComponent/index.tsx | 129 +++++++++--------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx index 656d77858..fe4f57145 100644 --- a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx @@ -5,7 +5,7 @@ import { } from "@blitzkit/core"; import { invalidate, useFrame } from "@react-three/fiber"; import type { QuicklimeEvent } from "quicklime"; -import { useEffect, useState } from "react"; +import { useEffect, useRef } from "react"; import { MeshBasicMaterial, NormalBlending, @@ -43,44 +43,43 @@ export function PrimaryArmorSceneComponent({ node, thickness, }: PrimaryArmorSceneComponentProps) { - const [material] = useState( - () => - new ShaderMaterial({ - fragmentShader, - vertexShader, + const material = useRef( + new ShaderMaterial({ + fragmentShader, + vertexShader, - fog: true, - transparent: true, + fog: true, + transparent: true, - blending: isHalloween ? SubtractiveBlending : NormalBlending, + blending: isHalloween ? SubtractiveBlending : NormalBlending, - uniforms: UniformsUtils.merge([ - UniformsLib.common, - UniformsLib.fog, + uniforms: UniformsUtils.merge([ + UniformsLib.common, + UniformsLib.fog, - { - thickness: { value: null }, - penetration: { value: null }, - caliber: { value: null }, - ricochet: { value: null }, - normalization: { value: null }, - isExplosive: { value: null }, - canSplash: { value: null }, - damage: { value: null }, - explosionRadius: { value: null }, - greenPenetration: { value: null }, - advancedHighlighting: { value: null }, - opaque: { value: null }, + { + thickness: { value: null }, + penetration: { value: null }, + caliber: { value: null }, + ricochet: { value: null }, + normalization: { value: null }, + isExplosive: { value: null }, + canSplash: { value: null }, + damage: { value: null }, + explosionRadius: { value: null }, + greenPenetration: { value: null }, + advancedHighlighting: { value: null }, + opaque: { value: null }, - inverseProjectionMatrix: { value: null }, - resolution: { value: new Vector2() }, - spacedArmorBuffer: { value: null }, - spacedArmorDepth: { value: null }, + inverseProjectionMatrix: { value: null }, + resolution: { value: new Vector2() }, + spacedArmorBuffer: { value: null }, + spacedArmorDepth: { value: null }, - opacity: { value: 0 }, - }, - ]), - }) + opacity: { value: 0 }, + }, + ]), + }), ); useEffect(() => { @@ -89,17 +88,17 @@ export function PrimaryArmorSceneComponent({ const shell = tankopediaEphemeral.customShell ?? Duel.state.antagonist.shell; - material.uniforms.caliber.value = shell.caliber; - material.uniforms.ricochet.value = degToRad( - isExplosive(shell.type) ? 90 : shell.ricochet! + material.current.uniforms.caliber.value = shell.caliber; + material.current.uniforms.ricochet.value = degToRad( + isExplosive(shell.type) ? 90 : shell.ricochet!, ); - material.uniforms.normalization.value = degToRad( - shell.normalization ?? 0 + material.current.uniforms.normalization.value = degToRad( + shell.normalization ?? 0, ); - material.uniforms.isExplosive.value = isExplosive(shell.type); - material.uniforms.canSplash.value = canSplash(shell.type); - material.uniforms.damage.value = shell.armor_damage; - material.uniforms.explosionRadius.value = shell.explosion_radius; + material.current.uniforms.isExplosive.value = isExplosive(shell.type); + material.current.uniforms.canSplash.value = canSplash(shell.type); + material.current.uniforms.damage.value = shell.armor_damage; + material.current.uniforms.explosionRadius.value = shell.explosion_radius; handleProtagonistEquipmentChange(true); handleAntagonistEquipmentChange(true); @@ -107,31 +106,32 @@ export function PrimaryArmorSceneComponent({ invalidate(); } function handleGreenPenetrationChange(greenPenetration: boolean) { - material.uniforms.greenPenetration.value = greenPenetration; + material.current.uniforms.greenPenetration.value = greenPenetration; } function handleAdvancedHighlightingChange(advancedHighlighting: boolean) { - material.uniforms.advancedHighlighting.value = advancedHighlighting; + material.current.uniforms.advancedHighlighting.value = + advancedHighlighting; invalidate(); } function handleOpaqueChange(opaque: boolean) { - material.uniforms.opaque.value = opaque; + material.current.uniforms.opaque.value = opaque; } function handleWireframeChange(wireframe: boolean) { - material.wireframe = wireframe; + material.current.wireframe = wireframe; } function handleProtagonistEquipmentChange(noInvalidate = false) { const equipment = Duel.state.protagonist.equipmentMatrix; const hasEnhancedArmor = hasEquipment( 110, Duel.state.protagonist.tank.equipment_preset, - equipment + equipment, ); const equalizer = (Duel.state.equalize ? Duel.state.protagonist.tank.equalizer?.armor : undefined) ?? 1; - material.uniforms.thickness.value = + material.current.uniforms.thickness.value = thickness * (hasEnhancedArmor ? 1.04 : 1) * equalizer; if (!noInvalidate) invalidate(); @@ -145,29 +145,29 @@ export function PrimaryArmorSceneComponent({ const hasCalibratedShells = hasEquipment( 103, Duel.state.antagonist.tank.equipment_preset, - equipment + equipment, ); - material.uniforms.penetration.value = + material.current.uniforms.penetration.value = penetration * resolvePenetrationCoefficient( hasCalibratedShells, Duel.state.equalize, shell.type, - Duel.state.antagonist.tank.equalizer + Duel.state.antagonist.tank.equalizer, ); if (!noInvalidate) invalidate(); } function handleTransitionEvent(event: QuicklimeEvent) { - material.uniforms.opacity.value = event.data; + material.current.uniforms.opacity.value = event.data; } handleShellChange(); handleGreenPenetrationChange(TankopediaPersistent.state.greenPenetration); handleAdvancedHighlightingChange( - TankopediaPersistent.state.advancedHighlighting + TankopediaPersistent.state.advancedHighlighting, ); handleOpaqueChange(TankopediaPersistent.state.opaque); handleWireframeChange(TankopediaPersistent.state.wireframe); @@ -181,27 +181,27 @@ export function PrimaryArmorSceneComponent({ Tankopedia.on((state) => state.customShell, handleShellChange), TankopediaPersistent.on( (state) => state.greenPenetration, - handleGreenPenetrationChange + handleGreenPenetrationChange, ), TankopediaPersistent.on( (state) => state.advancedHighlighting, - handleAdvancedHighlightingChange + handleAdvancedHighlightingChange, ), TankopediaPersistent.on((state) => state.opaque, handleOpaqueChange), Duel.on( (state) => state.protagonist.equipmentMatrix, - () => handleProtagonistEquipmentChange() + () => handleProtagonistEquipmentChange(), ), Duel.on( (state) => state.antagonist.equipmentMatrix, - () => handleAntagonistEquipmentChange() + () => handleAntagonistEquipmentChange(), ), Duel.on( (state) => state.equalize, () => { handleProtagonistEquipmentChange(); handleAntagonistEquipmentChange(); - } + }, ), () => transitionEvent.off(handleTransitionEvent), ]; @@ -212,13 +212,14 @@ export function PrimaryArmorSceneComponent({ }, []); useFrame(({ gl, camera }) => { - gl.getSize(material.uniforms.resolution.value).multiplyScalar( - gl.getPixelRatio() + gl.getSize(material.current.uniforms.resolution.value).multiplyScalar( + gl.getPixelRatio(), ); - material.uniforms.spacedArmorBuffer.value = spacedArmorRenderTarget.texture; - material.uniforms.spacedArmorDepth.value = + material.current.uniforms.spacedArmorBuffer.value = + spacedArmorRenderTarget.texture; + material.current.uniforms.spacedArmorDepth.value = spacedArmorRenderTarget.depthTexture; - material.uniforms.inverseProjectionMatrix.value = + material.current.uniforms.inverseProjectionMatrix.value = camera.projectionMatrixInverse; }); @@ -243,7 +244,7 @@ export function PrimaryArmorSceneComponent({ {...props} key={`${key}-include`} renderOrder={1} - material={material} + material={material.current} /> ); }, From 1a2caf120b9eb838625c3a1e5bbf65454c3a00c0 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 16:55:53 -0500 Subject: [PATCH 19/97] remove some dead code --- .../src/blitzkit/api/server/3_modelDefinitions.ts | 13 ++----------- .../pages/[...chunk_api]/icons/shells/[id].webp.ts | 9 --------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/packages/core/src/blitzkit/api/server/3_modelDefinitions.ts b/packages/core/src/blitzkit/api/server/3_modelDefinitions.ts index dfc96c1ab..3e6f7f590 100644 --- a/packages/core/src/blitzkit/api/server/3_modelDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/3_modelDefinitions.ts @@ -3,10 +3,8 @@ import { BlitzCrewType, ChassisDefinitionsList, Crew, - EngineDefinitionsList, GunDefinitionsList, ModelDefinitions, - ResearchCost, TankParameters, toUniqueId, TurretDefinitionsList, @@ -15,10 +13,10 @@ import { VehicleDefinitionList, VehicleDefinitions, } from "@blitzkit/core"; -import { Cache } from "./0_base"; -import { ServerBlitzKitAPI2 } from "./2_camouflageDefinitions"; import { parse as parsePath } from "path"; import { Vector3Tuple } from "three"; +import { Cache } from "./0_base"; +import { ServerBlitzKitAPI2 } from "./2_camouflageDefinitions"; export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 { private vector3TupleToBlitzkit(tuple: Vector3Tuple) { @@ -55,9 +53,6 @@ export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 { const gunList = await this.vfs.xml<{ root: GunDefinitionsList; }>(`Data/XML/item_defs/vehicles/${nation}/components/guns.xml`); - const enginesList = await this.vfs.xml<{ - root: EngineDefinitionsList; - }>(`Data/XML/item_defs/vehicles/${nation}/components/engines.xml`); const chassisList = await this.vfs.xml<{ root: ChassisDefinitionsList; }>(`Data/XML/item_defs/vehicles/${nation}/components/chassis.xml`); @@ -65,10 +60,6 @@ export abstract class ServerBlitzKitAPI3 extends ServerBlitzKitAPI2 { for (const tankKey in tankList.root) { if (this.botPattern.test(tankKey)) continue; - const gunXps = new Map(); - const turretXps = new Map(); - const engineXps = new Map(); - const trackXps = new Map(); const tank = tankList.root[tankKey]; const tankDefinition = await this.vfs.xml<{ root: VehicleDefinitions }>( `Data/XML/item_defs/vehicles/${nation}/${tankKey}.xml`, diff --git a/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts b/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts index 917866910..f8c520d04 100644 --- a/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts +++ b/packages/website/src/pages/[...chunk_api]/icons/shells/[id].webp.ts @@ -11,13 +11,6 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { .dir(`Data/Gfx/Shared/tank-supply/ammunition/big`) .then((files) => files.filter((file) => file.endsWith("_l.txt"))); - console.log( - "Shell files raw", - await vfs.dir(`Data/Gfx/Shared/tank-supply/ammunition/big`), - ); - - console.log("Shell file paths", files); - for (const file of files) { const id = file.match(/(.+)_l\.txt/)![1]; const sizes = ( @@ -33,8 +26,6 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { }); } - console.log("Shell paths", paths); - return paths; }); From 74ca01f97866b625367c08940f4e62ee02f7b6e4 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 17:01:43 -0500 Subject: [PATCH 20/97] remove string --- packages/i18n/strings/en.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 534e2fa8d..bbdd22efd 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -573,8 +573,7 @@ "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "Modules", From a5321ebde312c4770b7905d274bf9387d8a5b8ad Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 17:05:25 -0500 Subject: [PATCH 21/97] game mode banner with string ids --- .../CharacteristicsSection/components/Equalizer.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx index a5e2bfa1a..d06240059 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx @@ -29,9 +29,9 @@ export function Equalizer() { style={{ cursor: "pointer", borderRadius: "var(--radius-3)", - backgroundImage: `url(${alias("api", `/gamemodes/45/banner.webp`)})`, + backgroundImage: `url(${alias("api", `/gamemodes/Insanity/banner.webp`)})`, backgroundSize: "cover", - backgroundPosition: "center", + backgroundPosition: "50% 25%", overflow: "hidden", }} > From 91da72e8b41cd9d6e3bcc4601ceef967339b98d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:08:10 -0700 Subject: [PATCH 22/97] New Crowdin updates (#268) --- packages/i18n/strings/zh.json | 298 +++++++++++++++++----------------- 1 file changed, 149 insertions(+), 149 deletions(-) diff --git a/packages/i18n/strings/zh.json b/packages/i18n/strings/zh.json index 0ca5b5b64..84eecb93a 100644 --- a/packages/i18n/strings/zh.json +++ b/packages/i18n/strings/zh.json @@ -7,13 +7,13 @@ "common": { "name": "BlitzKit", "units": { - "m": "{value} 公尺", - "mm": "{value} 毫米", - "deg": "{value} 度°", - "hp": "{value} 生命值", + "m": "{value}m", + "mm": "{value}mm", + "deg": "{value} °", + "hp": "{value}血量", "x": "x{value}", "percentage": "{value}%", - "deg_s": "{value}度每秒", + "deg_s": "{value}°/s", "plus": "+{value}" }, "gun_types": { @@ -23,7 +23,7 @@ }, "shells": { "ap": "穿甲弹", - "ap_cr": "硬式复合穿甲弹", + "ap_cr": "硬芯穿甲弹", "hc": "破甲弹", "he": "高爆弹" }, @@ -38,10 +38,10 @@ }, "branches": { "beta": "测试版", - "development": "Development", - "opentest": "开放测试", - "preview": "Preview", - "production": "Production" + "development": "开发分支", + "opentest": "公开测试", + "preview": "预览分支", + "production": "生产环境" }, "locales": { "en": "英语", @@ -61,23 +61,23 @@ "3": "平均", "4": "高于平均", "5": "好", - "6": "好", + "6": "非常好", "7": "很好", - "8": "非常好", - "9": "极品" + "8": "强势", + "9": "超强势" }, "bkni_percentile": { "0": "垃圾", "1": "非常差", "2": "很差", "3": "差", - "4": "低于平均", + "4": "较差", "5": "平均", "6": "较好", "7": "好", "8": "很好", - "9": "非常好", - "10": "极品" + "9": "强势", + "10": "超强势" }, "nations": { "ussr": "苏联", @@ -87,8 +87,8 @@ "uk": "英国", "france": "法国", "japan": "日本", - "european": "欧盟 (E系)", - "other": "X系" + "european": "泛欧", + "other": "混合系" }, "nations_adjectives": { "ussr": "苏联", @@ -98,14 +98,14 @@ "uk": "英国", "france": "法国", "japan": "日本", - "european": "欧盟 (E系)", - "other": "X系" + "european": "泛欧", + "other": "混合系" }, "tank_class_short": { "-1": "未知", "0": "轻型坦克", "1": "中型坦克", - "2": "重型战车", + "2": "重型坦克", "3": "坦克歼击车" }, "tank_class_short_plural_lowercase": { @@ -129,14 +129,14 @@ }, "regions": { "normal": { - "com": "北美", - "eu": "欧洲", - "asia": "亚太地区" + "com": "北美服务器", + "eu": "欧洲服务器", + "asia": "亚太服务器" }, "short": { - "com": "北美", + "com": "美服", "eu": "欧洲", - "asia": "亚太地区" + "asia": "亚服" } }, "leagues": { @@ -155,7 +155,7 @@ "normalized_losses": "战败率", "normalized_misses": "未命中数", "normalized_shots": "开火次数", - "normalized_spotted": "侦查次数", + "normalized_spotted": "侦查数", "normalized_survived_battles": "存活率", "normalized_win_and_survived": "胜利并幸存的概率", "normalized_wins": "胜率", @@ -178,7 +178,7 @@ "cumulative_shots": "总射击数", "cumulative_spotted": "总侦查敌人数", "cumulative_survived_battles": "存活场次", - "cumulative_win_and_survived": "胜利与存活场次", + "cumulative_win_and_survived": "胜利并存活场次", "cumulative_wins": "胜利", "cumulative_xp": "总经验", "cumulative_wn8": "WN8", @@ -203,27 +203,27 @@ "searching": "搜索中..." }, "copy_button": { - "copied": "已拷贝！" + "copied": "已复制！" }, "tank_search": { - "select_dialog_title": "搜索坦克", + "select_dialog_title": "查找坦克", "swap_dialog_title": "交换坦克", - "clear_filters": "清除筛选", - "login": "登录以使用它", - "search_bar_hint": "搜寻战车……", - "recent": "最近查看的", + "clear_filters": "清空筛选器", + "login": "请先登录", + "search_bar_hint": "查找坦克……", + "recent": "最近查过", "select_all": "全选", "count_singular": "1 辆坦克", "count_plural": "{count} 辆坦克", "sorting_by": "按 {name} 排序", - "clear": "清除", - "tier": "{tier} 阶", + "clear": "清空", + "tier": "{tier} 级", "passive": "{name} (被动)", "active": "{name} (主动)", "no_tanks_found": { "body": "未找到坦克。", "search_again": "请尝试重新搜索。", - "clear_filters": "请尝试清除筛选。" + "clear_filters": "请尝试清空筛选器。" }, "sort": { "meta.none": "无", @@ -231,30 +231,30 @@ "survivability.viewRange": "侦察范围", "survivability.camouflageStill": "静止中隐蔽值", "survivability.camouflageMoving": "移动中隐蔽值", - "survivability.camouflageShooting": "射击隐蔽值", + "survivability.camouflageShooting": "射击隐蔽", "survivability.volume": "体积", "survivability.length": "长度", - "fire.dpm": "标准炮弹 每分钟伤害血量", - "fire.dpmPremium": "金币炮弹 每分钟伤害值", + "fire.dpm": "银币弹 每分钟伤害", + "fire.dpmPremium": "金币弹 每分钟伤害", "fire.reload": "装填时间", "fire.caliber": "口径", - "fire.standardPenetration": "标准炮弹穿透力", - "fire.premiumPenetration": "金币炮弹穿透力", - "fire.tertiaryPenetration": "第三种炮弹穿透力", - "fire.damage": "炮弹伤害值", + "fire.standardPenetration": "银币弹穿深", + "fire.premiumPenetration": "金币弹穿深", + "fire.tertiaryPenetration": "高爆弹穿深", + "fire.damage": "均伤", "fire.moduleDamage": "模组伤害值", - "fire.shellVelocity": "炮弹飞行速度", + "fire.shellVelocity": "弹速", "fire.shellRange": "最大射程", - "fire.shellCapacity": "携弹量", + "fire.shellCapacity": "载弹量", "fire.aimTime": "瞄准时间", - "fire.dispersionStill": "一百米处扩散度", - "fire.dispersionMoving": "移动时扩散度", + "fire.dispersionStill": "百米精度", + "fire.dispersionMoving": "移动扩圈", "fire.gunDepression": "俯角", "fire.gunElevation": "仰角", - "maneuverability.forwardsSpeed": "最高前进速度", - "maneuverability.backwardsSpeed": "最高后退速度", + "maneuverability.forwardsSpeed": "前进极速", + "maneuverability.backwardsSpeed": "后退极速", "maneuverability.power": "引擎功率", - "maneuverability.powerToWeight": "功重比", + "maneuverability.powerToWeight": "推重比", "maneuverability.weight": "重量", "maneuverability.traverseSpeed": "转速" }, @@ -266,10 +266,10 @@ "label": "排序依据", "fire": "开火", "maneuverability": "机动性", - "survivability": "生存能力" + "survivability": "生存性" }, "direction": { - "label": "排序算法", + "label": "排序方式", "ascending": "升序", "descending": "倒序" } @@ -301,8 +301,8 @@ }, "docs": { "patches": { - "name": "BlitzKit 变更日志", - "seo_description": "BlitzKit Discord 机器人和网站的变更日志" + "name": "BlitzKit 更新日志", + "seo_description": "BlitzKit Discord 机器人和网站的更新日志" } }, "tools": { @@ -339,44 +339,44 @@ "pool_size": "{count} 辆可生成的坦克" }, "mixer": { - "name": "组装", + "name": "拼装器", "button": "混合搭配", "description": "混搭不同坦克间的模块", - "seo_description": "《坦克世界：闪击战》的车体, 炮塔, 主炮混合搭配", + "seo_description": "混搭WoTB的坦克车体、炮塔与主炮", "screenshot": "屏幕截图", "randomize": "随机搭配" }, "guess": { "name": "猜测", - "button": "这会是什么？", + "button": "这可能是什么？", "description": "坦克剪影小游戏", "seo_description": "看剪影猜坦克", "search": { - "placeholder": "输入你的猜想……", + "placeholder": "输入你的猜测……", "skip": "跳过", "guess": "猜测", "next": "下一个", - "no_results": "沒有結果" + "no_results": "无结果" }, - "stats": "猜对了 {correct} / {total}", + "stats": "猜对了 {correct} / {total}，连对 {streak} 个", "help": { - "title": "显示坦克?", - "description": "显示坦克而不显示名字。这轮会被视为不正确，并打破你的连续记录！", + "title": "部分揭示坦克？", + "description": "揭示坦克但不显示答案。本轮会被视为答错，并中断连对！", "cancel": "取消", - "reveal": "显示" + "reveal": "揭示" }, "clear": "清除", "select_all": "全选", - "tier": "{tier} 阶" + "tier": "{tier} 级" }, "tankopedia": { "search": "搜索属性……", - "name": "战车百科", - "button": "搜索战车", - "description": "闪击战坦克百科全书", - "seo_description": "《坦克世界：闪击战》的所有坦克参数， 装甲， 等等...", - "tank_seo_title": "{name} - {tier} 阶 {nationality} {class} | {website} 坦克百科 | 坦克世界闪击战 (WoTB)", - "tank_seo_description": "{name} 装甲，统计资料，装备，规定配给等。 {dpm} 每分钟伤害， {alpha} 伤害值， {penetration}毫米 穿透， {speed}公里/小時 最高速度， {health} 生命值。", + "name": "坦克百科", + "button": "搜索坦克", + "description": "WoTB坦克百科", + "seo_description": "WoTB所有坦克的参数、 装甲等", + "tank_seo_title": "{name} - {tier} 级 {nationality} {class} | {website} 坦克百科 | 坦克世界闪击战（坦闪/WoTB）", + "tank_seo_description": "{name} 装甲、参数、配件、补给等。 {dpm} 每分钟伤害， {alpha} 均伤， {penetration}mm 穿深， {speed}km/h 极速， {health} 血量。", "visualizers": { "reload": { "skip": "跳过" @@ -387,15 +387,15 @@ "rotator": { "hull": "车体", "turret": "炮塔", - "hard": "硬地质", - "medium": "中性地質", - "soft": "軟地質", - "effective": "效率" + "hard": "公路", + "medium": "平地", + "soft": "水面", + "effective": "等效" }, "ricochet": { "angle": "角度", "normalization": "转正", - "effective_angle": "有效角度", + "effective_angle": "有效倾角", "armor": "装甲", "no_ricochet": "高爆弹不会跳弹" }, @@ -407,20 +407,20 @@ "flexibility": { "yaw": "水平角度", "pitch": "俯仰角度", - "min": "最少俯角", - "max": "最大仰角" + "min": "极限俯角", + "max": "极限仰角" } }, "sandbox": { "poses": { "hull_down": "俯角视角", - "face_hug": "抱脸视角", + "face_hug": "顶牛视角", "default": "默认" }, "settings": { "armor": "装甲", - "green_penetration": "可击穿区域", - "hide_model_under_armor": "隐藏装甲下的模型", + "green_penetration": "绿色可击穿", + "hide_model_under_armor": "隐藏坦克模型", "opaque": "不透明", "dev_wireframe": "开发选项：网格" }, @@ -454,14 +454,14 @@ "track": "履带" }, "status": { - "penetration": "{damage}生命值 击穿", + "penetration": "击穿：{damage}血量", "blocked": "抵挡伤害", "ricochet": "跳弹", - "splash": "{damage}生命值 溅射" + "splash": "溅射：{damage}血量" }, "stats": { - "thickness_and_angle": "{thickness}毫米 {angle}度°", - "nominal": "{thickness}毫米 装甲厚度", + "thickness_and_angle": "{thickness}mm/倾角{angle}°", + "nominal": "{thickness}mm 垂直厚度", "ricochet_loss": "{loss}% 击穿" } } @@ -490,9 +490,9 @@ "nation": "国别", "class": "坦克车型", "tier": "阶级", - "type": "战车类型", + "type": "坦克类型", "dev_id": "开发参数：ID", - "dev_name": "DEV: NAME", + "dev_name": "开发者名称", "purchase": "购买价格", "restoration": "恢复坦克价格", "sale": "出售价格", @@ -500,9 +500,9 @@ }, "tech_tree": { "title": "科技树", - "battle": "一场比赛", - "battles": "{count} 战斗场次", - "route": "路线 {index} / {count}" + "battle": "1场比赛", + "battles": "{count} 场次", + "route": "第 {index} / {count} 种科技线" }, "game_modes": { "title": "游戏模式技能" @@ -514,33 +514,33 @@ "configuration": { "title": "配置设定", "equalizer": { - "title": "Equalizer", - "equalize": "Equalize", - "beta": "测试版" + "title": "平衡器", + "equalize": "平衡", + "beta": "测试" }, "modules": { "title": "坦克模块", "stock": "白板", - "upgrade": "顶级配置" + "upgrade": "满配" }, "equipment": { "title": "装备", "clear": "清除" }, "provisions": { - "title": "规定配给", + "title": "补给", "clear": "清除" }, "consumables": { "title": "消耗品", "clear": "清除", - "info": "黄色高亮消耗品不影响坦克参数。" + "info": "以黄色标识的消耗品不影响坦克参数。" }, "skills": { "title": "乘员技能", "clear": "清除", "maximize": "最大化", - "info": "黄色高亮技能只适用于特殊情况。 按空格键可在0到7级之间快速切换。" + "info": "以黄色标识的技能只在特定情形起效。 按空格键可在0到7级之间快速切换。" }, "miscellaneous": { "title": "杂项" @@ -550,48 +550,48 @@ "title": "属性", "compare": { "label": "比较", - "class": "{tier} 阶的 {class}", - "tier": "所有{tier} 阶的", + "class": "{tier}级{class}", + "tier": "所有{tier}级坦克", "all": "所有坦克" }, "values": { "shell_index": "炮弹 {index}", - "at_distance": "在 {distance} 公尺", + "at_distance": "距离{distance}m", "at_distance_slider_label": "距离", - "dispersion_at_distance": "在 {distance} 公尺的扩散度", - "gun_flexibility": "炮管转动界限", + "dispersion_at_distance": "在 {distance}m 的精度", + "gun_flexibility": "主炮俯仰角", "speed": "速度", - "terrain_coefficients": "地形系数", + "terrain_coefficients": "地形适应性", "raw_terrain_coefficients": "原始地形系数", - "power_to_weight_ratio": "功重比", + "power_to_weight_ratio": "推重比", "hull_traverse_speed": "车体转向速率", - "camouflage": "迷彩", + "camouflage": "涂装", "reload": "装填时间", "crewCount": "乘员人数", "shellNormalization": "转正", "shellRicochet": "跳弹", "dpm": "每分钟伤害", - "dpmEffective": "60秒内生效", + "dpmEffective": "60秒内实际输出", "shells": "炮弹 ", "mostOptimalShellIndex": "最优炮弹", "shellReloads": "装填时间", "shellReload": "装填时间", - "intraClip": "炮弹装填", + "intraClip": "短装", "caliber": "口径", "penetration": "穿深", "damage": "伤害", "damageWithoutAssault": "无突击弹的伤害", - "clipDamage": "弹匣伤害期望值", - "moduleDamage": "模组伤害", + "clipDamage": "总爆发", + "moduleDamage": "模块伤害", "explosionRadius": "溅射半径", "shellVelocity": "炮弹飞行速度", "aimTime": "瞄准时间", "dispersion": "静止時", "dispersionMoving": "移动时", "dispersionHullTraversing": "车体转向时", - "dispersionTurretTraversing": "炮塔转向时", + "dispersionTurretTraversing": "炮转扩圈", "dispersionShooting": "开火时", - "dispersionGunDamaged": "主炮损坏时", + "dispersionGunDamaged": "主炮损坏扩圈", "gunDepression": "俯角", "gunElevation": "仰角", "gunFrontalDepression": "车体前部俯角", @@ -600,42 +600,42 @@ "gunRearElevation": "车体后部仰角", "azimuthLeft": "左射界", "azimuthRight": "右射界", - "speedForwards": "最高前进速度", - "speedBackwards": "最高后退速度", - "hardTerrainCoefficient": "硬地质", - "hardTerrainCoefficientRaw": "硬地质", - "mediumTerrainCoefficient": "中性地质", - "mediumTerrainCoefficientRaw": "中性地质", - "softTerrainCoefficient": "软地质", - "softTerrainCoefficientRaw": "软地质", + "speedForwards": "前进极速", + "speedBackwards": "后退极速", + "hardTerrainCoefficient": "公路", + "hardTerrainCoefficientRaw": "公路-原始", + "mediumTerrainCoefficient": "平地", + "mediumTerrainCoefficientRaw": "平地-原始", + "softTerrainCoefficient": "水面", + "softTerrainCoefficientRaw": "水面-原始", "enginePower": "引擎功率", - "powerToWeightRatioHardTerrain": "硬地质", - "powerToWeightRatioMediumTerrain": "中性地质", - "powerToWeightRatioSoftTerrain": "软地质", + "powerToWeightRatioHardTerrain": "公路实际推重", + "powerToWeightRatioMediumTerrain": "平地实际推重", + "powerToWeightRatioSoftTerrain": "水面实际推重", "weight": "重量", "turretTraverseSpeed": "炮塔转向速率", "gunTraverseSpeed": "炮管转向速率", - "hullTraverseHardTerrain": "硬地质", - "hullTraverseMediumTerrain": "中性地质", - "hullTraverseSoftTerrain": "软地质", - "health": "生命值", - "fireChance": "着火概率", + "hullTraverseHardTerrain": "公路上车转速率", + "hullTraverseMediumTerrain": "平地上车转速率", + "hullTraverseSoftTerrain": "水面上车转速率", + "health": "血量", + "fireChance": "发动机受击时着火概率", "viewRange": "视野范围", - "camouflageStill": "静止时", + "camouflageStill": "静止隐蔽", "camouflageMoving": "移动时", "camouflageShootingStill": "静止时", - "camouflageShootingMoving": "移动时", - "camouflageCaughtOnFire": "着火时", + "camouflageShootingMoving": "移动开火隐蔽", + "camouflageCaughtOnFire": "着火时隐蔽", "width": "宽度", "height": "高度", "length": "长度", "volume": "体积", "shellRange": "射程", - "shellCapacity": "携弹量", - "gunType": "炮管类型", - "penetrationAt250m": "两百五十米处的穿透力", - "burstShells": "爆破计数", - "burstInterShell": "爆破弹" + "shellCapacity": "载弹量", + "gunType": "主炮类型", + "penetrationAt250m": "250m处穿深", + "burstShells": "小弹夹发数", + "burstInterShell": "小弹夹短装" } }, "firepower": { @@ -662,7 +662,7 @@ "name": "比较", "button": "坦克比较", "description": "比较坦克参数", - "seo_description": "比较《坦克世界：闪击战》中的坦克参数和装备配置", + "seo_description": "比较坦克世界闪击战中的坦克参数和装备配置", "actions": { "add": { "button": "添加", @@ -692,15 +692,15 @@ }, "modules": { "stock": "白板", - "upgrade": "顶级配置" + "upgrade": "满配" }, "provisions": { - "clear": "清除", - "clear_all": "清除所有坦克" + "clear": "清空此坦克", + "clear_all": "清空所有坦克" }, "consumables": { - "clear": "清除", - "clear_all": "清除所有坦克" + "clear": "清空此坦克", + "clear_all": "清空所有坦克" } } }, @@ -708,7 +708,7 @@ "name": "性能表现", "button": "查看坦克", "description": "坦克性能统计", - "seo_description": "最好的坦克及其在《坦克世界：闪击战》中的表现", + "seo_description": "最好的坦克及其在坦克世界闪击战中的数据", "estimation": { "body": "基于 {count} 个玩家的估计数据。更新于 {age} 之前。", "hours": "{count} 小时", @@ -726,15 +726,15 @@ "winrate": "胜率", "players": "玩家", "damage": "伤害", - "survival": "生存性", + "survival": "生存率", "xp": "经验值", "kills": "击杀数", - "spots": "侦查次数", + "spots": "侦查数", "accuracy": "命中率", "shots": "开火次数", "hits": "命中数", - "damage_ratio": "伤害效率", - "damage_taken": "承受伤害值", + "damage_ratio": "伤害比率", + "damage_taken": "承受伤害", "capture_points": "占领值" } } @@ -743,11 +743,11 @@ "name": "图库", "button": "浏览全部", "description": "Blitz玩家头像", - "seo_description": "所有《坦克世界：闪击战》玩家头像", + "seo_description": "所有坦克世界闪击战玩家头像", "last_updated": "最后更新于 {time}", "search": { - "hint": "搜索頭像……", - "results": "{count} 头像" + "hint": "搜索头像……", + "results": "{count}个头像" } }, "session": { From ecfd50f05b91ed783feab2426233946f24d093bc Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 17:35:12 -0500 Subject: [PATCH 23/97] logs --- docs/changelogs/1.31.4.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/changelogs/1.31.4.md b/docs/changelogs/1.31.4.md index 229fd754d..36f96b947 100644 --- a/docs/changelogs/1.31.4.md +++ b/docs/changelogs/1.31.4.md @@ -2,9 +2,20 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update. +## Features + +- [Mark Greene] Added Peekaboo DPM + - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot +- + ## Fixes - [Mark Greene] BlitzKit Session now properly handles tanks removed from the game +- [Mark Greene] Removed the Beta badge from the Equalizer button +- Updated the background image for the Equalizer button to the actual banner of the new game mode +- [Mark Greene] The armor no longer disappears when you turn on Dynamic Armor System +- [Mark Greene] Camouflage values in Tankopedia are now more descriptive when shooting +- [Mark Greene] The contact shadows on the ground no longer grow & darken when switching between tabs ## Technical Fixes @@ -12,3 +23,4 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - The directory which preview versions of the game are downloaded to are now created properly - This was the last bug standing in the way of BlitzKit Previews - Welcome back, BlitzKit Previews! +- Removed some dead code from the BlitzKit model mangler From eea358c4e1ace88f94afe5c01edaf36e764dddec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:38 -0700 Subject: [PATCH 24/97] New translations en.json (Ukrainian) [ci skip] --- packages/i18n/strings/uk.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/i18n/strings/uk.json b/packages/i18n/strings/uk.json index c8bf56162..945d41188 100644 --- a/packages/i18n/strings/uk.json +++ b/packages/i18n/strings/uk.json @@ -515,8 +515,7 @@ "title": "Configuration", "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "Модулі", @@ -572,6 +571,8 @@ "shellRicochet": "Рикошет", "dpm": "DPM", "dpmEffective": "Effective at 60s", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "Снаряди", "mostOptimalShellIndex": "Most optimal shell", "shellReloads": "Reloads", From 8e8da15254b5724bc6df83ee0acc8ecace3d4f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:40 -0700 Subject: [PATCH 25/97] New translations en.json (Chinese Simplified) [ci skip] --- packages/i18n/strings/zh.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/i18n/strings/zh.json b/packages/i18n/strings/zh.json index 84eecb93a..eeb75358e 100644 --- a/packages/i18n/strings/zh.json +++ b/packages/i18n/strings/zh.json @@ -515,8 +515,7 @@ "title": "配置设定", "equalizer": { "title": "平衡器", - "equalize": "平衡", - "beta": "测试" + "equalize": "平衡" }, "modules": { "title": "坦克模块", @@ -572,6 +571,8 @@ "shellRicochet": "跳弹", "dpm": "每分钟伤害", "dpmEffective": "60秒内实际输出", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "炮弹 ", "mostOptimalShellIndex": "最优炮弹", "shellReloads": "装填时间", From 35ce79a421743294e7d8216b076f2ce777f6046e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:41 -0700 Subject: [PATCH 26/97] New translations en.json (French) [ci skip] --- packages/i18n/strings/fr.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/i18n/strings/fr.json b/packages/i18n/strings/fr.json index 7c4393c4b..7e5d2a7c3 100644 --- a/packages/i18n/strings/fr.json +++ b/packages/i18n/strings/fr.json @@ -515,8 +515,7 @@ "title": "Configuration", "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "Modules", @@ -572,6 +571,8 @@ "shellRicochet": "Ricochet", "dpm": "DPM", "dpmEffective": "Effective at 60s", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "Shells", "mostOptimalShellIndex": "Most optimal shell", "shellReloads": "Reloads", @@ -623,8 +624,8 @@ "viewRange": "View range", "camouflageStill": "Still", "camouflageMoving": "Moving", - "camouflageShootingStill": "Still", - "camouflageShootingMoving": "Moving", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "Caught on fire", "width": "Width", "height": "Height", From 66a6aece7c1d6020e779a22975ead9b11e5cd2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:43 -0700 Subject: [PATCH 27/97] New translations en.json (Spanish) [ci skip] --- packages/i18n/strings/es.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/i18n/strings/es.json b/packages/i18n/strings/es.json index cb4e05d34..8df0c4a90 100644 --- a/packages/i18n/strings/es.json +++ b/packages/i18n/strings/es.json @@ -515,8 +515,7 @@ "title": "", "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "Módulos", @@ -572,6 +571,8 @@ "shellRicochet": "Rebote", "dpm": "DPM", "dpmEffective": "Effective at 60s", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "Proyectiles", "mostOptimalShellIndex": "Proyectil más óptimo", "shellReloads": "Reloads", @@ -623,8 +624,8 @@ "viewRange": "Rango de visión", "camouflageStill": "Quieto", "camouflageMoving": "En movimiento", - "camouflageShootingStill": "Quieto", - "camouflageShootingMoving": "En movimiento", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "Atrapado en fuego", "width": "Ancho", "height": "Altura", From 38c595ebcec30e4c3f727867d6b4b9468b5cf4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:45 -0700 Subject: [PATCH 28/97] New translations en.json (Japanese) [ci skip] --- packages/i18n/strings/ja.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/i18n/strings/ja.json b/packages/i18n/strings/ja.json index 85475d201..18ae1e3f4 100644 --- a/packages/i18n/strings/ja.json +++ b/packages/i18n/strings/ja.json @@ -515,8 +515,7 @@ "title": "構成", "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "モジュール", @@ -572,6 +571,8 @@ "shellRicochet": "跳弾角度", "dpm": "DPM", "dpmEffective": "60秒での有効値", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "砲弾", "mostOptimalShellIndex": "最適な弾数", "shellReloads": "Reloads", @@ -623,8 +624,8 @@ "viewRange": "視認範囲", "camouflageStill": "静止時", "camouflageMoving": "移動時", - "camouflageShootingStill": "静止時", - "camouflageShootingMoving": "移動時", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "Caught on fire", "width": "全幅", "height": "全高", From 8c8b36f0d5c43bc08a39d4fe15f8a78ebde77baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:46 -0700 Subject: [PATCH 29/97] New translations en.json (Polish) [ci skip] --- packages/i18n/strings/pl.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/i18n/strings/pl.json b/packages/i18n/strings/pl.json index 407345858..cb209b4be 100644 --- a/packages/i18n/strings/pl.json +++ b/packages/i18n/strings/pl.json @@ -515,8 +515,7 @@ "title": "Configuration", "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "Modules", @@ -572,6 +571,8 @@ "shellRicochet": "Ricochet", "dpm": "DPM", "dpmEffective": "Effective at 60s", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "Shells", "mostOptimalShellIndex": "Most optimal shell", "shellReloads": "Reloads", @@ -623,8 +624,8 @@ "viewRange": "View range", "camouflageStill": "Still", "camouflageMoving": "Moving", - "camouflageShootingStill": "Still", - "camouflageShootingMoving": "Moving", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "Caught on fire", "width": "Width", "height": "Height", From 24ffd70394d26d595023b9b3fabab1cb3a3124e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:48 -0700 Subject: [PATCH 30/97] New translations en.json (Portuguese) [ci skip] --- packages/i18n/strings/pt.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/i18n/strings/pt.json b/packages/i18n/strings/pt.json index ea5da1e2d..c0591e83c 100644 --- a/packages/i18n/strings/pt.json +++ b/packages/i18n/strings/pt.json @@ -515,8 +515,7 @@ "title": "Configuração", "equalizer": { "title": "Equalizer", - "equalize": "Equalize", - "beta": "Beta" + "equalize": "Equalize" }, "modules": { "title": "Módulos", @@ -572,6 +571,8 @@ "shellRicochet": "Ricochete", "dpm": "DPM", "dpmEffective": "Efetivo aos 60s", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "Projéteis", "mostOptimalShellIndex": "Projétil mais ideal", "shellReloads": "Reloads", @@ -623,8 +624,8 @@ "viewRange": "Alcance de visão", "camouflageStill": "Parado", "camouflageMoving": "Em movimento", - "camouflageShootingStill": "Parado", - "camouflageShootingMoving": "Em movimento", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "Preso em chamas", "width": "Largura", "height": "Altura", From 126e91411a07b8eddef4c7cc8a6727940f6f4d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:35:49 -0700 Subject: [PATCH 31/97] New translations en.json (Russian) [ci skip] --- packages/i18n/strings/ru.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/i18n/strings/ru.json b/packages/i18n/strings/ru.json index bac2c99fa..3f34d00d4 100644 --- a/packages/i18n/strings/ru.json +++ b/packages/i18n/strings/ru.json @@ -515,8 +515,7 @@ "title": "Конфигурация", "equalizer": { "title": "Уравнение", - "equalize": "Уравнять", - "beta": "Бета" + "equalize": "Уравнять" }, "modules": { "title": "Модули", @@ -572,6 +571,8 @@ "shellRicochet": "Рикошет", "dpm": "ДПМ", "dpmEffective": "Эффективность за 60с", + "peekabooDpm": "Peekaboo DPM", + "peekabooDpmInfo": "Damage per minute assuming you only fire after resetting camouflage (or the reload finishes, if it's slower) — at least 10 seconds between shots.", "shells": "Снарядов в барабане", "mostOptimalShellIndex": "Самый эффективный снаряд", "shellReloads": "Перезарядка", @@ -623,8 +624,8 @@ "viewRange": "Радиус обзора", "camouflageStill": "Когда неподвижен", "camouflageMoving": "В движении", - "camouflageShootingStill": "После выстрела, если неподвижен", - "camouflageShootingMoving": "После выстрела в движении", + "camouflageShootingStill": "Shooting while still", + "camouflageShootingMoving": "Shooting while moving", "camouflageCaughtOnFire": "При пожаре", "width": "Ширина", "height": "Высота", From 4028df088651b8a03d844058a36e68d1670f7f1a Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 2 Oct 2026 17:37:42 -0500 Subject: [PATCH 32/97] dash --- docs/changelogs/1.31.4.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/changelogs/1.31.4.md b/docs/changelogs/1.31.4.md index 36f96b947..e4035ebb7 100644 --- a/docs/changelogs/1.31.4.md +++ b/docs/changelogs/1.31.4.md @@ -6,7 +6,6 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - [Mark Greene] Added Peekaboo DPM - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot -- ## Fixes From 962c3c78d0c580dd8ef4670b5b6f3eb8d87f7b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 14:17:57 -0500 Subject: [PATCH 33/97] Delete LICENSE.md --- LICENSE.md | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 456d31ebb..000000000 --- a/LICENSE.md +++ /dev/null @@ -1,50 +0,0 @@ -# BlitzKit License - -Version 1.1, August 5th, 2025. Copyright (c) TrèsAbhi. - -Permission is hereby granted to anyone to: - -- Fork, clone, and download the contents of this repository. -- Modify the code locally in private. -- Use and run the code **only for personal, non-public testing, or educational purposes**. - -The following restrictions apply: - -- You may **not** deploy, host, or make this project or any derivative publicly accessible. -- You may **not** share screenshots, recordings, or any form of media from this project unless you intend to merge your changes back into BlitzKit. -- You may **not** use this project or its contents in any public or commercial product. -- You may **not** redistribute modified or unmodified versions of this project. - -Contributions: - -- You are encouraged to propose changes or improvements via pull requests to the original BlitzKit repository. -- Any such contributions will be considered under the same license terms unless explicitly stated otherwise. - -Violations of this license may result in revocation of usage rights and takedown requests. - -For questions or licensing inquiries, contact support@blitzkit.app. - -## Notes on Existing Forks - -All forks fall under these categories: - -- If your fork was made from commit `8462901` (Apr 17, 2023) or between commits `2958124` (Jul 3, 2023) and `85e483e` (Jul 13, 2024), your fork falls under the **MIT license**. -- If your fork was made from commits between `5646093` (Jul 13, 2024) and `e3f131c` (Aug 5, 2025), your fork falls under the **AGPL-3.0 license**. -- If your fork was made between commit `f7c356d` (Apr 17, 2023) and `2958124` (Jul 3, 2023), your fork falls under **a default exclusive copyright**. -- If your fork was made from commits between `e3f131c` (Aug 5, 2025) and today, your fork falls under **this license**. - -MIT and AGPL-3.0 licensed fork owners: - -- You may continue to use your fork of BlitzKit under the corresponding license. -- You may upgrade your fork up to commit `5cab394` (Aug 4, 2025) and keep the AGPL-3.0 license. -- You may upgrade to commit `e3f131c` (Aug 5, 2025) or beyond but have to **switch to this license** where all rules apply. - - If you upgrade to commit `e3f131c` (Aug 5, 2025) or beyond, you must retract all public deployments of BlitzKit. - - Existing screenshots, recordings, or any form of media can remain. - -Default exclusive copyright fork owners: - -- You may continue to use their forks under the AGPL-3.0 license as no license was applied to BlitzKit at the time of forking. - -BlitzKit licensed fork owners: - -- You may continue to upgrade to the latest commits only under the conditions of this license. From f3e8cdd5e0447f4dafc92e4ba91f970ca05ab93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 14:18:59 -0500 Subject: [PATCH 34/97] add GNU AGPLv3 --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..0ad25db4b --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From 0bdb66742b261941465f9e6ff81b52ab6e8e6295 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 13:27:34 +1300 Subject: [PATCH 35/97] Feature: Add Spall Liner toggle to Tankopedia model viewer ## Summary - Add a Spall Liner toggle button to the Tankopedia model viewer, placed alongside the existing Calibrated Shells / Enhanced Armor buttons. It's only shown for tanks that can actually equip Spall Liner. - The toggle reads/writes the same `Duel.protagonist.provisions` array as the Provisions tab, so both stay in sync automatically. - If a provision slot is free, clicking equips Spall Liner immediately. If all slots are full, a popover shows icons with a shuffle arrow so you can pick which active provision to swap out in one step. - Buttons use the same medium rounding as the consumable buttons on the tank page. - When Spall Liner is equipped, the Dynamic Armor 3D viewer's click-damage tooltip now applies the same 20% HE damage reduction Spall Liner grants in-game. - Refactored the hardcoded `-0.2` HE damage coefficient in `tankCharacteristics.ts` into a shared constant so the Compare tool and the 3D viewer use a single source of truth. ## Scope This only affects the single-tank Tankopedia page. The Firepower stats table (the viewed tank's own outgoing gun damage) is intentionally untouched, since a defensive damage reduction would be semantically backwards there. The Dynamic Armor viewer's click tooltip is the only place a "damage taken by this tank" number exists, so that's where the reduction is wired in. --- .../SpacedArmorSceneComponent/index.tsx | 11 ++ .../Options/components/SpallLinerSwitcher.tsx | 128 ++++++++++++++++++ .../HeroSection/components/Options/index.tsx | 3 + .../website/src/core/blitzkit/spallLiner.ts | 8 ++ .../src/core/blitzkit/tankCharacteristics.ts | 6 +- 5 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx create mode 100644 packages/website/src/core/blitzkit/spallLiner.ts diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx index f2c770593..784836464 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx @@ -18,6 +18,10 @@ import { import { degToRad } from "three/src/math/MathUtils.js"; import { hasEquipment } from "../../../../core/blitzkit/hasEquipment"; import { jsxTree } from "../../../../core/blitzkit/jsxTree"; +import { + SPALL_LINER_HE_DAMAGE_DELTA, + SPALL_LINER_PROVISION_ID, +} from "../../../../core/blitzkit/spallLiner"; import { defaultEqualizer } from "../../../../core/blitzkit/tankToDuelMember"; import { discardClippingPlane } from "../../../../core/three/discardClippingPlane"; import { Duel } from "../../../../stores/duel"; @@ -384,6 +388,13 @@ export function SpacedArmorSceneComponent({ shot.damage *= antagonistEqualizer.damage; + const hasSpallLiner = Duel.state.protagonist.provisions.includes( + SPALL_LINER_PROVISION_ID, + ); + if (hasSpallLiner && shell.type === ShellType.SHELL_TYPE_HE) { + shot.damage *= 1 + SPALL_LINER_HE_DAMAGE_DELTA; + } + return shot; }, [camera], diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx new file mode 100644 index 000000000..021f5cacf --- /dev/null +++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/SpallLinerSwitcher.tsx @@ -0,0 +1,128 @@ +import { alias, availableProvisions } from "@blitzkit/core"; +import { ShuffleIcon } from "@radix-ui/react-icons"; +import { Flex, IconButton, Popover } from "@radix-ui/themes"; +import { api } from "../../../../../../core/blitzkit/api"; +import { SPALL_LINER_PROVISION_ID } from "../../../../../../core/blitzkit/spallLiner"; +import { useLocale } from "../../../../../../hooks/useLocale"; +import { Duel } from "../../../../../../stores/duel"; +import { Tankopedia } from "../../../../../../stores/tankopedia"; + +const provisionDefinitions = await api.provisionDefinitions(); + +export function SpallLinerSwitcher() { + const { tank, gun, provisions } = Duel.use((state) => state.protagonist); + const { unwrap } = useLocale(); + const isSpallLinerActive = provisions.includes(SPALL_LINER_PROVISION_ID); + const hasSlotAvailable = provisions.length < tank.max_provisions; + + const canEquipSpallLiner = availableProvisions( + tank, + gun, + provisionDefinitions, + ).some((provision) => provision.id === SPALL_LINER_PROVISION_ID); + + if (!canEquipSpallLiner) return null; + + function equip(replacing?: number) { + Duel.mutate((draft) => { + if (replacing !== undefined) { + const provisions = draft.protagonist.provisions; + provisions[provisions.indexOf(replacing)] = SPALL_LINER_PROVISION_ID; + } else { + draft.protagonist.provisions.push(SPALL_LINER_PROVISION_ID); + } + }); + Tankopedia.mutate((draft) => { + draft.shot = undefined; + }); + } + + function unequip() { + Duel.mutate((draft) => { + draft.protagonist.provisions = draft.protagonist.provisions.filter( + (id) => id !== SPALL_LINER_PROVISION_ID, + ); + }); + Tankopedia.mutate((draft) => { + draft.shot = undefined; + }); + } + + const button = ( + { + if (isSpallLinerActive) { + unequip(); + } else if (hasSlotAvailable) { + equip(); + } + }} + > + {unwrap(provisionDefinitions.provisions[SPALL_LINER_PROVISION_ID].name!)} + + ); + + if (isSpallLinerActive || hasSlotAvailable) return button; + + return ( + + {button} + + + + + {unwrap( + + + + + + {provisions.map((id) => ( + + equip(id)} + > + {unwrap(provisionDefinitions.provisions[id].name!)} + + + ))} + + + + + ); +} diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx index 05fc67d92..5856c66d0 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/index.tsx @@ -46,6 +46,7 @@ import { TankSearch } from "../../../../TankSearch"; import { CustomShellButton } from "./components/CustomShellButton"; import { DynamicArmorSwitcher } from "./components/DynamicArmorSwitcher"; import { QuickInputs } from "./components/QuickInputs"; +import { SpallLinerSwitcher } from "./components/SpallLinerSwitcher"; import { Thicknesses } from "./components/Thicknesses"; type OptionsProps = MaybeSkeletonComponentProps & { @@ -278,6 +279,8 @@ export function Options({ thicknessRange, canvas, skeleton }: OptionsProps) { }} /> + + {!skeleton && ( diff --git a/packages/website/src/core/blitzkit/spallLiner.ts b/packages/website/src/core/blitzkit/spallLiner.ts new file mode 100644 index 000000000..80598d5c1 --- /dev/null +++ b/packages/website/src/core/blitzkit/spallLiner.ts @@ -0,0 +1,8 @@ +export const SPALL_LINER_PROVISION_ID = 101; + +/** + * Matches the in-game reduction Spall Liner grants against HE splash + * damage. Shared between the characteristics panel and the Dynamic + * Armor 3D viewer's damage readout so the figure isn't duplicated. + */ +export const SPALL_LINER_HE_DAMAGE_DELTA = -0.2; diff --git a/packages/website/src/core/blitzkit/tankCharacteristics.ts b/packages/website/src/core/blitzkit/tankCharacteristics.ts index 0cc72302e..51301190a 100644 --- a/packages/website/src/core/blitzkit/tankCharacteristics.ts +++ b/packages/website/src/core/blitzkit/tankCharacteristics.ts @@ -22,6 +22,7 @@ import { } from "@blitzkit/core"; import { coefficient } from "@blitzkit/core/src/blitzkit/coefficient"; import type { EquipmentMatrix } from "../../stores/duel"; +import { SPALL_LINER_HE_DAMAGE_DELTA } from "./spallLiner"; import { defaultEqualizer } from "./tankToDuelMember"; export type TankCharacteristics = ReturnType; @@ -170,7 +171,10 @@ export function tankCharacteristics( coefficient( [applyReactiveArmor && shell.type !== ShellType.SHELL_TYPE_HE, -0.27], [applyDynamicArmor, -0.1], - [applySpallLiner && shell.type === ShellType.SHELL_TYPE_HE, -0.2], + [ + applySpallLiner && shell.type === ShellType.SHELL_TYPE_HE, + SPALL_LINER_HE_DAMAGE_DELTA, + ], ); const assaultDamageCoefficient = gun.assault_ranges && gun.assault_ranges.types.includes(shell.type) From 98b555fa7ee1b74219d33ebec53046a0bb21becb Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 13:38:20 +1300 Subject: [PATCH 36/97] Fix: gun depression visualizer ignoring turret mount tilt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The gun flexibility visualizer at the bottom of the Tankopedia Firepower section computed depression/elevation purely from the raw gun `pitch.min`/`pitch.max` values, ignoring `initial_turret_rotation.pitch` (the tank's baked-in turret mount tilt). Every other place that reports gun depression/elevation already accounts for this offset; the visualizer was the outlier. On tanks with a level turret mount the offset is zero, so it was invisible almost everywhere. Minotauro's turret sits pitched 3° forward, which made the visualizer's min/max/pitch stats and wedge shape disagree with the Firepower stats directly above it (e.g. 7°/-18° instead of 10°/15°). **Changes:** - `GunFlexibilityVisualizer/index.tsx`: fold the turret's initial pitch offset into `minPitch`, `maxPitch` and the displayed `pitch` stat, and into the drawn limit shape, the pitch dot and the pointer mapping, so the dashed neutrality circle sits at the displayed 0°. - `GunFlexibilityVisualizer/components/CanvasContent.tsx`: nest the gun mesh inside a turret group carrying the same static tilt as its base rotation, so the mini 3D preview's live drag-pitch composes on top of it, mirroring `useTankTransform.ts`. --- .../components/CanvasContent.tsx | 27 +++++++++++-- .../GunFlexibilityVisualizer/index.tsx | 40 +++++++++++++------ 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx index 2f1d7342c..1fdc38bb1 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx @@ -1,6 +1,7 @@ import type { QuicklimeEvent } from "quicklime"; import { useEffect, useRef } from "react"; import type { Group } from "three"; +import { degToRad } from "three/src/math/MathUtils.js"; import { api } from "../../../../../../../../core/blitzkit/api"; import { modelTransformEvent, @@ -21,6 +22,13 @@ export function CanvasContent() { const tankModel = modelDefinitions.models[tank.id]; const turretModel = tankModel.turrets[turret.id]; + // baked-in turret mount tilt (e.g. Minotauro sits pitched 3deg forward); + // applied as a static base rotation so the live gun pitch composes on top + // of it, mirroring useTankTransform.ts's turretContainer/gunContainer nesting + const initialTurretPitch = -degToRad( + tankModel.initial_turret_rotation?.pitch ?? 0, + ); + useEffect(() => { function handleModelTransformEvent( event: QuicklimeEvent, @@ -45,10 +53,23 @@ export function CanvasContent() { - + + + - - + + + + ); diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx index 171c1a73d..93d7a5e1a 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx @@ -48,13 +48,27 @@ export function GunFlexibilityVisualizer({ const turretModel = tankModel.turrets[turret.id]; const gunModel = turretModel.guns[gun.id]; + // turret's own baked-in mount tilt (e.g. Minotauro's turret sits pitched + // 3deg forward on the hull); must be folded into displayed pitch values + // the same way tankCharacteristics.ts and QuickInputs do + const initialTurretPitch = degToRad( + tankModel.initial_turret_rotation?.pitch ?? 0, + ); + + // radial map is in the tilt-compensated frame so the neutrality circle sits + // at the displayed 0deg + const tiltDeg = radToDeg(initialTurretPitch); + const magTilted = (deg: number) => mag(deg + tiltDeg); + const [yaw, setYaw] = useState(0); const [pitch, setPitch] = useState(0); const [minPitch, setMinPitch] = useState( - -degToRad(gunModel.pitch!.front?.max ?? gunModel.pitch!.max), + -degToRad(gunModel.pitch!.front?.max ?? gunModel.pitch!.max) - + initialTurretPitch, ); const [maxPitch, setMaxPitch] = useState( - -degToRad(gunModel.pitch!.front?.min ?? gunModel.pitch!.min), + -degToRad(gunModel.pitch!.front?.min ?? gunModel.pitch!.min) - + initialTurretPitch, ); const container = useRef(null); @@ -70,7 +84,7 @@ export function GunFlexibilityVisualizer({ let d = ""; // right - const mo = mag(p.max); + const mo = magTilted(p.max); if (y) { d += `M 0 0`; d += `L ${c(90 - y.max, mo)}`; @@ -87,7 +101,7 @@ export function GunFlexibilityVisualizer({ // front if (f) { - const m = mag(f.max); + const m = magTilted(f.max); d += `L ${c(90 - f.range / 2, m)}`; d += `A ${m} ${m} 0 0 0 ${c(90 + f.range / 2, m)}`; } @@ -108,7 +122,7 @@ export function GunFlexibilityVisualizer({ // back if (!y && b) { - const m = mag(b.max); + const m = magTilted(b.max); d += `L ${c(-90 - b.range / 2, m)}`; d += `A ${m} ${m} 0 0 0 ${c(-90 + b.range / 2, m)}`; } @@ -116,7 +130,7 @@ export function GunFlexibilityVisualizer({ d += `Z`; // right - const mi = mag(p.min); + const mi = magTilted(p.min); if (y) { d += `M 0 0`; d += `L ${c(90 - y.max, mi)}`; @@ -133,7 +147,7 @@ export function GunFlexibilityVisualizer({ // front if (f) { - const m = mag(f.min); + const m = magTilted(f.min); d += `L ${c(90 - f.range / 2, m)}`; d += `A ${m} ${m} 0 0 0 ${c(90 + f.range / 2, m)}`; } @@ -154,14 +168,14 @@ export function GunFlexibilityVisualizer({ // back if (!y && b) { - const m = mag(b.min); + const m = magTilted(b.min); d += `L ${c(-90 - b.range / 2, m)}`; d += `A ${m} ${m} 0 0 0 ${c(-90 + b.range / 2, m)}`; } d += `Z`; - const r = mag(radToDeg(-pitch)); + const r = mag(radToDeg(-(pitch - initialTurretPitch))); const dotX = r * Math.sin(yaw); const dotY = r * Math.cos(yaw); @@ -251,13 +265,13 @@ export function GunFlexibilityVisualizer({ yaw = min[1]; let t = 2 * Math.sqrt((u / rect.width) ** 2 + (v / rect.height) ** 2); t = clamp(t, 0, 1); - let pitch = degToRad(magInverse(-t)); + let pitch = degToRad(magInverse(-t)) + initialTurretPitch; pitch = clamp(pitch, min[0], max[0]); setPitch(pitch); setYaw(yaw); - setMinPitch(min[0]); - setMaxPitch(max[0]); + setMinPitch(min[0] - initialTurretPitch); + setMaxPitch(max[0] - initialTurretPitch); modelTransformEvent.dispatch({ pitch, yaw }); }} @@ -376,7 +390,7 @@ export function GunFlexibilityVisualizer({ From 90006dfd2a182ad7e8368178b2932352624fea83 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 14:14:57 +1300 Subject: [PATCH 37/97] Fix: loading bar too close to tank title The hero loading bar was offset below the title by half the font size plus a fixed 16px. The title is centered as a line box, so its descenders and heavy caps reach lower than half the font size, and the fixed gap didn't grow with the title. Offset the bar by 0.75 of the font size instead, so the gap scales with the title. --- .../components/TankSandbox/Title/components/Tracker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/components/Tracker.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/components/Tracker.tsx index 2b6d7071d..1f1e340fa 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/components/Tracker.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/components/Tracker.tsx @@ -15,7 +15,7 @@ export function Tracker({ fontSize }: Props) { top="50%" width="min(100%, 16rem)" style={{ - transform: `translate(-50%, calc(${fontSize} / 2 + var(--space-4)))`, + transform: `translate(-50%, calc(${fontSize} * 0.75 + var(--space-4)))`, }} > From 6153beced6fa8d0754b9d48c3e65cfc418f7319a Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 14:24:02 +1300 Subject: [PATCH 38/97] Fix: search redirecting early and missing full tank names **Enter key** - Enter redirected to the previous results' first tank while a search was still buffering, because the key handler captured a stale `searching` value. - Enter on an empty field redirected to the first tank of the unfiltered list (Sheridan). - The handler now reads live filter state and only acts when there is a settled search, matching the quick-link button. **Full names in search** - Search only knew short tank names, so queries like "super pershing" found nothing when the game stores a short form. - Add an optional `name_full` to `TankDefinition`, filled from the game's full name when a short name exists, and index it (plus an accent-stripped copy) in `fetchTankNames` / `SEARCH_KEYS`. - Displayed names are unchanged. Full names become searchable once the definitions are regenerated on the next build. --- .../blitzkit/api/server/1_tankDefinitions.ts | 3 +++ packages/core/src/blitzkit/tankNames.ts | 13 ++++++++++++ .../core/src/protos/tank_definitions.proto | 1 + packages/core/src/protos/tank_definitions.ts | 20 +++++++++++++++++++ .../TankSearch/components/SearchBar.tsx | 3 ++- 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts index ee3f69a58..b7ff54c8d 100644 --- a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts @@ -371,6 +371,9 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { (tank.shortUserString ? this.getString(tank.shortUserString) : undefined) ?? this.getString(tank.userString), + name_full: tank.shortUserString + ? this.getString(tank.userString) + : undefined, slug, nation, type: tankTags.includes("collectible") diff --git a/packages/core/src/blitzkit/tankNames.ts b/packages/core/src/blitzkit/tankNames.ts index bb19c9597..15462add5 100644 --- a/packages/core/src/blitzkit/tankNames.ts +++ b/packages/core/src/blitzkit/tankNames.ts @@ -18,11 +18,22 @@ export async function fetchTankNames(api: BlitzKitAPI) { searchableNameDeburr.locales[key] = deburr(value); }); + const searchableNameFull: I18nString = { + locales: { ...tank.name_full?.locales }, + }; + const searchableNameFullDeburr: I18nString = { locales: {} }; + + Object.entries(searchableNameFull.locales).forEach(([key, value]) => { + searchableNameFullDeburr.locales[key] = deburr(value); + }); + return { id: tank.id, name: tank.name, searchableName: tank.name, searchableNameDeburr, + searchableNameFull, + searchableNameFullDeburr, camouflages: tank.camouflages ?.map((id) => locales.supported.map( @@ -45,6 +56,8 @@ export const SEARCH_KEYS = [ .map(({ locale }) => [ `searchableName.locales.${locale}`, `searchableNameDeburr.locales.${locale}`, + `searchableNameFull.locales.${locale}`, + `searchableNameFullDeburr.locales.${locale}`, ]) .flat(), "camouflages", diff --git a/packages/core/src/protos/tank_definitions.proto b/packages/core/src/protos/tank_definitions.proto index 0c15d59f1..6c9cb1078 100644 --- a/packages/core/src/protos/tank_definitions.proto +++ b/packages/core/src/protos/tank_definitions.proto @@ -41,6 +41,7 @@ message TankDefinition { required uint32 weight = 31; required string dev_name = 32; optional Equalizer equalizer = 33; + optional I18nString name_full = 34; } message Equalizer { diff --git a/packages/core/src/protos/tank_definitions.ts b/packages/core/src/protos/tank_definitions.ts index 302424353..be6e2a1f0 100644 --- a/packages/core/src/protos/tank_definitions.ts +++ b/packages/core/src/protos/tank_definitions.ts @@ -292,6 +292,7 @@ export interface TankDefinition { weight: number; dev_name: string; equalizer?: Equalizer | undefined; + name_full?: I18nString | undefined; } export interface TankDefinition_RolesEntry { @@ -651,6 +652,7 @@ function createBaseTankDefinition(): TankDefinition { weight: 0, dev_name: "", equalizer: undefined, + name_full: undefined, }; } @@ -752,6 +754,9 @@ export const TankDefinition: MessageFns = { if (message.equalizer !== undefined) { Equalizer.encode(message.equalizer, writer.uint32(266).fork()).join(); } + if (message.name_full !== undefined) { + I18nString.encode(message.name_full, writer.uint32(274).fork()).join(); + } return writer; }, @@ -1051,6 +1056,14 @@ export const TankDefinition: MessageFns = { message.equalizer = Equalizer.decode(reader, reader.uint32()); continue; } + case 34: { + if (tag !== 274) { + break; + } + + message.name_full = I18nString.decode(reader, reader.uint32()); + continue; + } } if ((tag & 7) === 4 || tag === 0) { break; @@ -1111,6 +1124,7 @@ export const TankDefinition: MessageFns = { weight: isSet(object.weight) ? globalThis.Number(object.weight) : 0, dev_name: isSet(object.dev_name) ? globalThis.String(object.dev_name) : "", equalizer: isSet(object.equalizer) ? Equalizer.fromJSON(object.equalizer) : undefined, + name_full: isSet(object.name_full) ? I18nString.fromJSON(object.name_full) : undefined, }; }, @@ -1218,6 +1232,9 @@ export const TankDefinition: MessageFns = { if (message.equalizer !== undefined) { obj.equalizer = Equalizer.toJSON(message.equalizer); } + if (message.name_full !== undefined) { + obj.name_full = I18nString.toJSON(message.name_full); + } return obj; }, @@ -1271,6 +1288,9 @@ export const TankDefinition: MessageFns = { message.equalizer = (object.equalizer !== undefined && object.equalizer !== null) ? Equalizer.fromPartial(object.equalizer) : undefined; + message.name_full = (object.name_full !== undefined && object.name_full !== null) + ? I18nString.fromPartial(object.name_full) + : undefined; return message; }, }; diff --git a/packages/website/src/components/TankSearch/components/SearchBar.tsx b/packages/website/src/components/TankSearch/components/SearchBar.tsx index 32eba599f..1a97aa3d2 100644 --- a/packages/website/src/components/TankSearch/components/SearchBar.tsx +++ b/packages/website/src/components/TankSearch/components/SearchBar.tsx @@ -46,7 +46,8 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) { }, [searching]); const handleKeyDown = useCallback( (event) => { - if (event.key !== "Enter" || !topResult || searching) return; + if (event.key !== "Enter" || !topResult) return; + if (!TankFilters.state.search || TankFilters.state.searching) return; event.preventDefault(); From 2e46ba79cf9a51a8f7363aede16f7229d0f0d4bc Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 14:33:24 +1300 Subject: [PATCH 39/97] Fix: reload times show one decimal from a shared constant The reload visualizer and the Firepower reload rows showed two decimals. Add an exported `RELOAD_PRECISION` (1) in the reload visualizer and use it for the visualizer's times and placeholders and for the Firepower reload rows (per-shell reloads, reload and intra-clip). --- .../Characteristics/components/Firepower.tsx | 8 ++++---- .../components/ReloadVisualizer/index.tsx | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx index c1efdc8b4..6311aa782 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Firepower.tsx @@ -17,7 +17,7 @@ import { AssaultRangesVisualizer } from "./AssaultRangesVisualizer"; import { GunFlexibilityVisualizer } from "./GunFlexibilityVisualizer"; import { Info } from "./Info"; import { InfoWithDelta } from "./InfoWithDelta"; -import { ReloadVisualizer } from "./ReloadVisualizer"; +import { RELOAD_PRECISION, ReloadVisualizer } from "./ReloadVisualizer"; import { RicochetVisualizer } from "./RicochetVisualizer"; import { StatsTableWrapper } from "./StatsTableWrapper"; import type { StatsAcceptorProps } from "./TraverseVisualizer"; @@ -163,7 +163,7 @@ export function Firepower({ .shell_index, { index: index + 1 }, )} - decimals={2} + decimals={RELOAD_PRECISION} deltaType="lowerIsBetter" noRanking value={() => reload} @@ -173,7 +173,7 @@ export function Firepower({ ) : ( @@ -183,7 +183,7 @@ export function Firepower({ diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ReloadVisualizer/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ReloadVisualizer/index.tsx index 1ce46ab09..f2f7c8f46 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ReloadVisualizer/index.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/ReloadVisualizer/index.tsx @@ -11,7 +11,7 @@ import { Shell } from './components/Shell'; import { Target } from './components/Target'; import './index.css'; -const PRECISION = 2; +export const RELOAD_PRECISION = 1; export interface ReloadUpdateData { reload: number; @@ -82,9 +82,9 @@ export function ReloadVisualizer({ stats }: StatsAcceptorProps) { ); } - totalTime.current.innerHTML = shellReload.toFixed(PRECISION); + totalTime.current.innerHTML = shellReload.toFixed(RELOAD_PRECISION); progressTime.current.innerHTML = ((1 - reload) * shellReload).toFixed( - PRECISION, + RELOAD_PRECISION, ); if (state.current >= reloadThreshold) shoot(); @@ -117,9 +117,9 @@ export function ReloadVisualizer({ stats }: StatsAcceptorProps) { shells = times(stats.shells, (index) => index > state.current - 1); } - totalTime.current.innerHTML = interval.toFixed(PRECISION); + totalTime.current.innerHTML = interval.toFixed(RELOAD_PRECISION); progressTime.current.innerHTML = ((1 - reload) * interval).toFixed( - PRECISION, + RELOAD_PRECISION, ); if (lastState % 1 > state.current % 1) shoot(); @@ -262,7 +262,7 @@ export function ReloadVisualizer({ stats }: StatsAcceptorProps) { transform: 'translate(50%, -50%)', }} > - 0.00 + {(0).toFixed(RELOAD_PRECISION)} - 0.00 + {(0).toFixed(RELOAD_PRECISION)} {stats.shells > 1 && From 6fb14d5544fffc5cdff670491937f20e59719c0c Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 14:36:18 +1300 Subject: [PATCH 40/97] Fix: footer game version and CDN label The footer showed the game's full version with its build number and labelled the environment as "CDN". Show only the part of the game version before the underscore (e.g. 11.20), and rename the "CDN" label to "Branch" since it shows the environment/branch the site was built from. --- packages/website/src/components/Footer.astro | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/website/src/components/Footer.astro b/packages/website/src/components/Footer.astro index 3bcd19c6c..ff2f490d3 100644 --- a/packages/website/src/components/Footer.astro +++ b/packages/website/src/components/Footer.astro @@ -12,6 +12,7 @@ export interface Props { } const gameDefinitions = await api.gameDefinitions(); +const gameVersion = gameDefinitions.version.split("_")[0]; const environment = assertSecret(import.meta.env.PUBLIC_ENVIRONMENT); const { locale } = Astro.props; const strings = getStrings(locale); @@ -141,7 +142,7 @@ const strings = getStrings(locale); ) } - CDN + Branch @@ -151,7 +152,7 @@ const strings = getStrings(locale); { environment !== "preview" && ( - {gameDefinitions.version} + {gameVersion} ) } @@ -174,13 +175,13 @@ const strings = getStrings(locale); WoTB - {gameDefinitions.version} + {gameVersion} ) } - CDN + Branch {environment} From cef393473f8ed5de75ff3a94a109960dc7cea4be Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 14:39:30 +1300 Subject: [PATCH 41/97] Fix: testing and unlocked filters off by default and exclusive Both buttons in the testing and unlocked filter pairs started on, so showing only one kind meant turning the other kind off. Start all four filters off, treat a pair with neither button on as showing everything, and make the buttons in each pair mutually exclusive: turning one on turns its partner off, and clicking an active one turns it off. The playlist page now sets the unlocked filter on (and locked off) explicitly, since the old default no longer provides that. --- .../components/TankSearch/components/FilterControl.tsx | 4 ++++ packages/website/src/core/blitzkit/filterTank.ts | 6 ++++-- .../[...chunk_default]/[...locale]/playlist/_index.tsx | 5 ++++- packages/website/src/stores/tankFilters.ts | 8 ++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/packages/website/src/components/TankSearch/components/FilterControl.tsx b/packages/website/src/components/TankSearch/components/FilterControl.tsx index ac7bde3b8..41400d365 100644 --- a/packages/website/src/components/TankSearch/components/FilterControl.tsx +++ b/packages/website/src/components/TankSearch/components/FilterControl.tsx @@ -789,6 +789,7 @@ function OwnershipFilterInternal(props: FlexProps) { onClick={() => { TankFilters.mutate((draft) => { draft.showOwned = !draft.showOwned; + if (draft.showOwned) draft.showUnowned = false; }); }} > @@ -808,6 +809,7 @@ function OwnershipFilterInternal(props: FlexProps) { onClick={() => { TankFilters.mutate((draft) => { draft.showUnowned = !draft.showUnowned; + if (draft.showUnowned) draft.showOwned = false; }); }} > @@ -834,6 +836,7 @@ function TestFilter() { onClick={() => { TankFilters.mutate((draft) => { draft.showNonTesting = !draft.showNonTesting; + if (draft.showNonTesting) draft.showTesting = false; }); }} > @@ -854,6 +857,7 @@ function TestFilter() { onClick={() => { TankFilters.mutate((draft) => { draft.showTesting = !draft.showTesting; + if (draft.showTesting) draft.showNonTesting = false; }); }} > diff --git a/packages/website/src/core/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts index 91c808b56..48fc41a34 100644 --- a/packages/website/src/core/blitzkit/filterTank.ts +++ b/packages/website/src/core/blitzkit/filterTank.ts @@ -16,13 +16,15 @@ export async function filterTank( owned: number[] = [], ) { return ( - ((filters.showOwned && owned.includes(tank.id)) || + ((!filters.showOwned && !filters.showUnowned) || + (filters.showOwned && owned.includes(tank.id)) || (filters.showUnowned && !owned.includes(tank.id))) && (filters.tiers.length === 0 || filters.tiers.includes(tank.tier)) && (filters.nations.length === 0 || filters.nations.includes(tank.nation)) && (filters.classes.length === 0 || filters.classes.includes(tank.class)) && (filters.types.length === 0 || filters.types.includes(tank.type)) && - ((filters.showTesting && tank.testing) || + ((!filters.showTesting && !filters.showNonTesting) || + (filters.showTesting && tank.testing) || (filters.showNonTesting && !tank.testing)) && (filters.gunType.length === 0 || (filters.gunType.includes("regular") && diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx index 04e090b26..9d6d906db 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx @@ -17,7 +17,10 @@ export function Page({ }: Props & MaybeSkeletonComponentProps) { const generated = Playlist.use((state) => state.list !== undefined); - if (App.state.logins.wargaming) TankFilters.state.showUnowned = false; + if (App.state.logins.wargaming) { + TankFilters.state.showOwned = true; + TankFilters.state.showUnowned = false; + } return ( diff --git a/packages/website/src/stores/tankFilters.ts b/packages/website/src/stores/tankFilters.ts index 7d1c1dcdb..438d327ae 100644 --- a/packages/website/src/stores/tankFilters.ts +++ b/packages/website/src/stores/tankFilters.ts @@ -46,8 +46,8 @@ export const TankFilters = new Varuna({ abilities: [], powers: [], - showTesting: true, - showNonTesting: true, - showOwned: true, - showUnowned: true, + showTesting: false, + showNonTesting: false, + showOwned: false, + showUnowned: false, }); From b4770c1497b394c56079ba1d9121adad7d7b86f9 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 14:44:39 +1300 Subject: [PATCH 42/97] Fix: uneven margin around the help translate link The "Help translate BlitzKit" link on the home page had only a bottom margin, so it sat flush against the hero above while the tool grid below added extra space. Add a top margin so the space above matches the space below, leaving the bottom margin unchanged. --- .../src/pages/[...chunk_default]/[...locale]/index.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro index 1f43e7990..e00f7bc5a 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro @@ -67,7 +67,7 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { { locale !== locales.default && ( - + Date: Sun, 4 Oct 2026 14:50:10 +1300 Subject: [PATCH 43/97] Fix: static armor controls peeking in at the screen edge The static armor panel hid itself with a fixed `right: -6rem`. In languages with longer labels (e.g. Spanish) the panel is wider than that, so part of it stayed visible at the edge. Anchor the panel at `right: 0` and slide it out with a transform based on its own width (`translateX(calc(100% + var(--space-4)))`) when static armor isn't active, so it always clears the edge regardless of label length. --- .../HeroSection/components/Options/components/Thicknesses.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/Thicknesses.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/Thicknesses.tsx index 7fdb09d73..a5621bd97 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/Thicknesses.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/Options/components/Thicknesses.tsx @@ -31,11 +31,11 @@ export function Thicknesses({ thicknessRange, skeleton }: ThicknessesProps) { return ( Date: Sun, 4 Oct 2026 15:17:51 +1300 Subject: [PATCH 44/97] Fix: mixer buttons clipping at the screen edges on small phones The mixer's hull/turret/gun row is about 440px wide at its fixed sizes and is centered with `left: 50%` and `translateX(-50%)`, so on phones narrower than that it overflowed past both edges. Use smaller button sizes on phones and scale the tank images with the viewport (`clamp(2rem, 11vw, 4em)`), with smaller separators and gaps. From 520px up the layout is unchanged. --- .../[...locale]/mixer/_index.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx index 2346fc2d9..ebd83ff62 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx @@ -94,7 +94,7 @@ function ModuleChooser({ - + Date: Sat, 3 Oct 2026 21:42:03 -0500 Subject: [PATCH 45/97] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..dd84ea782 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..bbcbbe7d6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 46bd8f631638ac82cea503f83750fc3066b8ea2d Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 21:51:21 -0500 Subject: [PATCH 46/97] add template --- .github/ISSUE_TEMPLATE/bug_report.md | 38 ------------ .github/ISSUE_TEMPLATE/bug_report.yaml | 70 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yaml | 10 ++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ------- 4 files changed, 80 insertions(+), 58 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml create mode 100644 .github/ISSUE_TEMPLATE/config.yaml delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea782..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 000000000..9ea35e4ab --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,70 @@ +name: 🐞 Bug Report +description: BlitzKit is not behaving as expected +title: "[Bug]: " +labels: ["bug", "triage"] +type: bug + +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report! + - type: input + id: contact + attributes: + label: Contact Details + description: How can we get in touch with you if we need more info? + placeholder: ex. email@example.com + validations: + required: false + - type: textarea + id: what-happened + attributes: + label: What happened? + description: Also tell us, what did you expect to happen? + placeholder: Tell us what you see! + value: "A bug happened!" + validations: + required: true + - type: dropdown + id: version + attributes: + label: Version + description: What version of our software are you running? + options: + - 1.0.2 (Default) + - 1.0.3 (Edge) + default: 0 + validations: + required: true + - type: dropdown + id: browsers + attributes: + label: What browsers are you seeing the problem on? + multiple: true + options: + - Firefox + - Chrome + - Safari + - Microsoft Edge + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell + - type: checkboxes + id: terms + attributes: + label: Code of Conduct + description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com). + options: + - label: I agree to follow this project's Code of Conduct + required: true + - type: upload + id: screenshots + attributes: + label: Upload screenshots + description: If applicable, add screenshots to help explain your problem. + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml new file mode 100644 index 000000000..6f47ee63c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yaml @@ -0,0 +1,10 @@ +blank_issues_enabled: false + +contact_links: + - name: Discord Server + about: Got questions? We answer better on Discord! + url: https://discord.gg/nDt7AjGJQH + + - name: Formal Email + about: Reach out to BlitzKit formally through email. + url: mailto:support@blitzkit.app diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7d6..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. From 551183a65bc883f1af27b5f75f190d3f639c2148 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 21:51:50 -0500 Subject: [PATCH 47/97] yml --- .github/ISSUE_TEMPLATE/{config.yaml => config.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{config.yaml => config.yml} (100%) diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yaml rename to .github/ISSUE_TEMPLATE/config.yml From d7e06a2b46a8d55471a07a4a701c0547ebca1457 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 21:52:39 -0500 Subject: [PATCH 48/97] email link --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6f47ee63c..ba8f3ae9f 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -7,4 +7,4 @@ contact_links: - name: Formal Email about: Reach out to BlitzKit formally through email. - url: mailto:support@blitzkit.app + url: https://blitzkit.com/contact From a5637c9f0771cb1b13f41bf12afb38590b54b154 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 22:01:26 -0500 Subject: [PATCH 49/97] format --- .github/ISSUE_TEMPLATE/bug.yaml | 42 ++++++++++++++++ .github/ISSUE_TEMPLATE/bug_report.yaml | 70 -------------------------- .github/ISSUE_TEMPLATE/config.yml | 6 +-- 3 files changed, 45 insertions(+), 73 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug.yaml delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml new file mode 100644 index 000000000..25e6f4e54 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -0,0 +1,42 @@ +name: 🐞 Bug Report +description: BlitzKit is not behaving as expected. +labels: ["bug"] +type: bug + +body: + - type: markdown + attributes: + value: | + Thank you so much for reporting an issue! Please fill out the form + below in its entirety and we'll address your issue as soon as possible. + + - type: textarea + validations: + required: true + attributes: + label: What happened? + description: What about BlitzKit's behavior did you find unexpected? + + - type: textarea + validations: + required: true + attributes: + label: What should've happened? + description: What did you expect BlitzKit to do instead of what you observed? + + - type: textarea + attributes: + label: How do you reproduce the issue? + description: What steps one must follow to recreate your issue? + + - type: dropdown + attributes: + label: Branch + description: What branch of BlitzKit were you using? Please see the "Branch" section of the footer at the very bottom of any page. + options: + - Production + - Preview + - OpenTest + default: 0 + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml deleted file mode 100644 index 9ea35e4ab..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ /dev/null @@ -1,70 +0,0 @@ -name: 🐞 Bug Report -description: BlitzKit is not behaving as expected -title: "[Bug]: " -labels: ["bug", "triage"] -type: bug - -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this bug report! - - type: input - id: contact - attributes: - label: Contact Details - description: How can we get in touch with you if we need more info? - placeholder: ex. email@example.com - validations: - required: false - - type: textarea - id: what-happened - attributes: - label: What happened? - description: Also tell us, what did you expect to happen? - placeholder: Tell us what you see! - value: "A bug happened!" - validations: - required: true - - type: dropdown - id: version - attributes: - label: Version - description: What version of our software are you running? - options: - - 1.0.2 (Default) - - 1.0.3 (Edge) - default: 0 - validations: - required: true - - type: dropdown - id: browsers - attributes: - label: What browsers are you seeing the problem on? - multiple: true - options: - - Firefox - - Chrome - - Safari - - Microsoft Edge - - type: textarea - id: logs - attributes: - label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - render: shell - - type: checkboxes - id: terms - attributes: - label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com). - options: - - label: I agree to follow this project's Code of Conduct - required: true - - type: upload - id: screenshots - attributes: - label: Upload screenshots - description: If applicable, add screenshots to help explain your problem. - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ba8f3ae9f..eb67d647a 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,10 +1,10 @@ blank_issues_enabled: false contact_links: - - name: Discord Server + - name: 🎮 Discord Server about: Got questions? We answer better on Discord! url: https://discord.gg/nDt7AjGJQH - - name: Formal Email + - name: ✉️ Email about: Reach out to BlitzKit formally through email. - url: https://blitzkit.com/contact + url: https://blitzkit.app/contact From 8d5ef297719ea60fbf564927255576c3408a1289 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 22:05:07 -0500 Subject: [PATCH 50/97] feature --- .github/ISSUE_TEMPLATE/bug.yaml | 9 ++++++--- .github/ISSUE_TEMPLATE/feature.yaml | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/feature.yaml diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index 25e6f4e54..f02658323 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -6,9 +6,7 @@ type: bug body: - type: markdown attributes: - value: | - Thank you so much for reporting an issue! Please fill out the form - below in its entirety and we'll address your issue as soon as possible. + value: Thank you so much for reporting an issue! Please fill out the form below in its entirety and we'll address your issue as soon as possible. - type: textarea validations: @@ -40,3 +38,8 @@ body: default: 0 validations: required: true + + - type: input + attributes: + label: Discord username + description: Do you have a Discord account that we can reach out to for further information? diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml new file mode 100644 index 000000000..3c456044e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.yaml @@ -0,0 +1,16 @@ +name: 💡 Feature Request +description: BlitzKit could use a new idea. +labels: ["enhancement"] +type: feature + +body: + - type: markdown + attributes: + value: Thank you so much for pitching in an idea! + + - type: textarea + validations: + required: true + attributes: + label: What's your idea? + description: Please be descriptive and feel free to add drawings/screenshots if needed. From 067c9cb2670ccc014e61c41d87c3c4150c305659 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 3 Oct 2026 22:10:10 -0500 Subject: [PATCH 51/97] simpler bug forms --- .github/ISSUE_TEMPLATE/bug.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index f02658323..58ff6f92c 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -15,13 +15,6 @@ body: label: What happened? description: What about BlitzKit's behavior did you find unexpected? - - type: textarea - validations: - required: true - attributes: - label: What should've happened? - description: What did you expect BlitzKit to do instead of what you observed? - - type: textarea attributes: label: How do you reproduce the issue? From aaf0e52be4a268bdb7edea699ed2d47f88158f2c Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 19:47:20 +1300 Subject: [PATCH 52/97] Fix: restore redirect to the user's preferred locale Users were no longer sent to their preferred locale. `LocaleRedirector` was emptied in `115fa5aca` after its previous versions caused repeated redirects, and nothing replaced it. **Cause** - The earlier logic compared the best locale (a string) against the current locale entry (an object), so the check was always true on non-default locale pages - That made the redirect fire repeatedly, which led to the logic being removed entirely **Changes** - Derive the current locale from the URL, treating the default locale as unprefixed to match how pages are generated - Redirect only when the best locale differs from the current locale, so it stops after one hop - Redirect users with a saved `preferred-locale` from any page - Redirect users without a saved preference from default-locale URLs only, using their browser language, so shared locale links are respected - Preserve the rest of the path when swapping the locale prefix - Skip `/api` paths --- .../src/components/LocaleRedirector.astro | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/website/src/components/LocaleRedirector.astro b/packages/website/src/components/LocaleRedirector.astro index e4ed25333..80c0afeaa 100644 --- a/packages/website/src/components/LocaleRedirector.astro +++ b/packages/website/src/components/LocaleRedirector.astro @@ -1,3 +1,30 @@ From c2c586c2e7e46f47e2481fb8d313d642c0027343 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 20:00:51 +1300 Subject: [PATCH 53/97] Fix: scroll track textures at the same rate Dragging a tank's track scrolled its roughness/metalness texture at twice the speed of the base color and normal textures, so highlights drifted off the track links. **Cause** - `translateTexture` added the scroll offset to `roughnessMap` and `metalnessMap` separately - glTF has a single metallic-roughness texture, and the loader assigns that same texture object to both slots, so it received the offset twice **Changes** - Collect the track's maps in a `Set` before scrolling so a texture shared between slots is offset exactly once --- .../TankSandbox/components/TankModel.tsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel.tsx index ded24bba1..c74722bff 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel.tsx @@ -51,11 +51,17 @@ export function TankModel() { invalidate(); - if (material.map) material.map.offset.y += offset; - if (material.aoMap) material.aoMap.offset.y += offset; - if (material.normalMap) material.normalMap.offset.y += offset; - if (material.roughnessMap) material.roughnessMap.offset.y += offset; - if (material.metalnessMap) material.metalnessMap.offset.y += offset; + const textures = new Set([ + material.map, + material.aoMap, + material.normalMap, + material.roughnessMap, + material.metalnessMap, + ]); + + for (const texture of textures) { + if (texture) texture.offset.y += offset; + } } function onPointerDown(event: ThreeEvent) { From fbba0bf13bd927d15cc22d2223f28a12432ac5c9 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 4 Oct 2026 20:07:52 +1300 Subject: [PATCH 54/97] Fix: constrain playlist filter width The filters on the playlist page stretched into one long strip beside the tank pool, squeezing the pool into the remaining space. **Changes** - Place the filters and the generate button in a fixed-width column (`22rem`) on medium screens and up so the filter buttons wrap compactly - Stretch the generate button to the column width - Let the tank pool take the remaining width - Tighten the gap between the two columns - Keep the existing stacked layout on small screens --- packages/website/src/components/PlaylistGenerator.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/PlaylistGenerator.tsx b/packages/website/src/components/PlaylistGenerator.tsx index c533495ca..b50c74654 100644 --- a/packages/website/src/components/PlaylistGenerator.tsx +++ b/packages/website/src/components/PlaylistGenerator.tsx @@ -25,6 +25,7 @@ import { FilterControl } from "./TankSearch/components/FilterControl"; const tankDefinitions = await api.tankDefinitions(); const POOL_HEIGHT = "16rem"; +const FILTERS_WIDTH = "22rem"; export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) { const [largeWarningOpen, setLargeWarningOpen] = useState(false); @@ -80,13 +81,19 @@ export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) { - + + + )} ); } diff --git a/packages/website/src/components/Tankopedia/HeroSection/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/index.tsx index 11f13d58e..51205fb49 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/index.tsx @@ -1,6 +1,6 @@ import { Box, Flex } from "@radix-ui/themes"; import { times } from "lodash-es"; -import { useEffect, useMemo, useRef } from "react"; +import { Suspense, useEffect, useMemo, useRef } from "react"; import { api } from "../../../core/blitzkit/api"; import { defaultEqualizer } from "../../../core/blitzkit/tankToDuelMember"; import { useFullScreen } from "../../../hooks/useFullScreen"; @@ -20,6 +20,7 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) { const canvas = useRef(null!); const isFullScreen = useFullScreen(); const protagonist = Duel.use((state) => state.protagonist.tank); + const modelRequested = Tankopedia.use((state) => state.modelRequested); const thicknessRange = useMemo(() => { const entries = Object.values(tankDefinitions.tanks); const filtered = entries.filter( @@ -131,13 +132,15 @@ export function HeroSection({ skeleton }: MaybeSkeletonComponentProps) { top="0" left="0" > - {!skeleton && ( - + {!skeleton && modelRequested && ( + + + )} - + <Title skeleton={skeleton} /> <Options skeleton={skeleton} diff --git a/packages/website/src/hooks/useStableProgress.ts b/packages/website/src/hooks/useStableProgress.ts index 332ded1d0..396136e51 100644 --- a/packages/website/src/hooks/useStableProgress.ts +++ b/packages/website/src/hooks/useStableProgress.ts @@ -3,11 +3,13 @@ import { useRef } from "react"; export function useStableProgress() { const { loaded, total } = useProgress(); + const baseline = useRef(loaded); const progress = useRef(0); + const pending = total - baseline.current; progress.current = Math.max( progress.current, - total === 0 ? 0 : (loaded / total) * 100 + pending <= 0 ? 0 : ((loaded - baseline.current) / pending) * 100 ); return progress.current; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.tsx index c5054b676..374d24198 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.tsx @@ -18,6 +18,10 @@ export function Page({ locale }: LocaleAcceptorProps) { function Content({ locale }: LocaleAcceptorProps) { const developerMode = App.useDeferred((state) => state.developerMode, false); + const autoLoadModels = App.useDeferred( + (state) => state.autoLoadModels, + true, + ); const { strings } = useLocale(); return ( @@ -36,6 +40,19 @@ function Content({ locale }: LocaleAcceptorProps) { /> </Flex> + <Flex align="center" gap="2" justify="between"> + <Text>{strings.website.settings.auto_load_models}</Text> + <Switch + variant="classic" + checked={autoLoadModels} + onCheckedChange={(checked) => + App.mutate((draft) => { + draft.autoLoadModels = checked; + }) + } + /> + </Flex> + <Flex align="center" gap="2" justify="between"> <Text>{strings.website.settings.language}</Text> <LocaleSwitcher locale={locale} /> diff --git a/packages/website/src/stores/app/index.ts b/packages/website/src/stores/app/index.ts index 6b15394f2..ba975056c 100644 --- a/packages/website/src/stores/app/index.ts +++ b/packages/website/src/stores/app/index.ts @@ -8,6 +8,7 @@ export interface WargamingLogin { export interface App { developerMode: boolean; + autoLoadModels: boolean; policiesAgreementIndex: number; logins: { wargaming?: WargamingLogin; @@ -17,6 +18,7 @@ export interface App { export const App = new Varuna<App>( { developerMode: false, + autoLoadModels: true, policiesAgreementIndex: -1, logins: {}, }, diff --git a/packages/website/src/stores/tankopedia.ts b/packages/website/src/stores/tankopedia.ts index d2eb8a066..023ab0e87 100644 --- a/packages/website/src/stores/tankopedia.ts +++ b/packages/website/src/stores/tankopedia.ts @@ -9,6 +9,7 @@ import type { ArmorType } from "../components/Armor/components/SpacedArmorScene" import type { ExternalModuleVariant } from "../components/Armor/components/SpacedArmorSceneComponent"; import type { XP_MULTIPLIERS } from "../components/Tankopedia/TechTreeSection"; import { api } from "../core/blitzkit/api"; +import { App } from "./app"; import { TankopediaDisplay } from "./tankopediaPersistent/constants"; export interface ShotLayerBase { @@ -79,6 +80,7 @@ export enum TankopediaRelativeAgainst { interface Tankopedia { disturbed: boolean; revealed: boolean; + modelRequested: boolean; shot?: Shot; skills: Record<string, number>; relativeAgainst: TankopediaRelativeAgainst; @@ -110,6 +112,7 @@ const skillDefinitions = await api.skillDefinitions(); export const Tankopedia = new Varuna<Tankopedia, ModelDefinition>((model) => ({ disturbed: false, revealed: false, + modelRequested: App.state.autoLoadModels, relativeAgainst: TankopediaRelativeAgainst.Class, editStatic: false, skills: createDefaultSkills(skillDefinitions), From d79e0ddb5d289c157f95f3157c2fc2a3cfa8bb7c Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Mon, 5 Oct 2026 11:24:01 -0500 Subject: [PATCH 72/97] caching for strings --- .../core/src/blitzkit/api/server/0_base.ts | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/packages/core/src/blitzkit/api/server/0_base.ts b/packages/core/src/blitzkit/api/server/0_base.ts index a41ec123d..d67af5898 100644 --- a/packages/core/src/blitzkit/api/server/0_base.ts +++ b/packages/core/src/blitzkit/api/server/0_base.ts @@ -25,8 +25,8 @@ import { VehicleDefinitionList, } from "@blitzkit/core"; import { AbstractVFS } from "@blitzkit/core/src/blitzkit/vfs/abstract"; -import { SUPPORTED_LOCALE_BLITZ_MAP } from "@blitzkit/i18n"; import locales from "@blitzkit/i18n/locales.json"; +import { SUPPORTED_LOCALE_BLITZ_MAP } from "@blitzkit/i18n/src/strings"; import { parse as parseYaml } from "yaml"; import { BlitzKitAPI } from "../base"; @@ -113,6 +113,9 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI { } async init() { + const { existsSync } = await import("fs"); + const { readFile, writeFile, mkdir } = await import("fs/promises"); + console.log("Initializing virtual file system..."); await this.vfs.init(); @@ -155,31 +158,37 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI { console.log("Fetching game localizations..."); - if (import.meta.env.DEV) { - locales.supported = [locales.supported[0]]; - } - - let fetchedLocalizations = 0; await Promise.all( locales.supported.map(async ({ locale }) => { + const root = "../../temp/strings"; + const cachePath = `${root}/${locale}.json`; + + if (existsSync(cachePath)) { + console.log(` Cache hit for ${locale}`); + + const content = await readFile(cachePath, "utf-8"); + this.stringsI18n[locale] = JSON.parse(content) as BlitzStrings; + + return; + } + + console.log(` Cache miss for ${locale} (this will take a while...)`); + const blitzLocale = SUPPORTED_LOCALE_BLITZ_MAP[locale]; - const cache = await fetch( + const networkStrings = (await fetch( `https://stufficons.wgcdn.co/localizations/${blitzLocale}.yaml`, ) .then((response) => response.text()) - .then((string) => parseYaml(string) as BlitzStrings); - const preInstalled = await this.vfs.yaml<BlitzStrings>( + .then(parseYaml)) as BlitzStrings; + const localStrings = await this.vfs.yaml<BlitzStrings>( `Data/Strings/${blitzLocale}.yaml`, ); + const combined = { ...networkStrings, ...localStrings }; - this.stringsI18n[locale] = { - ...cache, - ...preInstalled, - }; + await mkdir(root, { recursive: true }); + await writeFile(cachePath, JSON.stringify(combined)); - console.log( - `Fetched localizations for ${locale} (${++fetchedLocalizations}/${locales.supported.length})`, - ); + this.stringsI18n[locale] = combined; }), ); From c70fae81622c6e55593d425bc387b159fb41d387 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Mon, 5 Oct 2026 11:24:29 -0500 Subject: [PATCH 73/97] game strings --- packages/core/src/blitzkit/api/server/0_base.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/blitzkit/api/server/0_base.ts b/packages/core/src/blitzkit/api/server/0_base.ts index d67af5898..2efff35ec 100644 --- a/packages/core/src/blitzkit/api/server/0_base.ts +++ b/packages/core/src/blitzkit/api/server/0_base.ts @@ -160,7 +160,7 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI { await Promise.all( locales.supported.map(async ({ locale }) => { - const root = "../../temp/strings"; + const root = "../../temp/game-strings"; const cachePath = `${root}/${locale}.json`; if (existsSync(cachePath)) { From 5ce927be4e8748861fa7b5c41a27963c7085501f Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:14:44 -0500 Subject: [PATCH 74/97] force bun even with node installed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 979a37799..3b4791010 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "BlitzKit License", "private": true, "scripts": { - "dev": "cd packages/website && bun run dev", + "dev": "cd packages/website && bun --bun run dev", "build": "cd packages/website && bun run build", "discover-ids": "cd packages/scripts && bun run discover-ids", "build-protos": "cd packages/scripts && bun run build-protos", From 00149a3d9d8a0d9aad1ebbbfb372d703ff4885bc Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:03:41 -0500 Subject: [PATCH 75/97] simplify strings --- packages/i18n/strings/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index c610ad57e..04125f138 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -215,7 +215,7 @@ "title": "Settings", "description": "Change BlitzKit settings", "dev_mode": "Development mode", - "auto_load_models": "Automatically load 3D models", + "auto_load_models": "Auto-load models", "language": "Language" }, @@ -459,7 +459,7 @@ }, "sandbox": { - "load_model": "Load 3D model", + "load_model": "Load model", "poses": { "hull_down": "Hull down", From e1b079ca02c233de57ddbb5047f5e763bd68dc67 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:06:52 -0500 Subject: [PATCH 76/97] high contrast button --- .../HeroSection/components/TankSandbox/Title/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx index b3dab3aaf..69f7a0193 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx @@ -81,8 +81,7 @@ export function Title({ skeleton }: MaybeSkeletonComponentProps) { }} > <Button - variant="surface" - color="gray" + variant="solid" highContrast onPointerDown={(event) => event.stopPropagation()} onClick={() => { From 16be5faae6516e4ba1a5bf8adc68b1ff4a5ef615 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:08:56 -0500 Subject: [PATCH 77/97] use UpdateIcon --- .../HeroSection/components/TankSandbox/Title/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx index 69f7a0193..d31db7a1f 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/Title/index.tsx @@ -1,4 +1,4 @@ -import { DownloadIcon } from "@radix-ui/react-icons"; +import { UpdateIcon } from "@radix-ui/react-icons"; import { Button, Flex, Heading } from "@radix-ui/themes"; import { useLocale } from "../../../../../../hooks/useLocale"; import { Duel } from "../../../../../../stores/duel"; @@ -90,7 +90,7 @@ export function Title({ skeleton }: MaybeSkeletonComponentProps) { }); }} > - <DownloadIcon /> + <UpdateIcon /> {strings.website.tools.tankopedia.sandbox.load_model} </Button> </Flex> From d4e649804e1a35d740fbd791f675c8ba430b387a Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:15:07 -0500 Subject: [PATCH 78/97] add astro cleaning script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b4791010..d9bc165ba 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "discover-ids": "cd packages/scripts && bun run discover-ids", "build-protos": "cd packages/scripts && bun run build-protos", "record-performance": "cd packages/scripts && bun run record-performance", - "download-client": "cd packages/scripts && bun run download-client" + "download-client": "cd packages/scripts && bun run download-client", + "clean-astro": "rm -rf packages/website/.astro packages/website/node_modules/.astro packages/website/node_modules/.vite" }, "type": "module", "workspaces": [ From 3397e7f67bc30260f291f197fc4bce4eea31d45e Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:25:34 -0500 Subject: [PATCH 79/97] truthy array --- .../components/Tankopedia/TechTreeSection/components/Node.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx index 6f575a078..7b743aeaa 100644 --- a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx +++ b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx @@ -127,7 +127,7 @@ export function Node({ id, highlight, nextIds, skeleton }: NodeProps) { </Text> </Flex> - {averages && nextTanks && nextTanks.length > 0 && ( + {averages && nextTanks && ( <Text color="gray" size="1" mt="2"> {skeleton && <Skeleton height="1em" width="4em" />} {!skeleton && From 0e119b6ba858db629e9c649670a32e9add880aa2 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:27:38 -0500 Subject: [PATCH 80/97] optimize awaitable tiers --- packages/website/src/core/awaitables/tiers.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/website/src/core/awaitables/tiers.ts b/packages/website/src/core/awaitables/tiers.ts index a83389b73..0729a3d45 100644 --- a/packages/website/src/core/awaitables/tiers.ts +++ b/packages/website/src/core/awaitables/tiers.ts @@ -2,9 +2,11 @@ import { times } from "lodash-es"; import { api } from "../blitzkit/api"; export const awaitableTiers = api.tankDefinitions().then((tankDefinitions) => { - const maxTier = Math.max( - ...Object.values(tankDefinitions.tanks).map((tank) => tank.tier), - ); + let max = 0; - return times(maxTier, (index) => maxTier - index); + for (const tank of Object.values(tankDefinitions.tanks)) { + if (tank.tier > max) max = tank.tier; + } + + return times(max, (index) => max - index); }); From e19d0d5895192f54e538a3e8de9ae559aec3bcfd Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:32:48 -0500 Subject: [PATCH 81/97] revert tank exclusion --- .../website/src/components/Compare/Controls.tsx | 7 ------- .../website/src/components/Compare/TankControl.tsx | 11 +---------- .../website/src/components/TankSearch/index.tsx | 13 +++---------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/packages/website/src/components/Compare/Controls.tsx b/packages/website/src/components/Compare/Controls.tsx index 8614c2c31..1bb45c6cb 100644 --- a/packages/website/src/components/Compare/Controls.tsx +++ b/packages/website/src/components/Compare/Controls.tsx @@ -1,6 +1,5 @@ import { PlusIcon, TrashIcon } from "@radix-ui/react-icons"; import { Button, Dialog, Flex, SegmentedControl } from "@radix-ui/themes"; -import { useMemo } from "react"; import { api } from "../../core/blitzkit/api"; import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember"; import { useLocale } from "../../hooks/useLocale"; @@ -23,11 +22,6 @@ export function Controls({ onAddTankDialogOpenChange, }: ControlsProps) { const deltaMode = ComparePersistent.use((state) => state.deltaMode); - const members = CompareEphemeral.use((state) => state.members); - const memberIds = useMemo( - () => members.map((member) => member.tank.id), - [members], - ); const { strings } = useLocale(); return ( @@ -59,7 +53,6 @@ export function Controls({ > <TankSearch compact - exclude={memberIds} onSelect={(tank) => { CompareEphemeral.mutate((draft) => { draft.members.push( diff --git a/packages/website/src/components/Compare/TankControl.tsx b/packages/website/src/components/Compare/TankControl.tsx index bf2e6e227..28ab0e129 100644 --- a/packages/website/src/components/Compare/TankControl.tsx +++ b/packages/website/src/components/Compare/TankControl.tsx @@ -1,6 +1,6 @@ import { ExternalLinkIcon, LoopIcon, TrashIcon } from "@radix-ui/react-icons"; import { Dialog, Flex, IconButton } from "@radix-ui/themes"; -import { useMemo, useState } from "react"; +import { useState } from "react"; import { api } from "../../core/blitzkit/api"; import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember"; import { useLocale } from "../../hooks/useLocale"; @@ -18,14 +18,6 @@ const provisionDefinitions = await api.provisionDefinitions(); export function TankControl({ index, slug }: TankControlProps) { const { locale, strings } = useLocale(); const [switchTankDialogOpen, setSwitchTankDialogOpen] = useState(false); - const members = CompareEphemeral.use((state) => state.members); - const otherMemberIds = useMemo( - () => - members - .filter((_, memberIndex) => memberIndex !== index) - .map((member) => member.tank.id), - [members, index], - ); return ( <Flex gap="3" justify="center" style={{ width: "100%" }}> @@ -65,7 +57,6 @@ export function TankControl({ index, slug }: TankControlProps) { > <TankSearch compact - exclude={otherMemberIds} onSelect={(tank) => { CompareEphemeral.mutate((draft) => { draft.members[index] = tankToCompareMember( diff --git a/packages/website/src/components/TankSearch/index.tsx b/packages/website/src/components/TankSearch/index.tsx index fcc976aed..35321dc2c 100644 --- a/packages/website/src/components/TankSearch/index.tsx +++ b/packages/website/src/components/TankSearch/index.tsx @@ -38,7 +38,6 @@ export type TankSearchProps = MaybeSkeletonComponentProps & compact?: boolean; onSelect?: (tank: TankDefinition) => void; onSelectAll?: (tanks: TankDefinition[]) => void; - exclude?: number[]; }; const PREVIEW_COUNT = 20; @@ -53,14 +52,14 @@ const [gameDefinitions, modelDefinitions, tankDefinitions, tankNames] = ]); export const TankSearch = memo<TankSearchProps>( - ({ compact, onSelect, onSelectAll, exclude, skeleton, ...props }) => { + ({ compact, onSelect, onSelectAll, skeleton, ...props }) => { const { strings, locale } = useLocale(); const wargaming = App.use((state) => state.logins.wargaming); const awaitedTanksDefinitionsArray = Object.values(tankDefinitions.tanks); const tankopediaSort = TankSort.use(); const tankFilters = TankFilters.use(); - const allFiltered = usePromise( + const filtered = usePromise( () => { if (tankFilters.search === null) { return filterTanks( @@ -82,15 +81,9 @@ export const TankSearch = memo<TankSearchProps>( [tankFilters] as any, ); const sorted = useMemo(() => { - const filtered = allFiltered.filter( - (tank) => !exclude?.includes(tank.id), - ); - if (tankFilters.search === null) { let sorted: TankDefinition[]; - filtered.sort((a, b) => a.id - b.id); - switch (tankopediaSort.by) { case "meta.none": sorted = metaSortTank(filtered, gameDefinitions); @@ -424,7 +417,7 @@ export const TankSearch = memo<TankSearchProps>( } else { return filtered; } - }, [tankFilters, tankopediaSort, exclude]); + }, [tankFilters, tankopediaSort]); const [loadedCards, setLoadedCards] = useState(DEFAULT_LOADED_CARDS); const tanks = sorted.slice(0, loadedCards); From 904d50f4c30f84ef611ad09511fc6a296186d9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:35:15 -0500 Subject: [PATCH 82/97] New Crowdin updates (#379) --- packages/i18n/strings/es.json | 2 ++ packages/i18n/strings/fr.json | 2 ++ packages/i18n/strings/ja.json | 2 ++ packages/i18n/strings/pl.json | 2 ++ packages/i18n/strings/pt.json | 2 ++ packages/i18n/strings/ru.json | 2 ++ packages/i18n/strings/uk.json | 2 ++ packages/i18n/strings/zh.json | 2 ++ 8 files changed, 16 insertions(+) diff --git a/packages/i18n/strings/es.json b/packages/i18n/strings/es.json index 8df0c4a90..e877464d5 100644 --- a/packages/i18n/strings/es.json +++ b/packages/i18n/strings/es.json @@ -194,6 +194,7 @@ "title": "Settings", "description": "Change BlitzKit settings", "dev_mode": "Modo de desarrollador", + "auto_load_models": "Auto-load models", "language": "Idioma" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "Hull down", "face_hug": "Cara a cara", diff --git a/packages/i18n/strings/fr.json b/packages/i18n/strings/fr.json index 7e5d2a7c3..ba01e0146 100644 --- a/packages/i18n/strings/fr.json +++ b/packages/i18n/strings/fr.json @@ -194,6 +194,7 @@ "title": "Paramètres", "description": "Modifier les paramètres de BlitzKit", "dev_mode": "Mode développement", + "auto_load_models": "Auto-load models", "language": "Langue" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "Hull down", "face_hug": "Face hug", diff --git a/packages/i18n/strings/ja.json b/packages/i18n/strings/ja.json index 18ae1e3f4..f56d1986f 100644 --- a/packages/i18n/strings/ja.json +++ b/packages/i18n/strings/ja.json @@ -194,6 +194,7 @@ "title": "Settings", "description": "Change BlitzKit settings", "dev_mode": "開発者モード", + "auto_load_models": "Auto-load models", "language": "言語 / Language" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "ハルダウン", "face_hug": "密着", diff --git a/packages/i18n/strings/pl.json b/packages/i18n/strings/pl.json index cb209b4be..447d389b3 100644 --- a/packages/i18n/strings/pl.json +++ b/packages/i18n/strings/pl.json @@ -194,6 +194,7 @@ "title": "Settings", "description": "Change BlitzKit settings", "dev_mode": "Development mode", + "auto_load_models": "Auto-load models", "language": "Language" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "Hull down", "face_hug": "Face hug", diff --git a/packages/i18n/strings/pt.json b/packages/i18n/strings/pt.json index c0591e83c..757530039 100644 --- a/packages/i18n/strings/pt.json +++ b/packages/i18n/strings/pt.json @@ -194,6 +194,7 @@ "title": "Settings", "description": "Change BlitzKit settings", "dev_mode": "Modo de desenvolvimento", + "auto_load_models": "Auto-load models", "language": "Idioma" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "Casco para baixo", "face_hug": "Abraço facial", diff --git a/packages/i18n/strings/ru.json b/packages/i18n/strings/ru.json index 3f34d00d4..c887147c7 100644 --- a/packages/i18n/strings/ru.json +++ b/packages/i18n/strings/ru.json @@ -194,6 +194,7 @@ "title": "Настройки", "description": "Изменить настройки BlitzKit", "dev_mode": "Режим разработчика", + "auto_load_models": "Auto-load models", "language": "Язык" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "За холмом", "face_hug": "В упор", diff --git a/packages/i18n/strings/uk.json b/packages/i18n/strings/uk.json index 945d41188..1cf6305fe 100644 --- a/packages/i18n/strings/uk.json +++ b/packages/i18n/strings/uk.json @@ -194,6 +194,7 @@ "title": "Налаштування", "description": "Змінити налаштування BlitzKit ", "dev_mode": "Режим розробника", + "auto_load_models": "Auto-load models", "language": "Мова" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "Від башти", "face_hug": "Клінч", diff --git a/packages/i18n/strings/zh.json b/packages/i18n/strings/zh.json index eeb75358e..3ab253b45 100644 --- a/packages/i18n/strings/zh.json +++ b/packages/i18n/strings/zh.json @@ -194,6 +194,7 @@ "title": "设置", "description": "更改 BlitzKit 设置", "dev_mode": "开发者模式", + "auto_load_models": "Auto-load models", "language": "语言" }, "common": { @@ -412,6 +413,7 @@ } }, "sandbox": { + "load_model": "Load model", "poses": { "hull_down": "俯角视角", "face_hug": "顶牛视角", From 0e7b020d60baaf4e2d500caff8600474515dba85 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:48:08 -0500 Subject: [PATCH 83/97] fix sliver --- .../CharacteristicsSection/components/Equalizer.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx index f9c29e521..8c5b2771b 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equalizer.tsx @@ -28,17 +28,17 @@ export function Equalizer() { width="100%" style={{ cursor: "pointer", - borderRadius: "var(--radius-3)", + borderRadius: "var(--radius-3) 0 0 var(--radius-3)", backgroundImage: ` linear-gradient(90deg, var(--black-a3), var(--gray-1)), url(${alias("api", `/gamemodes/Insanity/banner.webp`)}) `, - backgroundSize: "cover", + backgroundSize: "auto, fit", backgroundPosition: "50% 25%", overflow: "hidden", }} > - <Flex align="center" width="100%" justify="between" p="4"> + <Flex align="center" width="100%" justify="between" p="4" style={{}}> <Text style={{ textShadow: "0 0 var(--space-1) var(--black-a12)", From 92c8b90bb3084447eae534da60b6c20676ba4a23 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:56:40 -0500 Subject: [PATCH 84/97] remove api check --- packages/website/src/components/LocaleRedirector.astro | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/website/src/components/LocaleRedirector.astro b/packages/website/src/components/LocaleRedirector.astro index 80c0afeaa..50cd05acb 100644 --- a/packages/website/src/components/LocaleRedirector.astro +++ b/packages/website/src/components/LocaleRedirector.astro @@ -3,7 +3,6 @@ import { getBestLocale } from "../core/i18n/getBestLocale"; const pathname = window.location.pathname; - const isAPI = pathname.startsWith("/api"); const hasPreference = localStorage.getItem("preferred-locale") !== null; const bestLocale = getBestLocale(); const currentLocale = @@ -14,7 +13,6 @@ )?.locale ?? locales.default; if ( - !isAPI && bestLocale !== currentLocale && (hasPreference || currentLocale === locales.default) ) { From 02f5cc0686dd55ca6076e08d890312d0c17fffea Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 17:00:47 -0500 Subject: [PATCH 85/97] remove redundant logic --- packages/website/src/components/LocaleRedirector.astro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/website/src/components/LocaleRedirector.astro b/packages/website/src/components/LocaleRedirector.astro index 50cd05acb..3805c19cc 100644 --- a/packages/website/src/components/LocaleRedirector.astro +++ b/packages/website/src/components/LocaleRedirector.astro @@ -8,8 +8,7 @@ const currentLocale = locales.supported.find( ({ locale }) => - locale !== locales.default && - (pathname === `/${locale}` || pathname.startsWith(`/${locale}/`)), + pathname === `/${locale}` || pathname.startsWith(`/${locale}/`), )?.locale ?? locales.default; if ( From 7234c39ad81db68ba6e06349f0fe27331baeb7e9 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 7 Oct 2026 21:32:38 -0500 Subject: [PATCH 86/97] move credits back --- docs/changelogs/1.29.10.md | 4 ++-- docs/changelogs/1.29.16.md | 2 +- docs/changelogs/1.29.8.md | 2 +- docs/changelogs/1.29.9.md | 4 ++-- docs/changelogs/1.30.0.md | 10 +++++----- docs/changelogs/1.30.1.md | 2 +- docs/changelogs/1.30.2.md | 6 +++--- docs/changelogs/1.30.3.md | 10 +++++----- docs/changelogs/1.30.7.md | 8 ++++---- docs/changelogs/1.31.4.md | 30 +++++++++++++++--------------- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/changelogs/1.29.10.md b/docs/changelogs/1.29.10.md index c293c1b4f..d96d78fd8 100644 --- a/docs/changelogs/1.29.10.md +++ b/docs/changelogs/1.29.10.md @@ -5,10 +5,10 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Features - Combined game mode passive and active abilities into a single dropdown -- [Mark Greene] Added tier filters to the Guess game +- Added tier filters to the Guess game [Mark Greene] - Changing tiers will break your streak ## Fixes -- [Mark Greene] module damage is now properly shown when sorting with it in the tank search +- module damage is now properly shown when sorting with it in the tank search [Mark Greene] - Duplicate abilities in the tank filters are now removed diff --git a/docs/changelogs/1.29.16.md b/docs/changelogs/1.29.16.md index c111d385d..9a110001b 100644 --- a/docs/changelogs/1.29.16.md +++ b/docs/changelogs/1.29.16.md @@ -4,7 +4,7 @@ Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions ## Fixes -- [GonnaHetzMe] The turret for Centurion I is no longer offset from the body +- The turret for Centurion I is no longer offset from the body [GonnaHetzMe] - Please allow up to 24 hours for the model to update - Vertical Stabilizers now give the correct 12% buff instead of 15% - Re-ordering tanks in Compare now works once again diff --git a/docs/changelogs/1.29.8.md b/docs/changelogs/1.29.8.md index fa010e23f..a32e7d558 100644 --- a/docs/changelogs/1.29.8.md +++ b/docs/changelogs/1.29.8.md @@ -15,5 +15,5 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Fixes - The Tankopedia now smoothly resizes when enlarging on interaction -- [Mark Greene] Stock turrets now correctly mount the corresponding stock gun +- Stock turrets now correctly mount the corresponding stock gun [Mark Greene] - The consumable and provision buttons in Compare are no longer tiny diff --git a/docs/changelogs/1.29.9.md b/docs/changelogs/1.29.9.md index 5f8d4a78e..c426194e1 100644 --- a/docs/changelogs/1.29.9.md +++ b/docs/changelogs/1.29.9.md @@ -5,10 +5,10 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Features - Reworked tank search filters to be far more compact to make way for new filters -- [Mark Greene] Added the ability to filter tanks by consumables +- Added the ability to filter tanks by consumables [Mark Greene] - Added the ability to filter tanks by provisions and game-mode abilities and powers ## Fixes - Consumable and provision icons in Compare are now properly sized -- [Mark Greene] Provisions now properly affect terrain resistances +- Provisions now properly affect terrain resistances [Mark Greene] diff --git a/docs/changelogs/1.30.0.md b/docs/changelogs/1.30.0.md index cedbf5607..fd009b569 100644 --- a/docs/changelogs/1.30.0.md +++ b/docs/changelogs/1.30.0.md @@ -13,11 +13,11 @@ Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions ## Technical Features -- [GonnaHetzMe] Enabling dev mode now displays the tank's non-numerical id -- [GonnaHetzMe] The dev id and the new dev name are now copyable on click +- Enabling dev mode now displays the tank's non-numerical id [GonnaHetzMe] +- The dev id and the new dev name are now copyable on click [GonnaHetzMe] ## Fixes -- [GonnaHetzMe] Tech trees that start at tiers higher than tier 1 like the Blitz Nation ones now properly render their trees in Tankopedia -- [GonnaHetzMe] The tank pitch/yaw inputs in the Tank Sandbox now initialize with the correct values instead of 0 -- [GonnaHetzMe] Large Repair Kits once again use the correct modern icon +- Tech trees that start at tiers higher than tier 1 like the Blitz Nation ones now properly render their trees in Tankopedia [GonnaHetzMe] +- The tank pitch/yaw inputs in the Tank Sandbox now initialize with the correct values instead of 0 [GonnaHetzMe] +- Large Repair Kits once again use the correct modern icon [GonnaHetzMe] diff --git a/docs/changelogs/1.30.1.md b/docs/changelogs/1.30.1.md index 9491bc53a..8f2fd5c8c 100644 --- a/docs/changelogs/1.30.1.md +++ b/docs/changelogs/1.30.1.md @@ -4,5 +4,5 @@ Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions ## Fixes -- [GonnaHetzMe] Tank hit points in Equalizer mode is now accurate to the game +- Tank hit points in Equalizer mode is now accurate to the game [GonnaHetzMe] - Armor highlighting now reflects the actual thicknesses of tanks in Equalizer mode diff --git a/docs/changelogs/1.30.2.md b/docs/changelogs/1.30.2.md index e6437cad0..db259e391 100644 --- a/docs/changelogs/1.30.2.md +++ b/docs/changelogs/1.30.2.md @@ -4,9 +4,9 @@ Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions ## Fixes -- [GonnaHetzMe] Tungsten shells are now properly cropped +- Tungsten shells are now properly cropped [GonnaHetzMe] - Equalizer no longer gives insanely high penetration values - The tank reveal animation no longer repeats when you scroll away and back to the tank sandbox -- [GonnaHetzMe] The RHM. Pzw.'s turret no longer has the floating plate +- The RHM. Pzw.'s turret no longer has the floating plate [GonnaHetzMe] - Please give BlitzKit up to 1 hour to update the model -- [GonnaHetzMe] Tanks with inclined turret rings like the Minotauro now display the correct pitch in the tank sandbox inputs +- Tanks with inclined turret rings like the Minotauro now display the correct pitch in the tank sandbox inputs [GonnaHetzMe] diff --git a/docs/changelogs/1.30.3.md b/docs/changelogs/1.30.3.md index 69137dcac..74924659b 100644 --- a/docs/changelogs/1.30.3.md +++ b/docs/changelogs/1.30.3.md @@ -4,7 +4,7 @@ Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions ## Features -- [GonnaHetzMe] Added tooltips to the module selector in Tankopedia +- Added tooltips to the module selector in Tankopedia [GonnaHetzMe] ## Fixes @@ -12,7 +12,7 @@ Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions - Removed tank visual and collision model caching - Guesser once again breaks streaks if not all tiers are selected - BlitzKit now properly unloads tank models from memory when visually hidden in Guesser -- [GonnaHetzMe] Tanks with complex transparency like the Herdbreaker once again handle opacity correctly -- [GonnaHetzMe] Pieces of tank models that have transparency now handle culling properly (they're visible from both sides) -- [GonnaHetzMe] Tanks with "cardboard" textures have been fixed, thanks to better PVR file parsing -- [GonnaHetzMe] Tank icons are now scaled correctly so small tanks are now properly zoomed out in contrast to bigger ones +- Tanks with complex transparency like the Herdbreaker once again handle opacity correctly [GonnaHetzMe] +- Pieces of tank models that have transparency now handle culling properly (they're visible from both sides) [GonnaHetzMe] +- Tanks with "cardboard" textures have been fixed, thanks to better PVR file parsing [GonnaHetzMe] +- Tank icons are now scaled correctly so small tanks are now properly zoomed out in contrast to bigger ones [GonnaHetzMe] diff --git a/docs/changelogs/1.30.7.md b/docs/changelogs/1.30.7.md index 2545b4b20..c42589bff 100644 --- a/docs/changelogs/1.30.7.md +++ b/docs/changelogs/1.30.7.md @@ -8,13 +8,13 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Fixes -- [Mark Greene] Clicking on the armor multiple times with HE no longer crashes BlitzKit -- [Mark Greene] Ricochets that later intersect with external modules no longer falsely claim a successful damaging penetration +- Clicking on the armor multiple times with HE no longer crashes BlitzKit [Mark Greene] +- Ricochets that later intersect with external modules no longer falsely claim a successful damaging penetration [Mark Greene] - The lighting animation no longer stops prematurely when BlitzKit is unfocused - The spot light angle has been increased to more evenly light up larger tanks - BlitzKit once again uses soft shadows, reducing the pixelated shadows - Fixed the weird patterns that formed on the tracks of tanks under self-shadows - Increased the floor size and light decay to create the illusion that the floor is infinite -- [Mark Greene] Safari no longer crashes when unloading textures for unloaded tanks +- Safari no longer crashes when unloading textures for unloaded tanks [Mark Greene] - The gun depression transition between two constraints (like often behind tanks) now uses a gentler zoned and can never be 0 -- [Mark Greene] Armor plate names in Static Armor are now properly capitalized in English and translated to other languages +- Armor plate names in Static Armor are now properly capitalized in English and translated to other languages [Mark Greene] diff --git a/docs/changelogs/1.31.4.md b/docs/changelogs/1.31.4.md index ecf232845..462d732f7 100644 --- a/docs/changelogs/1.31.4.md +++ b/docs/changelogs/1.31.4.md @@ -4,27 +4,27 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Features -- [Mark Greene] Added Peekaboo DPM +- Added Peekaboo DPM [Mark Greene] - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot -- [Mark Greene] The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off -- [Mark Greene] Added a spall liner button to the Tankopedia beside the other equipment +- The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] +- Added a spall liner button to the Tankopedia beside the other equipment [Mark Greene] ## Fixes -- [Mark Greene] BlitzKit Session now properly handles tanks removed from the game -- [Mark Greene] Removed the Beta badge from the Equalizer button +- BlitzKit Session now properly handles tanks removed from the game [Mark Greene] +- Removed the Beta badge from the Equalizer button [Mark Greene] - Updated the background image for the Equalizer button to the actual banner of the new game mode -- [Mark Greene] The armor no longer disappears when you turn on Dynamic Armor System -- [Mark Greene] Camouflage values in Tankopedia are now more descriptive when shooting -- [Mark Greene] The contact shadows on the ground no longer grow & darken when switching between tabs +- The armor no longer disappears when you turn on Dynamic Armor System [Mark Greene] +- Camouflage values in Tankopedia are now more descriptive when shooting [Mark Greene] +- The contact shadows on the ground no longer grow & darken when switching between tabs [Mark Greene] - The "Help Translate BlitzKit" text on the home page is now properly centered vertically -- [Mark Greene] The footer now says "Branch" instead of "CDN" -- [Mark Greene] The game version in the footer now displays a shorthand version instead of the entire version number -- [Mark Greene] The reload visualizer now displays just 1 decimal place -- [Mark Greene] The search bar no longer redirects to a seemingly random tank when clicking enter when searching -- [Mark Greene] Tank search now properly handles the full names of tanks like the Super Pershing -- [Mark Greene] The loading bar below the name of the tanks in Tankopedia is now sufficiently spaced below -- [Mark Greene] The gun depression visualizer now properly handles the inherent tilt of tanks like the Minotauro +- The footer now says "Branch" instead of "CDN" [Mark Greene] +- The game version in the footer now displays a shorthand version instead of the entire version number [Mark Greene] +- The reload visualizer now displays just 1 decimal place [Mark Greene] +- The search bar no longer redirects to a seemingly random tank when clicking enter when searching [Mark Greene] +- Tank search now properly handles the full names of tanks like the Super Pershing [Mark Greene] +- The loading bar below the name of the tanks in Tankopedia is now sufficiently spaced below [Mark Greene] +- The gun depression visualizer now properly handles the inherent tilt of tanks like the Minotauro [Mark Greene] ## Technical Features From fbdfa2c0634c0de5e2aa1917b25bc1919db4a7f5 Mon Sep 17 00:00:00 2001 From: Mark Greene <markgreene5833@gmail.com> Date: Thu, 8 Oct 2026 18:00:57 +1300 Subject: [PATCH 87/97] Feature: Penetration chance in the armor shot card MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shows the chance a shot penetrates in the dynamic armor shot card, right-aligned on the shot's result line. - Penetration varies by ±5% (the same randomisation the armor highlighter shader uses), so the chance is the share of that range where the shot's final outcome is a penetration - Re-runs the existing shot calculation at different penetration values, so spaced armor, HEAT gap losses and ricochets are taken into account - For ricochets the chance is shown on the ricocheted shot's line; HE splashes don't count as penetrations - Adds the `shot_card.stats.penetration_chance` string Fixes #342 --- .../Armor/components/ShotDisplayCard.tsx | 45 ++++++++++++------- .../SpacedArmorSceneComponent/index.tsx | 43 ++++++++++++++++++ packages/website/src/stores/tankopedia.ts | 1 + 3 files changed, 74 insertions(+), 15 deletions(-) diff --git a/packages/website/src/components/Armor/components/ShotDisplayCard.tsx b/packages/website/src/components/Armor/components/ShotDisplayCard.tsx index e27c1de5c..6720458f3 100644 --- a/packages/website/src/components/Armor/components/ShotDisplayCard.tsx +++ b/packages/website/src/components/Armor/components/ShotDisplayCard.tsx @@ -128,19 +128,30 @@ export function ShotDisplayCard({ shot, ...props }: ShotDisplayCardProps) { ? shotStatusColors[shot.out.status] : undefined; const inTitleColor = shotStatusColors[shot.in.status]; + const hasOutLayers = shot.out !== undefined && shot.out.layers.length > 0; + const penetrationChance = shot.penetrationChance !== undefined && ( + <Text color="gray" weight="bold"> + {literals(strings.common.units.percentage, { + value: (shot.penetrationChance * 100).toFixed(0), + })} + </Text> + ); return ( <Card variant="classic" {...props}> <Flex direction="column" gap="2"> <Flex direction="column" gap="1"> - <Text color={inTitleColor} weight="bold"> - {literals( - strings.website.tools.tankopedia.sandbox.dynamic.shot_card.status[ - shot.in.status - ], - { damage: Math.round(shot.damage).toLocaleString(locale) } - )} - </Text> + <Flex justify="between" align="center" gap="4"> + <Text color={inTitleColor} weight="bold"> + {literals( + strings.website.tools.tankopedia.sandbox.dynamic.shot_card + .status[shot.in.status], + { damage: Math.round(shot.damage).toLocaleString(locale) } + )} + </Text> + + {!hasOutLayers && penetrationChance} + </Flex> <table style={{ @@ -204,13 +215,17 @@ export function ShotDisplayCard({ shot, ...props }: ShotDisplayCardProps) { </Flex> </Inset> - <Text color={outTitleColor} weight="bold"> - {literals( - strings.website.tools.tankopedia.sandbox.dynamic.shot_card - .status[shot.out.status], - { damage: Math.round(shot.damage).toLocaleString(locale) } - )} - </Text> + <Flex justify="between" align="center" gap="4"> + <Text color={outTitleColor} weight="bold"> + {literals( + strings.website.tools.tankopedia.sandbox.dynamic.shot_card + .status[shot.out.status], + { damage: Math.round(shot.damage).toLocaleString(locale) } + )} + </Text> + + {penetrationChance} + </Flex> <Flex direction="column"> {shot.out.layers.map((layer, index) => { diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx index 784836464..57149cbe4 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx @@ -63,6 +63,36 @@ export type ArmorUserData = { } ); +const PENETRATION_RANDOMIZATION = 0.05; + +function resolvePenetrationChance(shoot: (scale: number) => Shot | null) { + function penetrates(scale: number) { + const shot = shoot(scale); + + return (shot?.out ?? shot?.in)?.status === "penetration"; + } + + let low = 1 - PENETRATION_RANDOMIZATION; + let high = 1 + PENETRATION_RANDOMIZATION; + + if (penetrates(low)) return 1; + if (!penetrates(high)) return 0; + + for (let iteration = 0; iteration < 16; iteration++) { + const middle = (low + high) / 2; + + if (penetrates(middle)) { + high = middle; + } else { + low = middle; + } + } + + return ( + (1 + PENETRATION_RANDOMIZATION - high) / (2 * PENETRATION_RANDOMIZATION) + ); +} + const omitMaterial = new MeshBasicMaterial({ colorWrite: false, depthWrite: true, @@ -89,6 +119,7 @@ export function SpacedArmorSceneComponent({ intersections: Intersection[], allowRicochet: boolean, remainingPenetrationInput?: number, + penetrationScale = 1, ) => { const { customShell } = Tankopedia.state; const shell = customShell ?? Duel.state.antagonist.shell; @@ -125,6 +156,7 @@ export function SpacedArmorSceneComponent({ Duel.state.protagonist.equipmentMatrix, ); const penetration = + penetrationScale * shell.penetration!.near * resolvePenetrationCoefficient( hasCalibratedShells, @@ -367,6 +399,7 @@ export function SpacedArmorSceneComponent({ ricochetIntersections, false, remainingPenetration, + penetrationScale, ); shot.in.status = "ricochet"; @@ -422,6 +455,16 @@ export function SpacedArmorSceneComponent({ const shot = shoot(event.point, event.intersections, true)!; + shot.penetrationChance = resolvePenetrationChance((scale) => + shoot( + event.point, + event.intersections, + true, + undefined, + scale, + ), + ); + Tankopedia.mutate((draft) => { draft.shot = shot; }); diff --git a/packages/website/src/stores/tankopedia.ts b/packages/website/src/stores/tankopedia.ts index 023ab0e87..d6e374a0a 100644 --- a/packages/website/src/stores/tankopedia.ts +++ b/packages/website/src/stores/tankopedia.ts @@ -43,6 +43,7 @@ export type Shot = { containsGaps: boolean; damage: number; splashRadius?: number; + penetrationChance?: number; in: { surfaceNormal: Vector3; From 940c3c537b89452880246380c3d012a10933da3c Mon Sep 17 00:00:00 2001 From: Mark Greene <markgreene5833@gmail.com> Date: Thu, 8 Oct 2026 18:02:05 +1300 Subject: [PATCH 88/97] Feature: track repair time in Tankopedia Adds track repair time to the Tankopedia survivability stats, matching the value the game lists. - Added a required `repair_time` to track definitions, filled from each chassis's hysteresis health divided by its health regen per second - Applied the toolbox, the repair crew skill and the protective kit as multiplicative repair speed bonuses - Added a Track repair time row under fire chance; it appears once the definitions are regenerated on the next build Fixes #308 --- .../blitzkit/api/server/1_tankDefinitions.ts | 1 + .../core/src/protos/tank_definitions.proto | 1 + packages/core/src/protos/tank_definitions.ts | 18 ++++++++++++++++++ packages/core/src/types/vehicleDefinitions.ts | 2 ++ packages/i18n/strings/en.json | 1 + .../components/Survivability.tsx | 8 ++++++++ .../src/core/blitzkit/tankCharacteristics.ts | 8 ++++++++ 7 files changed, 39 insertions(+) diff --git a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts index e7192e140..9e211001b 100644 --- a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts @@ -434,6 +434,7 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { resistance_hard: terrainResistances[0], resistance_medium: terrainResistances[1], resistance_soft: terrainResistances[2], + repair_time: track.hysteresisHealth / track.healthRegenPerSec, tier: track.level, unlocks: resolveUnlocks( this.blitzModuleTypeToBlitzkit, diff --git a/packages/core/src/protos/tank_definitions.proto b/packages/core/src/protos/tank_definitions.proto index 6c9cb1078..9a2713bff 100644 --- a/packages/core/src/protos/tank_definitions.proto +++ b/packages/core/src/protos/tank_definitions.proto @@ -87,6 +87,7 @@ message TrackDefinition { required float resistance_medium = 10; required float resistance_soft = 11; repeated Unlock unlocks = 12; + required float repair_time = 13; } message EngineDefinition { diff --git a/packages/core/src/protos/tank_definitions.ts b/packages/core/src/protos/tank_definitions.ts index be6e2a1f0..52117f6d9 100644 --- a/packages/core/src/protos/tank_definitions.ts +++ b/packages/core/src/protos/tank_definitions.ts @@ -338,6 +338,7 @@ export interface TrackDefinition { resistance_medium: number; resistance_soft: number; unlocks: Unlock[]; + repair_time: number; } export interface EngineDefinition { @@ -1759,6 +1760,7 @@ function createBaseTrackDefinition(): TrackDefinition { resistance_medium: 0, resistance_soft: 0, unlocks: [], + repair_time: 0, }; } @@ -1800,6 +1802,9 @@ export const TrackDefinition: MessageFns<TrackDefinition> = { for (const v of message.unlocks) { Unlock.encode(v!, writer.uint32(98).fork()).join(); } + if (message.repair_time !== 0) { + writer.uint32(109).float(message.repair_time); + } return writer; }, @@ -1906,6 +1911,14 @@ export const TrackDefinition: MessageFns<TrackDefinition> = { message.unlocks.push(Unlock.decode(reader, reader.uint32())); continue; } + case 13: { + if (tag !== 109) { + break; + } + + message.repair_time = reader.float(); + continue; + } } if ((tag & 7) === 4 || tag === 0) { break; @@ -1929,6 +1942,7 @@ export const TrackDefinition: MessageFns<TrackDefinition> = { resistance_medium: isSet(object.resistance_medium) ? globalThis.Number(object.resistance_medium) : 0, resistance_soft: isSet(object.resistance_soft) ? globalThis.Number(object.resistance_soft) : 0, unlocks: globalThis.Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => Unlock.fromJSON(e)) : [], + repair_time: isSet(object.repair_time) ? globalThis.Number(object.repair_time) : 0, }; }, @@ -1970,6 +1984,9 @@ export const TrackDefinition: MessageFns<TrackDefinition> = { if (message.unlocks?.length) { obj.unlocks = message.unlocks.map((e) => Unlock.toJSON(e)); } + if (message.repair_time !== 0) { + obj.repair_time = message.repair_time; + } return obj; }, @@ -1994,6 +2011,7 @@ export const TrackDefinition: MessageFns<TrackDefinition> = { message.resistance_medium = object.resistance_medium ?? 0; message.resistance_soft = object.resistance_soft ?? 0; message.unlocks = object.unlocks?.map((e) => Unlock.fromPartial(e)) || []; + message.repair_time = object.repair_time ?? 0; return message; }, }; diff --git a/packages/core/src/types/vehicleDefinitions.ts b/packages/core/src/types/vehicleDefinitions.ts index e0ff86532..e497c6979 100644 --- a/packages/core/src/types/vehicleDefinitions.ts +++ b/packages/core/src/types/vehicleDefinitions.ts @@ -34,6 +34,8 @@ export interface VehicleDefinitions { }; level: number; hullPosition: string; + hysteresisHealth: number; + healthRegenPerSec: number; armor: { leftTrack: | number diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 04125f138..c55989b8f 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -683,6 +683,7 @@ "hullTraverseSoftTerrain": "Soft", "health": "Health", "fireChance": "Fire chance", + "trackRepairTime": "Track repair time", "viewRange": "View range", "camouflageStill": "Camouflage still", "camouflageMoving": "Moving", diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx index edd9c96f7..80d489d8b 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Survivability.tsx @@ -24,6 +24,14 @@ export function Survivability({ stats }: StatsAcceptorProps) { decimals={0} value={(stats) => stats.fireChance * 100} /> + {stats.trackRepairTime !== undefined && ( + <InfoWithDelta + value="trackRepairTime" + stats={stats} + deltaType="lowerIsBetter" + decimals={2} + /> + )} <InfoWithDelta value="viewRange" stats={stats} decimals={0} /> <ViewRangeVisualizer stats={stats} /> <Info diff --git a/packages/website/src/core/blitzkit/tankCharacteristics.ts b/packages/website/src/core/blitzkit/tankCharacteristics.ts index 51301190a..67569155a 100644 --- a/packages/website/src/core/blitzkit/tankCharacteristics.ts +++ b/packages/website/src/core/blitzkit/tankCharacteristics.ts @@ -119,6 +119,7 @@ export function tankCharacteristics( const hasImprovedVerticalStabilizer = equipment(122); const hasDownImprovedVerticalStabilizer = equipment(124); const hasImprovedSuspension = equipment(123); + const hasToolbox = equipment(113); const hasTungsten = consumable(45); const hasAdrenaline = consumable(18); @@ -518,6 +519,12 @@ export function tankCharacteristics( } const fireChance = engine.fire_chance * fireChanceCoefficient; + const trackRepairTime = track.repair_time + ? track.repair_time / + ((hasToolbox ? 1.2 : 1) * + (1 + (crewSkills.repair ?? 0) * 0.04) * + (hasProtectiveKit ? 1.1 : 1)) + : undefined; const viewRange = turret.view_range * viewRangeCoefficient; const camouflageStill = tank.camouflage_still * camouflageCoefficientStill; const camouflageMoving = @@ -602,6 +609,7 @@ export function tankCharacteristics( hullTraverseSoftTerrain, health, fireChance, + trackRepairTime, viewRange, camouflageStill, camouflageMoving, From 646d6fa7d5ddd2d63065d1908a087c75a1de50ea Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 16:54:37 -0500 Subject: [PATCH 89/97] center align and max width 32rem --- packages/website/src/components/PlaylistGenerator.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/PlaylistGenerator.tsx b/packages/website/src/components/PlaylistGenerator.tsx index b50c74654..a64999bc4 100644 --- a/packages/website/src/components/PlaylistGenerator.tsx +++ b/packages/website/src/components/PlaylistGenerator.tsx @@ -25,7 +25,7 @@ import { FilterControl } from "./TankSearch/components/FilterControl"; const tankDefinitions = await api.tankDefinitions(); const POOL_HEIGHT = "16rem"; -const FILTERS_WIDTH = "22rem"; +const FILTERS_WIDTH = "32rem"; export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) { const [largeWarningOpen, setLargeWarningOpen] = useState(false); @@ -90,7 +90,7 @@ export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) { <Flex direction="column" gap="4" - align="stretch" + align="center" flexShrink="0" width={{ initial: "100%", md: FILTERS_WIDTH }} > From fbc4355984cf91a6eaf34ab6e92b8d8891f131a5 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 17:02:54 -0500 Subject: [PATCH 90/97] remove clamped vw --- .../pages/[...chunk_default]/[...locale]/mixer/_index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx index ebd83ff62..7cf3539c4 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx @@ -103,12 +103,12 @@ function ModuleChooser({ {...props} > {skeleton ? ( - <Skeleton width="clamp(2rem, 11vw, 4em)" height="2em" /> + <Skeleton width="4em" height="2em" /> ) : ( <img style={{ - width: "clamp(2rem, 11vw, 4em)", - height: "clamp(2rem, 11vw, 4em)", + width: "4em", + height: "4em", objectFit: "contain", }} src={alias("api", `/tanks/${tank}/icons/big.webp`)} From 072174ad45c2641a96d191d39df5fab12de1d351 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 18:01:10 -0500 Subject: [PATCH 91/97] promote version --- docs/changelogs/{1.31.4.md => 1.32.0.md} | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename docs/changelogs/{1.31.4.md => 1.32.0.md} (99%) diff --git a/docs/changelogs/1.31.4.md b/docs/changelogs/1.32.0.md similarity index 99% rename from docs/changelogs/1.31.4.md rename to docs/changelogs/1.32.0.md index 462d732f7..4cd2f480f 100644 --- a/docs/changelogs/1.31.4.md +++ b/docs/changelogs/1.32.0.md @@ -1,4 +1,4 @@ -# BlitzKit 1.31.4 +# BlitzKit 1.32.0 Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update. diff --git a/package.json b/package.json index d9bc165ba..d8dc478c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blitzkit", - "version": "1.31.4", + "version": "1.32.0", "license": "BlitzKit License", "private": true, "scripts": { From 78bff2cdd26f6138c76f3ed806c019b23ebba511 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 18:13:22 -0500 Subject: [PATCH 92/97] logs --- cspell.json | 2 +- docs/changelogs/1.32.0.md | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cspell.json b/cspell.json index a67dd4960..17d054ca4 100644 --- a/cspell.json +++ b/cspell.json @@ -1,5 +1,5 @@ { - "words": [ + "words": [ "gamemodes", "Tankopedia" ] diff --git a/docs/changelogs/1.32.0.md b/docs/changelogs/1.32.0.md index 4cd2f480f..35c718cbe 100644 --- a/docs/changelogs/1.32.0.md +++ b/docs/changelogs/1.32.0.md @@ -8,6 +8,10 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot - The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] - Added a spall liner button to the Tankopedia beside the other equipment [Mark Greene] +- Listed track repair times in the Tankopedia [Mark Greene] +- The penetration chance is now displayed when penetration testing armor [Mark Greene] +- Added compatibility for tier XI tanks [Mark Greene] +- Added a new setting to disable automatically loading tanks in Tankopedia [Mark Greene] ## Fixes @@ -17,6 +21,7 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - The armor no longer disappears when you turn on Dynamic Armor System [Mark Greene] - Camouflage values in Tankopedia are now more descriptive when shooting [Mark Greene] - The contact shadows on the ground no longer grow & darken when switching between tabs [Mark Greene] +- Additionally, the contact shadows stays visible at low angles [Mark Greene] - The "Help Translate BlitzKit" text on the home page is now properly centered vertically - The footer now says "Branch" instead of "CDN" [Mark Greene] - The game version in the footer now displays a shorthand version instead of the entire version number [Mark Greene] @@ -25,6 +30,14 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - Tank search now properly handles the full names of tanks like the Super Pershing [Mark Greene] - The loading bar below the name of the tanks in Tankopedia is now sufficiently spaced below [Mark Greene] - The gun depression visualizer now properly handles the inherent tilt of tanks like the Minotauro [Mark Greene] +- Plot controls for the Static armor tab no longer pokes in from the right on non-Static armor tabs in some languages [Mark Greene] +- Mixer's controllers now scale better on smaller screens [Mark Greene] +- The flags in the Tankopedia tech tree are no longer offset to the top left [Mark Greene] +- The list of available tanks in the Playlist is no longer excessively wide [Mark Greene] +- When moving the tracks of tanks, the textures no longer move at different rates [Mark Greene] +- Users with a preference on a language are once again redirected to the correct localized pages [Mark Greene] +- Removed the vertical sliver of pixels found to the right of the Equalizer toggle in Tankopedia +- The tank search now remains consistent in order even when an added filter does not add/remove tanks from the list [Mark Greene] ## Technical Features @@ -39,3 +52,5 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - This was the last bug standing in the way of BlitzKit Previews - Welcome back, BlitzKit Previews! - Removed some dead code from the BlitzKit model mangler +- The player discovery loop now persists for longer than 1 iteration [Mark Greene] +- Bun is now forced to run scripts with the `--bun` flag From d0507766282518b9e0877f43a65bf8bd7b30bc24 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 18:14:59 -0500 Subject: [PATCH 93/97] format --- docs/changelogs/1.32.0.md | 70 +++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/docs/changelogs/1.32.0.md b/docs/changelogs/1.32.0.md index 35c718cbe..23b7e2ca6 100644 --- a/docs/changelogs/1.32.0.md +++ b/docs/changelogs/1.32.0.md @@ -4,40 +4,82 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Features -- Added Peekaboo DPM [Mark Greene] - - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot -- The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] +**Tankopedia & Armor** + - Added a spall liner button to the Tankopedia beside the other equipment [Mark Greene] - Listed track repair times in the Tankopedia [Mark Greene] - The penetration chance is now displayed when penetration testing armor [Mark Greene] -- Added compatibility for tier XI tanks [Mark Greene] - Added a new setting to disable automatically loading tanks in Tankopedia [Mark Greene] +**Tank Performance & Mechanics** + +- Added Peekaboo DPM [Mark Greene] + - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot + +**Tank Filters** + +- The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] + +**Game Compatibility** + +- Added compatibility for tier XI tanks [Mark Greene] + ## Fixes -- BlitzKit Session now properly handles tanks removed from the game [Mark Greene] -- Removed the Beta badge from the Equalizer button [Mark Greene] -- Updated the background image for the Equalizer button to the actual banner of the new game mode +**Tankopedia & Armor** + - The armor no longer disappears when you turn on Dynamic Armor System [Mark Greene] - Camouflage values in Tankopedia are now more descriptive when shooting [Mark Greene] +- The penetration chance is now displayed when penetration testing armor [Mark Greene] +- Listed track repair times in the Tankopedia [Mark Greene] +- Added a spall liner button to the Tankopedia beside the other equipment [Mark Greene] +- The flags in the Tankopedia tech tree are no longer offset to the top left [Mark Greene] +- The loading bar below the name of the tanks in Tankopedia is now sufficiently spaced below [Mark Greene] +- Removed the vertical sliver of pixels found to the right of the Equalizer toggle in Tankopedia + +**Tank Search & Filters** + +- The search bar no longer redirects to a seemingly random tank when clicking enter when searching [Mark Greene] +- Tank search now properly handles the full names of tanks like the Super Pershing [Mark Greene] +- The tank search now remains consistent in order even when an added filter does not add/remove tanks from the list [Mark Greene] +- The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] + +**Visuals & UI** + +- Removed the Beta badge from the Equalizer button [Mark Greene] +- Updated the background image for the Equalizer button to the actual banner of the new game mode - The contact shadows on the ground no longer grow & darken when switching between tabs [Mark Greene] - Additionally, the contact shadows stays visible at low angles [Mark Greene] - The "Help Translate BlitzKit" text on the home page is now properly centered vertically - The footer now says "Branch" instead of "CDN" [Mark Greene] - The game version in the footer now displays a shorthand version instead of the entire version number [Mark Greene] - The reload visualizer now displays just 1 decimal place [Mark Greene] -- The search bar no longer redirects to a seemingly random tank when clicking enter when searching [Mark Greene] -- Tank search now properly handles the full names of tanks like the Super Pershing [Mark Greene] -- The loading bar below the name of the tanks in Tankopedia is now sufficiently spaced below [Mark Greene] -- The gun depression visualizer now properly handles the inherent tilt of tanks like the Minotauro [Mark Greene] - Plot controls for the Static armor tab no longer pokes in from the right on non-Static armor tabs in some languages [Mark Greene] - Mixer's controllers now scale better on smaller screens [Mark Greene] -- The flags in the Tankopedia tech tree are no longer offset to the top left [Mark Greene] - The list of available tanks in the Playlist is no longer excessively wide [Mark Greene] + +**Tank Mechanics & Models** + +- The gun depression visualizer now properly handles the inherent tilt of tanks like the Minotauro [Mark Greene] - When moving the tracks of tanks, the textures no longer move at different rates [Mark Greene] + +**Localization** + - Users with a preference on a language are once again redirected to the correct localized pages [Mark Greene] -- Removed the vertical sliver of pixels found to the right of the Equalizer toggle in Tankopedia -- The tank search now remains consistent in order even when an added filter does not add/remove tanks from the list [Mark Greene] + +**Session & Game Compatibility** + +- BlitzKit Session now properly handles tanks removed from the game [Mark Greene] + +**## Technical Fixes** + +- BlitzKit now handles the new ID system for game-modes in WoTB +- The directory which preview versions of the game are downloaded to are now created properly + - This was the last bug standing in the way of BlitzKit Previews + - Welcome back, BlitzKit Previews! +- Removed some dead code from the BlitzKit model mangler +- The player discovery loop now persists for longer than 1 iteration [Mark Greene] +- Bun is now forced to run scripts with the `--bun` flag ## Technical Features From ff03f8ffb2cee027243a0f8a07717ae9c4b018f5 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 18:17:56 -0500 Subject: [PATCH 94/97] remove bold --- docs/changelogs/1.32.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelogs/1.32.0.md b/docs/changelogs/1.32.0.md index 23b7e2ca6..441babd95 100644 --- a/docs/changelogs/1.32.0.md +++ b/docs/changelogs/1.32.0.md @@ -71,7 +71,7 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - BlitzKit Session now properly handles tanks removed from the game [Mark Greene] -**## Technical Fixes** +## Technical Fixes - BlitzKit now handles the new ID system for game-modes in WoTB - The directory which preview versions of the game are downloaded to are now created properly From 1988ecff925f2697e69db6679244659fc26fad73 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 18:20:11 -0500 Subject: [PATCH 95/97] smaller titles --- docs/changelogs/1.32.0.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/changelogs/1.32.0.md b/docs/changelogs/1.32.0.md index 441babd95..ce86475ee 100644 --- a/docs/changelogs/1.32.0.md +++ b/docs/changelogs/1.32.0.md @@ -4,29 +4,29 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions ## Features -**Tankopedia & Armor** +### Tankopedia & Armor - Added a spall liner button to the Tankopedia beside the other equipment [Mark Greene] - Listed track repair times in the Tankopedia [Mark Greene] - The penetration chance is now displayed when penetration testing armor [Mark Greene] - Added a new setting to disable automatically loading tanks in Tankopedia [Mark Greene] -**Tank Performance & Mechanics** +### Tank Performance & Mechanics - Added Peekaboo DPM [Mark Greene] - Your Peekaboo DPM is lower than your normal DPM if your reload is faster than 10s as you'll have to wait for the remaining 10s for you to get unspotted before you can poke and shoot -**Tank Filters** +### Tank Filters - The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] -**Game Compatibility** +### Game Compatibility - Added compatibility for tier XI tanks [Mark Greene] ## Fixes -**Tankopedia & Armor** +### Tankopedia & Armor - The armor no longer disappears when you turn on Dynamic Armor System [Mark Greene] - Camouflage values in Tankopedia are now more descriptive when shooting [Mark Greene] @@ -37,14 +37,14 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - The loading bar below the name of the tanks in Tankopedia is now sufficiently spaced below [Mark Greene] - Removed the vertical sliver of pixels found to the right of the Equalizer toggle in Tankopedia -**Tank Search & Filters** +### Tank Search & Filters - The search bar no longer redirects to a seemingly random tank when clicking enter when searching [Mark Greene] - Tank search now properly handles the full names of tanks like the Super Pershing [Mark Greene] - The tank search now remains consistent in order even when an added filter does not add/remove tanks from the list [Mark Greene] - The test and owned tank filters are now more intuitive as clicking on them now turns the clicked option on instead of off [Mark Greene] -**Visuals & UI** +### Visuals & UI - Removed the Beta badge from the Equalizer button [Mark Greene] - Updated the background image for the Equalizer button to the actual banner of the new game mode @@ -58,16 +58,16 @@ Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions - Mixer's controllers now scale better on smaller screens [Mark Greene] - The list of available tanks in the Playlist is no longer excessively wide [Mark Greene] -**Tank Mechanics & Models** +### Tank Mechanics & Models - The gun depression visualizer now properly handles the inherent tilt of tanks like the Minotauro [Mark Greene] - When moving the tracks of tanks, the textures no longer move at different rates [Mark Greene] -**Localization** +### Localization - Users with a preference on a language are once again redirected to the correct localized pages [Mark Greene] -**Session & Game Compatibility** +### Session & Game Compatibility - BlitzKit Session now properly handles tanks removed from the game [Mark Greene] From 0c91ee360031678e329b7758978b5e04bd4e3a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 9 Oct 2026 23:33:06 -0500 Subject: [PATCH 96/97] New Crowdin updates (#389) * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] --- packages/i18n/strings/es.json | 1 + packages/i18n/strings/fr.json | 1 + packages/i18n/strings/ja.json | 1 + packages/i18n/strings/pl.json | 1 + packages/i18n/strings/pt.json | 1 + packages/i18n/strings/ru.json | 1 + packages/i18n/strings/uk.json | 1 + packages/i18n/strings/zh.json | 1 + 8 files changed, 8 insertions(+) diff --git a/packages/i18n/strings/es.json b/packages/i18n/strings/es.json index e877464d5..a4481cde5 100644 --- a/packages/i18n/strings/es.json +++ b/packages/i18n/strings/es.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "Suave", "health": "Salud", "fireChance": "Probabilidad de incendio", + "trackRepairTime": "Track repair time", "viewRange": "Rango de visión", "camouflageStill": "Quieto", "camouflageMoving": "En movimiento", diff --git a/packages/i18n/strings/fr.json b/packages/i18n/strings/fr.json index ba01e0146..7aeae0160 100644 --- a/packages/i18n/strings/fr.json +++ b/packages/i18n/strings/fr.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "Soft", "health": "Health", "fireChance": "Fire chance", + "trackRepairTime": "Track repair time", "viewRange": "View range", "camouflageStill": "Still", "camouflageMoving": "Moving", diff --git a/packages/i18n/strings/ja.json b/packages/i18n/strings/ja.json index f56d1986f..11209711e 100644 --- a/packages/i18n/strings/ja.json +++ b/packages/i18n/strings/ja.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "軟弱地", "health": "耐久値", "fireChance": "火災発生率", + "trackRepairTime": "Track repair time", "viewRange": "視認範囲", "camouflageStill": "静止時", "camouflageMoving": "移動時", diff --git a/packages/i18n/strings/pl.json b/packages/i18n/strings/pl.json index 447d389b3..de8d7a5d0 100644 --- a/packages/i18n/strings/pl.json +++ b/packages/i18n/strings/pl.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "Soft", "health": "Health", "fireChance": "Fire chance", + "trackRepairTime": "Track repair time", "viewRange": "View range", "camouflageStill": "Still", "camouflageMoving": "Moving", diff --git a/packages/i18n/strings/pt.json b/packages/i18n/strings/pt.json index 757530039..197d34a38 100644 --- a/packages/i18n/strings/pt.json +++ b/packages/i18n/strings/pt.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "Macio", "health": "Vida", "fireChance": "Chance de incêndio", + "trackRepairTime": "Track repair time", "viewRange": "Alcance de visão", "camouflageStill": "Parado", "camouflageMoving": "Em movimento", diff --git a/packages/i18n/strings/ru.json b/packages/i18n/strings/ru.json index c887147c7..4a75261b4 100644 --- a/packages/i18n/strings/ru.json +++ b/packages/i18n/strings/ru.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "На мягком грунте", "health": "Прочность", "fireChance": "Вероятность возгорания", + "trackRepairTime": "Track repair time", "viewRange": "Радиус обзора", "camouflageStill": "Когда неподвижен", "camouflageMoving": "В движении", diff --git a/packages/i18n/strings/uk.json b/packages/i18n/strings/uk.json index 1cf6305fe..d09afb611 100644 --- a/packages/i18n/strings/uk.json +++ b/packages/i18n/strings/uk.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "Soft", "health": "Здоров'я", "fireChance": "Fire chance", + "trackRepairTime": "Track repair time", "viewRange": "View range", "camouflageStill": "Нерухомо", "camouflageMoving": "У русі", diff --git a/packages/i18n/strings/zh.json b/packages/i18n/strings/zh.json index 3ab253b45..6882e04dd 100644 --- a/packages/i18n/strings/zh.json +++ b/packages/i18n/strings/zh.json @@ -623,6 +623,7 @@ "hullTraverseSoftTerrain": "水面上车转速率", "health": "血量", "fireChance": "发动机受击时着火概率", + "trackRepairTime": "Track repair time", "viewRange": "视野范围", "camouflageStill": "静止隐蔽", "camouflageMoving": "移动时", From 7f7d0cc4999923e5a95107a15cc1707e5b538556 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sat, 10 Oct 2026 16:41:57 -0500 Subject: [PATCH 97/97] remove outdated docs --- docs/guides/timezones.md | 9 -- docs/technical/bkrl.md | 45 ---------- docs/technical/dids.md | 18 ---- docs/technical/kitscore.md | 171 +------------------------------------ docs/technical/rts.md | 71 --------------- 5 files changed, 1 insertion(+), 313 deletions(-) delete mode 100644 docs/guides/timezones.md delete mode 100644 docs/technical/bkrl.md delete mode 100644 docs/technical/dids.md delete mode 100644 docs/technical/rts.md diff --git a/docs/guides/timezones.md b/docs/guides/timezones.md deleted file mode 100644 index 631450aaf..000000000 --- a/docs/guides/timezones.md +++ /dev/null @@ -1,9 +0,0 @@ -# Timezones - -What is considered a "day's worth of games" is determined by the reset time. The reset time is generally at midnight everyday after which newer games are counted towards the next day. Reset times vary from region to region: - -- North America: `UTC-5:00` (Central North American Time midnight) -- Europe: `UTC+1:00` (Central European Time midnight) -- Asia: `UTC+7:00` (Central Asia Standard Time midnight) - -**Reset times are different from Blitz Stars** (Blitz Stars resets at 5:00 am locally relative to the user opening their website). Inconsistencies with Blitz Stars only occur with sleep-deprived players and players who play in the wrong region. diff --git a/docs/technical/bkrl.md b/docs/technical/bkrl.md deleted file mode 100644 index b008e11a8..000000000 --- a/docs/technical/bkrl.md +++ /dev/null @@ -1,45 +0,0 @@ -# Blitzkit Rating Leaderboard - -A straightforward way of storing the entire World of Tanks Blitz rating leaderboard to disk. - -```cpp -primary BlitzkitRatingLeaderboard { - utf8"BKRL" magic; - Header header; - primary Body<header> body; -} - -Header { - uint16 version; // always 1 - Format format; - uint32 count; -} - -Format enum<uint8> { - Base, - Superset1, -} - -Body<Header header> match<header.format> { - Base { - primary { - uint32 id; - uint16 score; - }[header.count] entries; - }; - - Superset1 { - primary { - uint32 id; - uint16 score; - - uint32 battles; - uint32 wins; - uint32 survived; - - uint32 damage; - uint32 kills; - }[header.count] entries; - }; -} -``` diff --git a/docs/technical/dids.md b/docs/technical/dids.md deleted file mode 100644 index 6a02cabbf..000000000 --- a/docs/technical/dids.md +++ /dev/null @@ -1,18 +0,0 @@ -# Discovered Ids - -```c -primary DiscoveredIds { - utf8"DIDS" magic; - Header header; - primary Body body; -} - -Header { - uint16 version; // always 1 -} - -Body { - uint32 count; - uint32[count] ids; -} -``` diff --git a/docs/technical/kitscore.md b/docs/technical/kitscore.md index fe8e9dc5a..ab2168005 100644 --- a/docs/technical/kitscore.md +++ b/docs/technical/kitscore.md @@ -1,172 +1,3 @@ # KitScore -## Memo - -KitScore is a performance metric that makes sense. This metric can be applied to any game, virtual or real. Specific pieces of information relating directly to World of Tanks Blitz will be provided within parentheses and with a "WoTB:" prefix. - -## Consumption of Observations - -KitScore is driven solely by the behavior of other players and finding meaning of a new observation within a pool of condensed data based on previously observed data. Generally, we will be provided with a number of statistics (the $x_i$ of an observation) per player (WoTB: $x_\text{frags}$, $x_\text{xp}$, $x_\text{spots}$, etc.) including a target statistic (the $x_j$ of an observation) that all other statistics try to maximize (WoTB: "winrate" which we will defined later as $x_j$). - -If the statistics are cumulative, they will have to be normalized (WoTB: statistics fetched from Wargaming are indeed cumulative even for a single player; $x_\text{frags}=\frac{\Sigma x_\text{frags}}{\Sigma x_\text{battles}}$, $x_\text{spots}=\frac{\Sigma x_\text{spots}}{\Sigma x_\text{battles}}$, $x_j=\frac{\Sigma x_\text{wins}}{\Sigma x_\text{battles}}$, etc.). Each player will have such average statistics, giving us many points of data to work with. If the statistics are not cumulative, then you will be dealing with multiple observations per player which will only help improve accuracy. - -## It's Impossible to "Find What Makes the Metric Tick" - -WN8, a widely adopted metric in the World of Tanks and World of Tanks Blitz communities is plagued with problems. One of them being that people often find and exploit "what makes the metric tick." In other words, people easily exploit the rudimentary nature of WN8 to score undeservedly high. - -In WN8, the gains of some rewarding categories overshadow the losses of others though that may not necessarily be in the best interest in maximizing winrate. KitScore makes this nearly impossible as it punishes a player for scoring well solely high in a certain category. You will never exploit KitScore. Period. - -## Generating Reasonable Values - -TODO: there's like no runaway cases - -## Symbol Interpretation - -| Symbol | Interpretation | -| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| $A_\text{human}$ | The human readable version of the raw score $A$. | -| $A$ | The raw KitScore. | -| $C$ | An arbitrary coefficient. | -| $I$ | The number of statistics including the target statistic. This means that there are $I-1$ entries for $x_i$ and $1$ entry for $y$ for each observation. | -| $i$ | The statistic index of where there are $I$ entries. | -| $j$ | A discriminator for the target statistic. There may never be more than $1$ entries for $j$. | -| $m$ | The degree of the polynomial regression. | -| $n$ | The number of observations. | -| $a$ | An "atomic" score which is a function of the $i$th statistic. | -| $w$ | The weight of the $i$th atomic statistic. | - -## Computing the Score - -The final metric $A_\text{human}$ is an arbitrarily scaled value of the raw score $A$ where $C$ is any coefficient of your liking. BlitzKit uses $C=10^3$. - -$$ -A_\text{human}=CA -$$ - -The final metric $A$ is the weighted average of individual scores $a$ which are functions of the $i$th statistic excluding the target statistic $j$ itself. - -$$ -A=\frac{\sum_{i \neq j} w_{i}a_{i}}{\sum_{i \neq j} w_{i}} -$$ - -The "atomic" score $a$ is the difference between the predicted target statistic $P_{i \leftrightarrow j}(x_i)$ acquired using a polynomial regression of degree $m$ and the actual newly observed $x_j$. - -$$ -a_i=x_j-P_{i \leftrightarrow j}(x_i) -$$ - -The polynomial regression of $m$th degree can be written as follows: - -$$ -P(x)=\beta_0x^0+\beta_1x^1+\beta_2x^2+\dots+\beta_mx^m -$$ - -Polynomial regression coefficients $\beta$ can be acquired through basic linear algebra where an $m \times m$ of constants is multiplied with $m \times 1$ of unknowns which equals another $m \times 1$ of constants. - -```math -\begin{bmatrix} -\sum_{k=1}^n x_i^0 & \sum_{k=1}^n x_i^1 & \sum_{k=1}^n x_i^2 & \dots & \sum_{k=1}^n x_i^m \\ -\sum_{k=1}^n x_i^1 & \sum_{k=1}^n x_i^2 & \sum_{k=1}^n x_i^3 & \dots & \sum_{k=1}^n x_i^{m+1} \\ -\sum_{k=1}^n x_i^2 & \sum_{k=1}^n x_i^3 & \sum_{k=1}^n x_i^4 & \dots & \sum_{k=1}^n x_i^{m+2} \\ -\vdots & \vdots & \vdots & \ddots & \vdots \\ -\sum_{k=1}^n x_i^m & \sum_{k=1}^n x_i^{m+1} & \sum_{k=1}^n x_i^{m+1} & \dots & \sum_{k=1}^n x_i^{2m} \\ -\end{bmatrix} - -\begin{bmatrix} -\beta_0 \\ -\beta_1 \\ -\beta_2 \\ -\vdots \\ -\beta_m -\end{bmatrix} - -= - -\begin{bmatrix} -\sum_{k=1}^n x_jx_i^0 \\ -\sum_{k=1}^n x_jx_i^1 \\ -\sum_{k=1}^n x_jx_i^2 \\ -\vdots \\ -\sum_{k=1}^n x_jx_i^m -\end{bmatrix} -``` - -The weight $w$ is a slice of the Pearson corelation matrix. The numerator is the corelation between the $i$th statistic and the target statistic $j$ while the denominator the sum of the corelations between the $i$th statistic and all statistics but the target statistic $j$. - -$$ -w_{i}=\frac{r_{i\leftrightarrow j}^2}{\sum_{i_{k}\neq j}r_{i\leftrightarrow i_{k}}^2} -$$ - -## Understanding the Corelation Matrix - -Forming the corelation matrix will create an $I \times I$ matrix where. This matrix is best represented as a table. The example below illustrates a matrix/table for $I=4$ which includes $3$ entries for $i$ statistics and $1$ entry for the $j$ target statistic. - -| | $x_1$ | $x_2$ | $x_3$ | $x_j$ | -| ----- | --------------------------- | --------------------------- | --------------------------- | --------------------------- | -| $x_1$ | $1$ | $r_{1 \leftrightarrow 2}^2$ | $r_{1 \leftrightarrow 3}^2$ | $r_{1 \leftrightarrow j}^2$ | -| $x_2$ | $r_{1 \leftrightarrow 2}^2$ | $1$ | $r_{2 \leftrightarrow 3}^2$ | $r_{2 \leftrightarrow j}^2$ | -| $x_3$ | $r_{1 \leftrightarrow 3}^2$ | $r_{2 \leftrightarrow 3}^2$ | $1$ | $r_{3 \leftrightarrow j}^2$ | -| $x_j$ | $r_{1 \leftrightarrow j}^2$ | $r_{2 \leftrightarrow j}^2$ | $r_{3 \leftrightarrow j}^2$ | $1$ | - -It should not be a surprise to find $r_{i \leftrightarrow i}^2=1$ which forms a neat diagonal across the table. Note that there are many duplicates within the $I^2$ entries. The "bottom-right triangle" can be eliminated to remove redundancies leaving us with only $\frac{I(I+1)}{2}$ fields occupied. - -| | $x_1$ | $x_2$ | $x_3$ | $x_j$ | -| ----- | ----- | --------------------------- | --------------------------- | --------------------------- | -| $x_1$ | $1$ | $r_{1 \leftrightarrow 2}^2$ | $r_{1 \leftrightarrow 3}^2$ | $r_{1 \leftrightarrow j}^2$ | -| $x_2$ | | $1$ | $r_{2 \leftrightarrow 3}^2$ | $r_{2 \leftrightarrow j}^2$ | -| $x_3$ | | | $1$ | $r_{3 \leftrightarrow j}^2$ | -| $x_j$ | | | | $1$ | - -When programming this matrix into an array, $r_{i \leftrightarrow i}^2=1$ will be redundant. I recommend condensing the matrix into an array of size $\frac{I(I+1)}{2}+I=\frac{I(I-1)}{2}$ to avoid all redundant entries. For $I=4$, the array will look something like the one illustrated below (here, $j=4$). - -$$ -[r_{1 \leftrightarrow 2}^2, r_{1 \leftrightarrow 3}^2, r_{1 \leftrightarrow 4}^2, r_{2 \leftrightarrow 3}^2, r_{2 \leftrightarrow 4}^2, r_{3 \leftrightarrow 4}^2] -$$ - -## Understanding the Weights - -Some may find the weight equation arbitrary; it evidently isn't. The goal of $w$ is to eliminate over-rewarding the same behavior represented in multiple statistics. It makes all atomic statistics concurrent by leveraging the Pearson corelation matrix. - -A simplified example will clarify the idea. First, we compute a Pearson corelation matrix for $I=3$ statistics. We have $x_1$ and $x_2$, the statistics that are trying to maximize $x_j$. Reminder: a Pearson corelation matrix finds the $r$ value not only between $x_i$ and $x_j$ but also between all combinations of $x_i$ and themselves. Here, $r^2$ is calculated using polynomial regression corelation analysis to the $m$th degree. - -| | $x_1$ | $x_2$ | $x_3$ | $x_j$ | -| ----- | ----- | ----------- | ----- | ----- | -| $x_1$ | $1$ | $\boxed{0}$ | $0$ | $1$ | -| $x_2$ | | $1$ | $0$ | $1$ | -| $x_3$ | | | $1$ | $1$ | -| $x_j$ | | | | $1$ | - -In the case above, $r^2_{1 \leftrightarrow 2}=0$ meaning that both statistics have absolutely nothing to do with each other. Hence, the player will be awarded for optimizing both individually. And since $r^2_{1 \leftrightarrow j}=r^2_{2 \leftrightarrow j}$, they should both be rewarded equally; in other words, they should have equal weights. - -$$ -w_{1}=\frac{1}{1 + 0 + 0}=1 -$$ - -$$ -w_{2}=\frac{1}{0 + 1 + 0}=1 -$$ - -$$ -w_{3}=\frac{1}{0 + 0 + 1}=1 -$$ - -Now consider a case where $x_1$ and $x_2$ are fully correlated. It would be a bad idea to reward them equally; hence, their weights suffer. - -| | $x_1$ | $x_2$ | $x_3$ | $x_j$ | -| ----- | ----- | ----------- | ----- | ----- | -| $x_1$ | $1$ | $\boxed{1}$ | $0$ | $1$ | -| $x_2$ | | $1$ | $0$ | $1$ | -| $x_3$ | | | $1$ | $1$ | -| $x_j$ | | | | $1$ | - -$$ -w_{1}=\frac{1}{1 + 1 + 0}=0.5 -$$ - -$$ -w_{2}=\frac{1}{1 + 1 + 0}=0.5 -$$ - -$$ -w_{3}=\frac{1}{0 + 0 + 1}=1 -$$ +Remind me to write out the linearized model! diff --git a/docs/technical/rts.md b/docs/technical/rts.md deleted file mode 100644 index 18b814b2e..000000000 --- a/docs/technical/rts.md +++ /dev/null @@ -1,71 +0,0 @@ -# BlitzKit Regular Tank Stats - -A straightforward way of storing the entire World of Tanks Blitz tank statistics for players to disk. - -## Manifest `manifest.rtsm` - -```cpp -primary RegularTankStatisticsManifest { - utf8"RTSM" magic; - Header header; - primary Body body; -} - -Header { - uint16 version; // always 1 -} - -Body { - uint32 time; - uint8 base; -} -``` - -## Chunk `*.rtsc` - -```cpp -primary RegularTankStatisticsChunk { - utf8"RTSC" magic; - Header header; - primary Body body<header.playerCount>; -} - -Header { - uint16 version; // always 1 - uint32 playerCount; -} - -Body<uint32 playerCount> { - Player[playerCount] players; -} - -Player { - uint32 id; - uint16 tankCount; - Tank[tankCount] tanks; -} - -Tank { - uint32 id; - uint32 battleLifeTime; - uint32 lastBattleTime; - uint8 markOfMastery; - uint32 battles; - uint32 capturePoints; - uint32 damageDealt; - uint32 damageReceived; - uint32 droppedCapturePoints; - uint32 frags; - uint32 frags8p; - uint32 hits; - uint32 losses; - uint8 maxFrags; - uint16 maxXp; - uint32 shots; - uint32 spotted; - uint32 survivedBattles; - uint32 winAndSurvived; - uint32 wins; - uint32 xp; -} -```