From eef26defb4593b6b20a54165b630d3f4ae8ce9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Tue, 3 Sep 2024 21:54:35 -0500
Subject: [PATCH] feat: raw terrain coeffs

---
 src/app/tools/compare/components/Body.tsx     | 20 +++++++++++++++++++
 .../[id]/components/Characteristics/index.tsx | 13 +++++++++---
 src/core/blitzkit/tankCharacteristics.ts      |  3 +++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/app/tools/compare/components/Body.tsx b/src/app/tools/compare/components/Body.tsx
index e0f9e5ef8..e49ee84cd 100644
--- a/src/app/tools/compare/components/Body.tsx
+++ b/src/app/tools/compare/components/Body.tsx
@@ -259,6 +259,26 @@ export function Body({ stats }: BodyProps) {
           value="softTerrainCoefficient"
           decimals={0}
         />
+        <CompareRow
+          stats={stats}
+          name="Raw terrain coefficient"
+          value="hardTerrainCoefficientRaw"
+          decimals={2}
+        />
+        <CompareRow
+          stats={stats}
+          name="medium terrain"
+          indent
+          value="mediumTerrainCoefficientRaw"
+          decimals={2}
+        />
+        <CompareRow
+          stats={stats}
+          name="soft terrain"
+          indent
+          value="softTerrainCoefficientRaw"
+          decimals={2}
+        />
         <CompareRow
           stats={stats}
           name="Power to weight ratio"
diff --git a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
index 1d70a14f6..ea4f440bb 100644
--- a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
@@ -19,7 +19,6 @@ import { resolvePenetrationCoefficient } from '../../../../../../core/blitz/reso
 import { asset } from '../../../../../../core/blitzkit/asset';
 import { coefficient } from '../../../../../../core/blitzkit/coefficient';
 import { equipmentDefinitions } from '../../../../../../core/blitzkit/equipmentDefinitions';
-import { modelDefinitions } from '../../../../../../core/blitzkit/modelDefinitions';
 import { provisionDefinitions } from '../../../../../../core/blitzkit/provisionDefinitions';
 import { tankCharacteristics } from '../../../../../../core/blitzkit/tankCharacteristics';
 import {
@@ -58,7 +57,6 @@ export function Characteristics() {
       0,
     ) + (hasImprovedVentilation ? 0.08 : 0);
   const commanderMastery = crewMastery + provisionCrewBonus;
-  const crewMemberMastery = commanderMastery * 1.1;
   const consumables = Duel.use((state) => state.protagonist.consumables);
   const camouflage = Duel.use((state) => state.protagonist.camouflage);
   const equipmentMatrix = Duel.use(
@@ -71,7 +69,6 @@ export function Characteristics() {
   const stockTrack = tank.tracks[0];
   const stockTurret = tank.turrets[0];
   const stockGun = stockTurret.guns[0];
-  const awaitedModelDefinitions = use(modelDefinitions);
   const tankModelDefinition = useTankModelDefinition();
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
   const gunModelDefinition = turretModelDefinition.guns[gun.id];
@@ -546,6 +543,16 @@ export function Characteristics() {
           <InfoWithDelta decimals={0} unit="%" indent name="Soft">
             {stats.softTerrainCoefficient}
           </InfoWithDelta>
+          <Info name="Raw terrain coefficients" />
+          <InfoWithDelta decimals={2} unit="%" indent name="Hard">
+            {stats.hardTerrainCoefficientRaw}
+          </InfoWithDelta>
+          <InfoWithDelta decimals={2} unit="%" indent name="Medium">
+            {stats.mediumTerrainCoefficientRaw}
+          </InfoWithDelta>
+          <InfoWithDelta decimals={2} unit="%" indent name="Soft">
+            {stats.softTerrainCoefficientRaw}
+          </InfoWithDelta>
           <Info name="Power to weight ratio" unit="hp/tn" />
           <InfoWithDelta decimals={1} indent name="On hard terrain">
             {stats.powerToWeightRatioHardTerrain}
diff --git a/src/core/blitzkit/tankCharacteristics.ts b/src/core/blitzkit/tankCharacteristics.ts
index 884950f30..6f72ce8b6 100644
--- a/src/core/blitzkit/tankCharacteristics.ts
+++ b/src/core/blitzkit/tankCharacteristics.ts
@@ -519,8 +519,11 @@ export function tankCharacteristics(
     speedForwards,
     speedBackwards,
     hardTerrainCoefficient,
+    hardTerrainCoefficientRaw,
     mediumTerrainCoefficient,
+    mediumTerrainCoefficientRaw,
     softTerrainCoefficient,
+    softTerrainCoefficientRaw,
     enginePower,
     powerToWeightRatioHardTerrain,
     powerToWeightRatioMediumTerrain,