Add Hydra fully charged shot damage to analyzer

Closes #1046
This commit is contained in:
Kalle
2022-10-27 09:27:12 +03:00
parent 672fa07152
commit 41120088e0
6 changed files with 11 additions and 1 deletions

View File

@@ -23,6 +23,7 @@ export const DAMAGE_RECEIVERS = [
export const DAMAGE_TYPE = [
"NORMAL_MIN",
"NORMAL_MAX",
"NORMAL_MAX_FULL_CHARGE", // Hydra Splatling goes from 32 to 40 dmg when fully charged
"DIRECT",
"FULL_CHARGE",
"MAX_CHARGE",
@@ -38,6 +39,7 @@ export const damageTypeToWeaponType: Record<
> = {
NORMAL_MIN: "MAIN",
NORMAL_MAX: "MAIN",
NORMAL_MAX_FULL_CHARGE: "MAIN",
DIRECT: "MAIN",
FULL_CHARGE: "MAIN",
MAX_CHARGE: "MAIN",

View File

@@ -341,6 +341,7 @@ const damageTypeToParamsKey: Record<
> = {
NORMAL_MIN: "DamageParam_ValueMin",
NORMAL_MAX: "DamageParam_ValueMax",
NORMAL_MAX_FULL_CHARGE: "DamageParam_ValueFullChargeMax",
DIRECT: "DamageParam_ValueDirect",
DISTANCE: "BlastParam_DistanceDamage",
FULL_CHARGE: "DamageParam_ValueFullCharge",
@@ -398,7 +399,7 @@ function shotsToSplat({
type: DamageType;
isTripleShooter: boolean;
}) {
if (type !== "NORMAL_MAX") return;
if (type !== "NORMAL_MAX" && type !== "NORMAL_MAX_FULL_CHARGE") return;
const multiplier = isTripleShooter ? 3 : 1;

View File

@@ -33,6 +33,7 @@ export interface MainWeaponParams {
MoveSpeedFullCharge?: number;
DamageParam_ValueMax?: number;
DamageParam_ValueMin?: number;
DamageParam_ValueFullChargeMax?: number;
DamageParam_ValueDirect?: number;
Jump_DegSwerve?: number;
Stand_DegSwerve?: number;

View File

@@ -597,6 +597,7 @@
"MoveSpeed_Charge": 0.04,
"DamageParam_ValueMax": 320,
"DamageParam_ValueMin": 160,
"DamageParam_ValueFullChargeMax": 400,
"Jump_DegSwerve": 6,
"Stand_DegSwerve": 3,
"InkRecoverStop": 40,

View File

@@ -79,6 +79,7 @@
"damage.toSplat": "{{count}} hits to splat",
"damage.NORMAL_MIN": "Minimum",
"damage.NORMAL_MAX": "Maximum",
"damage.NORMAL_MAX_FULL_CHARGE": "Maximum (Fully charged)",
"damage.DIRECT": "Direct",
"damage.FULL_CHARGE": "Fully charged shot",
"damage.MAX_CHARGE": "Maximum partial charge",

View File

@@ -172,6 +172,10 @@ function parametersToMainWeaponResult(
DamageParam_ValueDirect,
BlastParam_DistanceDamage: params["BlastParam"]?.["DistanceDamage"],
DamageParam_ValueFullCharge: params["DamageParam"]?.["ValueFullCharge"],
DamageParam_ValueFullChargeMax:
params["DamageParam"]?.["ValueFullChargeMax"] !== DamageParam_ValueMax()
? params["DamageParam"]?.["ValueFullChargeMax"]
: undefined,
DamageParam_ValueMaxCharge: params["DamageParam"]?.["ValueMaxCharge"],
DamageParam_ValueMinCharge: params["DamageParam"]?.["ValueMinCharge"],
CanopyHP: params["spl__BulletShelterCanopyParam"]?.["CanopyHP"],