Merge branch 'main' into fixes

docs/changelogs/1.30.1.md

@@ -0,0 +1,8 @@
+# BlitzKit 1.30.1
+
+Thank you to [GonnaHetzMe](https://github.com/karelpak1) for your contributions this update.
+
+## Fixes
+
+- [GonnaHetzMe] Tank hit points in Equalizer mode is now accurate to the game
+- Armor highlighting now reflects the actual thicknesses of tanks in Equalizer mode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {
@@ -35,7 +35,7 @@
     "build:reviews": "cd packages/scripts && bun build:reviews",
     "build:ids": "cd packages/scripts && bun build:ids",
     "prunestrings": "cd packages/scripts && bun prunestrings",
-    "setup": "bun install && bun run build:prisma && bun run build:protos && bun run build:proxyclient",
+    "setup": "bun install && bun run build:prisma && bun run build:proxyclient",
     "patchnotes": "cd packages/scripts && bun run patchnotes"
   },
   "type": "module",

packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx

@@ -144,10 +144,6 @@ export function PrimaryArmorSceneComponent({
         Duel.state.antagonist.tank.equipment_preset,
         equipment,
       );
-      const equalize =
-        (Duel.state.equalize
-          ? Duel.state.antagonist.tank.equalizer?.penetration
-          : undefined) ?? 1;
 
       material.uniforms.penetration.value =
         penetration *
@@ -156,8 +152,7 @@ export function PrimaryArmorSceneComponent({
           Duel.state.equalize,
           shell.type,
           Duel.state.antagonist.tank.equalizer,
-        ) *
-        equalize;
+        );
 
       if (!noInvalidate) invalidate();
     }

packages/website/src/core/blitzkit/tankCharacteristics.ts

@@ -27,6 +27,8 @@ import { defaultEqualizer } from "./tankToDuelMember";
 export type TankCharacteristics = ReturnType<typeof tankCharacteristics>;
 export type TankCharacteristicsKey = keyof TankCharacteristics;
 
+const EQUALIZER_HEALTH_EPSILON = 50;
+
 export function tankCharacteristics(
   {
     tank,
@@ -176,8 +178,7 @@ export function tankCharacteristics(
           ({ distance }) => distance >= assaultDistance,
         )?.factor ?? 0)
       : 1;
-  const moduleDamageCoefficient =
-    coefficient([hasTungsten, 0.15]) * equalizer.damage;
+  const moduleDamageCoefficient = coefficient([hasTungsten, 0.15]);
   const reloadCoefficient =
     (coefficient([hasGunRammer, -0.05]) *
       coefficient([true, degressiveStat(loaderMastery)])) /
@@ -506,7 +507,13 @@ export function tankCharacteristics(
     hullTraverseCoefficient *
     (track.resistance_hard / softTerrainCoefficientRaw) *
     (stockWeight / weightKg);
-  const health = (tank.health + turret.health) * healthCoefficient;
+  let health = (tank.health + turret.health) * healthCoefficient;
+
+  if (equalize) {
+    health =
+      EQUALIZER_HEALTH_EPSILON * Math.round(health / EQUALIZER_HEALTH_EPSILON);
+  }
+
   const fireChance = engine.fire_chance * fireChanceCoefficient;
   const viewRange = turret.view_range * viewRangeCoefficient;
   const camouflageStill = tank.camouflage_still * camouflageCoefficientStill;

packages/website/src/pages/api/index.astro

@@ -5,4 +5,3 @@ import ToolLayout from "../../layouts/ToolLayout.astro";
 ---
 
 <ToolLayout locale={locales.default} tool={tools.api} />
-