diff --git a/app/features/build-analyzer/routes/analyzer.tsx b/app/features/build-analyzer/routes/analyzer.tsx index 009c7a6c3..b9d89ef0a 100644 --- a/app/features/build-analyzer/routes/analyzer.tsx +++ b/app/features/build-analyzer/routes/analyzer.tsx @@ -708,6 +708,15 @@ export default function BuildAnalyzerPage() { ) : null} + dmg.value !== + analyzed.stats.subWeaponDefenseDamages[i].value + ) + ? analyzed2.stats.subWeaponDefenseDamages + : undefined + } multiShots={analyzed.weapon.multiShots} /> @@ -1287,11 +1296,15 @@ function ModifiedByAbilities({ abilities }: { abilities: Stat["modifiedBy"] }) { function DamageTable({ values, + comparisonValues, multiShots, }: { values: | AnalyzedBuild["stats"]["damages"] | AnalyzedBuild["stats"]["subWeaponDefenseDamages"]; + comparisonValues?: + | AnalyzedBuild["stats"]["damages"] + | AnalyzedBuild["stats"]["subWeaponDefenseDamages"]; multiShots?: AnalyzedBuild["weapon"]["multiShots"]; }) { const { t } = useTranslation(["weapons", "analyzer"]); @@ -1314,14 +1327,18 @@ function DamageTable({ {t("analyzer:damage.header.distance")} )} {damageIsSubWeaponDamage(firstRow) ? ( - {t("analyzer:damage.header.baseDamage")} + + {comparisonValues + ? t("analyzer:damage.header.baseDamage.short") + : t("analyzer:damage.header.baseDamage")} + ) : null} {showDamageColumn && {t("analyzer:damage.header.damage")}} - {values.map((val) => { - const damage = + {values.map((val, i) => { + const damage = (val: AnalyzedBuild["stats"]["damages"][number]) => multiShots && damageTypeToWeaponType[val.type] === "MAIN" ? new Array(multiShots).fill(val.value).join(" + ") : val.value; @@ -1332,6 +1349,8 @@ function DamageTable({ damageType: val.type, }); + const comparisonVal = comparisonValues?.[i]; + return ( @@ -1358,7 +1377,8 @@ function DamageTable({ {damageIsSubWeaponDamage(val) && {val.baseValue}} {showDamageColumn && ( - {damage}{" "} + {damage(val)} + {comparisonVal ? `/${damage(comparisonVal)}` : null}{" "} {val.shotsToSplat && ( {t("analyzer:damage.toSplat", { diff --git a/public/locales/en/analyzer.json b/public/locales/en/analyzer.json index 5b05ba9fc..18404e354 100644 --- a/public/locales/en/analyzer.json +++ b/public/locales/en/analyzer.json @@ -86,6 +86,7 @@ "damage.header.type": "Type", "damage.header.damage": "Damage", "damage.header.baseDamage": "Base damage", + "damage.header.baseDamage.short": "Base", "damage.header.distance": "Distance", "damage.toSplat_one": "{{count}} hit to splat", "damage.toSplat_other": "{{count}} hits to splat",