Tri-Stringer correct damage

This commit is contained in:
Kalle
2022-12-10 19:58:17 +02:00
parent 914a3eae36
commit 21cfd958d8
3 changed files with 10 additions and 1 deletions

View File

@@ -181,6 +181,8 @@ export const damageTypesToCombine: Partial<
}>
>
> = {
// Tri-Stringer
7010: [{ when: "NORMAL_MAX", combineWith: "DISTANCE" }],
// Splatana Stamper
8000: [
{ when: "SPLATANA_VERTICAL_DIRECT", combineWith: "SPLATANA_VERTICAL" },

View File

@@ -93,6 +93,8 @@ const shotsToPopRM: Array<
[8010, "SPLATANA_HORIZONTAL_DIRECT", 9, 8],
// Splatana Stamper
[8000, "SPLATANA_VERTICAL_DIRECT", 3, 3],
// // Tri-Stringer
[7010, "NORMAL_MAX", 3, 3],
// REEF-LUX
[7020, "NORMAL_MIN", 8, 7],
];

View File

@@ -380,6 +380,8 @@ function damages(args: StatFunctionInput): AnalyzedBuild["stats"]["damages"] {
args.mainWeaponParams[key as keyof MainWeaponParams] ??
args.subWeaponParams[key as keyof SubWeaponParams];
const isMainWeaponParam = key in args.mainWeaponParams;
if (Array.isArray(value)) {
for (const subValue of value.flat()) {
result.push({
@@ -387,6 +389,9 @@ function damages(args: StatFunctionInput): AnalyzedBuild["stats"]["damages"] {
value: subValue.Damage / 10,
distance: subValue.Distance,
id: semiRandomId(),
multiShots: isMainWeaponParam
? multiShot[args.weaponSplId]
: undefined,
});
}
@@ -404,7 +409,7 @@ function damages(args: StatFunctionInput): AnalyzedBuild["stats"]["damages"] {
type,
multiShots: multiShot[args.weaponSplId],
}),
multiShots: multiShot[args.weaponSplId],
multiShots: isMainWeaponParam ? multiShot[args.weaponSplId] : undefined,
});
}