From bf85ca82a0308bc773ce0b878b4b74521f825f4b Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Sat, 10 Dec 2022 20:08:41 +0200 Subject: [PATCH] Obj DMG Calc: More accurate Explosher damage --- app/modules/analyzer/constants.ts | 2 ++ app/modules/analyzer/objectDamage.test.ts | 3 +++ 2 files changed, 5 insertions(+) diff --git a/app/modules/analyzer/constants.ts b/app/modules/analyzer/constants.ts index e2e321031..d4fadd12a 100644 --- a/app/modules/analyzer/constants.ts +++ b/app/modules/analyzer/constants.ts @@ -181,6 +181,8 @@ export const damageTypesToCombine: Partial< }> > > = { + // Explosher + 3040: [{ when: "DIRECT", combineWith: "DISTANCE" }], // Tri-Stringer 7010: [{ when: "NORMAL_MAX", combineWith: "DISTANCE" }], // Splatana Stamper diff --git a/app/modules/analyzer/objectDamage.test.ts b/app/modules/analyzer/objectDamage.test.ts index c6097bfe0..9c1d2fbff 100644 --- a/app/modules/analyzer/objectDamage.test.ts +++ b/app/modules/analyzer/objectDamage.test.ts @@ -81,6 +81,9 @@ const shotsToPopRM: Array< [2010, "FULL_CHARGE", 4, 3], // E-liter 4K [2030, "TAP_SHOT", 13, 12], + // TODO: Explosher damage wrong + // Explosher + // [3040, "DIRECT", 4, 3], // Hydra Splatling [4020, "NORMAL_MAX", 32, 29], // Sloshing Machine