From a0bc50c9aa24926de6459ebd4e663585ad839ace Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Wed, 21 Jan 2026 19:14:14 +0200 Subject: [PATCH] Add Crab Tank 80dmg under "Combo" name --- app/features/build-analyzer/core/stats.ts | 2 +- .../object-damage-calculator/core/objectDamage.test.ts | 2 ++ app/features/object-damage-calculator/core/objectDamage.ts | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/features/build-analyzer/core/stats.ts b/app/features/build-analyzer/core/stats.ts index cb3f6d820..45aff79be 100644 --- a/app/features/build-analyzer/core/stats.ts +++ b/app/features/build-analyzer/core/stats.ts @@ -548,7 +548,7 @@ function specialWeaponDamages( id: nanoid(), distance: 0, value: R.sum(cannonDamages.map((v) => v.value)), - type: "SPECIAL_CANNON", + type: "COMBO", }); } diff --git a/app/features/object-damage-calculator/core/objectDamage.test.ts b/app/features/object-damage-calculator/core/objectDamage.test.ts index e340ec58c..8566d73d2 100644 --- a/app/features/object-damage-calculator/core/objectDamage.test.ts +++ b/app/features/object-damage-calculator/core/objectDamage.test.ts @@ -64,6 +64,7 @@ describe("calculateDamage()", () => { }); for (const damage of analyzed.stats.damages) { + if (damage.type === "COMBO") continue; calculate({ mainWeaponId, damageType: damage.type }); } } @@ -89,6 +90,7 @@ describe("calculateDamage()", () => { for (const damage of analyzedWithSpecialWeapon.stats .specialWeaponDamages) { + if (damage.type === "COMBO") continue; calculate({ specialWeaponId, damageType: damage.type, diff --git a/app/features/object-damage-calculator/core/objectDamage.ts b/app/features/object-damage-calculator/core/objectDamage.ts index 441619bb3..fcf667ed0 100644 --- a/app/features/object-damage-calculator/core/objectDamage.ts +++ b/app/features/object-damage-calculator/core/objectDamage.ts @@ -129,7 +129,9 @@ export function resolveAllUniqueDamageTypes({ ? analyzed.stats.specialWeaponDamages.map((d) => d.type) : analyzed.stats.damages.map((d) => d.type); - return R.unique(damageTypes).filter((dmg) => !dmg.includes("SECONDARY")); + return R.unique(damageTypes).filter( + (dmg) => !dmg.includes("SECONDARY") && dmg !== "COMBO", + ); } function resolveFilteredDamages({