smaller titles

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

.github/workflows/website.yaml

@@ -93,7 +93,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        chunk: [default, api, models_tanks, models_legendary, models_maps]
+        chunk: [default, api]
 
     steps:
       - name: Free disk space

cspell.json

@@ -1,5 +1,5 @@
 {
-  "words": [
+  "words": [ 
     "gamemodes",
     "Tankopedia"
   ]

docs/changelogs/1.31.4.md

@@ -1,41 +0,0 @@
-# BlitzKit 1.31.4
-
-Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update.
-
-## 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]
-- Added a spall liner button to the Tankopedia beside the other equipment [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
-- 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
-- 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
-
-- Added documentation to the README on setting up and developing BlitzKit locally
-- Added bug report and feature request forms to GitHub
-- Switched to the GNU AGPLv3 license
-
-## 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

docs/changelogs/1.32.0.md

@@ -0,0 +1,98 @@
+# BlitzKit 1.32.0
+
+Thank you to [Mark Greene](https://github.com/Hitjack007) for your contributions this update.
+
+## Features
+
+### 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
+
+- 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
+
+### 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]
+- 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 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]
+
+### 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
+
+- Added documentation to the README on setting up and developing BlitzKit locally
+- Added bug report and feature request forms to GitHub
+- Switched to the GNU AGPLv3 license
+
+## 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

environments/beta.json

@@ -4,33 +4,14 @@
 
   "paths": {
     "default": null,
-
-    "api": null,
-
-    "models_tanks": null,
-    "models_legendary": null,
-    "models_maps": null
+    "api": null
   },
-
   "nodes": {
     "default": "blitzkit/deploy-node-beta.blitzkit.app",
-
-    "api": "blitzkit/deploy-node-api.beta.blitzkit.app",
-
-    "models_tanks": "blitzkit/deploy-node-tanks.models.beta.blitzkit.app",
-    "models_legendary": "blitzkit/deploy-node-legendary.models.beta.blitzkit.app",
-    "models_maps": "blitzkit/deploy-node-maps.models.beta.blitzkit.app"
+    "api": "blitzkit/deploy-node-api.beta.blitzkit.app"
   },
-
   "aliases": {
-    "default": "/",
-
     "api": "https://api.beta.blitzkit.app",
-
-    "models_tanks": "https://tanks.models.beta.blitzkit.app",
-    "models_legendary": "https://legendary.models.beta.blitzkit.app",
-    "models_maps": "https://maps.models.beta.blitzkit.app",
-
-    "static": "https://static.blitzkit.app"
+    "static": "https://static.beta.blitzkit.app"
   }
 }

environments/development.json

@@ -4,25 +4,11 @@
 
   "paths": {
     "default": null,
-
-    "api": "api",
-
-    "models_tanks": "models/tanks",
-    "models_legendary": "models/legendary",
-    "models_maps": "models/maps"
+    "api": "api"
   },
-
   "nodes": {},
-
   "aliases": {
-    "default": "/",
-
     "api": "/api",
-
-    "models_tanks": "/models/tanks",
-    "models_legendary": "/models/legendary",
-    "models_maps": "/models/maps",
-
     "static": "https://static.blitzkit.app"
   }
 }

environments/opentest.json

@@ -4,33 +4,14 @@
 
   "paths": {
     "default": null,
-
-    "api": null,
-
-    "models_tanks": null,
-    "models_legendary": null,
-    "models_maps": null
+    "api": null
   },
-
   "nodes": {
     "default": "blitzkit/deploy-node-opentest.blitzkit.app",
-
-    "api": "blitzkit/deploy-node-api.opentest.blitzkit.app",
-
-    "models_tanks": "blitzkit/deploy-node-tanks.models.opentest.blitzkit.app",
-    "models_legendary": "blitzkit/deploy-node-legendary.models.opentest.blitzkit.app",
-    "models_maps": "blitzkit/deploy-node-maps.models.opentest.blitzkit.app"
+    "api": "blitzkit/deploy-node-api.opentest.blitzkit.app"
   },
-
   "aliases": {
-    "default": "/",
-
     "api": "https://api.opentest.blitzkit.app",
-
-    "models_tanks": "https://tanks.models.opentest.blitzkit.app",
-    "models_legendary": "https://legendary.models.opentest.blitzkit.app",
-    "models_maps": "https://maps.models.opentest.blitzkit.app",
-
-    "static": "https://static.blitzkit.app"
+    "static": "https://static.opentest.blitzkit.app"
   }
 }

environments/preview.json

@@ -4,33 +4,14 @@
 
   "paths": {
     "default": null,
-
-    "api": null,
-
-    "models_tanks": null,
-    "models_legendary": null,
-    "models_maps": null
+    "api": null
   },
-
   "nodes": {
     "default": "blitzkit/deploy-node-preview.blitzkit.app",
-
-    "api": "blitzkit/deploy-node-api.preview.blitzkit.app",
-
-    "models_tanks": "blitzkit/deploy-node-tanks.models.preview.blitzkit.app",
-    "models_legendary": "blitzkit/deploy-node-legendary.models.preview.blitzkit.app",
-    "models_maps": "blitzkit/deploy-node-maps.models.preview.blitzkit.app"
+    "api": "blitzkit/deploy-node-api.preview.blitzkit.app"
   },
-
   "aliases": {
-    "default": "/",
-
     "api": "https://api.preview.blitzkit.app",
-
-    "models_tanks": "https://tanks.models.preview.blitzkit.app",
-    "models_legendary": "https://legendary.models.preview.blitzkit.app",
-    "models_maps": "https://maps.models.preview.blitzkit.app",
-
-    "static": "https://static.blitzkit.app"
+    "static": "https://static.preview.blitzkit.app"
   }
 }

environments/production.json

@@ -4,33 +4,14 @@
 
   "paths": {
     "default": null,
-
-    "api": null,
-
-    "models_tanks": null,
-    "models_legendary": null,
-    "models_maps": null
+    "api": null
   },
-
   "nodes": {
     "default": "blitzkit/deploy-node-blitzkit.app",
-
-    "api": "blitzkit/deploy-node-api.blitzkit.app",
-
-    "models_tanks": "blitzkit/deploy-node-tanks.models.blitzkit.app",
-    "models_legendary": "blitzkit/deploy-node-legendary.models.blitzkit.app",
-    "models_maps": "blitzkit/deploy-node-maps.models.blitzkit.app"
+    "api": "blitzkit/deploy-node-api.blitzkit.app"
   },
-
   "aliases": {
-    "default": "/",
-
     "api": "https://api.blitzkit.app",
-
-    "models_tanks": "https://tanks.models.blitzkit.app",
-    "models_legendary": "https://legendary.models.blitzkit.app",
-    "models_maps": "https://maps.models.blitzkit.app",
-
     "static": "https://static.blitzkit.app"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.31.4",
+  "version": "1.32.0",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {

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,

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 {

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

packages/core/src/types/vehicleDefinitions.ts

@@ -34,6 +34,8 @@ export interface VehicleDefinitions {
       };
       level: number;
       hullPosition: string;
+      hysteresisHealth: number;
+      healthRegenPerSec: number;
       armor: {
         leftTrack:
           | number

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",

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) => {

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

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 = "32rem";
 
 export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) {
   const [largeWarningOpen, setLargeWarningOpen] = useState(false);
@@ -80,13 +81,19 @@ export function PlaylistGenerator({ skeleton }: MaybeSkeletonComponentProps) {
       <Flex justify="center" width="100%" align="center" px="4">
         <Flex
           flexGrow="1"
-          gap="9"
+          gap="6"
           align="center"
           justify="center"
           maxWidth="80rem"
           direction={{ initial: "column-reverse", md: "row" }}
         >
-          <Flex direction="column" gap="4" align="center">
+          <Flex
+            direction="column"
+            gap="4"
+            align="center"
+            flexShrink="0"
+            width={{ initial: "100%", md: FILTERS_WIDTH }}
+          >
             <FilterControl />
 
             <Button

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

packages/website/src/components/Tankopedia/HeroSection/components/Options/components/Thicknesses.tsx

@@ -31,11 +31,11 @@ export function Thicknesses({ thicknessRange, skeleton }: ThicknessesProps) {
   return (
     <Flex
       position="absolute"
-      right={display === TankopediaDisplay.StaticArmor ? "0" : "-6rem"}
+      right="0"
       top="50%"
       mr="4"
       style={{
-        transform: "translateY(-50%)",
+        transform: `translate(${display === TankopediaDisplay.StaticArmor ? "0" : "calc(100% + var(--space-4))"}, -50%)`,
         userSelect: "none",
         transitionDuration: "200ms",
       }}

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,

packages/website/src/pages/[...chunk_api]/flags/fade/[id].webp.ts

@@ -1,3 +1,4 @@
+import sharp from "sharp";
 import type { APIContext, GetStaticPathsItem } from "astro";
 import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths";
 import { vfs } from "../../../../core/blitzkit/vfs";
@@ -29,7 +30,10 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
 });
 
 export async function GET({ props }: APIContext<{ path: string }>) {
-  const bytes = new Uint8Array(await vfs.file(props.path));
+  const bytes = await sharp(new Uint8Array(await vfs.file(props.path)))
+    .trim({ background: { r: 0, g: 0, b: 0, alpha: 0 }, threshold: 1 })
+    .webp()
+    .toBuffer();
 
-  return new Response(bytes);
+  return new Response(new Uint8Array(bytes));
 }

packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx

@@ -94,7 +94,7 @@ function ModuleChooser({
         <Dialog.Trigger>
           <Button
             variant="surface"
-            size={{ initial: "3", md: "4" }}
+            size={{ initial: "2", xs: "3", md: "4" }}
             style={{
               overflow: "clip",
               borderTopRightRadius: subSelector ? 0 : undefined,
@@ -137,7 +137,7 @@ function ModuleChooser({
           <Popover.Trigger>
             <IconButton
               variant="surface"
-              size={{ initial: "3", md: "4" }}
+              size={{ initial: "2", xs: "3", md: "4" }}
               style={{
                 overflow: "clip",
                 borderTopLeftRadius: 0,
@@ -204,7 +204,7 @@ function ModuleChooser({
 
 function ModuleSeparator() {
   return (
-    <Text size="5" color="gray" trim="end">
+    <Text size={{ initial: "3", xs: "5" }} color="gray" trim="end">
       <CaretRightIcon width="1em" height="1em" />
     </Text>
   );
@@ -260,7 +260,7 @@ function Content({ skeleton }: MaybeSkeletonComponentProps) {
           </Button>
         </Flex>
 
-        <Flex gap="2" align="center">
+        <Flex gap={{ initial: "1", xs: "2" }} align="center">
           <ModuleChooser
             skeleton={skeleton}
             tank={hullTankId.id}

packages/website/src/stores/tankopedia.ts

@@ -43,6 +43,7 @@ export type Shot = {
   containsGaps: boolean;
   damage: number;
   splashRadius?: number;
+  penetrationChance?: number;
 
   in: {
     surfaceNormal: Vector3;