Add recycled brella damage (#1719)

* Add recycled brella damage

* Modify create-object-dmg-json.ts to automatically generate values for Recycled Brella

* Remove console log

---------

Co-authored-by: Kalle <38327916+Sendouc@users.noreply.github.com>
This commit is contained in:
Anne
2024-04-20 03:46:51 -04:00
committed by GitHub
parent 33a4347e24
commit d4a31e2c12
5 changed files with 320 additions and 3 deletions

View File

@@ -19,6 +19,7 @@ export const DAMAGE_RECEIVERS = [
"BulletUmbrellaCanopyCompact", // Undercover Brella Canopy
"BulletUmbrellaCanopyNormal", // Splat Brella Canopy
"BulletUmbrellaCanopyWide", // Tenta Brella Canopy
"BulletShelterCanopyFocus", // Recycled Brella Canopy
] as const;
export const damagePriorities: Array<

View File

@@ -12,6 +12,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.6
@@ -59,6 +63,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3.6
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3.6
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -106,6 +114,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.6
@@ -153,6 +165,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.6
@@ -200,6 +216,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 7
@@ -301,6 +321,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -352,6 +376,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3.6
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3.6
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3.6
@@ -411,6 +439,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -458,6 +490,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 4
},
{
"target": "BulletShelterCanopyFocus",
"rate": 4
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 4
@@ -532,6 +568,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -583,6 +623,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -653,6 +697,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.5
@@ -708,6 +756,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 5
@@ -763,6 +815,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.4
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.4
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -818,6 +874,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2.4
@@ -873,6 +933,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -928,6 +992,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.4
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.4
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -983,6 +1051,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2.4
@@ -1038,6 +1110,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -1120,6 +1196,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3
@@ -1171,6 +1251,10 @@
"target": "BulletUmbrellaCanopyCompact",
"rate": 1
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1
},
{
"target": "BulletUmbrellaCanopyNormal",
"rate": 1
@@ -1198,6 +1282,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1
@@ -1244,6 +1332,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3
@@ -1295,6 +1387,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3.5
@@ -1354,6 +1450,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3.5
@@ -1413,6 +1513,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -1464,6 +1568,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.1
@@ -1499,6 +1607,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -1534,6 +1646,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -1581,6 +1697,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -1636,6 +1756,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.5
@@ -1687,6 +1811,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2.5
@@ -1785,6 +1913,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 4.75
},
{
"target": "BulletShelterCanopyFocus",
"rate": 4.75
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3
@@ -1863,6 +1995,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.8
@@ -1918,6 +2054,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.5
@@ -1973,6 +2113,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.5
@@ -2036,6 +2180,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3.4
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3.4
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 3.6
@@ -2091,6 +2239,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.78
@@ -2150,6 +2302,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 4.8
},
{
"target": "BulletShelterCanopyFocus",
"rate": 4.8
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 4.8
@@ -2209,6 +2365,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.2
@@ -2268,6 +2428,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 4.8
},
{
"target": "BulletShelterCanopyFocus",
"rate": 4.8
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 4.8
@@ -2327,6 +2491,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.4
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.4
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2.4
@@ -2386,6 +2554,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 5
@@ -2437,6 +2609,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 5
@@ -2488,6 +2664,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 5
@@ -2539,6 +2719,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -2598,6 +2782,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -2657,6 +2845,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -2774,6 +2966,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.1
@@ -2809,6 +3005,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -2844,6 +3044,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.1
@@ -2879,6 +3083,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.1
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.1
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -2926,6 +3134,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.1
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.1
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -2973,6 +3185,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.85
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.85
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -3016,6 +3232,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.1
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.1
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -3059,6 +3279,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -3094,6 +3318,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.1
@@ -3129,6 +3357,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.1
@@ -3168,6 +3400,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.8
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.8
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.8
@@ -3215,6 +3451,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.85
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.85
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.85
@@ -3262,6 +3502,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -3297,6 +3541,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 100
},
{
"target": "BulletShelterCanopyFocus",
"rate": 100
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 100
@@ -3348,6 +3596,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 9.5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 9.5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 6
@@ -3403,6 +3655,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 1.6
},
{
"target": "BulletShelterCanopyFocus",
"rate": 1.6
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.6
@@ -3446,6 +3702,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -3489,6 +3749,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -3536,6 +3800,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -3583,6 +3851,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 0.7
},
{
"target": "BulletShelterCanopyFocus",
"rate": 0.7
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 0.7
@@ -3641,6 +3913,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2.3333
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2.3333
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 1.5556
@@ -3688,6 +3964,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 3
},
{
"target": "BulletShelterCanopyFocus",
"rate": 3
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -3747,6 +4027,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -3798,6 +4082,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 2
},
{
"target": "BulletShelterCanopyFocus",
"rate": 2
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 2
@@ -3853,6 +4141,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 6
},
{
"target": "BulletShelterCanopyFocus",
"rate": 6
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 6
@@ -3900,6 +4192,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 20
},
{
"target": "BulletShelterCanopyFocus",
"rate": 20
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 20
@@ -3959,6 +4255,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 5
},
{
"target": "BulletShelterCanopyFocus",
"rate": 5
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 5
@@ -4018,6 +4318,10 @@
"target": "BulletUmbrellaCanopyNormal",
"rate": 4.091
},
{
"target": "BulletShelterCanopyFocus",
"rate": 4.091
},
{
"target": "BulletUmbrellaCanopyWide",
"rate": 4.091

View File

@@ -5,12 +5,12 @@ import {
SPLASH_WALL_ID,
} from "~/modules/in-game-lists";
import {
type AbilityPoints,
hpDivided,
specialDeviceHp,
specialFieldHp,
subStats,
hpDivided,
type AbilityPoints,
type SpecialWeaponParams,
subStats,
type SubWeaponParams,
} from "~/features/build-analyzer";
import type { HitPoints } from "../calculator-types";
@@ -55,6 +55,9 @@ export const objectHitPoints = (abilityPoints: AbilityPoints): HitPoints => {
BulletUmbrellaCanopyCompact: hpDivided(
weaponParams.mainWeapons[6020].CanopyHP,
),
BulletShelterCanopyFocus: hpDivided(
weaponParams.mainWeapons[6030].CanopyHP,
),
Wsb_Shield,
Bomb_TorpedoBullet: TORPEDO_HP,
Chariot: hpDivided(weaponParams.specialWeapons[CRAB_TANK_ID].ArmorHP),

View File

@@ -206,6 +206,7 @@ const damageReceiverImages: Record<DamageReceiver, string> = {
BulletUmbrellaCanopyNormal: mainWeaponImageUrl(6000),
BulletUmbrellaCanopyWide: mainWeaponImageUrl(6010),
BulletUmbrellaCanopyCompact: mainWeaponImageUrl(6020),
BulletShelterCanopyFocus: mainWeaponImageUrl(6030),
};
const damageReceiverAp: Partial<Record<DamageReceiver, JSX.Element>> = {

View File

@@ -76,6 +76,14 @@ for (const cell of Object.values(params.CellList)) {
target: cell.ColumnKey,
rate: cell.DamageRate,
});
// if it has special damage rates for Splat Brella, add the same value for Recycled Brella
if (cell.ColumnKey === "BulletUmbrellaCanopyNormal") {
result[cell.RowKey].rates.push({
target: "BulletShelterCanopyFocus",
rate: cell.DamageRate,
});
}
}
fs.writeFileSync(