Add/Fix miscellaneous object damage/build analyzer data (#1550)

* Add object damage data for Triple Splashdown

* Fix Sprinkler's HP + var name typo and add Ink Vac as a Damage Reciever

* Recompile object-dmg.json with Pogo and new Vac data added automatically

* (I forgot about Prettier)

* Add to json creating script

---------

Co-authored-by: Kalle <38327916+Sendouc@users.noreply.github.com>
This commit is contained in:
ash
2023-12-06 02:01:48 -07:00
committed by GitHub
parent 9a50eee1e5
commit f3397c033b
6 changed files with 135 additions and 25 deletions

View File

@@ -2324,7 +2324,17 @@
"Low": 9,
"Mid": 9.9
}
}
},
"DistanceDamage": [
{
"Damage": 2200,
"Distance": 7
},
{
"Damage": 600,
"Distance": 12
}
]
},
"19": {
"overwrites": {

View File

@@ -10,6 +10,7 @@ export const DAMAGE_RECEIVERS = [
"ShockSonar", // Wave Breaker
"GreatBarrier_Barrier", // Big Bubbler Shield
"GreatBarrier_WeakPoint", // Big Bubbler Weak Point
"BlowerInhale", // Ink Vac Inhale
"Gachihoko_Barrier", // Rainmaker Shield
"Wsb_Flag", // Squid Beakon
"Wsb_Shield", // Splash Wall
@@ -107,6 +108,7 @@ export const damagePriorities: Array<
["SPECIAL", [12], "SPECIAL_BULLET_MIN", "Chariot_Cannon"],
["SPECIAL", [12], "SPECIAL_BUMP", "Chariot_Body"],
["SPECIAL", [13], "BOMB_NORMAL", "Skewer"],
["SPECIAL", [18], "BOMB_NORMAL", "Pogo"],
];
export const damageTypesToCombine: Partial<

View File

@@ -1,6 +1,6 @@
{
"Blaster_BlasterMiddle": {
"mainWeaponIds": [210, 260],
"mainWeaponIds": [210, 211, 260, 261],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -94,7 +94,7 @@
]
},
"Blaster_KillOneShot": {
"mainWeaponIds": [220, 210, 260],
"mainWeaponIds": [220, 210, 211, 260, 261],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -618,7 +618,7 @@
]
},
"BrushCore": {
"mainWeaponIds": [1120, 1100, 1101, 1110, 1111],
"mainWeaponIds": [1120, 1121, 1100, 1101, 1110, 1111],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -641,7 +641,7 @@
]
},
"BrushSplash": {
"mainWeaponIds": [1120, 1100, 1101, 1110, 1111],
"mainWeaponIds": [1120, 1121, 1100, 1101, 1110, 1111],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -751,7 +751,7 @@
]
},
"ChargerFull_Light": {
"mainWeaponIds": [2050, 2070],
"mainWeaponIds": [2050, 2070, 2071],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -916,7 +916,7 @@
]
},
"Charger_Light": {
"mainWeaponIds": [2050, 2070],
"mainWeaponIds": [2050, 2070, 2071],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -1162,14 +1162,33 @@
}
]
},
"Chimney": {
"mainWeaponIds": [],
"subWeaponIds": [],
"specialWeaponIds": [19],
"rates": [
{
"target": "BulletUmbrellaCanopyCompact",
"rate": 1
},
{
"target": "BulletUmbrellaCanopyNormal",
"rate": 1
},
{
"target": "NiceBall_Armor",
"rate": 1
}
]
},
"Default": {
"mainWeaponIds": [
220, 210, 260, 1120, 1100, 1101, 1110, 1111, 2060, 2061, 2050, 2040, 2030,
2020, 2021, 2010, 2011, 2070, 2000, 1000, 1001, 1020, 1021, 1030, 1010,
1011, 1040, 1041, 6020, 6000, 6001, 6010, 6011
220, 210, 211, 260, 261, 1120, 1121, 1100, 1101, 1110, 1111, 2060, 2061,
2050, 2040, 2030, 2020, 2021, 2010, 2011, 2070, 2071, 2000, 1000, 1001,
1020, 1021, 1030, 1010, 1011, 1040, 1041, 6020, 6000, 6001, 6010, 6011
],
"subWeaponIds": [8, 6, 12, 9, 11],
"specialWeaponIds": [12, 15, 16, 2, 7],
"specialWeaponIds": [12, 19, 15, 16, 2, 7],
"rates": [
{
"target": "BulletUmbrellaCanopyCompact",
@@ -1197,6 +1216,17 @@
}
]
},
"InkStormRain": {
"mainWeaponIds": [],
"subWeaponIds": [],
"specialWeaponIds": [5],
"rates": [
{
"target": "BlowerInhale",
"rate": 1
}
]
},
"InkStorm": {
"mainWeaponIds": [],
"subWeaponIds": [],
@@ -1457,7 +1487,7 @@
]
},
"Maneuver": {
"mainWeaponIds": [5030, 5031, 5020, 5010, 5040, 5041],
"mainWeaponIds": [5030, 5031, 5020, 5010, 5011, 5040, 5041],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -1738,6 +1768,65 @@
}
]
},
"Pogo": {
"mainWeaponIds": [],
"subWeaponIds": [],
"specialWeaponIds": [18],
"rates": [
{
"target": "Bomb_TorpedoBullet",
"rate": 0.5
},
{
"target": "BulletUmbrellaCanopyCompact",
"rate": 3
},
{
"target": "BulletUmbrellaCanopyNormal",
"rate": 4.75
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3
},
{
"target": "Chariot",
"rate": 3.64
},
{
"target": "Gachihoko_Barrier",
"rate": 2.5
},
{
"target": "GreatBarrier_Barrier",
"rate": 2.5
},
{
"target": "GreatBarrier_WeakPoint",
"rate": 2.5
},
{
"target": "NiceBall_Armor",
"rate": 3.75
},
{
"target": "ShockSonar",
"rate": 2.5
},
{
"target": "Wsb_Flag",
"rate": 5
},
{
"target": "Wsb_Shield",
"rate": 2.5
},
{
"target": "Wsb_Sprinkler",
"rate": 5
}
]
},
"RollerCore": {
"mainWeaponIds": [1000, 1001, 1020, 1021, 1030, 1010, 1011, 1040, 1041],
"subWeaponIds": [],
@@ -1931,6 +2020,10 @@
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
{
"target": "BlowerInhale",
"rate": 2
},
{
"target": "Bomb_TorpedoBullet",
"rate": 2
@@ -2041,7 +2134,7 @@
]
},
"Saber_ChargeShot": {
"mainWeaponIds": [8010, 8011, 8000],
"mainWeaponIds": [8010, 8011, 8000, 8001],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2100,7 +2193,7 @@
]
},
"Saber_ChargeSlash": {
"mainWeaponIds": [8010, 8011, 8000],
"mainWeaponIds": [8010, 8011, 8000, 8001],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2159,7 +2252,7 @@
]
},
"Saber_Shot": {
"mainWeaponIds": [8010, 8011, 8000],
"mainWeaponIds": [8010, 8011, 8000, 8001],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2218,7 +2311,7 @@
]
},
"Saber_Slash": {
"mainWeaponIds": [8010, 8011, 8000],
"mainWeaponIds": [8010, 8011, 8000, 8001],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2277,7 +2370,7 @@
]
},
"ShelterCanopy_Compact": {
"mainWeaponIds": [6020],
"mainWeaponIds": [6020, 6021],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2430,7 +2523,7 @@
]
},
"ShelterShot_Compact": {
"mainWeaponIds": [6020],
"mainWeaponIds": [6020, 6021],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2774,7 +2867,7 @@
]
},
"Shooter_FlashRepeat": {
"mainWeaponIds": [400],
"mainWeaponIds": [400, 401],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -2821,7 +2914,7 @@
]
},
"Shooter_Flash": {
"mainWeaponIds": [400],
"mainWeaponIds": [400, 401],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -3157,7 +3250,7 @@
]
},
"Shooter": {
"mainWeaponIds": [400, 40, 41, 45, 100, 101, 60, 61],
"mainWeaponIds": [400, 401, 40, 41, 45, 100, 101, 60, 61],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [
@@ -3536,7 +3629,7 @@
]
},
"Stringer_Short": {
"mainWeaponIds": [7020],
"mainWeaponIds": [7020, 7021],
"subWeaponIds": [],
"specialWeaponIds": [],
"rates": [

View File

@@ -17,10 +17,11 @@ import {
import type { HitPoints } from "../calculator-types";
const WAVE_BREAKER_HP = 400;
const SPRINKER_HP = 100;
const SPRINKLER_HP = 120;
const RAINMAKER_HP = 1000;
const SPLAT_BRELLA_SHIELD_HP = 500;
const BOOYAH_BOMB_ARMOR_HP = 470;
const INK_VAC_HP = 800;
const BEAKON_HP = 120;
const TORPEDO_HP = 20;
@@ -61,8 +62,9 @@ export const objectHitPoints = (abilityPoints: AbilityPoints): HitPoints => {
GreatBarrier_Barrier,
GreatBarrier_WeakPoint,
NiceBall_Armor: BOOYAH_BOMB_ARMOR_HP, // ??
BlowerInhale: INK_VAC_HP,
ShockSonar: WAVE_BREAKER_HP,
Wsb_Flag: BEAKON_HP,
Wsb_Sprinkler: SPRINKER_HP,
Wsb_Sprinkler: SPRINKLER_HP,
};
};

View File

@@ -19,6 +19,7 @@ import {
SPLASH_WALL_ID,
SPRINKLER_ID,
SQUID_BEAKON_ID,
INK_VAC_ID,
TORPEDO_ID,
WAVE_BREAKER_ID,
} from "~/modules/in-game-lists";
@@ -196,6 +197,7 @@ function DamageTypesSelect({
const damageReceiverImages: Record<DamageReceiver, string> = {
Bomb_TorpedoBullet: subWeaponImageUrl(TORPEDO_ID),
BlowerInhale: specialWeaponImageUrl(INK_VAC_ID),
Chariot: specialWeaponImageUrl(CRAB_TANK_ID),
Gachihoko_Barrier: modeImageUrl("RM"),
GreatBarrier_Barrier: specialWeaponImageUrl(BIG_BUBBLER_ID),

View File

@@ -594,7 +594,8 @@ function parametersToSpecialWeaponResult(params: any) {
params["HookBlastParam"]?.["DistanceDamage"] ??
params["spl__BulletBlastParam"]?.["DistanceDamage"] ??
params["BulletBlastParam"]?.["DistanceDamage"] ??
params["IceParam"]?.["BlastParam"]?.["DistanceDamage"],
params["IceParam"]?.["BlastParam"]?.["DistanceDamage"] ??
params["BlastParamNormal"]?.["DistanceDamage"],
DirectDamage:
params["DamageParam"]?.["DirectHitDamage"] ??
params["spl__BulletSpShockSonarParam"]?.["GeneratorParam"]?.[