From ce3eda35459d67b9777b77e9f4d238c87a26ef38 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:51:34 +0200 Subject: [PATCH] Build Analyzer: Splatana damages --- app/modules/analyzer/constants.ts | 8 ++++++++ app/modules/analyzer/stats.ts | 4 ++++ app/modules/analyzer/types.ts | 4 ++++ app/modules/analyzer/weapon-params.json | 8 ++++++++ public/locales/en/analyzer.json | 4 ++++ scripts/create-analyzer-json.ts | 15 +++++++++++++++ 6 files changed, 43 insertions(+) diff --git a/app/modules/analyzer/constants.ts b/app/modules/analyzer/constants.ts index 95c74008a..e4413b67e 100644 --- a/app/modules/analyzer/constants.ts +++ b/app/modules/analyzer/constants.ts @@ -35,6 +35,10 @@ export const DAMAGE_TYPE = [ "SPLASH", "BOMB_NORMAL", "BOMB_DIRECT", + "SPLATANA_VERTICAL", + "SPLATANA_VERTICAL_DIRECT", + "SPLATANA_HORIZONTAL", + "SPLATANA_HORIZONTAL_DIRECT", ] as const; export const damageTypeToWeaponType: Record< @@ -54,6 +58,10 @@ export const damageTypeToWeaponType: Record< SPLASH: "MAIN", BOMB_NORMAL: "SUB", BOMB_DIRECT: "SUB", + SPLATANA_VERTICAL: "MAIN", + SPLATANA_VERTICAL_DIRECT: "MAIN", + SPLATANA_HORIZONTAL: "MAIN", + SPLATANA_HORIZONTAL_DIRECT: "MAIN", }; export const objectDamageJsonKeyPriority: Record< diff --git a/app/modules/analyzer/stats.ts b/app/modules/analyzer/stats.ts index 5643a64de..3ab29979e 100644 --- a/app/modules/analyzer/stats.ts +++ b/app/modules/analyzer/stats.ts @@ -363,6 +363,10 @@ const damageTypeToParamsKey: Record< FULL_CHARGE: "DamageParam_ValueFullCharge", MAX_CHARGE: "DamageParam_ValueMaxCharge", TAP_SHOT: "DamageParam_ValueMinCharge", + SPLATANA_VERTICAL: "DamageParam_SplatanaVertical", + SPLATANA_VERTICAL_DIRECT: "DamageParam_SplatanaVerticalDirect", + SPLATANA_HORIZONTAL: "DamageParam_SplatanaHorizontal", + SPLATANA_HORIZONTAL_DIRECT: "DamageParam_SplatanaHorizontalDirect", BOMB_NORMAL: "DistanceDamage", BOMB_DIRECT: "DirectDamage", }; diff --git a/app/modules/analyzer/types.ts b/app/modules/analyzer/types.ts index aa01aa6c3..799dbc48b 100644 --- a/app/modules/analyzer/types.ts +++ b/app/modules/analyzer/types.ts @@ -38,6 +38,10 @@ export interface MainWeaponParams { DamageParam_ValueDirect?: number; DamageParam_ValueDirectMax?: number; DamageParam_ValueDirectMin?: number; + DamageParam_SplatanaVerticalDirect?: number; + DamageParam_SplatanaVertical?: number; + DamageParam_SplatanaHorizontalDirect?: number; + DamageParam_SplatanaHorizontal?: number; Jump_DegSwerve?: number; Stand_DegSwerve?: number; /** Damage caused by charger's full charged shot */ diff --git a/app/modules/analyzer/weapon-params.json b/app/modules/analyzer/weapon-params.json index 3dbda784d..b4ef19097 100644 --- a/app/modules/analyzer/weapon-params.json +++ b/app/modules/analyzer/weapon-params.json @@ -941,6 +941,10 @@ "subWeaponId": 2, "specialWeaponId": 3, "MoveSpeedFullCharge": 0.4, + "DamageParam_SplatanaVerticalDirect": 1400, + "DamageParam_SplatanaVertical": 700, + "DamageParam_SplatanaHorizontalDirect": 550, + "DamageParam_SplatanaHorizontal": 350, "InkConsume_SwingParam": 0.04, "InkConsumeFullCharge_ChargeParam": 0.09 }, @@ -950,6 +954,10 @@ "specialWeaponId": 11, "WeaponSpeedType": "Fast", "MoveSpeedFullCharge": 0.4, + "DamageParam_SplatanaVerticalDirect": 1200, + "DamageParam_SplatanaVertical": 600, + "DamageParam_SplatanaHorizontalDirect": 450, + "DamageParam_SplatanaHorizontal": 300, "InkConsume_SwingParam": 0.03, "InkConsumeFullCharge_ChargeParam": 0.06 } diff --git a/public/locales/en/analyzer.json b/public/locales/en/analyzer.json index 3c227b5ed..26e9566a7 100644 --- a/public/locales/en/analyzer.json +++ b/public/locales/en/analyzer.json @@ -91,6 +91,10 @@ "damage.TAP_SHOT": "Tap shot", "damage.DISTANCE": "Splash", "damage.SPLASH": "Splash", + "damage.SPLATANA_VERTICAL_DIRECT": "Vertical direct", + "damage.SPLATANA_VERTICAL": "Vertical", + "damage.SPLATANA_HORIZONTAL_DIRECT": "Horizontal direct", + "damage.SPLATANA_HORIZONTAL": "Horizontal", "suffix.seconds": "s", "suffix.hp": "hp", "suffix.specialPointsShort": "p", diff --git a/scripts/create-analyzer-json.ts b/scripts/create-analyzer-json.ts index 3f4c92d3f..f45427bf5 100644 --- a/scripts/create-analyzer-json.ts +++ b/scripts/create-analyzer-json.ts @@ -175,6 +175,10 @@ function parametersToMainWeaponResult( const isSloshingMachine = weapon.Id === 3020; + const DamageParam_SplatanaHorizontalDirect = + params["BulletSaberHorizontalParam"]?.["DamageParam"]?.["HitDamage"] + + params["BulletSaberSlashHorizontalParam"]?.["DamageParam"]?.["DamageValue"]; + return { SpecialPoint: weapon.SpecialPoint, subWeaponId: resolveSubWeaponId(weapon), @@ -214,6 +218,17 @@ function parametersToMainWeaponResult( : undefined, DamageParam_ValueMaxCharge: params["DamageParam"]?.["ValueMaxCharge"], DamageParam_ValueMinCharge: params["DamageParam"]?.["ValueMinCharge"], + DamageParam_SplatanaVerticalDirect: + params["BulletSaberSlashVerticalParam"]?.["DamageParam"]?.["DamageValue"], + DamageParam_SplatanaVertical: + params["BulletSaberVerticalParam"]?.["DamageParam"]?.["HitDamage"], + DamageParam_SplatanaHorizontalDirect: Number.isNaN( + DamageParam_SplatanaHorizontalDirect + ) + ? undefined + : DamageParam_SplatanaHorizontalDirect, + DamageParam_SplatanaHorizontal: + params["BulletSaberHorizontalParam"]?.["DamageParam"]?.["HitDamage"], CanopyHP: params["spl__BulletShelterCanopyParam"]?.["CanopyHP"], ChargeFrameFullCharge: params["WeaponParam"]?.["ChargeFrameFullCharge"] ??