Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-08-26 21:26:01 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Build Analyzer: fix Dread Wringer damage

Browse Source
This commit is contained in:
Kalle
2023-11-11 15:00:24 +02:00
parent f20a3ee8d8
commit f63c1d50ae
9 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/features/build-analyzer/analyzer-constants.ts
View File

@@ -12,6 +12,8 @@ export const DAMAGE_TYPE = [
"DIRECT",
"DIRECT_MIN",
"DIRECT_MAX",
"DIRECT_SECONDARY_MIN",
"DIRECT_SECONDARY_MAX",
"FULL_CHARGE",
"MAX_CHARGE",
"TAP_SHOT",
@@ -60,6 +62,8 @@ export const damageTypeToWeaponType: Record<
DIRECT: "MAIN",
DIRECT_MIN: "MAIN",
DIRECT_MAX: "MAIN",
DIRECT_SECONDARY_MAX: "MAIN",
DIRECT_SECONDARY_MIN: "MAIN",
FULL_CHARGE: "MAIN",
MAX_CHARGE: "MAIN",
TAP_SHOT: "MAIN",

3
app/features/build-analyzer/analyzer-types.ts
View File

@@ -39,6 +39,9 @@ export interface MainWeaponParams {
DamageParam_ValueDirect?: number;
DamageParam_ValueDirectMax?: number;
DamageParam_ValueDirectMin?: number;
// Dread Wringer
DamageParam_Secondary_ValueDirectMax?: number;
DamageParam_Secondary_ValueDirectMin?: number;
DamageParam_SplatanaVerticalDirect?: number;
DamageParam_SplatanaVertical?: number;
DamageParam_SplatanaHorizontalDirect?: number;

2
app/features/build-analyzer/core/stats.ts
View File

@@ -414,6 +414,8 @@ const damageTypeToParamsKey: Record<
DIRECT: "DamageParam_ValueDirect",
DIRECT_MIN: "DamageParam_ValueDirectMin",
DIRECT_MAX: "DamageParam_ValueDirectMax",
DIRECT_SECONDARY_MIN: "DamageParam_Secondary_ValueDirectMin",
DIRECT_SECONDARY_MAX: "DamageParam_Secondary_ValueDirectMax",
DISTANCE: ["BlastParam_DistanceDamage", "DistanceDamage_BlastParamArray"],
SPLASH: ["BlastParam_SplashDamage", "DistanceDamage_SplashBlastParam"],
SPLASH_MIN: "SwingUnitGroupParam_DamageParam_DamageMinValue",

2
app/features/build-analyzer/core/weapon-params.json
View File

@@ -1063,6 +1063,8 @@
"MoveSpeed": 0.04,
"DamageParam_ValueDirectMax": 480,
"DamageParam_ValueDirectMin": 350,
"DamageParam_Secondary_ValueDirectMax": 420,
"DamageParam_Secondary_ValueDirectMin": 350,
"InkRecoverStop": 50,
"InkConsumeSlosher": 0.1
},

29
app/features/build-analyzer/routes/analyzer.tsx
View File

@@ -54,6 +54,7 @@ import type {
AbilityPoints,
AnalyzedBuild,
Damage,
DamageType,
SpecialEffectType,
Stat,
SubWeaponDamage,
@@ -75,6 +76,7 @@ import {
isStackableAbility,
} from "../core/utils";
import { PerInkTankGrid } from "../components/PerInkTankGrid";
import invariant from "tiny-invariant";
export const CURRENT_PATCH = "5.1";
@@ -1497,6 +1499,27 @@ function DamageTable({
return true;
};
const multiShotValues = (
damage: AnalyzedBuild["stats"]["damages"][number],
) => {
// initially only Dread Wringer
const isAsymmetric = values.some(
(value) => value.type === "DIRECT_SECONDARY_MIN",
);
if (!isAsymmetric) return new Array(multiShots).fill(damage.value);
const otherKey: DamageType =
damage.type === "DIRECT_MAX"
? "DIRECT_SECONDARY_MAX"
: "DIRECT_SECONDARY_MIN";
const secondaryDamage = values.find((value) => value.type === otherKey);
invariant(secondaryDamage, "secondary damage not found");
return [damage.value, secondaryDamage.value];
};
return (
<>
<Table>
@@ -1519,9 +1542,11 @@ function DamageTable({
</thead>
<tbody>
{values.map((val, i) => {
if (val.type.includes("SECONDARY")) return null;
const damage = (val: AnalyzedBuild["stats"]["damages"][number]) =>
multiShots && damageTypeToWeaponType[val.type] === "MAIN"
? new Array(multiShots).fill(val.value).join(" + ")
? multiShotValues(val).join(" + ")
: val.value;
const typeRowName = damageIsSubWeaponDamage(val)
@@ -1543,7 +1568,7 @@ function DamageTable({
height={12}
/>
) : null}{" "}
{t(typeRowName)}{" "}
{t(typeRowName as any)}{" "}
{damageIsSubWeaponDamage(val) && val.type === "SPLASH" ? (
<>({t("analyzer:damage.SPLASH")})</>
) : null}

2
app/features/object-damage-calculator/calculator-hooks.ts
View File

@@ -103,6 +103,8 @@ export const damageTypePriorityList = [
"TURRET_MAX",
"TURRET_MIN",
"DIRECT_MAX",
"DIRECT_SECONDARY_MAX",
"DIRECT_SECONDARY_MIN",
"DIRECT",
"DIRECT_MIN",
"FULL_CHARGE",

28
app/features/object-damage-calculator/core/objectDamage.ts
View File

@@ -20,6 +20,7 @@ import {
} from "../calculator-constants";
import type { CombineWith, DamageReceiver } from "../calculator-types";
import { removeDuplicates } from "~/utils/arrays";
import type { Damage } from "~/features/build-analyzer/analyzer-types";
export function damageTypeToMultipliers({
type,
@@ -127,7 +128,9 @@ export function resolveAllUniqueDamageTypes({
? analyzed.stats.specialWeaponDamages.map((d) => d.type)
: analyzed.stats.damages.map((d) => d.type);
return removeDuplicates(damageTypes);
return removeDuplicates(damageTypes).filter(
(dmg) => !dmg.includes("SECONDARY"),
);
}
function resolveFilteredDamages({
@@ -149,6 +152,27 @@ function resolveFilteredDamages({
);
}
const damageWithMultishots = (dmg: Damage, multiShots: number) => {
// initially only Dread Wringer
const isAsymmetric = analyzed.stats.damages.some(
(dmg) => dmg.type === "DIRECT_SECONDARY_MIN",
);
if (!isAsymmetric) return dmg.value * multiShots;
const otherKey: DamageType =
dmg.type === "DIRECT_MAX"
? "DIRECT_SECONDARY_MAX"
: "DIRECT_SECONDARY_MIN";
const secondaryDamage = analyzed.stats.damages.find(
(dmg) => dmg.type === otherKey,
);
invariant(secondaryDamage, "secondary damage not found");
return dmg.value + secondaryDamage.value;
};
const damages =
anyWeapon.type === "SPECIAL"
? analyzed.stats.specialWeaponDamages
@@ -161,7 +185,7 @@ function resolveFilteredDamages({
return {
...damage,
value: damage.value * damage.multiShots,
value: damageWithMultishots(damage, damage.multiShots),
};
});
}

4
app/features/object-damage-calculator/routes/object-damage-calculator.tsx
View File

@@ -185,7 +185,7 @@ function DamageTypesSelect({
{t(
damageTypeTranslationString({
damageType,
}),
}) as any,
)}
</option>
);
@@ -307,7 +307,7 @@ function DamageReceiversGrid({
{t(
damageTypeTranslationString({
damageType: damage.type,
}),
}) as any,
)}
{damage.objectShredder && <Ability ability="OS" size="TINY" />}
</div>

16
scripts/create-analyzer-json.ts
View File

@@ -191,6 +191,21 @@ function parametersToMainWeaponResult(
};
};
const slosherDirectDamageSecondary = () => {
const isDreadWringer = weapon.Id === 3050 || weapon.Id === 3051;
if (!isDreadWringer) return;
const DamageParam_Secondary_ValueDirectMax =
params["UnitGroupParam"]?.["Unit"]?.[1]?.["DamageParam"]?.["ValueMax"];
const DamageParam_Secondary_ValueDirectMin =
params["UnitGroupParam"]?.["Unit"]?.[1]?.["DamageParam"]?.["ValueMin"];
return {
DamageParam_Secondary_ValueDirectMax,
DamageParam_Secondary_ValueDirectMin,
};
};
const KeepChargeFullFrame =
params["WeaponKeepChargeParam"]?.["KeepChargeFullFrame"] ??
params["spl__WeaponStringerParam"]?.["ChargeKeepParam"]?.[
@@ -258,6 +273,7 @@ function parametersToMainWeaponResult(
: undefined,
DamageParam_ValueDirect,
...slosherDirectDamage(),
...slosherDirectDamageSecondary(),
// Glooga turret mode damage
DamageLapOverParam_ValueMax: params["DamageLapOverParam"]?.["ValueMax"],
DamageLapOverParam_ValueMin: params["DamageLapOverParam"]?.["ValueMin"],