From ee74c5ea5bd64ffc5b68d5227d4caec758e0173a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 27 Jan 2024 18:21:35 -0600
Subject: [PATCH] feat: order

---
 .../[id]/components/Characteristics/index.tsx | 71 +++++++++----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
index 22a41ecb7..a71191a34 100644
--- a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
@@ -19,48 +19,61 @@ export function Characteristics() {
         <Tabs.Content value="statistics">
           <Flex direction="column" gap="4">
             <Flex direction="column" gap="2">
-              <Heading size="4">Survivability</Heading>
+              <Heading size="5">Survivability</Heading>
               <Info name="Health" value="2014" unit="hp" />
+              <Info name="Fire chance" value="20" unit="%" />
+              <Info name="View range" value="302" unit="m" />
+              <Info name="Camouflage when still" value="30.00" unit="%" />
+              <Info indent name="Moving" value="30.00" unit="%" />
+              <Info indent name="Shooting" value="30.00" unit="%" />
+              <Info indent name="Shooting and moving" value="30.00" unit="%" />
+              <Info indent name="Size" value="6.21 x 2.43 x 2.00" unit="m" />
             </Flex>
 
             <Flex direction="column" gap="2">
-              <Heading size="4">Lethality</Heading>
-              <Info name="Armor damage" value="330" unit="hp" />
-              <Info indent name="Module damage" value="125" unit="hp" />
-              <Info indent name="Caliber" value="100" unit="mm" />
-              <Info name="Penetration" value="257" unit="mm" />
-              <Info indent name="At 500m" value="240" unit="mm" />
+              <Heading size="5">Fire</Heading>
               <Info name="Damage per minute" value="2316" unit="hp / min" />
               <Info indent name="Maximum" value="2316" unit="hp / min" />
-              <Info
-                indent
-                name="Effective at 60s"
-                value="2316"
-                unit="hp / min"
-              />
+              <Info indent name="Effective" value="2316" unit="hp / min" />
               <Info name="Reload" value="5.73" unit="s" />
+              <Info name="AP penetration" value="273" unit="mm" />
+              <Info indent name="AP at 500m" value="253" unit="mm" />
+              <Info indent name="APCR" value="312" unit="mm" />
+              <Info indent name="APCR at 500m" value="300" unit="mm" />
+              <Info indent name="HE" value="90" unit="mm" />
+              <Info indent name="Caliber" value="100" unit="mm" />
+              <Info name="AP damage" value="400" unit="hp" />
               <Info name="Shell velocity" value="1535" unit="m/s" />
+              <Info indent name="AP module damage" value="130" unit="hp" />
+              <Info indent name="APCR" value="340" unit="hp" />
+              <Info indent name="APCR module" value="110" unit="hp" />
+              <Info indent name="HE" value="520" unit="hp" />
+              <Info indent name="HE module" value="200" unit="hp" />
               <Info name="Aim time" value="1.72" unit="s" />
-              <Info name="Dispersion" value="0.326" unit="m" />
+              <Info name="Dispersion at 100m" value="0.326" unit="m" />
               <Info indent name="On move" value="0.100" unit="m" />
               <Info indent name="On hull traverse" value="0.100" unit="m" />
               <Info indent name="On turret traverse" value="0.070" unit="m" />
               <Info indent name="On shoot" value="3.500" unit="m" />
-            </Flex>
-
-            <Flex direction="column" gap="2">
-              <Heading size="4">Flexibility</Heading>
               <Info name="Gun depression" value="20" unit="°" />
               <Info indent name="Elevation" value="7" unit="°" />
+              <Info indent name="Frontal depression" value="7" unit="°" />
+              <Info indent name="Frontal elevation" value="7" unit="°" />
+              <Info indent name="Rear depression" value="7" unit="°" />
+              <Info indent name="Rear elevation" value="7" unit="°" />
               <Info indent name="Azimuth" value="30, 30" unit="°" />
             </Flex>
 
             <Flex direction="column" gap="2">
-              <Heading size="4">Mobility</Heading>
-              <Info name="Weight" value="45" unit="mt" />
+              <Heading size="5">Maneuverability</Heading>
               <Info name="Speed forwards" value="55" unit="km/s" />
               <Info indent name="Backward" value="20" unit="km/s" />
-              <Info name="Power on hard terrain" value="36.86" unit="hp/kg" />
+              {/* TODO: average speed? */}
+              <Info
+                name="Effective power on hard terrain"
+                value="36.86"
+                unit="hp/kg"
+              />
               <Info
                 indent
                 name="On medium terrain"
@@ -68,6 +81,7 @@ export function Characteristics() {
                 unit="hp/kg"
               />
               <Info indent name="On soft terrain" value="36.86" unit="hp/kg" />
+              <Info name="Weight" value="45" unit="mt" />
               <Info
                 name="Traverse speed on hard terrain"
                 value="36.86"
@@ -76,21 +90,6 @@ export function Characteristics() {
               <Info indent name="On medium terrain" value="36.86" unit="°/s" />
               <Info indent name="On soft terrain" value="36.86" unit="°/s" />
             </Flex>
-
-            <Flex direction="column" gap="2">
-              <Heading size="4">Stealth</Heading>
-              <Info name="View range" value="302" unit="m" />
-              <Info name="Size" value="6.21 x 2.43 x 2.00" unit="m" />
-              <Info name="Camouflage when still" value="30.00" unit="%" />
-              <Info indent name="When moving" value="30.00" unit="%" />
-              <Info indent name="When shooting still" value="30.00" unit="%" />
-              <Info
-                indent
-                name="When shooting while moving"
-                value="30.00"
-                unit="%"
-              />
-            </Flex>
           </Flex>
         </Tabs.Content>