From 1f0392681afd089eb034ab37ab9506f2ff1b8dca Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sun, 11 Oct 2026 13:42:20 -0500 Subject: [PATCH] shell params --- packages/i18n/strings/en.json | 14 +++++++------- .../TankopediaCharacteristics/index.module.css | 2 +- packages/website/src/config/characteristics.ts | 18 ++++++++++++------ .../src/config/characteristicsGroups.ts | 12 ++++++++++-- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 2696d8665..ad5127710 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -45,11 +45,11 @@ "burst_size": "Burst size", "intra_burst": "Intra-burst", "penetration": "Penetration", - "penetration_loss_by_distance": "Penetration loss by 500m", - "penetration_loss_after_ricochet": "Penetration loss after ricochet", - "shell_velocity": "Shell velocity", - "shell_range": "Shell range", - "shell_capacity": "Shell capacity", + "penetration_loss_by_distance": "Loss by 500m", + "penetration_loss_after_ricochet": "Loss after ricochet", + "shell_velocity": "Velocity", + "shell_range": "Range", + "shell_capacity": "Capacity", "caliber": "Caliber", "normalization": "Normalization", "ricochet": "Ricochet", @@ -66,7 +66,7 @@ "azimuth_right": "Azimuth right", "speed_forward": "Forward", "speed_backward": "Backward", - "speeds": "Speeds", + "speeds": "Speed", "engine_power": "Engine power", "brake_force": "Brake force", "weight": "Weight", @@ -80,7 +80,7 @@ "medium_terrain_coefficient_raw": "Medium", "soft_terrain_coefficient_raw": "Soft", "hull_traverse_speed": "Hull traverse speed", - "hull_traverse_speeds": "Hull traverse speeds", + "hull_traverse_speeds": "Hull traverse speed", "hull_traverse_speed_hard": "Hard", "hull_traverse_speed_medium": "Medium", "hull_traverse_speed_soft": "Soft", diff --git a/packages/website/src/components/TankopediaCharacteristics/index.module.css b/packages/website/src/components/TankopediaCharacteristics/index.module.css index 37249ef07..81de52b3f 100644 --- a/packages/website/src/components/TankopediaCharacteristics/index.module.css +++ b/packages/website/src/components/TankopediaCharacteristics/index.module.css @@ -75,7 +75,7 @@ gap: var(--space-2); &[data-indent="true"] { - padding-left: var(--space-5); + padding-left: var(--space-4); } .value { diff --git a/packages/website/src/config/characteristics.ts b/packages/website/src/config/characteristics.ts index b01d100a9..05d1bde34 100644 --- a/packages/website/src/config/characteristics.ts +++ b/packages/website/src/config/characteristics.ts @@ -316,7 +316,17 @@ export const characteristics = { }, }, - // penetration_loss_after_ricochet: unavailable, + penetration_loss_after_ricochet: { + type: CharacteristicType.Number, + + should_render({ shell }) { + return !isExplosive(shell.type); + }, + + compute() { + return 25; + }, + }, shell_velocity: { type: CharacteristicType.Number, @@ -458,11 +468,7 @@ export const characteristics = { coefficient *= effect.shotDispersionAngleFactor; }); - return ( - gun.dispersion_base * - degressive("gunner") * - coefficient - ); + return gun.dispersion_base * degressive("gunner") * coefficient; }, }, diff --git a/packages/website/src/config/characteristicsGroups.ts b/packages/website/src/config/characteristicsGroups.ts index 1135395b4..ad104a333 100644 --- a/packages/website/src/config/characteristicsGroups.ts +++ b/packages/website/src/config/characteristicsGroups.ts @@ -110,8 +110,16 @@ export const characteristicsGroups: CharacteristicsGroup[] = [ // render: CharacteristicsGroupRender.Statistical, order: [ { name: "penetration", units: "mm" }, - { name: "penetration_loss_by_distance", units: "percentage" }, - { name: "penetration_loss_after_ricochet" }, + { + name: "penetration_loss_by_distance", + units: "percentage", + indent: true, + }, + { + name: "penetration_loss_after_ricochet", + units: "percentage", + indent: true, + }, { name: "shell_velocity", units: "m_s" }, { name: "shell_range", units: "m" }, { name: "shell_capacity" },