Add Meryl Ironheart (#139)

.vscode/settings.json

@@ -7,10 +7,12 @@
     "debuff",
     "exponentiated",
     "Handguards",
+    "Ironheart",
     "Legguards",
     "loadout",
     "Loadouts",
     "macchiato",
+    "Meryl",
     "Microreactor",
     "Persistable",
     "replacee",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tof-tools",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "private": true,
   "scripts": {
     "dev": "next dev -p 8080",

src/definitions/changelog.tsx

@@ -230,4 +230,9 @@ export const changelog: Changelog = [
     description:
       'Since simulacra trait selection has not been added to the gear comparer yet, the calculator assumes you might also equip her trait when using Nola. (Nola trait buffs all ATK for every altered weapon equipped)',
   },
+  {
+    semver: '3.18.0',
+    date: new Date(Date.UTC(2024, 10, 4)),
+    title: 'Add Meryl Ironheart',
+  },
 ];

src/definitions/matrix-set-definitions.ts

@@ -48,6 +48,7 @@ export const matrixSet2pcOrder: DataAllIds<MatrixSet2pcName> = [
   'Liu Huo 2pc',
   'Lyra 2pc',
   'Meryl 2pc',
+  'Meryl Ironheart 2pc',
   'Ming Jing 2pc',
   'Nan Yin 2pc',
   'Nemesis 2pc',
@@ -97,6 +98,7 @@ export const matrixSet4pcOrder: DataAllIds<MatrixSet4pcName> = [
   'Liu Huo 4pc',
   'Lyra 4pc',
   'Meryl 4pc',
+  'Meryl Ironheart 4pc',
   'Ming Jing 4pc',
   'Nan Yin 4pc',
   'Nemesis 4pc',
@@ -561,6 +563,29 @@ export const matrixSetDefinitionsLookup: DataById<
     critDamageBuffs: [],
     buffs: [],
   },
+  'Meryl Ironheart 2pc': {
+    id: 'Meryl Ironheart 2pc',
+    displayName: 'Meryl Ironheart 2pc',
+    pieces: 2,
+    attackPercentBuffs: [],
+    critRateBuffs: [],
+    critDamageBuffs: [
+      {
+        description:
+          '(Assuming max stacks) Each time Chain Static is triggered, increase crit damage by 6% for 5, stacking up to 4 times',
+        starValues: [
+          { star: 0, value: 0.24 },
+          { star: 1, value: 0.24 },
+          { star: 2, value: 0.24 },
+          { star: 3, value: 0.24 },
+        ],
+        canStack: false,
+        isActivePassively: false,
+        weaponRequirements: ['Meryl Ironheart'],
+      },
+    ],
+    buffs: [],
+  },
   'Ming Jing 2pc': {
     id: 'Ming Jing 2pc',
     displayName: 'Ming Jing 2pc',
@@ -1280,6 +1305,42 @@ export const matrixSetDefinitionsLookup: DataById<
     critDamageBuffs: [],
     buffs: [],
   },
+  'Meryl Ironheart 4pc': {
+    id: 'Meryl Ironheart 4pc',
+    displayName: 'Meryl Ironheart 4pc',
+    pieces: 4,
+    attackPercentBuffs: [
+      {
+        description: 'Increase volt ATK when Siege Edge is equipped',
+        starValues: [
+          { star: 0, value: 0.21 },
+          { star: 1, value: 0.24 },
+          { star: 2, value: 0.27 },
+          { star: 3, value: 0.3 },
+        ],
+        elementalTypes: ['Volt'],
+        canStack: false,
+        isActivePassively: true,
+        weaponRequirements: ['Meryl Ironheart'],
+      },
+    ],
+    critRateBuffs: [
+      {
+        description: '+7% crit rate when Fortitude Resonance is triggered',
+        starValues: [
+          { star: 0, value: 0.07 },
+          { star: 1, value: 0.07 },
+          { star: 2, value: 0.07 },
+          { star: 3, value: 0.07 },
+        ],
+        canStack: false,
+        isActivePassively: true,
+        weaponResonanceRequirements: ['Fortitude'],
+      },
+    ],
+    critDamageBuffs: [],
+    buffs: [],
+  },
   'Ming Jing 4pc': {
     id: 'Ming Jing 4pc',
     displayName: 'Ming Jing 4pc',

src/definitions/simulacrum-traits.ts

@@ -37,6 +37,7 @@ export const simulacrumTraits: Data<SimulacrumName, SimulacrumTrait> = {
     'Liu Huo',
     'Lyra',
     'Meryl',
+    'Meryl Ironheart',
     'Ming Jing',
     'Nan Yin',
     'Nemesis',
@@ -564,6 +565,11 @@ export const simulacrumTraits: Data<SimulacrumName, SimulacrumTrait> = {
       displayName: 'Meryl',
       buffs: [],
     },
+    'Meryl Ironheart': {
+      id: 'Meryl Ironheart',
+      displayName: 'Meryl Ironheart',
+      buffs: [],
+    },
     'Ming Jing': {
       id: 'Ming Jing',
       displayName: 'Ming Jing (Zeke)',

src/definitions/weapons/definitions/meryl-ironheart.ts

@@ -0,0 +1,56 @@
+import type { Weapon } from '../../types/weapon/weapon';
+
+export const merylIronheart = {
+  id: 'Meryl Ironheart',
+  displayName: 'Meryl Ironheart',
+  elementalIcon: 'Volt-Frost',
+  resonanceElements: ['Volt', 'Frost'],
+  calculationElements: ['Volt', 'Frost'],
+  damageElement: 'Volt',
+  type: 'Defense',
+  attackPercentBuffs: [
+    {
+      id: 'Volt Resonance',
+      displayName: 'Volt Resonance',
+      description: '+15% volt ATK when equipping 2 or more volt weapons',
+      value: 0.15,
+      elementalTypes: ['Volt'],
+      canStack: false,
+      isActivePassively: true,
+      minStarRequirement: 0,
+      maxStarRequirement: 6,
+      elementalResonanceRequirements: ['Volt'],
+    },
+    {
+      id: 'Frost Resonance',
+      displayName: 'Frost Resonance',
+      description: '+15% frost ATK when equipping 2 or more frost weapons',
+      value: 0.15,
+      elementalTypes: ['Frost'],
+      canStack: false,
+      isActivePassively: true,
+      minStarRequirement: 0,
+      maxStarRequirement: 6,
+      elementalResonanceRequirements: ['Frost'],
+    },
+    {
+      id: 'Meryl Ironheart Discharge ATK Buff',
+      displayName: 'Meryl Ironheart discharge',
+      description: '+10% volt ATK for 20s on Meryl Ironheart discharge',
+      value: 0.1,
+      elementalTypes: ['Volt'],
+      canStack: false,
+      isActivePassively: false,
+      minStarRequirement: 0,
+      maxStarRequirement: 6,
+    }
+  ],
+  critRateBuffs: [],
+  critDamageBuffs: [],
+  normalAttacks: [],
+  dodgeAttacks: [],
+  skills: [],
+  discharges: [],
+  buffs: [],
+  resources: [],
+} as const satisfies Weapon;

src/definitions/weapons/weapon-definitions.ts

@@ -24,6 +24,7 @@ import { lingHan } from './definitions/ling-han';
 import { liuHuo } from './definitions/liu-huo';
 import { lyra } from './definitions/lyra';
 import { meryl } from './definitions/meryl';
+import { merylIronheart } from './definitions/meryl-ironheart';
 import { mimi } from './definitions/mimi';
 import { mingJing } from './definitions/ming-jing';
 import { nanYin } from './definitions/nan-yin';
@@ -76,6 +77,7 @@ export type WeaponName =
   | 'Liu Huo'
   | 'Lyra'
   | 'Meryl'
+  | 'Meryl Ironheart'
   | 'Ming Jing'
   | 'Nan Yin'
   | 'Nemesis'
@@ -128,6 +130,7 @@ export const weaponDefinitions: Data<WeaponName, Weapon> = {
     'Liu Huo',
     'Lyra',
     'Meryl',
+    'Meryl Ironheart',
     'Ming Jing',
     'Nan Yin',
     'Nemesis',
@@ -178,6 +181,7 @@ export const weaponDefinitions: Data<WeaponName, Weapon> = {
     'Liu Huo': liuHuo,
     Lyra: lyra,
     Meryl: meryl,
+    'Meryl Ironheart': merylIronheart,
     'Ming Jing': mingJing,
     'Nan Yin': nanYin,
     Nemesis: nemesis,