From 5f442bc1d42c58119f81edefe6c2b4fd310aa140 Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 08:46:26 -0700 Subject: [PATCH 01/10] Fix template --- libs/gi-formula/src/data/char/Albedo.ts | 2 +- libs/gi-formula/src/data/char/Alhaitham.ts | 2 +- libs/gi-formula/src/data/char/Aloy.ts | 5 +++-- libs/gi-formula/src/data/char/Amber.ts | 2 +- libs/gi-formula/src/data/char/AratakiItto.ts | 2 +- libs/gi-formula/src/data/char/Baizhu.ts | 2 +- libs/gi-formula/src/data/char/Barbara.ts | 2 +- libs/gi-formula/src/data/char/Beidou.ts | 2 +- libs/gi-formula/src/data/char/Bennett.ts | 2 +- libs/gi-formula/src/data/char/Charlotte.ts | 2 +- libs/gi-formula/src/data/char/Chongyun.ts | 2 +- libs/gi-formula/src/data/char/Collei.ts | 2 +- libs/gi-formula/src/data/char/Cyno.ts | 2 +- libs/gi-formula/src/data/char/Dehya.ts | 2 +- libs/gi-formula/src/data/char/Diluc.ts | 2 +- libs/gi-formula/src/data/char/Diona.ts | 2 +- libs/gi-formula/src/data/char/Dori.ts | 2 +- libs/gi-formula/src/data/char/Eula.ts | 2 +- libs/gi-formula/src/data/char/Faruzan.ts | 2 +- libs/gi-formula/src/data/char/Fischl.ts | 2 +- libs/gi-formula/src/data/char/Freminet.ts | 2 +- libs/gi-formula/src/data/char/Furina.ts | 2 +- libs/gi-formula/src/data/char/Ganyu.ts | 2 +- libs/gi-formula/src/data/char/Gorou.ts | 2 +- libs/gi-formula/src/data/char/HuTao.ts | 2 +- libs/gi-formula/src/data/char/Jean.ts | 2 +- libs/gi-formula/src/data/char/KaedeharaKazuha.ts | 2 +- libs/gi-formula/src/data/char/Kaeya.ts | 2 +- libs/gi-formula/src/data/char/KamisatoAyaka.ts | 2 +- libs/gi-formula/src/data/char/KamisatoAyato.ts | 2 +- libs/gi-formula/src/data/char/Kaveh.ts | 2 +- libs/gi-formula/src/data/char/Keqing.ts | 2 +- libs/gi-formula/src/data/char/Kirara.ts | 2 +- libs/gi-formula/src/data/char/Klee.ts | 2 +- libs/gi-formula/src/data/char/KujouSara.ts | 2 +- libs/gi-formula/src/data/char/KukiShinobu.ts | 2 +- libs/gi-formula/src/data/char/Layla.ts | 2 +- libs/gi-formula/src/data/char/Lisa.ts | 2 +- libs/gi-formula/src/data/char/Lynette.ts | 2 +- libs/gi-formula/src/data/char/Lyney.ts | 2 +- libs/gi-formula/src/data/char/Mika.ts | 2 +- libs/gi-formula/src/data/char/Mona.ts | 2 +- libs/gi-formula/src/data/char/Nahida.ts | 4 ++-- libs/gi-formula/src/data/char/Neuvillette.ts | 2 +- libs/gi-formula/src/data/char/Ningguang.ts | 2 +- libs/gi-formula/src/data/char/Noelle.ts | 2 +- libs/gi-formula/src/data/char/Qiqi.ts | 2 +- libs/gi-formula/src/data/char/RaidenShogun.ts | 2 +- libs/gi-formula/src/data/char/Razor.ts | 2 +- libs/gi-formula/src/data/char/Rosaria.ts | 2 +- libs/gi-formula/src/data/char/SangonomiyaKokomi.ts | 2 +- libs/gi-formula/src/data/char/Sayu.ts | 2 +- libs/gi-formula/src/data/char/Shenhe.ts | 2 +- libs/gi-formula/src/data/char/ShikanoinHeizou.ts | 2 +- libs/gi-formula/src/data/char/Somnia.ts | 2 +- libs/gi-formula/src/data/char/Sucrose.ts | 2 +- libs/gi-formula/src/data/char/Tartaglia.ts | 2 +- libs/gi-formula/src/data/char/Thoma.ts | 2 +- libs/gi-formula/src/data/char/Tighnari.ts | 2 +- libs/gi-formula/src/data/char/TravelerAnemo.ts | 2 +- libs/gi-formula/src/data/char/TravelerDendro.ts | 2 +- libs/gi-formula/src/data/char/TravelerElectro.ts | 2 +- libs/gi-formula/src/data/char/TravelerGeo.ts | 2 +- libs/gi-formula/src/data/char/TravelerHydro.ts | 2 +- libs/gi-formula/src/data/char/Venti.ts | 2 +- libs/gi-formula/src/data/char/Wanderer.ts | 2 +- libs/gi-formula/src/data/char/Wriothesley.ts | 2 +- libs/gi-formula/src/data/char/Xiangling.ts | 2 +- libs/gi-formula/src/data/char/Xiao.ts | 2 +- libs/gi-formula/src/data/char/Xingqiu.ts | 2 +- libs/gi-formula/src/data/char/Xinyan.ts | 2 +- libs/gi-formula/src/data/char/YaeMiko.ts | 2 +- libs/gi-formula/src/data/char/Yanfei.ts | 2 +- libs/gi-formula/src/data/char/Yaoyao.ts | 2 +- libs/gi-formula/src/data/char/Yelan.ts | 2 +- libs/gi-formula/src/data/char/Yoimiya.ts | 2 +- libs/gi-formula/src/data/char/YunJin.ts | 2 +- libs/gi-formula/src/data/char/Zhongli.ts | 2 +- .../src/generators/gen-sheet/char/__src__.ts.template | 2 +- 79 files changed, 82 insertions(+), 81 deletions(-) diff --git a/libs/gi-formula/src/data/char/Albedo.ts b/libs/gi-formula/src/data/char/Albedo.ts index 74720a1d7a..3910ffe462 100644 --- a/libs/gi-formula/src/data/char/Albedo.ts +++ b/libs/gi-formula/src/data/char/Albedo.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Alhaitham.ts b/libs/gi-formula/src/data/char/Alhaitham.ts index 9d28a5640e..aa37f80288 100644 --- a/libs/gi-formula/src/data/char/Alhaitham.ts +++ b/libs/gi-formula/src/data/char/Alhaitham.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Aloy.ts b/libs/gi-formula/src/data/char/Aloy.ts index e414d21843..9a6180d0fb 100644 --- a/libs/gi-formula/src/data/char/Aloy.ts +++ b/libs/gi-formula/src/data/char/Aloy.ts @@ -45,7 +45,7 @@ const { _someStack } = allStacks(info.key) const _count = team.common.count -export default register( +const t = register( info.key, entriesForChar(info, data_gen), // TODO: Double check these @@ -66,5 +66,6 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) +export default t diff --git a/libs/gi-formula/src/data/char/Amber.ts b/libs/gi-formula/src/data/char/Amber.ts index f6c3936d28..8a89842594 100644 --- a/libs/gi-formula/src/data/char/Amber.ts +++ b/libs/gi-formula/src/data/char/Amber.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/AratakiItto.ts b/libs/gi-formula/src/data/char/AratakiItto.ts index ddb834041f..ce0b499730 100644 --- a/libs/gi-formula/src/data/char/AratakiItto.ts +++ b/libs/gi-formula/src/data/char/AratakiItto.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Baizhu.ts b/libs/gi-formula/src/data/char/Baizhu.ts index 730f8e57b0..a26e1c6b23 100644 --- a/libs/gi-formula/src/data/char/Baizhu.ts +++ b/libs/gi-formula/src/data/char/Baizhu.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Barbara.ts b/libs/gi-formula/src/data/char/Barbara.ts index 5e435f063c..bb656683b2 100644 --- a/libs/gi-formula/src/data/char/Barbara.ts +++ b/libs/gi-formula/src/data/char/Barbara.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Beidou.ts b/libs/gi-formula/src/data/char/Beidou.ts index f2509bc7c6..cf0080b5c4 100644 --- a/libs/gi-formula/src/data/char/Beidou.ts +++ b/libs/gi-formula/src/data/char/Beidou.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Bennett.ts b/libs/gi-formula/src/data/char/Bennett.ts index b3140689e1..e796c34e1c 100644 --- a/libs/gi-formula/src/data/char/Bennett.ts +++ b/libs/gi-formula/src/data/char/Bennett.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Charlotte.ts b/libs/gi-formula/src/data/char/Charlotte.ts index 1cdb915741..3f08279c30 100644 --- a/libs/gi-formula/src/data/char/Charlotte.ts +++ b/libs/gi-formula/src/data/char/Charlotte.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Chongyun.ts b/libs/gi-formula/src/data/char/Chongyun.ts index e5f373710a..0b3cbcd023 100644 --- a/libs/gi-formula/src/data/char/Chongyun.ts +++ b/libs/gi-formula/src/data/char/Chongyun.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Collei.ts b/libs/gi-formula/src/data/char/Collei.ts index 158370e558..18a91255ff 100644 --- a/libs/gi-formula/src/data/char/Collei.ts +++ b/libs/gi-formula/src/data/char/Collei.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Cyno.ts b/libs/gi-formula/src/data/char/Cyno.ts index 4d87a07d42..0eca0a809e 100644 --- a/libs/gi-formula/src/data/char/Cyno.ts +++ b/libs/gi-formula/src/data/char/Cyno.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Dehya.ts b/libs/gi-formula/src/data/char/Dehya.ts index 33c227db2f..4bdf6e2a80 100644 --- a/libs/gi-formula/src/data/char/Dehya.ts +++ b/libs/gi-formula/src/data/char/Dehya.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Diluc.ts b/libs/gi-formula/src/data/char/Diluc.ts index eebd6b6dbe..d91ce2fbdb 100644 --- a/libs/gi-formula/src/data/char/Diluc.ts +++ b/libs/gi-formula/src/data/char/Diluc.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Diona.ts b/libs/gi-formula/src/data/char/Diona.ts index eb4a694b90..35ca4b69f0 100644 --- a/libs/gi-formula/src/data/char/Diona.ts +++ b/libs/gi-formula/src/data/char/Diona.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Dori.ts b/libs/gi-formula/src/data/char/Dori.ts index bbe7e65e9d..87045c0efe 100644 --- a/libs/gi-formula/src/data/char/Dori.ts +++ b/libs/gi-formula/src/data/char/Dori.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Eula.ts b/libs/gi-formula/src/data/char/Eula.ts index 781705ee93..7e74ae77c5 100644 --- a/libs/gi-formula/src/data/char/Eula.ts +++ b/libs/gi-formula/src/data/char/Eula.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Faruzan.ts b/libs/gi-formula/src/data/char/Faruzan.ts index 912671942e..a1e6244a88 100644 --- a/libs/gi-formula/src/data/char/Faruzan.ts +++ b/libs/gi-formula/src/data/char/Faruzan.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Fischl.ts b/libs/gi-formula/src/data/char/Fischl.ts index 69fa8135ff..74aa2c3ee2 100644 --- a/libs/gi-formula/src/data/char/Fischl.ts +++ b/libs/gi-formula/src/data/char/Fischl.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Freminet.ts b/libs/gi-formula/src/data/char/Freminet.ts index 55ac983997..60b75d8ce1 100644 --- a/libs/gi-formula/src/data/char/Freminet.ts +++ b/libs/gi-formula/src/data/char/Freminet.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Furina.ts b/libs/gi-formula/src/data/char/Furina.ts index 8ddc0a2a9f..8c253cb763 100644 --- a/libs/gi-formula/src/data/char/Furina.ts +++ b/libs/gi-formula/src/data/char/Furina.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Ganyu.ts b/libs/gi-formula/src/data/char/Ganyu.ts index 4794612b8a..643d0eaa09 100644 --- a/libs/gi-formula/src/data/char/Ganyu.ts +++ b/libs/gi-formula/src/data/char/Ganyu.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Gorou.ts b/libs/gi-formula/src/data/char/Gorou.ts index 9ff743b216..c87356b8c6 100644 --- a/libs/gi-formula/src/data/char/Gorou.ts +++ b/libs/gi-formula/src/data/char/Gorou.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/HuTao.ts b/libs/gi-formula/src/data/char/HuTao.ts index a6bdd436d0..6ea869aa62 100644 --- a/libs/gi-formula/src/data/char/HuTao.ts +++ b/libs/gi-formula/src/data/char/HuTao.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Jean.ts b/libs/gi-formula/src/data/char/Jean.ts index dada8ce979..a2bb67d58a 100644 --- a/libs/gi-formula/src/data/char/Jean.ts +++ b/libs/gi-formula/src/data/char/Jean.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/KaedeharaKazuha.ts b/libs/gi-formula/src/data/char/KaedeharaKazuha.ts index 66d36c3afa..3cff9fe510 100644 --- a/libs/gi-formula/src/data/char/KaedeharaKazuha.ts +++ b/libs/gi-formula/src/data/char/KaedeharaKazuha.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Kaeya.ts b/libs/gi-formula/src/data/char/Kaeya.ts index bed7878019..dcd19c7fc9 100644 --- a/libs/gi-formula/src/data/char/Kaeya.ts +++ b/libs/gi-formula/src/data/char/Kaeya.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/KamisatoAyaka.ts b/libs/gi-formula/src/data/char/KamisatoAyaka.ts index c2497939f6..abd68bc4bb 100644 --- a/libs/gi-formula/src/data/char/KamisatoAyaka.ts +++ b/libs/gi-formula/src/data/char/KamisatoAyaka.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/KamisatoAyato.ts b/libs/gi-formula/src/data/char/KamisatoAyato.ts index 4bcab26f76..cdb34adc5b 100644 --- a/libs/gi-formula/src/data/char/KamisatoAyato.ts +++ b/libs/gi-formula/src/data/char/KamisatoAyato.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Kaveh.ts b/libs/gi-formula/src/data/char/Kaveh.ts index 74ca30ddba..132e7a1a6d 100644 --- a/libs/gi-formula/src/data/char/Kaveh.ts +++ b/libs/gi-formula/src/data/char/Kaveh.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Keqing.ts b/libs/gi-formula/src/data/char/Keqing.ts index a97adb4925..772faf1cfa 100644 --- a/libs/gi-formula/src/data/char/Keqing.ts +++ b/libs/gi-formula/src/data/char/Keqing.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Kirara.ts b/libs/gi-formula/src/data/char/Kirara.ts index bb2ebb331a..546ecddac7 100644 --- a/libs/gi-formula/src/data/char/Kirara.ts +++ b/libs/gi-formula/src/data/char/Kirara.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Klee.ts b/libs/gi-formula/src/data/char/Klee.ts index ee675d56cd..83879d3f03 100644 --- a/libs/gi-formula/src/data/char/Klee.ts +++ b/libs/gi-formula/src/data/char/Klee.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/KujouSara.ts b/libs/gi-formula/src/data/char/KujouSara.ts index 5773d3e855..5ddfa08758 100644 --- a/libs/gi-formula/src/data/char/KujouSara.ts +++ b/libs/gi-formula/src/data/char/KujouSara.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/KukiShinobu.ts b/libs/gi-formula/src/data/char/KukiShinobu.ts index e43113a10b..05b65f3cf5 100644 --- a/libs/gi-formula/src/data/char/KukiShinobu.ts +++ b/libs/gi-formula/src/data/char/KukiShinobu.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Layla.ts b/libs/gi-formula/src/data/char/Layla.ts index b41bb2a110..b6c83eeae4 100644 --- a/libs/gi-formula/src/data/char/Layla.ts +++ b/libs/gi-formula/src/data/char/Layla.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Lisa.ts b/libs/gi-formula/src/data/char/Lisa.ts index d488911883..72098dd58b 100644 --- a/libs/gi-formula/src/data/char/Lisa.ts +++ b/libs/gi-formula/src/data/char/Lisa.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Lynette.ts b/libs/gi-formula/src/data/char/Lynette.ts index 584b0813e4..35043e9bd8 100644 --- a/libs/gi-formula/src/data/char/Lynette.ts +++ b/libs/gi-formula/src/data/char/Lynette.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Lyney.ts b/libs/gi-formula/src/data/char/Lyney.ts index 5d9b56a853..342b854444 100644 --- a/libs/gi-formula/src/data/char/Lyney.ts +++ b/libs/gi-formula/src/data/char/Lyney.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Mika.ts b/libs/gi-formula/src/data/char/Mika.ts index 23279691cd..e208e1f4e4 100644 --- a/libs/gi-formula/src/data/char/Mika.ts +++ b/libs/gi-formula/src/data/char/Mika.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Mona.ts b/libs/gi-formula/src/data/char/Mona.ts index fe2578fdee..c347dd3f53 100644 --- a/libs/gi-formula/src/data/char/Mona.ts +++ b/libs/gi-formula/src/data/char/Mona.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Nahida.ts b/libs/gi-formula/src/data/char/Nahida.ts index 8c4dcdfd67..c44448e993 100644 --- a/libs/gi-formula/src/data/char/Nahida.ts +++ b/libs/gi-formula/src/data/char/Nahida.ts @@ -192,8 +192,7 @@ const a4Karma_critRate_ = percent( prod(percent(dm.passive2.eleMas_critRate_), passive2Elemas) ) ) - -export default register( +const t = register( info.key, entriesForChar(info, data_gen), selfBuff.char.skill.add(cmpGE(constellation, 3, 3)), @@ -254,3 +253,4 @@ export default register( selfBuff.premod.critRate_.add(a4Karma_critRate_) ) ) +export default t diff --git a/libs/gi-formula/src/data/char/Neuvillette.ts b/libs/gi-formula/src/data/char/Neuvillette.ts index 401a86e6d6..36827d9a21 100644 --- a/libs/gi-formula/src/data/char/Neuvillette.ts +++ b/libs/gi-formula/src/data/char/Neuvillette.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Ningguang.ts b/libs/gi-formula/src/data/char/Ningguang.ts index 3edb83f33d..cccc55a49d 100644 --- a/libs/gi-formula/src/data/char/Ningguang.ts +++ b/libs/gi-formula/src/data/char/Ningguang.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Noelle.ts b/libs/gi-formula/src/data/char/Noelle.ts index bbfaa8dc65..50f5a1c00f 100644 --- a/libs/gi-formula/src/data/char/Noelle.ts +++ b/libs/gi-formula/src/data/char/Noelle.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Qiqi.ts b/libs/gi-formula/src/data/char/Qiqi.ts index 0e7d96ac8d..5e100b632b 100644 --- a/libs/gi-formula/src/data/char/Qiqi.ts +++ b/libs/gi-formula/src/data/char/Qiqi.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/RaidenShogun.ts b/libs/gi-formula/src/data/char/RaidenShogun.ts index 29234e3261..2e257c01eb 100644 --- a/libs/gi-formula/src/data/char/RaidenShogun.ts +++ b/libs/gi-formula/src/data/char/RaidenShogun.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Razor.ts b/libs/gi-formula/src/data/char/Razor.ts index 5258f8bd7a..53eab8dbd1 100644 --- a/libs/gi-formula/src/data/char/Razor.ts +++ b/libs/gi-formula/src/data/char/Razor.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Rosaria.ts b/libs/gi-formula/src/data/char/Rosaria.ts index 3f757a358b..59f7bac448 100644 --- a/libs/gi-formula/src/data/char/Rosaria.ts +++ b/libs/gi-formula/src/data/char/Rosaria.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/SangonomiyaKokomi.ts b/libs/gi-formula/src/data/char/SangonomiyaKokomi.ts index 7a440fed70..bb7d941a83 100644 --- a/libs/gi-formula/src/data/char/SangonomiyaKokomi.ts +++ b/libs/gi-formula/src/data/char/SangonomiyaKokomi.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Sayu.ts b/libs/gi-formula/src/data/char/Sayu.ts index c6e01a6c26..711644eed9 100644 --- a/libs/gi-formula/src/data/char/Sayu.ts +++ b/libs/gi-formula/src/data/char/Sayu.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Shenhe.ts b/libs/gi-formula/src/data/char/Shenhe.ts index 09374b51e8..25e886b25a 100644 --- a/libs/gi-formula/src/data/char/Shenhe.ts +++ b/libs/gi-formula/src/data/char/Shenhe.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/ShikanoinHeizou.ts b/libs/gi-formula/src/data/char/ShikanoinHeizou.ts index 05d092fbd4..6549888f32 100644 --- a/libs/gi-formula/src/data/char/ShikanoinHeizou.ts +++ b/libs/gi-formula/src/data/char/ShikanoinHeizou.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Somnia.ts b/libs/gi-formula/src/data/char/Somnia.ts index 7b811c5e40..2ed75ae45a 100644 --- a/libs/gi-formula/src/data/char/Somnia.ts +++ b/libs/gi-formula/src/data/char/Somnia.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Sucrose.ts b/libs/gi-formula/src/data/char/Sucrose.ts index 9ce32689d9..4084b5c6e3 100644 --- a/libs/gi-formula/src/data/char/Sucrose.ts +++ b/libs/gi-formula/src/data/char/Sucrose.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Tartaglia.ts b/libs/gi-formula/src/data/char/Tartaglia.ts index 55d44a9996..03201c5fc6 100644 --- a/libs/gi-formula/src/data/char/Tartaglia.ts +++ b/libs/gi-formula/src/data/char/Tartaglia.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Thoma.ts b/libs/gi-formula/src/data/char/Thoma.ts index 0f5a2e8c51..7cc0656009 100644 --- a/libs/gi-formula/src/data/char/Thoma.ts +++ b/libs/gi-formula/src/data/char/Thoma.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Tighnari.ts b/libs/gi-formula/src/data/char/Tighnari.ts index f426e388b0..18a5890c0e 100644 --- a/libs/gi-formula/src/data/char/Tighnari.ts +++ b/libs/gi-formula/src/data/char/Tighnari.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/TravelerAnemo.ts b/libs/gi-formula/src/data/char/TravelerAnemo.ts index 4839b406d0..ac143c4d18 100644 --- a/libs/gi-formula/src/data/char/TravelerAnemo.ts +++ b/libs/gi-formula/src/data/char/TravelerAnemo.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/TravelerDendro.ts b/libs/gi-formula/src/data/char/TravelerDendro.ts index 0367132e1b..259f428bcc 100644 --- a/libs/gi-formula/src/data/char/TravelerDendro.ts +++ b/libs/gi-formula/src/data/char/TravelerDendro.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/TravelerElectro.ts b/libs/gi-formula/src/data/char/TravelerElectro.ts index 38e82ec83b..c40cca6957 100644 --- a/libs/gi-formula/src/data/char/TravelerElectro.ts +++ b/libs/gi-formula/src/data/char/TravelerElectro.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/TravelerGeo.ts b/libs/gi-formula/src/data/char/TravelerGeo.ts index dfcb70b0a9..729959d31f 100644 --- a/libs/gi-formula/src/data/char/TravelerGeo.ts +++ b/libs/gi-formula/src/data/char/TravelerGeo.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/TravelerHydro.ts b/libs/gi-formula/src/data/char/TravelerHydro.ts index f497d453f6..920dd01308 100644 --- a/libs/gi-formula/src/data/char/TravelerHydro.ts +++ b/libs/gi-formula/src/data/char/TravelerHydro.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Venti.ts b/libs/gi-formula/src/data/char/Venti.ts index 9589c45f7f..e7dd7356d3 100644 --- a/libs/gi-formula/src/data/char/Venti.ts +++ b/libs/gi-formula/src/data/char/Venti.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Wanderer.ts b/libs/gi-formula/src/data/char/Wanderer.ts index 2fca3b646d..de872c7222 100644 --- a/libs/gi-formula/src/data/char/Wanderer.ts +++ b/libs/gi-formula/src/data/char/Wanderer.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Wriothesley.ts b/libs/gi-formula/src/data/char/Wriothesley.ts index 5ce1eb7e7a..fdda4432e7 100644 --- a/libs/gi-formula/src/data/char/Wriothesley.ts +++ b/libs/gi-formula/src/data/char/Wriothesley.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Xiangling.ts b/libs/gi-formula/src/data/char/Xiangling.ts index 7c655114be..71d13b8a35 100644 --- a/libs/gi-formula/src/data/char/Xiangling.ts +++ b/libs/gi-formula/src/data/char/Xiangling.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Xiao.ts b/libs/gi-formula/src/data/char/Xiao.ts index e4da2aae88..3b0dbb6706 100644 --- a/libs/gi-formula/src/data/char/Xiao.ts +++ b/libs/gi-formula/src/data/char/Xiao.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Xingqiu.ts b/libs/gi-formula/src/data/char/Xingqiu.ts index 39dbf91fac..77ff7ba713 100644 --- a/libs/gi-formula/src/data/char/Xingqiu.ts +++ b/libs/gi-formula/src/data/char/Xingqiu.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Xinyan.ts b/libs/gi-formula/src/data/char/Xinyan.ts index e14c5351ea..bc96e6675b 100644 --- a/libs/gi-formula/src/data/char/Xinyan.ts +++ b/libs/gi-formula/src/data/char/Xinyan.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/YaeMiko.ts b/libs/gi-formula/src/data/char/YaeMiko.ts index 3d474b2f72..e7e772013d 100644 --- a/libs/gi-formula/src/data/char/YaeMiko.ts +++ b/libs/gi-formula/src/data/char/YaeMiko.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Yanfei.ts b/libs/gi-formula/src/data/char/Yanfei.ts index aa0f40572d..19ed344c07 100644 --- a/libs/gi-formula/src/data/char/Yanfei.ts +++ b/libs/gi-formula/src/data/char/Yanfei.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Yaoyao.ts b/libs/gi-formula/src/data/char/Yaoyao.ts index ed0591926b..c517106306 100644 --- a/libs/gi-formula/src/data/char/Yaoyao.ts +++ b/libs/gi-formula/src/data/char/Yaoyao.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Yelan.ts b/libs/gi-formula/src/data/char/Yelan.ts index b23fc97730..eba1f80861 100644 --- a/libs/gi-formula/src/data/char/Yelan.ts +++ b/libs/gi-formula/src/data/char/Yelan.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Yoimiya.ts b/libs/gi-formula/src/data/char/Yoimiya.ts index d54393b4bf..927962c903 100644 --- a/libs/gi-formula/src/data/char/Yoimiya.ts +++ b/libs/gi-formula/src/data/char/Yoimiya.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/YunJin.ts b/libs/gi-formula/src/data/char/YunJin.ts index 3f593829d5..4d1ea3c37a 100644 --- a/libs/gi-formula/src/data/char/YunJin.ts +++ b/libs/gi-formula/src/data/char/YunJin.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/data/char/Zhongli.ts b/libs/gi-formula/src/data/char/Zhongli.ts index 1071a11bc2..81fc255d56 100644 --- a/libs/gi-formula/src/data/char/Zhongli.ts +++ b/libs/gi-formula/src/data/char/Zhongli.ts @@ -66,5 +66,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) diff --git a/libs/gi-formula/src/generators/gen-sheet/char/__src__.ts.template b/libs/gi-formula/src/generators/gen-sheet/char/__src__.ts.template index ac68b68c24..f554d36ae6 100644 --- a/libs/gi-formula/src/generators/gen-sheet/char/__src__.ts.template +++ b/libs/gi-formula/src/generators/gen-sheet/char/__src__.ts.template @@ -70,5 +70,5 @@ export default register( // Formulas // TODO: Add dmg/heal/shield formulas using `dmg`, `customDmg`, `shield`, `customShield`, `fixedShield`, or `customHeal` - dmg('normal1', info, 'atk', dm.normal.dmg1, 'normal') + dmg('normal1', info, 'atk', _dm.normal.dmg1, 'normal') ) From d4abce2221a39e4ffd83ecc43e0e99cd978a4836 Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:20:35 -0700 Subject: [PATCH 02/10] Fix alias imports --- libs/gi-formula/tsconfig.lib.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/gi-formula/tsconfig.lib.json b/libs/gi-formula/tsconfig.lib.json index 2ad74828c4..189edd0267 100644 --- a/libs/gi-formula/tsconfig.lib.json +++ b/libs/gi-formula/tsconfig.lib.json @@ -4,6 +4,10 @@ "outDir": "../../dist/out-tsc", "types": ["node"] }, - "include": ["src/index.ts"], + "include": [ + "src/index.ts", + "src/generators/**/*.ts", + "src/executors/**/*.ts" + ], "exclude": ["**/*.spec.ts", "vitest.config.ts", "src/example/test.json"] } From 5018b93dd6efe361bcf5682c14b8f6a9da475991 Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:47:51 -0700 Subject: [PATCH 03/10] Bandaid traveler --- libs/gi-formula/src/data/char/TravelerAnemo.ts | 5 +++-- libs/gi-formula/src/data/char/TravelerDendro.ts | 5 +++-- libs/gi-formula/src/data/char/TravelerElectro.ts | 5 +++-- libs/gi-formula/src/data/char/TravelerGeo.ts | 5 +++-- libs/gi-formula/src/data/char/TravelerHydro.ts | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libs/gi-formula/src/data/char/TravelerAnemo.ts b/libs/gi-formula/src/data/char/TravelerAnemo.ts index ac143c4d18..cde426f577 100644 --- a/libs/gi-formula/src/data/char/TravelerAnemo.ts +++ b/libs/gi-formula/src/data/char/TravelerAnemo.ts @@ -17,8 +17,9 @@ import { import { dataGenToCharInfo, dmg, entriesForChar } from './util' const key: CharacterKey = 'TravelerAnemo' -const data_gen = allStats.char.data[key] -const skillParam_gen = allStats.char.skillParam[key] +const data_gen = allStats.char.data['Traveler'] +// TODO: Fix gender 🏳️‍⚧️ +const skillParam_gen = allStats.char.skillParam['TravelerAnemoF'] // TODO: Fill data-mine values here const _dm = { diff --git a/libs/gi-formula/src/data/char/TravelerDendro.ts b/libs/gi-formula/src/data/char/TravelerDendro.ts index 259f428bcc..79db0008d0 100644 --- a/libs/gi-formula/src/data/char/TravelerDendro.ts +++ b/libs/gi-formula/src/data/char/TravelerDendro.ts @@ -17,8 +17,9 @@ import { import { dataGenToCharInfo, dmg, entriesForChar } from './util' const key: CharacterKey = 'TravelerDendro' -const data_gen = allStats.char.data[key] -const skillParam_gen = allStats.char.skillParam[key] +const data_gen = allStats.char.data['Traveler'] +// TODO: Fix gender 🏳️‍⚧️ +const skillParam_gen = allStats.char.skillParam['TravelerDendroF'] // TODO: Fill data-mine values here const _dm = { diff --git a/libs/gi-formula/src/data/char/TravelerElectro.ts b/libs/gi-formula/src/data/char/TravelerElectro.ts index c40cca6957..4b5c30c1c6 100644 --- a/libs/gi-formula/src/data/char/TravelerElectro.ts +++ b/libs/gi-formula/src/data/char/TravelerElectro.ts @@ -17,8 +17,9 @@ import { import { dataGenToCharInfo, dmg, entriesForChar } from './util' const key: CharacterKey = 'TravelerElectro' -const data_gen = allStats.char.data[key] -const skillParam_gen = allStats.char.skillParam[key] +const data_gen = allStats.char.data['Traveler'] +// TODO: Fix gender 🏳️‍⚧️ +const skillParam_gen = allStats.char.skillParam['TravelerElectroF'] // TODO: Fill data-mine values here const _dm = { diff --git a/libs/gi-formula/src/data/char/TravelerGeo.ts b/libs/gi-formula/src/data/char/TravelerGeo.ts index 729959d31f..61e5e492c2 100644 --- a/libs/gi-formula/src/data/char/TravelerGeo.ts +++ b/libs/gi-formula/src/data/char/TravelerGeo.ts @@ -17,8 +17,9 @@ import { import { dataGenToCharInfo, dmg, entriesForChar } from './util' const key: CharacterKey = 'TravelerGeo' -const data_gen = allStats.char.data[key] -const skillParam_gen = allStats.char.skillParam[key] +const data_gen = allStats.char.data['Traveler'] +// TODO: Fix gender 🏳️‍⚧️ +const skillParam_gen = allStats.char.skillParam['TravelerGeoF'] // TODO: Fill data-mine values here const _dm = { diff --git a/libs/gi-formula/src/data/char/TravelerHydro.ts b/libs/gi-formula/src/data/char/TravelerHydro.ts index 920dd01308..a57ce2388a 100644 --- a/libs/gi-formula/src/data/char/TravelerHydro.ts +++ b/libs/gi-formula/src/data/char/TravelerHydro.ts @@ -17,8 +17,9 @@ import { import { dataGenToCharInfo, dmg, entriesForChar } from './util' const key: CharacterKey = 'TravelerHydro' -const data_gen = allStats.char.data[key] -const skillParam_gen = allStats.char.skillParam[key] +const data_gen = allStats.char.data['Traveler'] +// TODO: Fix gender 🏳️‍⚧️ +const skillParam_gen = allStats.char.skillParam['TravelerHydroF'] // TODO: Fill data-mine values here const _dm = { From 4b99beb913036eb3ed8434a4bcae0eeed0b4f317 Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:48:12 -0700 Subject: [PATCH 04/10] Generate index files as well --- libs/gi-formula/src/data/artifact/index.ts | 96 +- libs/gi-formula/src/data/char/index.ts | 160 +- libs/gi-formula/src/data/weapon/index.ts | 382 +- .../src/generators/gen-sheet/all-generator.ts | 4 + .../src/generators/gen-sheet/genIndex.ts | 85 + .../generators/gen-sheet/single-generator.ts | 2 + libs/gi-formula/src/meta.ts | 7835 ++++++++++++++++- 7 files changed, 8338 insertions(+), 226 deletions(-) create mode 100644 libs/gi-formula/src/generators/gen-sheet/genIndex.ts diff --git a/libs/gi-formula/src/data/artifact/index.ts b/libs/gi-formula/src/data/artifact/index.ts index 34e107e699..23dfc8297a 100644 --- a/libs/gi-formula/src/data/artifact/index.ts +++ b/libs/gi-formula/src/data/artifact/index.ts @@ -1,5 +1,99 @@ import type { TagMapNodeEntries } from '../util' +import Adventurer from './Adventurer' +import ArchaicPetra from './ArchaicPetra' +import Berserker from './Berserker' +import BlizzardStrayer from './BlizzardStrayer' +import BloodstainedChivalry from './BloodstainedChivalry' +import BraveHeart from './BraveHeart' +import CrimsonWitchOfFlames from './CrimsonWitchOfFlames' +import DeepwoodMemories from './DeepwoodMemories' +import DefendersWill from './DefendersWill' +import DesertPavilionChronicle from './DesertPavilionChronicle' +import EchoesOfAnOffering from './EchoesOfAnOffering' +import EmblemOfSeveredFate from './EmblemOfSeveredFate' +import FlowerOfParadiseLost from './FlowerOfParadiseLost' +import Gambler from './Gambler' +import GildedDreams from './GildedDreams' +import GladiatorsFinale from './GladiatorsFinale' +import GoldenTroupe from './GoldenTroupe' +import HeartOfDepth from './HeartOfDepth' +import HuskOfOpulentDreams from './HuskOfOpulentDreams' +import Instructor from './Instructor' +import Lavawalker from './Lavawalker' +import LuckyDog from './LuckyDog' +import MaidenBeloved from './MaidenBeloved' +import MarechausseeHunter from './MarechausseeHunter' +import MartialArtist from './MartialArtist' import NoblesseOblige from './NoblesseOblige' +import NymphsDream from './NymphsDream' +import OceanHuedClam from './OceanHuedClam' +import PaleFlame from './PaleFlame' +import PrayersForDestiny from './PrayersForDestiny' +import PrayersForIllumination from './PrayersForIllumination' +import PrayersForWisdom from './PrayersForWisdom' +import PrayersToSpringtime from './PrayersToSpringtime' +import ResolutionOfSojourner from './ResolutionOfSojourner' +import RetracingBolide from './RetracingBolide' +import Scholar from './Scholar' +import ShimenawasReminiscence from './ShimenawasReminiscence' +import TenacityOfTheMillelith from './TenacityOfTheMillelith' +import TheExile from './TheExile' +import ThunderingFury from './ThunderingFury' +import Thundersoother from './Thundersoother' +import TinyMiracle from './TinyMiracle' +import TravelingDoctor from './TravelingDoctor' +import VermillionHereafter from './VermillionHereafter' +import ViridescentVenerer from './ViridescentVenerer' +import VourukashasGlow from './VourukashasGlow' +import WanderersTroupe from './WanderersTroupe' -const data: TagMapNodeEntries[] = [NoblesseOblige] +const data: TagMapNodeEntries[] = [ + Adventurer, + ArchaicPetra, + Berserker, + BlizzardStrayer, + BloodstainedChivalry, + BraveHeart, + CrimsonWitchOfFlames, + DeepwoodMemories, + DefendersWill, + DesertPavilionChronicle, + EchoesOfAnOffering, + EmblemOfSeveredFate, + FlowerOfParadiseLost, + Gambler, + GildedDreams, + GladiatorsFinale, + GoldenTroupe, + HeartOfDepth, + HuskOfOpulentDreams, + Instructor, + Lavawalker, + LuckyDog, + MaidenBeloved, + MarechausseeHunter, + MartialArtist, + NoblesseOblige, + NymphsDream, + OceanHuedClam, + PaleFlame, + PrayersForDestiny, + PrayersForIllumination, + PrayersForWisdom, + PrayersToSpringtime, + ResolutionOfSojourner, + RetracingBolide, + Scholar, + ShimenawasReminiscence, + TenacityOfTheMillelith, + TheExile, + ThunderingFury, + Thundersoother, + TinyMiracle, + TravelingDoctor, + VermillionHereafter, + ViridescentVenerer, + VourukashasGlow, + WanderersTroupe, +] export default data.flat() diff --git a/libs/gi-formula/src/data/char/index.ts b/libs/gi-formula/src/data/char/index.ts index 7c3c88930a..77a05900b9 100644 --- a/libs/gi-formula/src/data/char/index.ts +++ b/libs/gi-formula/src/data/char/index.ts @@ -1,7 +1,165 @@ import type { TagMapNodeEntries } from '../util' +import Albedo from './Albedo' +import Alhaitham from './Alhaitham' +import Aloy from './Aloy' +import Amber from './Amber' +import AratakiItto from './AratakiItto' +import Baizhu from './Baizhu' +import Barbara from './Barbara' +import Beidou from './Beidou' +import Bennett from './Bennett' import Candace from './Candace' +import Charlotte from './Charlotte' +import Chongyun from './Chongyun' +import Collei from './Collei' +import Cyno from './Cyno' +import Dehya from './Dehya' +import Diluc from './Diluc' +import Diona from './Diona' +import Dori from './Dori' +import Eula from './Eula' +import Faruzan from './Faruzan' +import Fischl from './Fischl' +import Freminet from './Freminet' +import Furina from './Furina' +import Ganyu from './Ganyu' +import Gorou from './Gorou' +import HuTao from './HuTao' +import Jean from './Jean' +import KaedeharaKazuha from './KaedeharaKazuha' +import Kaeya from './Kaeya' +import KamisatoAyaka from './KamisatoAyaka' +import KamisatoAyato from './KamisatoAyato' +import Kaveh from './Kaveh' +import Keqing from './Keqing' +import Kirara from './Kirara' +import Klee from './Klee' +import KujouSara from './KujouSara' +import KukiShinobu from './KukiShinobu' +import Layla from './Layla' +import Lisa from './Lisa' +import Lynette from './Lynette' +import Lyney from './Lyney' +import Mika from './Mika' +import Mona from './Mona' import Nahida from './Nahida' +import Neuvillette from './Neuvillette' import Nilou from './Nilou' +import Ningguang from './Ningguang' +import Noelle from './Noelle' +import Qiqi from './Qiqi' +import RaidenShogun from './RaidenShogun' +import Razor from './Razor' +import Rosaria from './Rosaria' +import SangonomiyaKokomi from './SangonomiyaKokomi' +import Sayu from './Sayu' +import Shenhe from './Shenhe' +import ShikanoinHeizou from './ShikanoinHeizou' +import Somnia from './Somnia' +import Sucrose from './Sucrose' +import Tartaglia from './Tartaglia' +import Thoma from './Thoma' +import Tighnari from './Tighnari' +import Venti from './Venti' +import Wanderer from './Wanderer' +import Wriothesley from './Wriothesley' +import Xiangling from './Xiangling' +import Xiao from './Xiao' +import Xingqiu from './Xingqiu' +import Xinyan from './Xinyan' +import YaeMiko from './YaeMiko' +import Yanfei from './Yanfei' +import Yaoyao from './Yaoyao' +import Yelan from './Yelan' +import Yoimiya from './Yoimiya' +import YunJin from './YunJin' +import Zhongli from './Zhongli' +import TravelerAnemo from './TravelerAnemo' +import TravelerGeo from './TravelerGeo' +import TravelerElectro from './TravelerElectro' +import TravelerDendro from './TravelerDendro' +import TravelerHydro from './TravelerHydro' -const data: TagMapNodeEntries[] = [Candace, Nahida, Nilou] +const data: TagMapNodeEntries[] = [ + Albedo, + Alhaitham, + Aloy, + Amber, + AratakiItto, + Baizhu, + Barbara, + Beidou, + Bennett, + Candace, + Charlotte, + Chongyun, + Collei, + Cyno, + Dehya, + Diluc, + Diona, + Dori, + Eula, + Faruzan, + Fischl, + Freminet, + Furina, + Ganyu, + Gorou, + HuTao, + Jean, + KaedeharaKazuha, + Kaeya, + KamisatoAyaka, + KamisatoAyato, + Kaveh, + Keqing, + Kirara, + Klee, + KujouSara, + KukiShinobu, + Layla, + Lisa, + Lynette, + Lyney, + Mika, + Mona, + Nahida, + Neuvillette, + Nilou, + Ningguang, + Noelle, + Qiqi, + RaidenShogun, + Razor, + Rosaria, + SangonomiyaKokomi, + Sayu, + Shenhe, + ShikanoinHeizou, + Somnia, + Sucrose, + Tartaglia, + Thoma, + Tighnari, + Venti, + Wanderer, + Wriothesley, + Xiangling, + Xiao, + Xingqiu, + Xinyan, + YaeMiko, + Yanfei, + Yaoyao, + Yelan, + Yoimiya, + YunJin, + Zhongli, + TravelerAnemo, + TravelerGeo, + TravelerElectro, + TravelerDendro, + TravelerHydro, +] export default data.flat() diff --git a/libs/gi-formula/src/data/weapon/index.ts b/libs/gi-formula/src/data/weapon/index.ts index 5d05a1cf88..58811b7a76 100644 --- a/libs/gi-formula/src/data/weapon/index.ts +++ b/libs/gi-formula/src/data/weapon/index.ts @@ -1,46 +1,360 @@ -import { allWeaponKeys, type WeaponKey } from '@genshin-optimizer/consts' -import { allStats } from '@genshin-optimizer/gi-stats' -import { prod, subscript } from '@genshin-optimizer/pando' import type { TagMapNodeEntries } from '../util' -import { - addStatCurve, - allStatics, - register, - registerStatListing, - self, -} from '../util' -import CalamityQueller from './CalamityQueller' +import AmenomaKageuchi from './AmenomaKageuchi' +import AquilaFavonia from './AquilaFavonia' +import BlackcliffLongsword from './BlackcliffLongsword' +import CinnabarSpindle from './CinnabarSpindle' +import CoolSteel from './CoolSteel' +import DarkIronSword from './DarkIronSword' +import DullBlade from './DullBlade' +import FavoniusSword from './FavoniusSword' +import FesteringDesire from './FesteringDesire' +import FilletBlade from './FilletBlade' +import FinaleOfTheDeep from './FinaleOfTheDeep' +import FleuveCendreFerryman from './FleuveCendreFerryman' +import FreedomSworn from './FreedomSworn' +import HaranGeppakuFutsu from './HaranGeppakuFutsu' +import HarbingerOfDawn from './HarbingerOfDawn' +import IronSting from './IronSting' +import KagotsurubeIsshin from './KagotsurubeIsshin' import KeyOfKhajNisut from './KeyOfKhajNisut' +import LightOfFoliarIncision from './LightOfFoliarIncision' +import LionsRoar from './LionsRoar' +import MistsplitterReforged from './MistsplitterReforged' +import PrimordialJadeCutter from './PrimordialJadeCutter' +import PrototypeRancour from './PrototypeRancour' +import RoyalLongsword from './RoyalLongsword' +import SacrificialSword from './SacrificialSword' +import SapwoodBlade from './SapwoodBlade' +import SilverSword from './SilverSword' +import SkyriderSword from './SkyriderSword' +import SkywardBlade from './SkywardBlade' +import SplendorOfTranquilWaters from './SplendorOfTranquilWaters' +import SummitShaper from './SummitShaper' +import SwordOfDescension from './SwordOfDescension' +import SwordOfNarzissenkreuz from './SwordOfNarzissenkreuz' +import TheAlleyFlash from './TheAlleyFlash' +import TheBlackSword from './TheBlackSword' +import TheDockhandsAssistant from './TheDockhandsAssistant' +import TheFlute from './TheFlute' +import ToukabouShigure from './ToukabouShigure' +import TravelersHandySword from './TravelersHandySword' +import WolfFang from './WolfFang' +import XiphosMoonlight from './XiphosMoonlight' +import Akuoumaru from './Akuoumaru' +import BeaconOfTheReedSea from './BeaconOfTheReedSea' +import BlackcliffSlasher from './BlackcliffSlasher' +import BloodtaintedGreatsword from './BloodtaintedGreatsword' +import DebateClub from './DebateClub' +import FavoniusGreatsword from './FavoniusGreatsword' +import FerrousShadow from './FerrousShadow' +import ForestRegalia from './ForestRegalia' +import KatsuragikiriNagamasa from './KatsuragikiriNagamasa' +import LithicBlade from './LithicBlade' +import LuxuriousSeaLord from './LuxuriousSeaLord' +import MailedFlower from './MailedFlower' +import MakhairaAquamarine from './MakhairaAquamarine' +import OldMercsPal from './OldMercsPal' +import PortablePowerSaw from './PortablePowerSaw' +import PrototypeArchaic from './PrototypeArchaic' +import Rainslasher from './Rainslasher' +import RedhornStonethresher from './RedhornStonethresher' +import RoyalGreatsword from './RoyalGreatsword' +import SacrificialGreatsword from './SacrificialGreatsword' +import SerpentSpine from './SerpentSpine' +import SkyriderGreatsword from './SkyriderGreatsword' +import SkywardPride from './SkywardPride' +import SnowTombedStarsilver from './SnowTombedStarsilver' +import SongOfBrokenPines from './SongOfBrokenPines' +import TalkingStick from './TalkingStick' +import TheBell from './TheBell' +import TheUnforged from './TheUnforged' +import TidalShadow from './TidalShadow' +import WasterGreatsword from './WasterGreatsword' +import Whiteblind from './Whiteblind' +import WhiteIronGreatsword from './WhiteIronGreatsword' +import WolfsGravestone from './WolfsGravestone' +import BalladOfTheFjords from './BalladOfTheFjords' +import BeginnersProtector from './BeginnersProtector' +import BlackcliffPole from './BlackcliffPole' +import BlackTassel from './BlackTassel' +import CalamityQueller from './CalamityQueller' +import CrescentPike from './CrescentPike' +import Deathmatch from './Deathmatch' +import DragonsBane from './DragonsBane' +import DragonspineSpear from './DragonspineSpear' +import EngulfingLightning from './EngulfingLightning' +import FavoniusLance from './FavoniusLance' +import Halberd from './Halberd' +import IronPoint from './IronPoint' +import KitainCrossSpear from './KitainCrossSpear' +import LithicSpear from './LithicSpear' +import MissiveWindspear from './MissiveWindspear' +import Moonpiercer from './Moonpiercer' +import PrimordialJadeWingedSpear from './PrimordialJadeWingedSpear' +import ProspectorsDrill from './ProspectorsDrill' +import PrototypeStarglitter from './PrototypeStarglitter' +import RightfulReward from './RightfulReward' +import RoyalSpear from './RoyalSpear' +import SkywardSpine from './SkywardSpine' +import StaffOfHoma from './StaffOfHoma' +import StaffOfTheScarletSands from './StaffOfTheScarletSands' +import TheCatch from './TheCatch' +import VortexVanquisher from './VortexVanquisher' +import WavebreakersFin from './WavebreakersFin' +import WhiteTassel from './WhiteTassel' +import AlleyHunter from './AlleyHunter' +import AmosBow from './AmosBow' +import AquaSimulacra from './AquaSimulacra' +import BlackcliffWarbow from './BlackcliffWarbow' +import CompoundBow from './CompoundBow' +import ElegyForTheEnd from './ElegyForTheEnd' +import EndOfTheLine from './EndOfTheLine' +import FadingTwilight from './FadingTwilight' +import FavoniusWarbow from './FavoniusWarbow' +import Hamayumi from './Hamayumi' +import HuntersBow from './HuntersBow' +import HuntersPath from './HuntersPath' +import IbisPiercer from './IbisPiercer' +import KingsSquire from './KingsSquire' +import Messenger from './Messenger' +import MitternachtsWaltz from './MitternachtsWaltz' +import MouunsMoon from './MouunsMoon' +import PolarStar from './PolarStar' +import Predator from './Predator' +import PrototypeCrescent from './PrototypeCrescent' +import RangeGauge from './RangeGauge' +import RavenBow from './RavenBow' +import RecurveBow from './RecurveBow' +import RoyalBow from './RoyalBow' +import Rust from './Rust' +import SacrificialBow from './SacrificialBow' +import ScionOfTheBlazingSun from './ScionOfTheBlazingSun' +import SeasonedHuntersBow from './SeasonedHuntersBow' +import SharpshootersOath from './SharpshootersOath' +import SkywardHarp from './SkywardHarp' +import Slingshot from './Slingshot' +import SongOfStillness from './SongOfStillness' +import TheFirstGreatMagic from './TheFirstGreatMagic' +import TheStringless from './TheStringless' +import TheViridescentHunt from './TheViridescentHunt' +import ThunderingPulse from './ThunderingPulse' +import WindblumeOde from './WindblumeOde' +import ApprenticesNotes from './ApprenticesNotes' +import AThousandFloatingDreams from './AThousandFloatingDreams' +import BalladOfTheBoundlessBlue from './BalladOfTheBoundlessBlue' +import BlackcliffAgate from './BlackcliffAgate' +import CashflowSupervision from './CashflowSupervision' +import DodocoTales from './DodocoTales' +import EmeraldOrb from './EmeraldOrb' +import EverlastingMoonglow from './EverlastingMoonglow' +import EyeOfPerception from './EyeOfPerception' +import FavoniusCodex from './FavoniusCodex' +import FlowingPurity from './FlowingPurity' +import Frostbearer from './Frostbearer' +import FruitOfFulfillment from './FruitOfFulfillment' +import HakushinRing from './HakushinRing' +import JadefallsSplendor from './JadefallsSplendor' +import KagurasVerity from './KagurasVerity' +import LostPrayerToTheSacredWinds from './LostPrayerToTheSacredWinds' +import MagicGuide from './MagicGuide' +import MappaMare from './MappaMare' +import MemoryOfDust from './MemoryOfDust' +import OathswornEye from './OathswornEye' +import OtherworldlyStory from './OtherworldlyStory' +import PocketGrimoire from './PocketGrimoire' import PrototypeAmber from './PrototypeAmber' +import QuantumCatalyst from './QuantumCatalyst' +import RoyalGrimoire from './RoyalGrimoire' +import SacrificialFragments from './SacrificialFragments' +import SacrificialJade from './SacrificialJade' +import SkywardAtlas from './SkywardAtlas' +import SolarPearl from './SolarPearl' +import TheWidsith from './TheWidsith' +import ThrillingTalesOfDragonSlayers from './ThrillingTalesOfDragonSlayers' +import TomeOfTheEternalFlow from './TomeOfTheEternalFlow' import TulaytullahsRemembrance from './TulaytullahsRemembrance' +import TwinNephrite from './TwinNephrite' +import WanderingEvenstar from './WanderingEvenstar' +import WineAndSong from './WineAndSong' const data: TagMapNodeEntries[] = [ - CalamityQueller, + AmenomaKageuchi, + AquilaFavonia, + BlackcliffLongsword, + CinnabarSpindle, + CoolSteel, + DarkIronSword, + DullBlade, + FavoniusSword, + FesteringDesire, + FilletBlade, + FinaleOfTheDeep, + FleuveCendreFerryman, + FreedomSworn, + HaranGeppakuFutsu, + HarbingerOfDawn, + IronSting, + KagotsurubeIsshin, KeyOfKhajNisut, + LightOfFoliarIncision, + LionsRoar, + MistsplitterReforged, + PrimordialJadeCutter, + PrototypeRancour, + RoyalLongsword, + SacrificialSword, + SapwoodBlade, + SilverSword, + SkyriderSword, + SkywardBlade, + SplendorOfTranquilWaters, + SummitShaper, + SwordOfDescension, + SwordOfNarzissenkreuz, + TheAlleyFlash, + TheBlackSword, + TheDockhandsAssistant, + TheFlute, + ToukabouShigure, + TravelersHandySword, + WolfFang, + XiphosMoonlight, + Akuoumaru, + BeaconOfTheReedSea, + BlackcliffSlasher, + BloodtaintedGreatsword, + DebateClub, + FavoniusGreatsword, + FerrousShadow, + ForestRegalia, + KatsuragikiriNagamasa, + LithicBlade, + LuxuriousSeaLord, + MailedFlower, + MakhairaAquamarine, + OldMercsPal, + PortablePowerSaw, + PrototypeArchaic, + Rainslasher, + RedhornStonethresher, + RoyalGreatsword, + SacrificialGreatsword, + SerpentSpine, + SkyriderGreatsword, + SkywardPride, + SnowTombedStarsilver, + SongOfBrokenPines, + TalkingStick, + TheBell, + TheUnforged, + TidalShadow, + WasterGreatsword, + Whiteblind, + WhiteIronGreatsword, + WolfsGravestone, + BalladOfTheFjords, + BeginnersProtector, + BlackcliffPole, + BlackTassel, + CalamityQueller, + CrescentPike, + Deathmatch, + DragonsBane, + DragonspineSpear, + EngulfingLightning, + FavoniusLance, + Halberd, + IronPoint, + KitainCrossSpear, + LithicSpear, + MissiveWindspear, + Moonpiercer, + PrimordialJadeWingedSpear, + ProspectorsDrill, + PrototypeStarglitter, + RightfulReward, + RoyalSpear, + SkywardSpine, + StaffOfHoma, + StaffOfTheScarletSands, + TheCatch, + VortexVanquisher, + WavebreakersFin, + WhiteTassel, + AlleyHunter, + AmosBow, + AquaSimulacra, + BlackcliffWarbow, + CompoundBow, + ElegyForTheEnd, + EndOfTheLine, + FadingTwilight, + FavoniusWarbow, + Hamayumi, + HuntersBow, + HuntersPath, + IbisPiercer, + KingsSquire, + Messenger, + MitternachtsWaltz, + MouunsMoon, + PolarStar, + Predator, + PrototypeCrescent, + RangeGauge, + RavenBow, + RecurveBow, + RoyalBow, + Rust, + SacrificialBow, + ScionOfTheBlazingSun, + SeasonedHuntersBow, + SharpshootersOath, + SkywardHarp, + Slingshot, + SongOfStillness, + TheFirstGreatMagic, + TheStringless, + TheViridescentHunt, + ThunderingPulse, + WindblumeOde, + ApprenticesNotes, + AThousandFloatingDreams, + BalladOfTheBoundlessBlue, + BlackcliffAgate, + CashflowSupervision, + DodocoTales, + EmeraldOrb, + EverlastingMoonglow, + EyeOfPerception, + FavoniusCodex, + FlowingPurity, + Frostbearer, + FruitOfFulfillment, + HakushinRing, + JadefallsSplendor, + KagurasVerity, + LostPrayerToTheSacredWinds, + MagicGuide, + MappaMare, + MemoryOfDust, + OathswornEye, + OtherworldlyStory, + PocketGrimoire, PrototypeAmber, + QuantumCatalyst, + RoyalGrimoire, + SacrificialFragments, + SacrificialJade, + SkywardAtlas, + SolarPearl, + TheWidsith, + ThrillingTalesOfDragonSlayers, + TomeOfTheEternalFlow, TulaytullahsRemembrance, - ...allWeaponKeys.map(entriesForWeapon), + TwinNephrite, + WanderingEvenstar, + WineAndSong, ] -function entriesForWeapon(key: WeaponKey): TagMapNodeEntries { - const gen = allStats.weapon.data[key] - const { refinement, ascension } = self.weapon - const specials = new Set(Object.keys(gen.ascensionBonus)) - - return register(key, [ - // Stats - ...gen.lvlCurves.map(({ key, base, curve }) => - addStatCurve(key, prod(base, allStatics('static')[curve])) - ), - ...Object.entries(gen.ascensionBonus).map(([key, values]) => - addStatCurve(key, subscript(ascension, values)) - ), - ...Object.entries(gen.refinementBonus).map(([key, values]) => - addStatCurve(key, subscript(refinement, values)) - ), - // Listing - ...[...specials].map((key) => registerStatListing(key)), - ]) -} - export default data.flat() diff --git a/libs/gi-formula/src/generators/gen-sheet/all-generator.ts b/libs/gi-formula/src/generators/gen-sheet/all-generator.ts index fe1bd57a09..a353b297fb 100644 --- a/libs/gi-formula/src/generators/gen-sheet/all-generator.ts +++ b/libs/gi-formula/src/generators/gen-sheet/all-generator.ts @@ -5,6 +5,7 @@ import { } from '@genshin-optimizer/consts' import type { Tree } from '@nx/devkit' import genSheet from './genSheet' +import genIndex from './genIndex' export default async function genSheetGenerator(tree: Tree) { for (const src of allCharacterKeys) await genSheet(tree, { sheet_type: 'char', src }) @@ -12,4 +13,7 @@ export default async function genSheetGenerator(tree: Tree) { await genSheet(tree, { sheet_type: 'artifact', src }) for (const src of allWeaponKeys) await genSheet(tree, { sheet_type: 'weapon', src }) + await genIndex(tree, 'char') + await genIndex(tree, 'artifact') + await genIndex(tree, 'weapon') } diff --git a/libs/gi-formula/src/generators/gen-sheet/genIndex.ts b/libs/gi-formula/src/generators/gen-sheet/genIndex.ts new file mode 100644 index 0000000000..6bce33e242 --- /dev/null +++ b/libs/gi-formula/src/generators/gen-sheet/genIndex.ts @@ -0,0 +1,85 @@ +import type { Tree } from '@nx/devkit' +import { workspaceRoot } from '@nx/devkit' +import { writeFileSync } from 'fs' +import * as prettier from 'prettier' +import { + allArtifactSetKeys, + allCharacterKeys, + allWeaponKeys, +} from '@genshin-optimizer/consts' + +export default async function genIndex(tree: Tree, sheet_type: string) { + const file_location = `${workspaceRoot}/libs/gi-formula/src/data/${sheet_type}/index.ts` + switch (sheet_type) { + case 'char': + await writeCharIndex(file_location) + break + case 'artifact': + await writeArtifactIndex(file_location) + break + case 'weapon': + await writeWeaponIndex(file_location) + break + } +} + +async function writeCharIndex(path: string) { + const prettierRc = await prettier.resolveConfig(path) + const index = prettier.format( + ` +import type { TagMapNodeEntries } from '../util' +${allCharacterKeys + .map((charKey) => `import ${charKey} from './${charKey}'`) + .join('\n')} + +const data: TagMapNodeEntries[] = [ + ${allCharacterKeys.join('\n, ')} +] +export default data.flat() + + `, + { ...prettierRc, parser: 'typescript' } + ) + writeFileSync(path, index) +} + +async function writeArtifactIndex(path: string) { + const prettierRc = await prettier.resolveConfig(path) + const index = prettier.format( + ` +import type { TagMapNodeEntries } from '../util' +${allArtifactSetKeys + .map((setKey) => `import ${setKey} from './${setKey}'`) + .join('\n')} + +const data: TagMapNodeEntries[] = [ + ${allArtifactSetKeys.join('\n, ')} +] +export default data.flat() + + `, + { ...prettierRc, parser: 'typescript' } + ) + writeFileSync(path, index) +} + +async function writeWeaponIndex(path: string) { + const prettierRc = await prettier.resolveConfig(path) + const index = prettier.format( + ` +import type { TagMapNodeEntries } from '../util' +${allWeaponKeys + .map((weaponKey) => `import ${weaponKey} from './${weaponKey}'`) + .join('\n')} + +const data: TagMapNodeEntries[] = [ + ${allWeaponKeys.join(',\n ')} +] + +export default data.flat() + + `, + { ...prettierRc, parser: 'typescript' } + ) + writeFileSync(path, index) +} diff --git a/libs/gi-formula/src/generators/gen-sheet/single-generator.ts b/libs/gi-formula/src/generators/gen-sheet/single-generator.ts index 29fb76f17f..4d6442ff82 100644 --- a/libs/gi-formula/src/generators/gen-sheet/single-generator.ts +++ b/libs/gi-formula/src/generators/gen-sheet/single-generator.ts @@ -6,6 +6,7 @@ import { import type { Tree } from '@nx/devkit' import genSheet from './genSheet' import type { GenSheetGeneratorSchema } from './schema' +import genIndex from './genIndex' export default async function genSheetGenerator( tree: Tree, options: GenSheetGeneratorSchema @@ -29,6 +30,7 @@ export default async function genSheetGenerator( return } await genSheet(tree, options, true) + await genIndex(tree, sheet_type) console.log( 'Generated sheet. Include the generated file in the corresponding `index.ts` to complete the process' ) diff --git a/libs/gi-formula/src/meta.ts b/libs/gi-formula/src/meta.ts index fdb0abd556..cc03947376 100644 --- a/libs/gi-formula/src/meta.ts +++ b/libs/gi-formula/src/meta.ts @@ -40,6 +40,556 @@ export type INumConditionalData = { } export const conditionals = { + Adventurer: { + someBoolConditional: { + src: 'Adventurer', + name: 'someBoolConditional', + tag: { src: 'Adventurer', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Adventurer', + name: '_someListConditional', + tag: { src: 'Adventurer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Adventurer', + name: '_someNumConditional', + tag: { src: 'Adventurer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ArchaicPetra: { + someBoolConditional: { + src: 'ArchaicPetra', + name: 'someBoolConditional', + tag: { src: 'ArchaicPetra', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ArchaicPetra', + name: '_someListConditional', + tag: { src: 'ArchaicPetra', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ArchaicPetra', + name: '_someNumConditional', + tag: { src: 'ArchaicPetra', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Berserker: { + someBoolConditional: { + src: 'Berserker', + name: 'someBoolConditional', + tag: { src: 'Berserker', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Berserker', + name: '_someListConditional', + tag: { src: 'Berserker', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Berserker', + name: '_someNumConditional', + tag: { src: 'Berserker', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlizzardStrayer: { + someBoolConditional: { + src: 'BlizzardStrayer', + name: 'someBoolConditional', + tag: { src: 'BlizzardStrayer', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlizzardStrayer', + name: '_someListConditional', + tag: { src: 'BlizzardStrayer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlizzardStrayer', + name: '_someNumConditional', + tag: { src: 'BlizzardStrayer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BloodstainedChivalry: { + someBoolConditional: { + src: 'BloodstainedChivalry', + name: 'someBoolConditional', + tag: { src: 'BloodstainedChivalry', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BloodstainedChivalry', + name: '_someListConditional', + tag: { src: 'BloodstainedChivalry', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BloodstainedChivalry', + name: '_someNumConditional', + tag: { src: 'BloodstainedChivalry', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BraveHeart: { + someBoolConditional: { + src: 'BraveHeart', + name: 'someBoolConditional', + tag: { src: 'BraveHeart', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BraveHeart', + name: '_someListConditional', + tag: { src: 'BraveHeart', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BraveHeart', + name: '_someNumConditional', + tag: { src: 'BraveHeart', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + CrimsonWitchOfFlames: { + someBoolConditional: { + src: 'CrimsonWitchOfFlames', + name: 'someBoolConditional', + tag: { src: 'CrimsonWitchOfFlames', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'CrimsonWitchOfFlames', + name: '_someListConditional', + tag: { src: 'CrimsonWitchOfFlames', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'CrimsonWitchOfFlames', + name: '_someNumConditional', + tag: { src: 'CrimsonWitchOfFlames', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DeepwoodMemories: { + someBoolConditional: { + src: 'DeepwoodMemories', + name: 'someBoolConditional', + tag: { src: 'DeepwoodMemories', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DeepwoodMemories', + name: '_someListConditional', + tag: { src: 'DeepwoodMemories', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DeepwoodMemories', + name: '_someNumConditional', + tag: { src: 'DeepwoodMemories', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DefendersWill: { + someBoolConditional: { + src: 'DefendersWill', + name: 'someBoolConditional', + tag: { src: 'DefendersWill', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DefendersWill', + name: '_someListConditional', + tag: { src: 'DefendersWill', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DefendersWill', + name: '_someNumConditional', + tag: { src: 'DefendersWill', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DesertPavilionChronicle: { + someBoolConditional: { + src: 'DesertPavilionChronicle', + name: 'someBoolConditional', + tag: { src: 'DesertPavilionChronicle', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DesertPavilionChronicle', + name: '_someListConditional', + tag: { src: 'DesertPavilionChronicle', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DesertPavilionChronicle', + name: '_someNumConditional', + tag: { src: 'DesertPavilionChronicle', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EchoesOfAnOffering: { + someBoolConditional: { + src: 'EchoesOfAnOffering', + name: 'someBoolConditional', + tag: { src: 'EchoesOfAnOffering', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EchoesOfAnOffering', + name: '_someListConditional', + tag: { src: 'EchoesOfAnOffering', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EchoesOfAnOffering', + name: '_someNumConditional', + tag: { src: 'EchoesOfAnOffering', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EmblemOfSeveredFate: { + someBoolConditional: { + src: 'EmblemOfSeveredFate', + name: 'someBoolConditional', + tag: { src: 'EmblemOfSeveredFate', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EmblemOfSeveredFate', + name: '_someListConditional', + tag: { src: 'EmblemOfSeveredFate', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EmblemOfSeveredFate', + name: '_someNumConditional', + tag: { src: 'EmblemOfSeveredFate', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FlowerOfParadiseLost: { + someBoolConditional: { + src: 'FlowerOfParadiseLost', + name: 'someBoolConditional', + tag: { src: 'FlowerOfParadiseLost', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FlowerOfParadiseLost', + name: '_someListConditional', + tag: { src: 'FlowerOfParadiseLost', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FlowerOfParadiseLost', + name: '_someNumConditional', + tag: { src: 'FlowerOfParadiseLost', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Gambler: { + someBoolConditional: { + src: 'Gambler', + name: 'someBoolConditional', + tag: { src: 'Gambler', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Gambler', + name: '_someListConditional', + tag: { src: 'Gambler', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Gambler', + name: '_someNumConditional', + tag: { src: 'Gambler', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + GildedDreams: { + someBoolConditional: { + src: 'GildedDreams', + name: 'someBoolConditional', + tag: { src: 'GildedDreams', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'GildedDreams', + name: '_someListConditional', + tag: { src: 'GildedDreams', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'GildedDreams', + name: '_someNumConditional', + tag: { src: 'GildedDreams', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + GladiatorsFinale: { + someBoolConditional: { + src: 'GladiatorsFinale', + name: 'someBoolConditional', + tag: { src: 'GladiatorsFinale', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'GladiatorsFinale', + name: '_someListConditional', + tag: { src: 'GladiatorsFinale', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'GladiatorsFinale', + name: '_someNumConditional', + tag: { src: 'GladiatorsFinale', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + GoldenTroupe: { + someBoolConditional: { + src: 'GoldenTroupe', + name: 'someBoolConditional', + tag: { src: 'GoldenTroupe', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'GoldenTroupe', + name: '_someListConditional', + tag: { src: 'GoldenTroupe', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'GoldenTroupe', + name: '_someNumConditional', + tag: { src: 'GoldenTroupe', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HeartOfDepth: { + someBoolConditional: { + src: 'HeartOfDepth', + name: 'someBoolConditional', + tag: { src: 'HeartOfDepth', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HeartOfDepth', + name: '_someListConditional', + tag: { src: 'HeartOfDepth', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HeartOfDepth', + name: '_someNumConditional', + tag: { src: 'HeartOfDepth', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HuskOfOpulentDreams: { + someBoolConditional: { + src: 'HuskOfOpulentDreams', + name: 'someBoolConditional', + tag: { src: 'HuskOfOpulentDreams', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HuskOfOpulentDreams', + name: '_someListConditional', + tag: { src: 'HuskOfOpulentDreams', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HuskOfOpulentDreams', + name: '_someNumConditional', + tag: { src: 'HuskOfOpulentDreams', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Instructor: { + someBoolConditional: { + src: 'Instructor', + name: 'someBoolConditional', + tag: { src: 'Instructor', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Instructor', + name: '_someListConditional', + tag: { src: 'Instructor', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Instructor', + name: '_someNumConditional', + tag: { src: 'Instructor', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Lavawalker: { + someBoolConditional: { + src: 'Lavawalker', + name: 'someBoolConditional', + tag: { src: 'Lavawalker', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Lavawalker', + name: '_someListConditional', + tag: { src: 'Lavawalker', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Lavawalker', + name: '_someNumConditional', + tag: { src: 'Lavawalker', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + LuckyDog: { + someBoolConditional: { + src: 'LuckyDog', + name: 'someBoolConditional', + tag: { src: 'LuckyDog', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LuckyDog', + name: '_someListConditional', + tag: { src: 'LuckyDog', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LuckyDog', + name: '_someNumConditional', + tag: { src: 'LuckyDog', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MaidenBeloved: { + someBoolConditional: { + src: 'MaidenBeloved', + name: 'someBoolConditional', + tag: { src: 'MaidenBeloved', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MaidenBeloved', + name: '_someListConditional', + tag: { src: 'MaidenBeloved', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MaidenBeloved', + name: '_someNumConditional', + tag: { src: 'MaidenBeloved', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MarechausseeHunter: { + someBoolConditional: { + src: 'MarechausseeHunter', + name: 'someBoolConditional', + tag: { src: 'MarechausseeHunter', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MarechausseeHunter', + name: '_someListConditional', + tag: { src: 'MarechausseeHunter', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MarechausseeHunter', + name: '_someNumConditional', + tag: { src: 'MarechausseeHunter', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MartialArtist: { + someBoolConditional: { + src: 'MartialArtist', + name: 'someBoolConditional', + tag: { src: 'MartialArtist', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MartialArtist', + name: '_someListConditional', + tag: { src: 'MartialArtist', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MartialArtist', + name: '_someNumConditional', + tag: { src: 'MartialArtist', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, NoblesseOblige: { set4: { src: 'NoblesseOblige', @@ -48,321 +598,6792 @@ export const conditionals = { type: 'bool', }, }, - Candace: { - afterBurst: { - src: 'Candace', - name: 'afterBurst', - tag: { src: 'Candace', name: 'afterBurst' }, + NymphsDream: { + someBoolConditional: { + src: 'NymphsDream', + name: 'someBoolConditional', + tag: { src: 'NymphsDream', name: 'someBoolConditional' }, type: 'bool', }, - c2AfterSkillHit: { - src: 'Candace', - name: 'c2AfterSkillHit', - tag: { src: 'Candace', name: 'c2AfterSkillHit' }, + _someListConditional: { + src: 'NymphsDream', + name: '_someListConditional', + tag: { src: 'NymphsDream', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'NymphsDream', + name: '_someNumConditional', + tag: { src: 'NymphsDream', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + OceanHuedClam: { + someBoolConditional: { + src: 'OceanHuedClam', + name: 'someBoolConditional', + tag: { src: 'OceanHuedClam', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'OceanHuedClam', + name: '_someListConditional', + tag: { src: 'OceanHuedClam', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'OceanHuedClam', + name: '_someNumConditional', + tag: { src: 'OceanHuedClam', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PaleFlame: { + someBoolConditional: { + src: 'PaleFlame', + name: 'someBoolConditional', + tag: { src: 'PaleFlame', name: 'someBoolConditional' }, type: 'bool', }, + _someListConditional: { + src: 'PaleFlame', + name: '_someListConditional', + tag: { src: 'PaleFlame', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PaleFlame', + name: '_someNumConditional', + tag: { src: 'PaleFlame', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, }, - Nahida: { - a1ActiveInBurst: { - src: 'Nahida', - name: 'a1ActiveInBurst', - tag: { src: 'Nahida', name: 'a1ActiveInBurst' }, + PrayersForDestiny: { + someBoolConditional: { + src: 'PrayersForDestiny', + name: 'someBoolConditional', + tag: { src: 'PrayersForDestiny', name: 'someBoolConditional' }, type: 'bool', }, - c2Bloom: { - src: 'Nahida', - name: 'c2Bloom', - tag: { src: 'Nahida', name: 'c2Bloom' }, + _someListConditional: { + src: 'PrayersForDestiny', + name: '_someListConditional', + tag: { src: 'PrayersForDestiny', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrayersForDestiny', + name: '_someNumConditional', + tag: { src: 'PrayersForDestiny', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrayersForIllumination: { + someBoolConditional: { + src: 'PrayersForIllumination', + name: 'someBoolConditional', + tag: { src: 'PrayersForIllumination', name: 'someBoolConditional' }, type: 'bool', }, - c2QSA: { - src: 'Nahida', - name: 'c2QSA', - tag: { src: 'Nahida', name: 'c2QSA' }, + _someListConditional: { + src: 'PrayersForIllumination', + name: '_someListConditional', + tag: { src: 'PrayersForIllumination', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrayersForIllumination', + name: '_someNumConditional', + tag: { src: 'PrayersForIllumination', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrayersForWisdom: { + someBoolConditional: { + src: 'PrayersForWisdom', + name: 'someBoolConditional', + tag: { src: 'PrayersForWisdom', name: 'someBoolConditional' }, type: 'bool', }, - partyInBurst: { - src: 'Nahida', - name: 'partyInBurst', - tag: { src: 'Nahida', name: 'partyInBurst' }, + _someListConditional: { + src: 'PrayersForWisdom', + name: '_someListConditional', + tag: { src: 'PrayersForWisdom', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrayersForWisdom', + name: '_someNumConditional', + tag: { src: 'PrayersForWisdom', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrayersToSpringtime: { + someBoolConditional: { + src: 'PrayersToSpringtime', + name: 'someBoolConditional', + tag: { src: 'PrayersToSpringtime', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrayersToSpringtime', + name: '_someListConditional', + tag: { src: 'PrayersToSpringtime', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrayersToSpringtime', + name: '_someNumConditional', + tag: { src: 'PrayersToSpringtime', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ResolutionOfSojourner: { + someBoolConditional: { + src: 'ResolutionOfSojourner', + name: 'someBoolConditional', + tag: { src: 'ResolutionOfSojourner', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ResolutionOfSojourner', + name: '_someListConditional', + tag: { src: 'ResolutionOfSojourner', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ResolutionOfSojourner', + name: '_someNumConditional', + tag: { src: 'ResolutionOfSojourner', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RetracingBolide: { + someBoolConditional: { + src: 'RetracingBolide', + name: 'someBoolConditional', + tag: { src: 'RetracingBolide', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RetracingBolide', + name: '_someListConditional', + tag: { src: 'RetracingBolide', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RetracingBolide', + name: '_someNumConditional', + tag: { src: 'RetracingBolide', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Scholar: { + someBoolConditional: { + src: 'Scholar', + name: 'someBoolConditional', + tag: { src: 'Scholar', name: 'someBoolConditional' }, type: 'bool', }, - c4Count: { - src: 'Nahida', - name: 'c4Count', - tag: { src: 'Nahida', name: 'c4Count' }, - type: 'num', - int_only: true, - min: 0, - max: 4, + _someListConditional: { + src: 'Scholar', + name: '_someListConditional', + tag: { src: 'Scholar', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Scholar', + name: '_someNumConditional', + tag: { src: 'Scholar', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ShimenawasReminiscence: { + someBoolConditional: { + src: 'ShimenawasReminiscence', + name: 'someBoolConditional', + tag: { src: 'ShimenawasReminiscence', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ShimenawasReminiscence', + name: '_someListConditional', + tag: { src: 'ShimenawasReminiscence', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ShimenawasReminiscence', + name: '_someNumConditional', + tag: { src: 'ShimenawasReminiscence', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TenacityOfTheMillelith: { + someBoolConditional: { + src: 'TenacityOfTheMillelith', + name: 'someBoolConditional', + tag: { src: 'TenacityOfTheMillelith', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TenacityOfTheMillelith', + name: '_someListConditional', + tag: { src: 'TenacityOfTheMillelith', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TenacityOfTheMillelith', + name: '_someNumConditional', + tag: { src: 'TenacityOfTheMillelith', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheExile: { + someBoolConditional: { + src: 'TheExile', + name: 'someBoolConditional', + tag: { src: 'TheExile', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheExile', + name: '_someListConditional', + tag: { src: 'TheExile', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheExile', + name: '_someNumConditional', + tag: { src: 'TheExile', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ThunderingFury: { + someBoolConditional: { + src: 'ThunderingFury', + name: 'someBoolConditional', + tag: { src: 'ThunderingFury', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ThunderingFury', + name: '_someListConditional', + tag: { src: 'ThunderingFury', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ThunderingFury', + name: '_someNumConditional', + tag: { src: 'ThunderingFury', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Thundersoother: { + someBoolConditional: { + src: 'Thundersoother', + name: 'someBoolConditional', + tag: { src: 'Thundersoother', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Thundersoother', + name: '_someListConditional', + tag: { src: 'Thundersoother', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Thundersoother', + name: '_someNumConditional', + tag: { src: 'Thundersoother', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TinyMiracle: { + someBoolConditional: { + src: 'TinyMiracle', + name: 'someBoolConditional', + tag: { src: 'TinyMiracle', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TinyMiracle', + name: '_someListConditional', + tag: { src: 'TinyMiracle', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TinyMiracle', + name: '_someNumConditional', + tag: { src: 'TinyMiracle', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TravelingDoctor: { + someBoolConditional: { + src: 'TravelingDoctor', + name: 'someBoolConditional', + tag: { src: 'TravelingDoctor', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelingDoctor', + name: '_someListConditional', + tag: { src: 'TravelingDoctor', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelingDoctor', + name: '_someNumConditional', + tag: { src: 'TravelingDoctor', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + VermillionHereafter: { + someBoolConditional: { + src: 'VermillionHereafter', + name: 'someBoolConditional', + tag: { src: 'VermillionHereafter', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'VermillionHereafter', + name: '_someListConditional', + tag: { src: 'VermillionHereafter', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'VermillionHereafter', + name: '_someNumConditional', + tag: { src: 'VermillionHereafter', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ViridescentVenerer: { + someBoolConditional: { + src: 'ViridescentVenerer', + name: 'someBoolConditional', + tag: { src: 'ViridescentVenerer', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ViridescentVenerer', + name: '_someListConditional', + tag: { src: 'ViridescentVenerer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ViridescentVenerer', + name: '_someNumConditional', + tag: { src: 'ViridescentVenerer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + VourukashasGlow: { + someBoolConditional: { + src: 'VourukashasGlow', + name: 'someBoolConditional', + tag: { src: 'VourukashasGlow', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'VourukashasGlow', + name: '_someListConditional', + tag: { src: 'VourukashasGlow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'VourukashasGlow', + name: '_someNumConditional', + tag: { src: 'VourukashasGlow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WanderersTroupe: { + someBoolConditional: { + src: 'WanderersTroupe', + name: 'someBoolConditional', + tag: { src: 'WanderersTroupe', name: 'someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WanderersTroupe', + name: '_someListConditional', + tag: { src: 'WanderersTroupe', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WanderersTroupe', + name: '_someNumConditional', + tag: { src: 'WanderersTroupe', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Albedo: { + _someBoolConditional: { + src: 'Albedo', + name: '_someBoolConditional', + tag: { src: 'Albedo', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Albedo', + name: '_someListConditional', + tag: { src: 'Albedo', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Albedo', + name: '_someNumConditional', + tag: { src: 'Albedo', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Alhaitham: { + _someBoolConditional: { + src: 'Alhaitham', + name: '_someBoolConditional', + tag: { src: 'Alhaitham', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Alhaitham', + name: '_someListConditional', + tag: { src: 'Alhaitham', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Alhaitham', + name: '_someNumConditional', + tag: { src: 'Alhaitham', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Aloy: { + _someBoolConditional: { + src: 'Aloy', + name: '_someBoolConditional', + tag: { src: 'Aloy', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Aloy', + name: '_someListConditional', + tag: { src: 'Aloy', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Aloy', + name: '_someNumConditional', + tag: { src: 'Aloy', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Amber: { + _someBoolConditional: { + src: 'Amber', + name: '_someBoolConditional', + tag: { src: 'Amber', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Amber', + name: '_someListConditional', + tag: { src: 'Amber', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Amber', + name: '_someNumConditional', + tag: { src: 'Amber', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AratakiItto: { + _someBoolConditional: { + src: 'AratakiItto', + name: '_someBoolConditional', + tag: { src: 'AratakiItto', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AratakiItto', + name: '_someListConditional', + tag: { src: 'AratakiItto', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AratakiItto', + name: '_someNumConditional', + tag: { src: 'AratakiItto', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Baizhu: { + _someBoolConditional: { + src: 'Baizhu', + name: '_someBoolConditional', + tag: { src: 'Baizhu', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Baizhu', + name: '_someListConditional', + tag: { src: 'Baizhu', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Baizhu', + name: '_someNumConditional', + tag: { src: 'Baizhu', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Barbara: { + _someBoolConditional: { + src: 'Barbara', + name: '_someBoolConditional', + tag: { src: 'Barbara', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Barbara', + name: '_someListConditional', + tag: { src: 'Barbara', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Barbara', + name: '_someNumConditional', + tag: { src: 'Barbara', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Beidou: { + _someBoolConditional: { + src: 'Beidou', + name: '_someBoolConditional', + tag: { src: 'Beidou', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Beidou', + name: '_someListConditional', + tag: { src: 'Beidou', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Beidou', + name: '_someNumConditional', + tag: { src: 'Beidou', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Bennett: { + _someBoolConditional: { + src: 'Bennett', + name: '_someBoolConditional', + tag: { src: 'Bennett', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Bennett', + name: '_someListConditional', + tag: { src: 'Bennett', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Bennett', + name: '_someNumConditional', + tag: { src: 'Bennett', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Candace: { + afterBurst: { + src: 'Candace', + name: 'afterBurst', + tag: { src: 'Candace', name: 'afterBurst' }, + type: 'bool', + }, + c2AfterSkillHit: { + src: 'Candace', + name: 'c2AfterSkillHit', + tag: { src: 'Candace', name: 'c2AfterSkillHit' }, + type: 'bool', + }, + }, + Charlotte: { + _someBoolConditional: { + src: 'Charlotte', + name: '_someBoolConditional', + tag: { src: 'Charlotte', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Charlotte', + name: '_someListConditional', + tag: { src: 'Charlotte', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Charlotte', + name: '_someNumConditional', + tag: { src: 'Charlotte', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Chongyun: { + _someBoolConditional: { + src: 'Chongyun', + name: '_someBoolConditional', + tag: { src: 'Chongyun', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Chongyun', + name: '_someListConditional', + tag: { src: 'Chongyun', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Chongyun', + name: '_someNumConditional', + tag: { src: 'Chongyun', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Collei: { + _someBoolConditional: { + src: 'Collei', + name: '_someBoolConditional', + tag: { src: 'Collei', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Collei', + name: '_someListConditional', + tag: { src: 'Collei', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Collei', + name: '_someNumConditional', + tag: { src: 'Collei', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Cyno: { + _someBoolConditional: { + src: 'Cyno', + name: '_someBoolConditional', + tag: { src: 'Cyno', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Cyno', + name: '_someListConditional', + tag: { src: 'Cyno', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Cyno', + name: '_someNumConditional', + tag: { src: 'Cyno', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Dehya: { + _someBoolConditional: { + src: 'Dehya', + name: '_someBoolConditional', + tag: { src: 'Dehya', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Dehya', + name: '_someListConditional', + tag: { src: 'Dehya', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Dehya', + name: '_someNumConditional', + tag: { src: 'Dehya', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Diluc: { + _someBoolConditional: { + src: 'Diluc', + name: '_someBoolConditional', + tag: { src: 'Diluc', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Diluc', + name: '_someListConditional', + tag: { src: 'Diluc', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Diluc', + name: '_someNumConditional', + tag: { src: 'Diluc', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Diona: { + _someBoolConditional: { + src: 'Diona', + name: '_someBoolConditional', + tag: { src: 'Diona', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Diona', + name: '_someListConditional', + tag: { src: 'Diona', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Diona', + name: '_someNumConditional', + tag: { src: 'Diona', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Dori: { + _someBoolConditional: { + src: 'Dori', + name: '_someBoolConditional', + tag: { src: 'Dori', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Dori', + name: '_someListConditional', + tag: { src: 'Dori', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Dori', + name: '_someNumConditional', + tag: { src: 'Dori', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Eula: { + _someBoolConditional: { + src: 'Eula', + name: '_someBoolConditional', + tag: { src: 'Eula', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Eula', + name: '_someListConditional', + tag: { src: 'Eula', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Eula', + name: '_someNumConditional', + tag: { src: 'Eula', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Faruzan: { + _someBoolConditional: { + src: 'Faruzan', + name: '_someBoolConditional', + tag: { src: 'Faruzan', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Faruzan', + name: '_someListConditional', + tag: { src: 'Faruzan', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Faruzan', + name: '_someNumConditional', + tag: { src: 'Faruzan', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Fischl: { + _someBoolConditional: { + src: 'Fischl', + name: '_someBoolConditional', + tag: { src: 'Fischl', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Fischl', + name: '_someListConditional', + tag: { src: 'Fischl', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Fischl', + name: '_someNumConditional', + tag: { src: 'Fischl', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Freminet: { + _someBoolConditional: { + src: 'Freminet', + name: '_someBoolConditional', + tag: { src: 'Freminet', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Freminet', + name: '_someListConditional', + tag: { src: 'Freminet', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Freminet', + name: '_someNumConditional', + tag: { src: 'Freminet', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Furina: { + _someBoolConditional: { + src: 'Furina', + name: '_someBoolConditional', + tag: { src: 'Furina', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Furina', + name: '_someListConditional', + tag: { src: 'Furina', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Furina', + name: '_someNumConditional', + tag: { src: 'Furina', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Ganyu: { + _someBoolConditional: { + src: 'Ganyu', + name: '_someBoolConditional', + tag: { src: 'Ganyu', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Ganyu', + name: '_someListConditional', + tag: { src: 'Ganyu', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Ganyu', + name: '_someNumConditional', + tag: { src: 'Ganyu', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Gorou: { + _someBoolConditional: { + src: 'Gorou', + name: '_someBoolConditional', + tag: { src: 'Gorou', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Gorou', + name: '_someListConditional', + tag: { src: 'Gorou', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Gorou', + name: '_someNumConditional', + tag: { src: 'Gorou', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HuTao: { + _someBoolConditional: { + src: 'HuTao', + name: '_someBoolConditional', + tag: { src: 'HuTao', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HuTao', + name: '_someListConditional', + tag: { src: 'HuTao', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HuTao', + name: '_someNumConditional', + tag: { src: 'HuTao', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Jean: { + _someBoolConditional: { + src: 'Jean', + name: '_someBoolConditional', + tag: { src: 'Jean', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Jean', + name: '_someListConditional', + tag: { src: 'Jean', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Jean', + name: '_someNumConditional', + tag: { src: 'Jean', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KaedeharaKazuha: { + _someBoolConditional: { + src: 'KaedeharaKazuha', + name: '_someBoolConditional', + tag: { src: 'KaedeharaKazuha', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KaedeharaKazuha', + name: '_someListConditional', + tag: { src: 'KaedeharaKazuha', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KaedeharaKazuha', + name: '_someNumConditional', + tag: { src: 'KaedeharaKazuha', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Kaeya: { + _someBoolConditional: { + src: 'Kaeya', + name: '_someBoolConditional', + tag: { src: 'Kaeya', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Kaeya', + name: '_someListConditional', + tag: { src: 'Kaeya', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Kaeya', + name: '_someNumConditional', + tag: { src: 'Kaeya', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KamisatoAyaka: { + _someBoolConditional: { + src: 'KamisatoAyaka', + name: '_someBoolConditional', + tag: { src: 'KamisatoAyaka', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KamisatoAyaka', + name: '_someListConditional', + tag: { src: 'KamisatoAyaka', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KamisatoAyaka', + name: '_someNumConditional', + tag: { src: 'KamisatoAyaka', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KamisatoAyato: { + _someBoolConditional: { + src: 'KamisatoAyato', + name: '_someBoolConditional', + tag: { src: 'KamisatoAyato', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KamisatoAyato', + name: '_someListConditional', + tag: { src: 'KamisatoAyato', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KamisatoAyato', + name: '_someNumConditional', + tag: { src: 'KamisatoAyato', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Kaveh: { + _someBoolConditional: { + src: 'Kaveh', + name: '_someBoolConditional', + tag: { src: 'Kaveh', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Kaveh', + name: '_someListConditional', + tag: { src: 'Kaveh', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Kaveh', + name: '_someNumConditional', + tag: { src: 'Kaveh', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Keqing: { + _someBoolConditional: { + src: 'Keqing', + name: '_someBoolConditional', + tag: { src: 'Keqing', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Keqing', + name: '_someListConditional', + tag: { src: 'Keqing', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Keqing', + name: '_someNumConditional', + tag: { src: 'Keqing', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Kirara: { + _someBoolConditional: { + src: 'Kirara', + name: '_someBoolConditional', + tag: { src: 'Kirara', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Kirara', + name: '_someListConditional', + tag: { src: 'Kirara', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Kirara', + name: '_someNumConditional', + tag: { src: 'Kirara', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Klee: { + _someBoolConditional: { + src: 'Klee', + name: '_someBoolConditional', + tag: { src: 'Klee', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Klee', + name: '_someListConditional', + tag: { src: 'Klee', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Klee', + name: '_someNumConditional', + tag: { src: 'Klee', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KujouSara: { + _someBoolConditional: { + src: 'KujouSara', + name: '_someBoolConditional', + tag: { src: 'KujouSara', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KujouSara', + name: '_someListConditional', + tag: { src: 'KujouSara', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KujouSara', + name: '_someNumConditional', + tag: { src: 'KujouSara', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KukiShinobu: { + _someBoolConditional: { + src: 'KukiShinobu', + name: '_someBoolConditional', + tag: { src: 'KukiShinobu', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KukiShinobu', + name: '_someListConditional', + tag: { src: 'KukiShinobu', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KukiShinobu', + name: '_someNumConditional', + tag: { src: 'KukiShinobu', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Layla: { + _someBoolConditional: { + src: 'Layla', + name: '_someBoolConditional', + tag: { src: 'Layla', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Layla', + name: '_someListConditional', + tag: { src: 'Layla', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Layla', + name: '_someNumConditional', + tag: { src: 'Layla', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Lisa: { + _someBoolConditional: { + src: 'Lisa', + name: '_someBoolConditional', + tag: { src: 'Lisa', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Lisa', + name: '_someListConditional', + tag: { src: 'Lisa', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Lisa', + name: '_someNumConditional', + tag: { src: 'Lisa', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Lynette: { + _someBoolConditional: { + src: 'Lynette', + name: '_someBoolConditional', + tag: { src: 'Lynette', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Lynette', + name: '_someListConditional', + tag: { src: 'Lynette', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Lynette', + name: '_someNumConditional', + tag: { src: 'Lynette', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Lyney: { + _someBoolConditional: { + src: 'Lyney', + name: '_someBoolConditional', + tag: { src: 'Lyney', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Lyney', + name: '_someListConditional', + tag: { src: 'Lyney', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Lyney', + name: '_someNumConditional', + tag: { src: 'Lyney', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Mika: { + _someBoolConditional: { + src: 'Mika', + name: '_someBoolConditional', + tag: { src: 'Mika', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Mika', + name: '_someListConditional', + tag: { src: 'Mika', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Mika', + name: '_someNumConditional', + tag: { src: 'Mika', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Mona: { + _someBoolConditional: { + src: 'Mona', + name: '_someBoolConditional', + tag: { src: 'Mona', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Mona', + name: '_someListConditional', + tag: { src: 'Mona', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Mona', + name: '_someNumConditional', + tag: { src: 'Mona', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Nahida: { + a1ActiveInBurst: { + src: 'Nahida', + name: 'a1ActiveInBurst', + tag: { src: 'Nahida', name: 'a1ActiveInBurst' }, + type: 'bool', + }, + c2Bloom: { + src: 'Nahida', + name: 'c2Bloom', + tag: { src: 'Nahida', name: 'c2Bloom' }, + type: 'bool', + }, + c2QSA: { + src: 'Nahida', + name: 'c2QSA', + tag: { src: 'Nahida', name: 'c2QSA' }, + type: 'bool', + }, + partyInBurst: { + src: 'Nahida', + name: 'partyInBurst', + tag: { src: 'Nahida', name: 'partyInBurst' }, + type: 'bool', + }, + c4Count: { + src: 'Nahida', + name: 'c4Count', + tag: { src: 'Nahida', name: 'c4Count' }, + type: 'num', + int_only: true, + min: 0, + max: 4, + }, + }, + Neuvillette: { + _someBoolConditional: { + src: 'Neuvillette', + name: '_someBoolConditional', + tag: { src: 'Neuvillette', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Neuvillette', + name: '_someListConditional', + tag: { src: 'Neuvillette', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Neuvillette', + name: '_someNumConditional', + tag: { src: 'Neuvillette', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Nilou: { + a1AfterSkill: { + src: 'Nilou', + name: 'a1AfterSkill', + tag: { src: 'Nilou', name: 'a1AfterSkill' }, + type: 'bool', + }, + a1AfterHit: { + src: 'Nilou', + name: 'a1AfterHit', + tag: { src: 'Nilou', name: 'a1AfterHit' }, + type: 'bool', + }, + c4AfterPirHit: { + src: 'Nilou', + name: 'c4AfterPirHit', + tag: { src: 'Nilou', name: 'c4AfterPirHit' }, + type: 'bool', + }, + c2Hydro: { + src: 'Nilou', + name: 'c2Hydro', + tag: { src: 'Nilou', name: 'c2Hydro' }, + type: 'bool', + }, + c2Dendro: { + src: 'Nilou', + name: 'c2Dendro', + tag: { src: 'Nilou', name: 'c2Dendro' }, + type: 'bool', + }, + }, + Ningguang: { + _someBoolConditional: { + src: 'Ningguang', + name: '_someBoolConditional', + tag: { src: 'Ningguang', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Ningguang', + name: '_someListConditional', + tag: { src: 'Ningguang', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Ningguang', + name: '_someNumConditional', + tag: { src: 'Ningguang', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Noelle: { + _someBoolConditional: { + src: 'Noelle', + name: '_someBoolConditional', + tag: { src: 'Noelle', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Noelle', + name: '_someListConditional', + tag: { src: 'Noelle', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Noelle', + name: '_someNumConditional', + tag: { src: 'Noelle', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Qiqi: { + _someBoolConditional: { + src: 'Qiqi', + name: '_someBoolConditional', + tag: { src: 'Qiqi', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Qiqi', + name: '_someListConditional', + tag: { src: 'Qiqi', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Qiqi', + name: '_someNumConditional', + tag: { src: 'Qiqi', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RaidenShogun: { + _someBoolConditional: { + src: 'RaidenShogun', + name: '_someBoolConditional', + tag: { src: 'RaidenShogun', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RaidenShogun', + name: '_someListConditional', + tag: { src: 'RaidenShogun', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RaidenShogun', + name: '_someNumConditional', + tag: { src: 'RaidenShogun', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Razor: { + _someBoolConditional: { + src: 'Razor', + name: '_someBoolConditional', + tag: { src: 'Razor', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Razor', + name: '_someListConditional', + tag: { src: 'Razor', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Razor', + name: '_someNumConditional', + tag: { src: 'Razor', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Rosaria: { + _someBoolConditional: { + src: 'Rosaria', + name: '_someBoolConditional', + tag: { src: 'Rosaria', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Rosaria', + name: '_someListConditional', + tag: { src: 'Rosaria', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Rosaria', + name: '_someNumConditional', + tag: { src: 'Rosaria', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SangonomiyaKokomi: { + _someBoolConditional: { + src: 'SangonomiyaKokomi', + name: '_someBoolConditional', + tag: { src: 'SangonomiyaKokomi', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SangonomiyaKokomi', + name: '_someListConditional', + tag: { src: 'SangonomiyaKokomi', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SangonomiyaKokomi', + name: '_someNumConditional', + tag: { src: 'SangonomiyaKokomi', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Sayu: { + _someBoolConditional: { + src: 'Sayu', + name: '_someBoolConditional', + tag: { src: 'Sayu', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Sayu', + name: '_someListConditional', + tag: { src: 'Sayu', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Sayu', + name: '_someNumConditional', + tag: { src: 'Sayu', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Shenhe: { + _someBoolConditional: { + src: 'Shenhe', + name: '_someBoolConditional', + tag: { src: 'Shenhe', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Shenhe', + name: '_someListConditional', + tag: { src: 'Shenhe', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Shenhe', + name: '_someNumConditional', + tag: { src: 'Shenhe', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ShikanoinHeizou: { + _someBoolConditional: { + src: 'ShikanoinHeizou', + name: '_someBoolConditional', + tag: { src: 'ShikanoinHeizou', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ShikanoinHeizou', + name: '_someListConditional', + tag: { src: 'ShikanoinHeizou', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ShikanoinHeizou', + name: '_someNumConditional', + tag: { src: 'ShikanoinHeizou', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Somnia: { + _someBoolConditional: { + src: 'Somnia', + name: '_someBoolConditional', + tag: { src: 'Somnia', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Somnia', + name: '_someListConditional', + tag: { src: 'Somnia', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Somnia', + name: '_someNumConditional', + tag: { src: 'Somnia', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Sucrose: { + _someBoolConditional: { + src: 'Sucrose', + name: '_someBoolConditional', + tag: { src: 'Sucrose', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Sucrose', + name: '_someListConditional', + tag: { src: 'Sucrose', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Sucrose', + name: '_someNumConditional', + tag: { src: 'Sucrose', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Tartaglia: { + _someBoolConditional: { + src: 'Tartaglia', + name: '_someBoolConditional', + tag: { src: 'Tartaglia', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Tartaglia', + name: '_someListConditional', + tag: { src: 'Tartaglia', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Tartaglia', + name: '_someNumConditional', + tag: { src: 'Tartaglia', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Thoma: { + _someBoolConditional: { + src: 'Thoma', + name: '_someBoolConditional', + tag: { src: 'Thoma', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Thoma', + name: '_someListConditional', + tag: { src: 'Thoma', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Thoma', + name: '_someNumConditional', + tag: { src: 'Thoma', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Tighnari: { + _someBoolConditional: { + src: 'Tighnari', + name: '_someBoolConditional', + tag: { src: 'Tighnari', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Tighnari', + name: '_someListConditional', + tag: { src: 'Tighnari', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Tighnari', + name: '_someNumConditional', + tag: { src: 'Tighnari', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Venti: { + _someBoolConditional: { + src: 'Venti', + name: '_someBoolConditional', + tag: { src: 'Venti', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Venti', + name: '_someListConditional', + tag: { src: 'Venti', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Venti', + name: '_someNumConditional', + tag: { src: 'Venti', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Wanderer: { + _someBoolConditional: { + src: 'Wanderer', + name: '_someBoolConditional', + tag: { src: 'Wanderer', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Wanderer', + name: '_someListConditional', + tag: { src: 'Wanderer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Wanderer', + name: '_someNumConditional', + tag: { src: 'Wanderer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Wriothesley: { + _someBoolConditional: { + src: 'Wriothesley', + name: '_someBoolConditional', + tag: { src: 'Wriothesley', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Wriothesley', + name: '_someListConditional', + tag: { src: 'Wriothesley', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Wriothesley', + name: '_someNumConditional', + tag: { src: 'Wriothesley', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Xiangling: { + _someBoolConditional: { + src: 'Xiangling', + name: '_someBoolConditional', + tag: { src: 'Xiangling', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Xiangling', + name: '_someListConditional', + tag: { src: 'Xiangling', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Xiangling', + name: '_someNumConditional', + tag: { src: 'Xiangling', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Xiao: { + _someBoolConditional: { + src: 'Xiao', + name: '_someBoolConditional', + tag: { src: 'Xiao', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Xiao', + name: '_someListConditional', + tag: { src: 'Xiao', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Xiao', + name: '_someNumConditional', + tag: { src: 'Xiao', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Xingqiu: { + _someBoolConditional: { + src: 'Xingqiu', + name: '_someBoolConditional', + tag: { src: 'Xingqiu', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Xingqiu', + name: '_someListConditional', + tag: { src: 'Xingqiu', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Xingqiu', + name: '_someNumConditional', + tag: { src: 'Xingqiu', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Xinyan: { + _someBoolConditional: { + src: 'Xinyan', + name: '_someBoolConditional', + tag: { src: 'Xinyan', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Xinyan', + name: '_someListConditional', + tag: { src: 'Xinyan', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Xinyan', + name: '_someNumConditional', + tag: { src: 'Xinyan', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + YaeMiko: { + _someBoolConditional: { + src: 'YaeMiko', + name: '_someBoolConditional', + tag: { src: 'YaeMiko', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'YaeMiko', + name: '_someListConditional', + tag: { src: 'YaeMiko', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'YaeMiko', + name: '_someNumConditional', + tag: { src: 'YaeMiko', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Yanfei: { + _someBoolConditional: { + src: 'Yanfei', + name: '_someBoolConditional', + tag: { src: 'Yanfei', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Yanfei', + name: '_someListConditional', + tag: { src: 'Yanfei', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Yanfei', + name: '_someNumConditional', + tag: { src: 'Yanfei', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Yaoyao: { + _someBoolConditional: { + src: 'Yaoyao', + name: '_someBoolConditional', + tag: { src: 'Yaoyao', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Yaoyao', + name: '_someListConditional', + tag: { src: 'Yaoyao', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Yaoyao', + name: '_someNumConditional', + tag: { src: 'Yaoyao', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Yelan: { + _someBoolConditional: { + src: 'Yelan', + name: '_someBoolConditional', + tag: { src: 'Yelan', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Yelan', + name: '_someListConditional', + tag: { src: 'Yelan', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Yelan', + name: '_someNumConditional', + tag: { src: 'Yelan', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Yoimiya: { + _someBoolConditional: { + src: 'Yoimiya', + name: '_someBoolConditional', + tag: { src: 'Yoimiya', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Yoimiya', + name: '_someListConditional', + tag: { src: 'Yoimiya', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Yoimiya', + name: '_someNumConditional', + tag: { src: 'Yoimiya', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + YunJin: { + _someBoolConditional: { + src: 'YunJin', + name: '_someBoolConditional', + tag: { src: 'YunJin', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'YunJin', + name: '_someListConditional', + tag: { src: 'YunJin', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'YunJin', + name: '_someNumConditional', + tag: { src: 'YunJin', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Zhongli: { + _someBoolConditional: { + src: 'Zhongli', + name: '_someBoolConditional', + tag: { src: 'Zhongli', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Zhongli', + name: '_someListConditional', + tag: { src: 'Zhongli', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Zhongli', + name: '_someNumConditional', + tag: { src: 'Zhongli', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TravelerAnemo: { + _someBoolConditional: { + src: 'TravelerAnemo', + name: '_someBoolConditional', + tag: { src: 'TravelerAnemo', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelerAnemo', + name: '_someListConditional', + tag: { src: 'TravelerAnemo', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelerAnemo', + name: '_someNumConditional', + tag: { src: 'TravelerAnemo', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AmenomaKageuchi: { + _someBoolConditional: { + src: 'AmenomaKageuchi', + name: '_someBoolConditional', + tag: { src: 'AmenomaKageuchi', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AmenomaKageuchi', + name: '_someListConditional', + tag: { src: 'AmenomaKageuchi', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AmenomaKageuchi', + name: '_someNumConditional', + tag: { src: 'AmenomaKageuchi', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AquilaFavonia: { + _someBoolConditional: { + src: 'AquilaFavonia', + name: '_someBoolConditional', + tag: { src: 'AquilaFavonia', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AquilaFavonia', + name: '_someListConditional', + tag: { src: 'AquilaFavonia', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AquilaFavonia', + name: '_someNumConditional', + tag: { src: 'AquilaFavonia', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlackcliffLongsword: { + _someBoolConditional: { + src: 'BlackcliffLongsword', + name: '_someBoolConditional', + tag: { src: 'BlackcliffLongsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlackcliffLongsword', + name: '_someListConditional', + tag: { src: 'BlackcliffLongsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlackcliffLongsword', + name: '_someNumConditional', + tag: { src: 'BlackcliffLongsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + CinnabarSpindle: { + _someBoolConditional: { + src: 'CinnabarSpindle', + name: '_someBoolConditional', + tag: { src: 'CinnabarSpindle', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'CinnabarSpindle', + name: '_someListConditional', + tag: { src: 'CinnabarSpindle', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'CinnabarSpindle', + name: '_someNumConditional', + tag: { src: 'CinnabarSpindle', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + CoolSteel: { + _someBoolConditional: { + src: 'CoolSteel', + name: '_someBoolConditional', + tag: { src: 'CoolSteel', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'CoolSteel', + name: '_someListConditional', + tag: { src: 'CoolSteel', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'CoolSteel', + name: '_someNumConditional', + tag: { src: 'CoolSteel', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DarkIronSword: { + _someBoolConditional: { + src: 'DarkIronSword', + name: '_someBoolConditional', + tag: { src: 'DarkIronSword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DarkIronSword', + name: '_someListConditional', + tag: { src: 'DarkIronSword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DarkIronSword', + name: '_someNumConditional', + tag: { src: 'DarkIronSword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DullBlade: { + _someBoolConditional: { + src: 'DullBlade', + name: '_someBoolConditional', + tag: { src: 'DullBlade', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DullBlade', + name: '_someListConditional', + tag: { src: 'DullBlade', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DullBlade', + name: '_someNumConditional', + tag: { src: 'DullBlade', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FavoniusSword: { + _someBoolConditional: { + src: 'FavoniusSword', + name: '_someBoolConditional', + tag: { src: 'FavoniusSword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FavoniusSword', + name: '_someListConditional', + tag: { src: 'FavoniusSword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FavoniusSword', + name: '_someNumConditional', + tag: { src: 'FavoniusSword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FesteringDesire: { + _someBoolConditional: { + src: 'FesteringDesire', + name: '_someBoolConditional', + tag: { src: 'FesteringDesire', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FesteringDesire', + name: '_someListConditional', + tag: { src: 'FesteringDesire', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FesteringDesire', + name: '_someNumConditional', + tag: { src: 'FesteringDesire', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FilletBlade: { + _someBoolConditional: { + src: 'FilletBlade', + name: '_someBoolConditional', + tag: { src: 'FilletBlade', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FilletBlade', + name: '_someListConditional', + tag: { src: 'FilletBlade', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FilletBlade', + name: '_someNumConditional', + tag: { src: 'FilletBlade', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FinaleOfTheDeep: { + _someBoolConditional: { + src: 'FinaleOfTheDeep', + name: '_someBoolConditional', + tag: { src: 'FinaleOfTheDeep', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FinaleOfTheDeep', + name: '_someListConditional', + tag: { src: 'FinaleOfTheDeep', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FinaleOfTheDeep', + name: '_someNumConditional', + tag: { src: 'FinaleOfTheDeep', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FleuveCendreFerryman: { + _someBoolConditional: { + src: 'FleuveCendreFerryman', + name: '_someBoolConditional', + tag: { src: 'FleuveCendreFerryman', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FleuveCendreFerryman', + name: '_someListConditional', + tag: { src: 'FleuveCendreFerryman', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FleuveCendreFerryman', + name: '_someNumConditional', + tag: { src: 'FleuveCendreFerryman', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FreedomSworn: { + _someBoolConditional: { + src: 'FreedomSworn', + name: '_someBoolConditional', + tag: { src: 'FreedomSworn', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FreedomSworn', + name: '_someListConditional', + tag: { src: 'FreedomSworn', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FreedomSworn', + name: '_someNumConditional', + tag: { src: 'FreedomSworn', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HaranGeppakuFutsu: { + _someBoolConditional: { + src: 'HaranGeppakuFutsu', + name: '_someBoolConditional', + tag: { src: 'HaranGeppakuFutsu', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HaranGeppakuFutsu', + name: '_someListConditional', + tag: { src: 'HaranGeppakuFutsu', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HaranGeppakuFutsu', + name: '_someNumConditional', + tag: { src: 'HaranGeppakuFutsu', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HarbingerOfDawn: { + _someBoolConditional: { + src: 'HarbingerOfDawn', + name: '_someBoolConditional', + tag: { src: 'HarbingerOfDawn', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HarbingerOfDawn', + name: '_someListConditional', + tag: { src: 'HarbingerOfDawn', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HarbingerOfDawn', + name: '_someNumConditional', + tag: { src: 'HarbingerOfDawn', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + IronSting: { + _someBoolConditional: { + src: 'IronSting', + name: '_someBoolConditional', + tag: { src: 'IronSting', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'IronSting', + name: '_someListConditional', + tag: { src: 'IronSting', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'IronSting', + name: '_someNumConditional', + tag: { src: 'IronSting', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KagotsurubeIsshin: { + _someBoolConditional: { + src: 'KagotsurubeIsshin', + name: '_someBoolConditional', + tag: { src: 'KagotsurubeIsshin', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KagotsurubeIsshin', + name: '_someListConditional', + tag: { src: 'KagotsurubeIsshin', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KagotsurubeIsshin', + name: '_someNumConditional', + tag: { src: 'KagotsurubeIsshin', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KeyOfKhajNisut: { + afterSkillStacks: { + src: 'KeyOfKhajNisut', + name: 'afterSkillStacks', + tag: { src: 'KeyOfKhajNisut', name: 'afterSkillStacks' }, + type: 'num', + int_only: true, + min: 0, + max: 3, + }, + }, + LightOfFoliarIncision: { + _someBoolConditional: { + src: 'LightOfFoliarIncision', + name: '_someBoolConditional', + tag: { src: 'LightOfFoliarIncision', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LightOfFoliarIncision', + name: '_someListConditional', + tag: { src: 'LightOfFoliarIncision', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LightOfFoliarIncision', + name: '_someNumConditional', + tag: { src: 'LightOfFoliarIncision', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + LionsRoar: { + _someBoolConditional: { + src: 'LionsRoar', + name: '_someBoolConditional', + tag: { src: 'LionsRoar', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LionsRoar', + name: '_someListConditional', + tag: { src: 'LionsRoar', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LionsRoar', + name: '_someNumConditional', + tag: { src: 'LionsRoar', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MistsplitterReforged: { + _someBoolConditional: { + src: 'MistsplitterReforged', + name: '_someBoolConditional', + tag: { src: 'MistsplitterReforged', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MistsplitterReforged', + name: '_someListConditional', + tag: { src: 'MistsplitterReforged', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MistsplitterReforged', + name: '_someNumConditional', + tag: { src: 'MistsplitterReforged', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrimordialJadeCutter: { + _someBoolConditional: { + src: 'PrimordialJadeCutter', + name: '_someBoolConditional', + tag: { src: 'PrimordialJadeCutter', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrimordialJadeCutter', + name: '_someListConditional', + tag: { src: 'PrimordialJadeCutter', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrimordialJadeCutter', + name: '_someNumConditional', + tag: { src: 'PrimordialJadeCutter', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrototypeRancour: { + _someBoolConditional: { + src: 'PrototypeRancour', + name: '_someBoolConditional', + tag: { src: 'PrototypeRancour', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrototypeRancour', + name: '_someListConditional', + tag: { src: 'PrototypeRancour', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrototypeRancour', + name: '_someNumConditional', + tag: { src: 'PrototypeRancour', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RoyalLongsword: { + _someBoolConditional: { + src: 'RoyalLongsword', + name: '_someBoolConditional', + tag: { src: 'RoyalLongsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RoyalLongsword', + name: '_someListConditional', + tag: { src: 'RoyalLongsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RoyalLongsword', + name: '_someNumConditional', + tag: { src: 'RoyalLongsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SacrificialSword: { + _someBoolConditional: { + src: 'SacrificialSword', + name: '_someBoolConditional', + tag: { src: 'SacrificialSword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SacrificialSword', + name: '_someListConditional', + tag: { src: 'SacrificialSword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SacrificialSword', + name: '_someNumConditional', + tag: { src: 'SacrificialSword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SapwoodBlade: { + _someBoolConditional: { + src: 'SapwoodBlade', + name: '_someBoolConditional', + tag: { src: 'SapwoodBlade', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SapwoodBlade', + name: '_someListConditional', + tag: { src: 'SapwoodBlade', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SapwoodBlade', + name: '_someNumConditional', + tag: { src: 'SapwoodBlade', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SilverSword: { + _someBoolConditional: { + src: 'SilverSword', + name: '_someBoolConditional', + tag: { src: 'SilverSword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SilverSword', + name: '_someListConditional', + tag: { src: 'SilverSword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SilverSword', + name: '_someNumConditional', + tag: { src: 'SilverSword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkyriderSword: { + _someBoolConditional: { + src: 'SkyriderSword', + name: '_someBoolConditional', + tag: { src: 'SkyriderSword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkyriderSword', + name: '_someListConditional', + tag: { src: 'SkyriderSword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkyriderSword', + name: '_someNumConditional', + tag: { src: 'SkyriderSword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkywardBlade: { + _someBoolConditional: { + src: 'SkywardBlade', + name: '_someBoolConditional', + tag: { src: 'SkywardBlade', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkywardBlade', + name: '_someListConditional', + tag: { src: 'SkywardBlade', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkywardBlade', + name: '_someNumConditional', + tag: { src: 'SkywardBlade', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SplendorOfTranquilWaters: { + _someBoolConditional: { + src: 'SplendorOfTranquilWaters', + name: '_someBoolConditional', + tag: { src: 'SplendorOfTranquilWaters', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SplendorOfTranquilWaters', + name: '_someListConditional', + tag: { src: 'SplendorOfTranquilWaters', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SplendorOfTranquilWaters', + name: '_someNumConditional', + tag: { src: 'SplendorOfTranquilWaters', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SummitShaper: { + _someBoolConditional: { + src: 'SummitShaper', + name: '_someBoolConditional', + tag: { src: 'SummitShaper', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SummitShaper', + name: '_someListConditional', + tag: { src: 'SummitShaper', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SummitShaper', + name: '_someNumConditional', + tag: { src: 'SummitShaper', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SwordOfDescension: { + _someBoolConditional: { + src: 'SwordOfDescension', + name: '_someBoolConditional', + tag: { src: 'SwordOfDescension', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SwordOfDescension', + name: '_someListConditional', + tag: { src: 'SwordOfDescension', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SwordOfDescension', + name: '_someNumConditional', + tag: { src: 'SwordOfDescension', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SwordOfNarzissenkreuz: { + _someBoolConditional: { + src: 'SwordOfNarzissenkreuz', + name: '_someBoolConditional', + tag: { src: 'SwordOfNarzissenkreuz', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SwordOfNarzissenkreuz', + name: '_someListConditional', + tag: { src: 'SwordOfNarzissenkreuz', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SwordOfNarzissenkreuz', + name: '_someNumConditional', + tag: { src: 'SwordOfNarzissenkreuz', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheAlleyFlash: { + _someBoolConditional: { + src: 'TheAlleyFlash', + name: '_someBoolConditional', + tag: { src: 'TheAlleyFlash', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheAlleyFlash', + name: '_someListConditional', + tag: { src: 'TheAlleyFlash', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheAlleyFlash', + name: '_someNumConditional', + tag: { src: 'TheAlleyFlash', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheBlackSword: { + _someBoolConditional: { + src: 'TheBlackSword', + name: '_someBoolConditional', + tag: { src: 'TheBlackSword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheBlackSword', + name: '_someListConditional', + tag: { src: 'TheBlackSword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheBlackSword', + name: '_someNumConditional', + tag: { src: 'TheBlackSword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheDockhandsAssistant: { + _someBoolConditional: { + src: 'TheDockhandsAssistant', + name: '_someBoolConditional', + tag: { src: 'TheDockhandsAssistant', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheDockhandsAssistant', + name: '_someListConditional', + tag: { src: 'TheDockhandsAssistant', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheDockhandsAssistant', + name: '_someNumConditional', + tag: { src: 'TheDockhandsAssistant', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheFlute: { + _someBoolConditional: { + src: 'TheFlute', + name: '_someBoolConditional', + tag: { src: 'TheFlute', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheFlute', + name: '_someListConditional', + tag: { src: 'TheFlute', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheFlute', + name: '_someNumConditional', + tag: { src: 'TheFlute', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ToukabouShigure: { + _someBoolConditional: { + src: 'ToukabouShigure', + name: '_someBoolConditional', + tag: { src: 'ToukabouShigure', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ToukabouShigure', + name: '_someListConditional', + tag: { src: 'ToukabouShigure', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ToukabouShigure', + name: '_someNumConditional', + tag: { src: 'ToukabouShigure', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TravelersHandySword: { + _someBoolConditional: { + src: 'TravelersHandySword', + name: '_someBoolConditional', + tag: { src: 'TravelersHandySword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelersHandySword', + name: '_someListConditional', + tag: { src: 'TravelersHandySword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelersHandySword', + name: '_someNumConditional', + tag: { src: 'TravelersHandySword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WolfFang: { + _someBoolConditional: { + src: 'WolfFang', + name: '_someBoolConditional', + tag: { src: 'WolfFang', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WolfFang', + name: '_someListConditional', + tag: { src: 'WolfFang', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WolfFang', + name: '_someNumConditional', + tag: { src: 'WolfFang', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + XiphosMoonlight: { + _someBoolConditional: { + src: 'XiphosMoonlight', + name: '_someBoolConditional', + tag: { src: 'XiphosMoonlight', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'XiphosMoonlight', + name: '_someListConditional', + tag: { src: 'XiphosMoonlight', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'XiphosMoonlight', + name: '_someNumConditional', + tag: { src: 'XiphosMoonlight', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Akuoumaru: { + _someBoolConditional: { + src: 'Akuoumaru', + name: '_someBoolConditional', + tag: { src: 'Akuoumaru', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Akuoumaru', + name: '_someListConditional', + tag: { src: 'Akuoumaru', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Akuoumaru', + name: '_someNumConditional', + tag: { src: 'Akuoumaru', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BeaconOfTheReedSea: { + _someBoolConditional: { + src: 'BeaconOfTheReedSea', + name: '_someBoolConditional', + tag: { src: 'BeaconOfTheReedSea', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BeaconOfTheReedSea', + name: '_someListConditional', + tag: { src: 'BeaconOfTheReedSea', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BeaconOfTheReedSea', + name: '_someNumConditional', + tag: { src: 'BeaconOfTheReedSea', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlackcliffSlasher: { + _someBoolConditional: { + src: 'BlackcliffSlasher', + name: '_someBoolConditional', + tag: { src: 'BlackcliffSlasher', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlackcliffSlasher', + name: '_someListConditional', + tag: { src: 'BlackcliffSlasher', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlackcliffSlasher', + name: '_someNumConditional', + tag: { src: 'BlackcliffSlasher', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BloodtaintedGreatsword: { + _someBoolConditional: { + src: 'BloodtaintedGreatsword', + name: '_someBoolConditional', + tag: { src: 'BloodtaintedGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BloodtaintedGreatsword', + name: '_someListConditional', + tag: { src: 'BloodtaintedGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BloodtaintedGreatsword', + name: '_someNumConditional', + tag: { src: 'BloodtaintedGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DebateClub: { + _someBoolConditional: { + src: 'DebateClub', + name: '_someBoolConditional', + tag: { src: 'DebateClub', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DebateClub', + name: '_someListConditional', + tag: { src: 'DebateClub', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DebateClub', + name: '_someNumConditional', + tag: { src: 'DebateClub', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FavoniusGreatsword: { + _someBoolConditional: { + src: 'FavoniusGreatsword', + name: '_someBoolConditional', + tag: { src: 'FavoniusGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FavoniusGreatsword', + name: '_someListConditional', + tag: { src: 'FavoniusGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FavoniusGreatsword', + name: '_someNumConditional', + tag: { src: 'FavoniusGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FerrousShadow: { + _someBoolConditional: { + src: 'FerrousShadow', + name: '_someBoolConditional', + tag: { src: 'FerrousShadow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FerrousShadow', + name: '_someListConditional', + tag: { src: 'FerrousShadow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FerrousShadow', + name: '_someNumConditional', + tag: { src: 'FerrousShadow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ForestRegalia: { + _someBoolConditional: { + src: 'ForestRegalia', + name: '_someBoolConditional', + tag: { src: 'ForestRegalia', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ForestRegalia', + name: '_someListConditional', + tag: { src: 'ForestRegalia', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ForestRegalia', + name: '_someNumConditional', + tag: { src: 'ForestRegalia', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KatsuragikiriNagamasa: { + _someBoolConditional: { + src: 'KatsuragikiriNagamasa', + name: '_someBoolConditional', + tag: { src: 'KatsuragikiriNagamasa', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KatsuragikiriNagamasa', + name: '_someListConditional', + tag: { src: 'KatsuragikiriNagamasa', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KatsuragikiriNagamasa', + name: '_someNumConditional', + tag: { src: 'KatsuragikiriNagamasa', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + LithicBlade: { + _someBoolConditional: { + src: 'LithicBlade', + name: '_someBoolConditional', + tag: { src: 'LithicBlade', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LithicBlade', + name: '_someListConditional', + tag: { src: 'LithicBlade', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LithicBlade', + name: '_someNumConditional', + tag: { src: 'LithicBlade', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + LuxuriousSeaLord: { + _someBoolConditional: { + src: 'LuxuriousSeaLord', + name: '_someBoolConditional', + tag: { src: 'LuxuriousSeaLord', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LuxuriousSeaLord', + name: '_someListConditional', + tag: { src: 'LuxuriousSeaLord', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LuxuriousSeaLord', + name: '_someNumConditional', + tag: { src: 'LuxuriousSeaLord', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MailedFlower: { + _someBoolConditional: { + src: 'MailedFlower', + name: '_someBoolConditional', + tag: { src: 'MailedFlower', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MailedFlower', + name: '_someListConditional', + tag: { src: 'MailedFlower', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MailedFlower', + name: '_someNumConditional', + tag: { src: 'MailedFlower', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MakhairaAquamarine: { + _someBoolConditional: { + src: 'MakhairaAquamarine', + name: '_someBoolConditional', + tag: { src: 'MakhairaAquamarine', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MakhairaAquamarine', + name: '_someListConditional', + tag: { src: 'MakhairaAquamarine', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MakhairaAquamarine', + name: '_someNumConditional', + tag: { src: 'MakhairaAquamarine', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + OldMercsPal: { + _someBoolConditional: { + src: 'OldMercsPal', + name: '_someBoolConditional', + tag: { src: 'OldMercsPal', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'OldMercsPal', + name: '_someListConditional', + tag: { src: 'OldMercsPal', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'OldMercsPal', + name: '_someNumConditional', + tag: { src: 'OldMercsPal', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PortablePowerSaw: { + _someBoolConditional: { + src: 'PortablePowerSaw', + name: '_someBoolConditional', + tag: { src: 'PortablePowerSaw', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PortablePowerSaw', + name: '_someListConditional', + tag: { src: 'PortablePowerSaw', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PortablePowerSaw', + name: '_someNumConditional', + tag: { src: 'PortablePowerSaw', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrototypeArchaic: { + _someBoolConditional: { + src: 'PrototypeArchaic', + name: '_someBoolConditional', + tag: { src: 'PrototypeArchaic', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrototypeArchaic', + name: '_someListConditional', + tag: { src: 'PrototypeArchaic', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrototypeArchaic', + name: '_someNumConditional', + tag: { src: 'PrototypeArchaic', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Rainslasher: { + _someBoolConditional: { + src: 'Rainslasher', + name: '_someBoolConditional', + tag: { src: 'Rainslasher', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Rainslasher', + name: '_someListConditional', + tag: { src: 'Rainslasher', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Rainslasher', + name: '_someNumConditional', + tag: { src: 'Rainslasher', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RedhornStonethresher: { + _someBoolConditional: { + src: 'RedhornStonethresher', + name: '_someBoolConditional', + tag: { src: 'RedhornStonethresher', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RedhornStonethresher', + name: '_someListConditional', + tag: { src: 'RedhornStonethresher', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RedhornStonethresher', + name: '_someNumConditional', + tag: { src: 'RedhornStonethresher', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RoyalGreatsword: { + _someBoolConditional: { + src: 'RoyalGreatsword', + name: '_someBoolConditional', + tag: { src: 'RoyalGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RoyalGreatsword', + name: '_someListConditional', + tag: { src: 'RoyalGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RoyalGreatsword', + name: '_someNumConditional', + tag: { src: 'RoyalGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SacrificialGreatsword: { + _someBoolConditional: { + src: 'SacrificialGreatsword', + name: '_someBoolConditional', + tag: { src: 'SacrificialGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SacrificialGreatsword', + name: '_someListConditional', + tag: { src: 'SacrificialGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SacrificialGreatsword', + name: '_someNumConditional', + tag: { src: 'SacrificialGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SerpentSpine: { + _someBoolConditional: { + src: 'SerpentSpine', + name: '_someBoolConditional', + tag: { src: 'SerpentSpine', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SerpentSpine', + name: '_someListConditional', + tag: { src: 'SerpentSpine', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SerpentSpine', + name: '_someNumConditional', + tag: { src: 'SerpentSpine', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkyriderGreatsword: { + _someBoolConditional: { + src: 'SkyriderGreatsword', + name: '_someBoolConditional', + tag: { src: 'SkyriderGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkyriderGreatsword', + name: '_someListConditional', + tag: { src: 'SkyriderGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkyriderGreatsword', + name: '_someNumConditional', + tag: { src: 'SkyriderGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkywardPride: { + _someBoolConditional: { + src: 'SkywardPride', + name: '_someBoolConditional', + tag: { src: 'SkywardPride', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkywardPride', + name: '_someListConditional', + tag: { src: 'SkywardPride', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkywardPride', + name: '_someNumConditional', + tag: { src: 'SkywardPride', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SnowTombedStarsilver: { + _someBoolConditional: { + src: 'SnowTombedStarsilver', + name: '_someBoolConditional', + tag: { src: 'SnowTombedStarsilver', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SnowTombedStarsilver', + name: '_someListConditional', + tag: { src: 'SnowTombedStarsilver', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SnowTombedStarsilver', + name: '_someNumConditional', + tag: { src: 'SnowTombedStarsilver', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SongOfBrokenPines: { + _someBoolConditional: { + src: 'SongOfBrokenPines', + name: '_someBoolConditional', + tag: { src: 'SongOfBrokenPines', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SongOfBrokenPines', + name: '_someListConditional', + tag: { src: 'SongOfBrokenPines', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SongOfBrokenPines', + name: '_someNumConditional', + tag: { src: 'SongOfBrokenPines', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TalkingStick: { + _someBoolConditional: { + src: 'TalkingStick', + name: '_someBoolConditional', + tag: { src: 'TalkingStick', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TalkingStick', + name: '_someListConditional', + tag: { src: 'TalkingStick', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TalkingStick', + name: '_someNumConditional', + tag: { src: 'TalkingStick', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheBell: { + _someBoolConditional: { + src: 'TheBell', + name: '_someBoolConditional', + tag: { src: 'TheBell', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheBell', + name: '_someListConditional', + tag: { src: 'TheBell', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheBell', + name: '_someNumConditional', + tag: { src: 'TheBell', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheUnforged: { + _someBoolConditional: { + src: 'TheUnforged', + name: '_someBoolConditional', + tag: { src: 'TheUnforged', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheUnforged', + name: '_someListConditional', + tag: { src: 'TheUnforged', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheUnforged', + name: '_someNumConditional', + tag: { src: 'TheUnforged', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TidalShadow: { + _someBoolConditional: { + src: 'TidalShadow', + name: '_someBoolConditional', + tag: { src: 'TidalShadow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TidalShadow', + name: '_someListConditional', + tag: { src: 'TidalShadow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TidalShadow', + name: '_someNumConditional', + tag: { src: 'TidalShadow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WasterGreatsword: { + _someBoolConditional: { + src: 'WasterGreatsword', + name: '_someBoolConditional', + tag: { src: 'WasterGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WasterGreatsword', + name: '_someListConditional', + tag: { src: 'WasterGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WasterGreatsword', + name: '_someNumConditional', + tag: { src: 'WasterGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Whiteblind: { + _someBoolConditional: { + src: 'Whiteblind', + name: '_someBoolConditional', + tag: { src: 'Whiteblind', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Whiteblind', + name: '_someListConditional', + tag: { src: 'Whiteblind', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Whiteblind', + name: '_someNumConditional', + tag: { src: 'Whiteblind', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WhiteIronGreatsword: { + _someBoolConditional: { + src: 'WhiteIronGreatsword', + name: '_someBoolConditional', + tag: { src: 'WhiteIronGreatsword', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WhiteIronGreatsword', + name: '_someListConditional', + tag: { src: 'WhiteIronGreatsword', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WhiteIronGreatsword', + name: '_someNumConditional', + tag: { src: 'WhiteIronGreatsword', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WolfsGravestone: { + _someBoolConditional: { + src: 'WolfsGravestone', + name: '_someBoolConditional', + tag: { src: 'WolfsGravestone', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WolfsGravestone', + name: '_someListConditional', + tag: { src: 'WolfsGravestone', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WolfsGravestone', + name: '_someNumConditional', + tag: { src: 'WolfsGravestone', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BalladOfTheFjords: { + _someBoolConditional: { + src: 'BalladOfTheFjords', + name: '_someBoolConditional', + tag: { src: 'BalladOfTheFjords', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BalladOfTheFjords', + name: '_someListConditional', + tag: { src: 'BalladOfTheFjords', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BalladOfTheFjords', + name: '_someNumConditional', + tag: { src: 'BalladOfTheFjords', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BeginnersProtector: { + _someBoolConditional: { + src: 'BeginnersProtector', + name: '_someBoolConditional', + tag: { src: 'BeginnersProtector', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BeginnersProtector', + name: '_someListConditional', + tag: { src: 'BeginnersProtector', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BeginnersProtector', + name: '_someNumConditional', + tag: { src: 'BeginnersProtector', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlackcliffPole: { + _someBoolConditional: { + src: 'BlackcliffPole', + name: '_someBoolConditional', + tag: { src: 'BlackcliffPole', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlackcliffPole', + name: '_someListConditional', + tag: { src: 'BlackcliffPole', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlackcliffPole', + name: '_someNumConditional', + tag: { src: 'BlackcliffPole', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlackTassel: { + _someBoolConditional: { + src: 'BlackTassel', + name: '_someBoolConditional', + tag: { src: 'BlackTassel', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlackTassel', + name: '_someListConditional', + tag: { src: 'BlackTassel', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlackTassel', + name: '_someNumConditional', + tag: { src: 'BlackTassel', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + CalamityQueller: { + stack: { + src: 'CalamityQueller', + name: 'stack', + tag: { src: 'CalamityQueller', name: 'stack' }, + type: 'num', + int_only: true, + min: 0, + max: 6, + }, + }, + CrescentPike: { + _someBoolConditional: { + src: 'CrescentPike', + name: '_someBoolConditional', + tag: { src: 'CrescentPike', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'CrescentPike', + name: '_someListConditional', + tag: { src: 'CrescentPike', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'CrescentPike', + name: '_someNumConditional', + tag: { src: 'CrescentPike', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Deathmatch: { + _someBoolConditional: { + src: 'Deathmatch', + name: '_someBoolConditional', + tag: { src: 'Deathmatch', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Deathmatch', + name: '_someListConditional', + tag: { src: 'Deathmatch', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Deathmatch', + name: '_someNumConditional', + tag: { src: 'Deathmatch', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DragonsBane: { + _someBoolConditional: { + src: 'DragonsBane', + name: '_someBoolConditional', + tag: { src: 'DragonsBane', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DragonsBane', + name: '_someListConditional', + tag: { src: 'DragonsBane', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DragonsBane', + name: '_someNumConditional', + tag: { src: 'DragonsBane', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DragonspineSpear: { + _someBoolConditional: { + src: 'DragonspineSpear', + name: '_someBoolConditional', + tag: { src: 'DragonspineSpear', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DragonspineSpear', + name: '_someListConditional', + tag: { src: 'DragonspineSpear', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DragonspineSpear', + name: '_someNumConditional', + tag: { src: 'DragonspineSpear', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EngulfingLightning: { + _someBoolConditional: { + src: 'EngulfingLightning', + name: '_someBoolConditional', + tag: { src: 'EngulfingLightning', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EngulfingLightning', + name: '_someListConditional', + tag: { src: 'EngulfingLightning', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EngulfingLightning', + name: '_someNumConditional', + tag: { src: 'EngulfingLightning', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FavoniusLance: { + _someBoolConditional: { + src: 'FavoniusLance', + name: '_someBoolConditional', + tag: { src: 'FavoniusLance', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FavoniusLance', + name: '_someListConditional', + tag: { src: 'FavoniusLance', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FavoniusLance', + name: '_someNumConditional', + tag: { src: 'FavoniusLance', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Halberd: { + _someBoolConditional: { + src: 'Halberd', + name: '_someBoolConditional', + tag: { src: 'Halberd', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Halberd', + name: '_someListConditional', + tag: { src: 'Halberd', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Halberd', + name: '_someNumConditional', + tag: { src: 'Halberd', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + IronPoint: { + _someBoolConditional: { + src: 'IronPoint', + name: '_someBoolConditional', + tag: { src: 'IronPoint', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'IronPoint', + name: '_someListConditional', + tag: { src: 'IronPoint', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'IronPoint', + name: '_someNumConditional', + tag: { src: 'IronPoint', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KitainCrossSpear: { + _someBoolConditional: { + src: 'KitainCrossSpear', + name: '_someBoolConditional', + tag: { src: 'KitainCrossSpear', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KitainCrossSpear', + name: '_someListConditional', + tag: { src: 'KitainCrossSpear', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KitainCrossSpear', + name: '_someNumConditional', + tag: { src: 'KitainCrossSpear', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + LithicSpear: { + _someBoolConditional: { + src: 'LithicSpear', + name: '_someBoolConditional', + tag: { src: 'LithicSpear', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LithicSpear', + name: '_someListConditional', + tag: { src: 'LithicSpear', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LithicSpear', + name: '_someNumConditional', + tag: { src: 'LithicSpear', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MissiveWindspear: { + _someBoolConditional: { + src: 'MissiveWindspear', + name: '_someBoolConditional', + tag: { src: 'MissiveWindspear', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MissiveWindspear', + name: '_someListConditional', + tag: { src: 'MissiveWindspear', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MissiveWindspear', + name: '_someNumConditional', + tag: { src: 'MissiveWindspear', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Moonpiercer: { + _someBoolConditional: { + src: 'Moonpiercer', + name: '_someBoolConditional', + tag: { src: 'Moonpiercer', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Moonpiercer', + name: '_someListConditional', + tag: { src: 'Moonpiercer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Moonpiercer', + name: '_someNumConditional', + tag: { src: 'Moonpiercer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrimordialJadeWingedSpear: { + _someBoolConditional: { + src: 'PrimordialJadeWingedSpear', + name: '_someBoolConditional', + tag: { src: 'PrimordialJadeWingedSpear', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrimordialJadeWingedSpear', + name: '_someListConditional', + tag: { src: 'PrimordialJadeWingedSpear', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrimordialJadeWingedSpear', + name: '_someNumConditional', + tag: { src: 'PrimordialJadeWingedSpear', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ProspectorsDrill: { + _someBoolConditional: { + src: 'ProspectorsDrill', + name: '_someBoolConditional', + tag: { src: 'ProspectorsDrill', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ProspectorsDrill', + name: '_someListConditional', + tag: { src: 'ProspectorsDrill', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ProspectorsDrill', + name: '_someNumConditional', + tag: { src: 'ProspectorsDrill', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrototypeStarglitter: { + _someBoolConditional: { + src: 'PrototypeStarglitter', + name: '_someBoolConditional', + tag: { src: 'PrototypeStarglitter', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrototypeStarglitter', + name: '_someListConditional', + tag: { src: 'PrototypeStarglitter', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrototypeStarglitter', + name: '_someNumConditional', + tag: { src: 'PrototypeStarglitter', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RightfulReward: { + _someBoolConditional: { + src: 'RightfulReward', + name: '_someBoolConditional', + tag: { src: 'RightfulReward', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RightfulReward', + name: '_someListConditional', + tag: { src: 'RightfulReward', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RightfulReward', + name: '_someNumConditional', + tag: { src: 'RightfulReward', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RoyalSpear: { + _someBoolConditional: { + src: 'RoyalSpear', + name: '_someBoolConditional', + tag: { src: 'RoyalSpear', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RoyalSpear', + name: '_someListConditional', + tag: { src: 'RoyalSpear', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RoyalSpear', + name: '_someNumConditional', + tag: { src: 'RoyalSpear', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkywardSpine: { + _someBoolConditional: { + src: 'SkywardSpine', + name: '_someBoolConditional', + tag: { src: 'SkywardSpine', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkywardSpine', + name: '_someListConditional', + tag: { src: 'SkywardSpine', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkywardSpine', + name: '_someNumConditional', + tag: { src: 'SkywardSpine', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + StaffOfHoma: { + _someBoolConditional: { + src: 'StaffOfHoma', + name: '_someBoolConditional', + tag: { src: 'StaffOfHoma', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'StaffOfHoma', + name: '_someListConditional', + tag: { src: 'StaffOfHoma', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'StaffOfHoma', + name: '_someNumConditional', + tag: { src: 'StaffOfHoma', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + StaffOfTheScarletSands: { + _someBoolConditional: { + src: 'StaffOfTheScarletSands', + name: '_someBoolConditional', + tag: { src: 'StaffOfTheScarletSands', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'StaffOfTheScarletSands', + name: '_someListConditional', + tag: { src: 'StaffOfTheScarletSands', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'StaffOfTheScarletSands', + name: '_someNumConditional', + tag: { src: 'StaffOfTheScarletSands', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheCatch: { + _someBoolConditional: { + src: 'TheCatch', + name: '_someBoolConditional', + tag: { src: 'TheCatch', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheCatch', + name: '_someListConditional', + tag: { src: 'TheCatch', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheCatch', + name: '_someNumConditional', + tag: { src: 'TheCatch', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + VortexVanquisher: { + _someBoolConditional: { + src: 'VortexVanquisher', + name: '_someBoolConditional', + tag: { src: 'VortexVanquisher', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'VortexVanquisher', + name: '_someListConditional', + tag: { src: 'VortexVanquisher', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'VortexVanquisher', + name: '_someNumConditional', + tag: { src: 'VortexVanquisher', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WavebreakersFin: { + _someBoolConditional: { + src: 'WavebreakersFin', + name: '_someBoolConditional', + tag: { src: 'WavebreakersFin', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WavebreakersFin', + name: '_someListConditional', + tag: { src: 'WavebreakersFin', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WavebreakersFin', + name: '_someNumConditional', + tag: { src: 'WavebreakersFin', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WhiteTassel: { + _someBoolConditional: { + src: 'WhiteTassel', + name: '_someBoolConditional', + tag: { src: 'WhiteTassel', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WhiteTassel', + name: '_someListConditional', + tag: { src: 'WhiteTassel', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WhiteTassel', + name: '_someNumConditional', + tag: { src: 'WhiteTassel', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AlleyHunter: { + _someBoolConditional: { + src: 'AlleyHunter', + name: '_someBoolConditional', + tag: { src: 'AlleyHunter', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AlleyHunter', + name: '_someListConditional', + tag: { src: 'AlleyHunter', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AlleyHunter', + name: '_someNumConditional', + tag: { src: 'AlleyHunter', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AmosBow: { + _someBoolConditional: { + src: 'AmosBow', + name: '_someBoolConditional', + tag: { src: 'AmosBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AmosBow', + name: '_someListConditional', + tag: { src: 'AmosBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AmosBow', + name: '_someNumConditional', + tag: { src: 'AmosBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AquaSimulacra: { + _someBoolConditional: { + src: 'AquaSimulacra', + name: '_someBoolConditional', + tag: { src: 'AquaSimulacra', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AquaSimulacra', + name: '_someListConditional', + tag: { src: 'AquaSimulacra', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AquaSimulacra', + name: '_someNumConditional', + tag: { src: 'AquaSimulacra', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlackcliffWarbow: { + _someBoolConditional: { + src: 'BlackcliffWarbow', + name: '_someBoolConditional', + tag: { src: 'BlackcliffWarbow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlackcliffWarbow', + name: '_someListConditional', + tag: { src: 'BlackcliffWarbow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlackcliffWarbow', + name: '_someNumConditional', + tag: { src: 'BlackcliffWarbow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + CompoundBow: { + _someBoolConditional: { + src: 'CompoundBow', + name: '_someBoolConditional', + tag: { src: 'CompoundBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'CompoundBow', + name: '_someListConditional', + tag: { src: 'CompoundBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'CompoundBow', + name: '_someNumConditional', + tag: { src: 'CompoundBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ElegyForTheEnd: { + _someBoolConditional: { + src: 'ElegyForTheEnd', + name: '_someBoolConditional', + tag: { src: 'ElegyForTheEnd', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ElegyForTheEnd', + name: '_someListConditional', + tag: { src: 'ElegyForTheEnd', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ElegyForTheEnd', + name: '_someNumConditional', + tag: { src: 'ElegyForTheEnd', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EndOfTheLine: { + _someBoolConditional: { + src: 'EndOfTheLine', + name: '_someBoolConditional', + tag: { src: 'EndOfTheLine', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EndOfTheLine', + name: '_someListConditional', + tag: { src: 'EndOfTheLine', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EndOfTheLine', + name: '_someNumConditional', + tag: { src: 'EndOfTheLine', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FadingTwilight: { + _someBoolConditional: { + src: 'FadingTwilight', + name: '_someBoolConditional', + tag: { src: 'FadingTwilight', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FadingTwilight', + name: '_someListConditional', + tag: { src: 'FadingTwilight', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FadingTwilight', + name: '_someNumConditional', + tag: { src: 'FadingTwilight', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FavoniusWarbow: { + _someBoolConditional: { + src: 'FavoniusWarbow', + name: '_someBoolConditional', + tag: { src: 'FavoniusWarbow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FavoniusWarbow', + name: '_someListConditional', + tag: { src: 'FavoniusWarbow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FavoniusWarbow', + name: '_someNumConditional', + tag: { src: 'FavoniusWarbow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Hamayumi: { + _someBoolConditional: { + src: 'Hamayumi', + name: '_someBoolConditional', + tag: { src: 'Hamayumi', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Hamayumi', + name: '_someListConditional', + tag: { src: 'Hamayumi', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Hamayumi', + name: '_someNumConditional', + tag: { src: 'Hamayumi', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HuntersBow: { + _someBoolConditional: { + src: 'HuntersBow', + name: '_someBoolConditional', + tag: { src: 'HuntersBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HuntersBow', + name: '_someListConditional', + tag: { src: 'HuntersBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HuntersBow', + name: '_someNumConditional', + tag: { src: 'HuntersBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HuntersPath: { + _someBoolConditional: { + src: 'HuntersPath', + name: '_someBoolConditional', + tag: { src: 'HuntersPath', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HuntersPath', + name: '_someListConditional', + tag: { src: 'HuntersPath', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HuntersPath', + name: '_someNumConditional', + tag: { src: 'HuntersPath', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + IbisPiercer: { + _someBoolConditional: { + src: 'IbisPiercer', + name: '_someBoolConditional', + tag: { src: 'IbisPiercer', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'IbisPiercer', + name: '_someListConditional', + tag: { src: 'IbisPiercer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'IbisPiercer', + name: '_someNumConditional', + tag: { src: 'IbisPiercer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KingsSquire: { + _someBoolConditional: { + src: 'KingsSquire', + name: '_someBoolConditional', + tag: { src: 'KingsSquire', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KingsSquire', + name: '_someListConditional', + tag: { src: 'KingsSquire', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KingsSquire', + name: '_someNumConditional', + tag: { src: 'KingsSquire', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Messenger: { + _someBoolConditional: { + src: 'Messenger', + name: '_someBoolConditional', + tag: { src: 'Messenger', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Messenger', + name: '_someListConditional', + tag: { src: 'Messenger', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Messenger', + name: '_someNumConditional', + tag: { src: 'Messenger', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MitternachtsWaltz: { + _someBoolConditional: { + src: 'MitternachtsWaltz', + name: '_someBoolConditional', + tag: { src: 'MitternachtsWaltz', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MitternachtsWaltz', + name: '_someListConditional', + tag: { src: 'MitternachtsWaltz', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MitternachtsWaltz', + name: '_someNumConditional', + tag: { src: 'MitternachtsWaltz', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MouunsMoon: { + _someBoolConditional: { + src: 'MouunsMoon', + name: '_someBoolConditional', + tag: { src: 'MouunsMoon', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MouunsMoon', + name: '_someListConditional', + tag: { src: 'MouunsMoon', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MouunsMoon', + name: '_someNumConditional', + tag: { src: 'MouunsMoon', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PolarStar: { + _someBoolConditional: { + src: 'PolarStar', + name: '_someBoolConditional', + tag: { src: 'PolarStar', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PolarStar', + name: '_someListConditional', + tag: { src: 'PolarStar', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PolarStar', + name: '_someNumConditional', + tag: { src: 'PolarStar', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Predator: { + _someBoolConditional: { + src: 'Predator', + name: '_someBoolConditional', + tag: { src: 'Predator', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Predator', + name: '_someListConditional', + tag: { src: 'Predator', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Predator', + name: '_someNumConditional', + tag: { src: 'Predator', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PrototypeCrescent: { + _someBoolConditional: { + src: 'PrototypeCrescent', + name: '_someBoolConditional', + tag: { src: 'PrototypeCrescent', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PrototypeCrescent', + name: '_someListConditional', + tag: { src: 'PrototypeCrescent', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PrototypeCrescent', + name: '_someNumConditional', + tag: { src: 'PrototypeCrescent', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RangeGauge: { + _someBoolConditional: { + src: 'RangeGauge', + name: '_someBoolConditional', + tag: { src: 'RangeGauge', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RangeGauge', + name: '_someListConditional', + tag: { src: 'RangeGauge', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RangeGauge', + name: '_someNumConditional', + tag: { src: 'RangeGauge', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RavenBow: { + _someBoolConditional: { + src: 'RavenBow', + name: '_someBoolConditional', + tag: { src: 'RavenBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RavenBow', + name: '_someListConditional', + tag: { src: 'RavenBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RavenBow', + name: '_someNumConditional', + tag: { src: 'RavenBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RecurveBow: { + _someBoolConditional: { + src: 'RecurveBow', + name: '_someBoolConditional', + tag: { src: 'RecurveBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RecurveBow', + name: '_someListConditional', + tag: { src: 'RecurveBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RecurveBow', + name: '_someNumConditional', + tag: { src: 'RecurveBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RoyalBow: { + _someBoolConditional: { + src: 'RoyalBow', + name: '_someBoolConditional', + tag: { src: 'RoyalBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RoyalBow', + name: '_someListConditional', + tag: { src: 'RoyalBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RoyalBow', + name: '_someNumConditional', + tag: { src: 'RoyalBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Rust: { + _someBoolConditional: { + src: 'Rust', + name: '_someBoolConditional', + tag: { src: 'Rust', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Rust', + name: '_someListConditional', + tag: { src: 'Rust', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Rust', + name: '_someNumConditional', + tag: { src: 'Rust', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SacrificialBow: { + _someBoolConditional: { + src: 'SacrificialBow', + name: '_someBoolConditional', + tag: { src: 'SacrificialBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SacrificialBow', + name: '_someListConditional', + tag: { src: 'SacrificialBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SacrificialBow', + name: '_someNumConditional', + tag: { src: 'SacrificialBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ScionOfTheBlazingSun: { + _someBoolConditional: { + src: 'ScionOfTheBlazingSun', + name: '_someBoolConditional', + tag: { src: 'ScionOfTheBlazingSun', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ScionOfTheBlazingSun', + name: '_someListConditional', + tag: { src: 'ScionOfTheBlazingSun', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ScionOfTheBlazingSun', + name: '_someNumConditional', + tag: { src: 'ScionOfTheBlazingSun', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SeasonedHuntersBow: { + _someBoolConditional: { + src: 'SeasonedHuntersBow', + name: '_someBoolConditional', + tag: { src: 'SeasonedHuntersBow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SeasonedHuntersBow', + name: '_someListConditional', + tag: { src: 'SeasonedHuntersBow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SeasonedHuntersBow', + name: '_someNumConditional', + tag: { src: 'SeasonedHuntersBow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SharpshootersOath: { + _someBoolConditional: { + src: 'SharpshootersOath', + name: '_someBoolConditional', + tag: { src: 'SharpshootersOath', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SharpshootersOath', + name: '_someListConditional', + tag: { src: 'SharpshootersOath', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SharpshootersOath', + name: '_someNumConditional', + tag: { src: 'SharpshootersOath', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkywardHarp: { + _someBoolConditional: { + src: 'SkywardHarp', + name: '_someBoolConditional', + tag: { src: 'SkywardHarp', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkywardHarp', + name: '_someListConditional', + tag: { src: 'SkywardHarp', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkywardHarp', + name: '_someNumConditional', + tag: { src: 'SkywardHarp', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Slingshot: { + _someBoolConditional: { + src: 'Slingshot', + name: '_someBoolConditional', + tag: { src: 'Slingshot', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Slingshot', + name: '_someListConditional', + tag: { src: 'Slingshot', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Slingshot', + name: '_someNumConditional', + tag: { src: 'Slingshot', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SongOfStillness: { + _someBoolConditional: { + src: 'SongOfStillness', + name: '_someBoolConditional', + tag: { src: 'SongOfStillness', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SongOfStillness', + name: '_someListConditional', + tag: { src: 'SongOfStillness', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SongOfStillness', + name: '_someNumConditional', + tag: { src: 'SongOfStillness', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheFirstGreatMagic: { + _someBoolConditional: { + src: 'TheFirstGreatMagic', + name: '_someBoolConditional', + tag: { src: 'TheFirstGreatMagic', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheFirstGreatMagic', + name: '_someListConditional', + tag: { src: 'TheFirstGreatMagic', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheFirstGreatMagic', + name: '_someNumConditional', + tag: { src: 'TheFirstGreatMagic', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheStringless: { + _someBoolConditional: { + src: 'TheStringless', + name: '_someBoolConditional', + tag: { src: 'TheStringless', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheStringless', + name: '_someListConditional', + tag: { src: 'TheStringless', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheStringless', + name: '_someNumConditional', + tag: { src: 'TheStringless', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheViridescentHunt: { + _someBoolConditional: { + src: 'TheViridescentHunt', + name: '_someBoolConditional', + tag: { src: 'TheViridescentHunt', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheViridescentHunt', + name: '_someListConditional', + tag: { src: 'TheViridescentHunt', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheViridescentHunt', + name: '_someNumConditional', + tag: { src: 'TheViridescentHunt', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ThunderingPulse: { + _someBoolConditional: { + src: 'ThunderingPulse', + name: '_someBoolConditional', + tag: { src: 'ThunderingPulse', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ThunderingPulse', + name: '_someListConditional', + tag: { src: 'ThunderingPulse', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ThunderingPulse', + name: '_someNumConditional', + tag: { src: 'ThunderingPulse', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WindblumeOde: { + _someBoolConditional: { + src: 'WindblumeOde', + name: '_someBoolConditional', + tag: { src: 'WindblumeOde', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WindblumeOde', + name: '_someListConditional', + tag: { src: 'WindblumeOde', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WindblumeOde', + name: '_someNumConditional', + tag: { src: 'WindblumeOde', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ApprenticesNotes: { + _someBoolConditional: { + src: 'ApprenticesNotes', + name: '_someBoolConditional', + tag: { src: 'ApprenticesNotes', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'ApprenticesNotes', + name: '_someListConditional', + tag: { src: 'ApprenticesNotes', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ApprenticesNotes', + name: '_someNumConditional', + tag: { src: 'ApprenticesNotes', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + AThousandFloatingDreams: { + _someBoolConditional: { + src: 'AThousandFloatingDreams', + name: '_someBoolConditional', + tag: { src: 'AThousandFloatingDreams', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'AThousandFloatingDreams', + name: '_someListConditional', + tag: { src: 'AThousandFloatingDreams', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'AThousandFloatingDreams', + name: '_someNumConditional', + tag: { src: 'AThousandFloatingDreams', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BalladOfTheBoundlessBlue: { + _someBoolConditional: { + src: 'BalladOfTheBoundlessBlue', + name: '_someBoolConditional', + tag: { src: 'BalladOfTheBoundlessBlue', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BalladOfTheBoundlessBlue', + name: '_someListConditional', + tag: { src: 'BalladOfTheBoundlessBlue', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BalladOfTheBoundlessBlue', + name: '_someNumConditional', + tag: { src: 'BalladOfTheBoundlessBlue', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + BlackcliffAgate: { + _someBoolConditional: { + src: 'BlackcliffAgate', + name: '_someBoolConditional', + tag: { src: 'BlackcliffAgate', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'BlackcliffAgate', + name: '_someListConditional', + tag: { src: 'BlackcliffAgate', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'BlackcliffAgate', + name: '_someNumConditional', + tag: { src: 'BlackcliffAgate', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + CashflowSupervision: { + _someBoolConditional: { + src: 'CashflowSupervision', + name: '_someBoolConditional', + tag: { src: 'CashflowSupervision', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'CashflowSupervision', + name: '_someListConditional', + tag: { src: 'CashflowSupervision', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'CashflowSupervision', + name: '_someNumConditional', + tag: { src: 'CashflowSupervision', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + DodocoTales: { + _someBoolConditional: { + src: 'DodocoTales', + name: '_someBoolConditional', + tag: { src: 'DodocoTales', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'DodocoTales', + name: '_someListConditional', + tag: { src: 'DodocoTales', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'DodocoTales', + name: '_someNumConditional', + tag: { src: 'DodocoTales', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EmeraldOrb: { + _someBoolConditional: { + src: 'EmeraldOrb', + name: '_someBoolConditional', + tag: { src: 'EmeraldOrb', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EmeraldOrb', + name: '_someListConditional', + tag: { src: 'EmeraldOrb', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EmeraldOrb', + name: '_someNumConditional', + tag: { src: 'EmeraldOrb', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EverlastingMoonglow: { + _someBoolConditional: { + src: 'EverlastingMoonglow', + name: '_someBoolConditional', + tag: { src: 'EverlastingMoonglow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EverlastingMoonglow', + name: '_someListConditional', + tag: { src: 'EverlastingMoonglow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EverlastingMoonglow', + name: '_someNumConditional', + tag: { src: 'EverlastingMoonglow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + EyeOfPerception: { + _someBoolConditional: { + src: 'EyeOfPerception', + name: '_someBoolConditional', + tag: { src: 'EyeOfPerception', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'EyeOfPerception', + name: '_someListConditional', + tag: { src: 'EyeOfPerception', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'EyeOfPerception', + name: '_someNumConditional', + tag: { src: 'EyeOfPerception', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FavoniusCodex: { + _someBoolConditional: { + src: 'FavoniusCodex', + name: '_someBoolConditional', + tag: { src: 'FavoniusCodex', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FavoniusCodex', + name: '_someListConditional', + tag: { src: 'FavoniusCodex', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FavoniusCodex', + name: '_someNumConditional', + tag: { src: 'FavoniusCodex', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FlowingPurity: { + _someBoolConditional: { + src: 'FlowingPurity', + name: '_someBoolConditional', + tag: { src: 'FlowingPurity', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FlowingPurity', + name: '_someListConditional', + tag: { src: 'FlowingPurity', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FlowingPurity', + name: '_someNumConditional', + tag: { src: 'FlowingPurity', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + Frostbearer: { + _someBoolConditional: { + src: 'Frostbearer', + name: '_someBoolConditional', + tag: { src: 'Frostbearer', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'Frostbearer', + name: '_someListConditional', + tag: { src: 'Frostbearer', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'Frostbearer', + name: '_someNumConditional', + tag: { src: 'Frostbearer', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + FruitOfFulfillment: { + _someBoolConditional: { + src: 'FruitOfFulfillment', + name: '_someBoolConditional', + tag: { src: 'FruitOfFulfillment', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'FruitOfFulfillment', + name: '_someListConditional', + tag: { src: 'FruitOfFulfillment', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'FruitOfFulfillment', + name: '_someNumConditional', + tag: { src: 'FruitOfFulfillment', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + HakushinRing: { + _someBoolConditional: { + src: 'HakushinRing', + name: '_someBoolConditional', + tag: { src: 'HakushinRing', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'HakushinRing', + name: '_someListConditional', + tag: { src: 'HakushinRing', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'HakushinRing', + name: '_someNumConditional', + tag: { src: 'HakushinRing', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + JadefallsSplendor: { + _someBoolConditional: { + src: 'JadefallsSplendor', + name: '_someBoolConditional', + tag: { src: 'JadefallsSplendor', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'JadefallsSplendor', + name: '_someListConditional', + tag: { src: 'JadefallsSplendor', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'JadefallsSplendor', + name: '_someNumConditional', + tag: { src: 'JadefallsSplendor', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + KagurasVerity: { + _someBoolConditional: { + src: 'KagurasVerity', + name: '_someBoolConditional', + tag: { src: 'KagurasVerity', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'KagurasVerity', + name: '_someListConditional', + tag: { src: 'KagurasVerity', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'KagurasVerity', + name: '_someNumConditional', + tag: { src: 'KagurasVerity', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + LostPrayerToTheSacredWinds: { + _someBoolConditional: { + src: 'LostPrayerToTheSacredWinds', + name: '_someBoolConditional', + tag: { src: 'LostPrayerToTheSacredWinds', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'LostPrayerToTheSacredWinds', + name: '_someListConditional', + tag: { src: 'LostPrayerToTheSacredWinds', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'LostPrayerToTheSacredWinds', + name: '_someNumConditional', + tag: { src: 'LostPrayerToTheSacredWinds', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MagicGuide: { + _someBoolConditional: { + src: 'MagicGuide', + name: '_someBoolConditional', + tag: { src: 'MagicGuide', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MagicGuide', + name: '_someListConditional', + tag: { src: 'MagicGuide', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MagicGuide', + name: '_someNumConditional', + tag: { src: 'MagicGuide', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MappaMare: { + _someBoolConditional: { + src: 'MappaMare', + name: '_someBoolConditional', + tag: { src: 'MappaMare', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MappaMare', + name: '_someListConditional', + tag: { src: 'MappaMare', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MappaMare', + name: '_someNumConditional', + tag: { src: 'MappaMare', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + MemoryOfDust: { + _someBoolConditional: { + src: 'MemoryOfDust', + name: '_someBoolConditional', + tag: { src: 'MemoryOfDust', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'MemoryOfDust', + name: '_someListConditional', + tag: { src: 'MemoryOfDust', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'MemoryOfDust', + name: '_someNumConditional', + tag: { src: 'MemoryOfDust', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + OathswornEye: { + _someBoolConditional: { + src: 'OathswornEye', + name: '_someBoolConditional', + tag: { src: 'OathswornEye', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'OathswornEye', + name: '_someListConditional', + tag: { src: 'OathswornEye', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'OathswornEye', + name: '_someNumConditional', + tag: { src: 'OathswornEye', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + OtherworldlyStory: { + _someBoolConditional: { + src: 'OtherworldlyStory', + name: '_someBoolConditional', + tag: { src: 'OtherworldlyStory', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'OtherworldlyStory', + name: '_someListConditional', + tag: { src: 'OtherworldlyStory', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'OtherworldlyStory', + name: '_someNumConditional', + tag: { src: 'OtherworldlyStory', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + PocketGrimoire: { + _someBoolConditional: { + src: 'PocketGrimoire', + name: '_someBoolConditional', + tag: { src: 'PocketGrimoire', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'PocketGrimoire', + name: '_someListConditional', + tag: { src: 'PocketGrimoire', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'PocketGrimoire', + name: '_someNumConditional', + tag: { src: 'PocketGrimoire', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + QuantumCatalyst: { + _someBoolConditional: { + src: 'QuantumCatalyst', + name: '_someBoolConditional', + tag: { src: 'QuantumCatalyst', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'QuantumCatalyst', + name: '_someListConditional', + tag: { src: 'QuantumCatalyst', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'QuantumCatalyst', + name: '_someNumConditional', + tag: { src: 'QuantumCatalyst', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + RoyalGrimoire: { + _someBoolConditional: { + src: 'RoyalGrimoire', + name: '_someBoolConditional', + tag: { src: 'RoyalGrimoire', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'RoyalGrimoire', + name: '_someListConditional', + tag: { src: 'RoyalGrimoire', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'RoyalGrimoire', + name: '_someNumConditional', + tag: { src: 'RoyalGrimoire', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SacrificialFragments: { + _someBoolConditional: { + src: 'SacrificialFragments', + name: '_someBoolConditional', + tag: { src: 'SacrificialFragments', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SacrificialFragments', + name: '_someListConditional', + tag: { src: 'SacrificialFragments', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SacrificialFragments', + name: '_someNumConditional', + tag: { src: 'SacrificialFragments', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SacrificialJade: { + _someBoolConditional: { + src: 'SacrificialJade', + name: '_someBoolConditional', + tag: { src: 'SacrificialJade', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SacrificialJade', + name: '_someListConditional', + tag: { src: 'SacrificialJade', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SacrificialJade', + name: '_someNumConditional', + tag: { src: 'SacrificialJade', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SkywardAtlas: { + _someBoolConditional: { + src: 'SkywardAtlas', + name: '_someBoolConditional', + tag: { src: 'SkywardAtlas', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SkywardAtlas', + name: '_someListConditional', + tag: { src: 'SkywardAtlas', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SkywardAtlas', + name: '_someNumConditional', + tag: { src: 'SkywardAtlas', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + SolarPearl: { + _someBoolConditional: { + src: 'SolarPearl', + name: '_someBoolConditional', + tag: { src: 'SolarPearl', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'SolarPearl', + name: '_someListConditional', + tag: { src: 'SolarPearl', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'SolarPearl', + name: '_someNumConditional', + tag: { src: 'SolarPearl', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TheWidsith: { + _someBoolConditional: { + src: 'TheWidsith', + name: '_someBoolConditional', + tag: { src: 'TheWidsith', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TheWidsith', + name: '_someListConditional', + tag: { src: 'TheWidsith', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TheWidsith', + name: '_someNumConditional', + tag: { src: 'TheWidsith', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + ThrillingTalesOfDragonSlayers: { + _someBoolConditional: { + src: 'ThrillingTalesOfDragonSlayers', + name: '_someBoolConditional', + tag: { + src: 'ThrillingTalesOfDragonSlayers', + name: '_someBoolConditional', + }, + type: 'bool', + }, + _someListConditional: { + src: 'ThrillingTalesOfDragonSlayers', + name: '_someListConditional', + tag: { + src: 'ThrillingTalesOfDragonSlayers', + name: '_someListConditional', + }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'ThrillingTalesOfDragonSlayers', + name: '_someNumConditional', + tag: { + src: 'ThrillingTalesOfDragonSlayers', + name: '_someNumConditional', + }, + type: 'num', + int_only: false, + }, + }, + TomeOfTheEternalFlow: { + _someBoolConditional: { + src: 'TomeOfTheEternalFlow', + name: '_someBoolConditional', + tag: { src: 'TomeOfTheEternalFlow', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TomeOfTheEternalFlow', + name: '_someListConditional', + tag: { src: 'TomeOfTheEternalFlow', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TomeOfTheEternalFlow', + name: '_someNumConditional', + tag: { src: 'TomeOfTheEternalFlow', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TulaytullahsRemembrance: { + timePassive: { + src: 'TulaytullahsRemembrance', + name: 'timePassive', + tag: { src: 'TulaytullahsRemembrance', name: 'timePassive' }, + type: 'num', + int_only: false, + min: 0, + max: 12, + }, + hitPassive: { + src: 'TulaytullahsRemembrance', + name: 'hitPassive', + tag: { src: 'TulaytullahsRemembrance', name: 'hitPassive' }, + type: 'num', + int_only: true, + min: 0, + max: 5, + }, + }, + TwinNephrite: { + _someBoolConditional: { + src: 'TwinNephrite', + name: '_someBoolConditional', + tag: { src: 'TwinNephrite', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TwinNephrite', + name: '_someListConditional', + tag: { src: 'TwinNephrite', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TwinNephrite', + name: '_someNumConditional', + tag: { src: 'TwinNephrite', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WanderingEvenstar: { + _someBoolConditional: { + src: 'WanderingEvenstar', + name: '_someBoolConditional', + tag: { src: 'WanderingEvenstar', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WanderingEvenstar', + name: '_someListConditional', + tag: { src: 'WanderingEvenstar', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WanderingEvenstar', + name: '_someNumConditional', + tag: { src: 'WanderingEvenstar', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + WineAndSong: { + _someBoolConditional: { + src: 'WineAndSong', + name: '_someBoolConditional', + tag: { src: 'WineAndSong', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'WineAndSong', + name: '_someListConditional', + tag: { src: 'WineAndSong', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'WineAndSong', + name: '_someNumConditional', + tag: { src: 'WineAndSong', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, +} +export const formulas = { + Albedo: { + normal1: { + src: 'Albedo', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Albedo', + move: 'normal', + name: 'normal1', + }, + }, + }, + Alhaitham: { + normal1: { + src: 'Alhaitham', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Alhaitham', + move: 'normal', + name: 'normal1', + }, + }, + }, + Aloy: { + normal1: { + src: 'Aloy', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Aloy', + move: 'normal', + name: 'normal1', + }, + }, + }, + Amber: { + normal1: { + src: 'Amber', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Amber', + move: 'normal', + name: 'normal1', + }, + }, + }, + AratakiItto: { + normal1: { + src: 'AratakiItto', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'AratakiItto', + move: 'normal', + name: 'normal1', + }, + }, + }, + Baizhu: { + normal1: { + src: 'Baizhu', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Baizhu', + move: 'normal', + name: 'normal1', + }, + }, + }, + Barbara: { + normal1: { + src: 'Barbara', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Barbara', + move: 'normal', + name: 'normal1', + }, + }, + }, + Beidou: { + normal1: { + src: 'Beidou', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Beidou', + move: 'normal', + name: 'normal1', + }, + }, + }, + Bennett: { + normal1: { + src: 'Bennett', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Bennett', + move: 'normal', + name: 'normal1', + }, + }, + }, + Candace: { + normal_0: { + src: 'Candace', + name: 'normal_0', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'normal', + name: 'normal_0', + }, + }, + normal_1: { + src: 'Candace', + name: 'normal_1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'normal', + name: 'normal_1', + }, + }, + normal_2: { + src: 'Candace', + name: 'normal_2', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'normal', + name: 'normal_2', + }, + }, + normal_3: { + src: 'Candace', + name: 'normal_3', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'normal', + name: 'normal_3', + }, + }, + normal_4: { + src: 'Candace', + name: 'normal_4', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'normal', + name: 'normal_4', + }, + }, + charged: { + src: 'Candace', + name: 'charged', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'charged', + name: 'charged', + }, + }, + plunging_dmg: { + src: 'Candace', + name: 'plunging_dmg', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'plunging', + name: 'plunging_dmg', + }, + }, + plunging_low: { + src: 'Candace', + name: 'plunging_low', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'plunging', + name: 'plunging_low', + }, + }, + plunging_high: { + src: 'Candace', + name: 'plunging_high', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'plunging', + name: 'plunging_high', + }, + }, + skill_basic: { + src: 'Candace', + name: 'skill_basic', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'skill', + name: 'skill_basic', + }, + }, + skill_charged: { + src: 'Candace', + name: 'skill_charged', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'skill', + name: 'skill_charged', + }, + }, + burst_skill: { + src: 'Candace', + name: 'burst_skill', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'burst', + name: 'burst_skill', + }, + }, + burst_wave: { + src: 'Candace', + name: 'burst_wave', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'burst', + name: 'burst_wave', + }, + }, + skill_shield: { + src: 'Candace', + name: 'skill_shield', + tag: { + et: 'self', + qt: 'formula', + q: 'shield', + src: 'Candace', + name: 'skill_shield', + }, + }, + skill_hydroShield: { + src: 'Candace', + name: 'skill_hydroShield', + tag: { + et: 'self', + qt: 'formula', + q: 'shield', + src: 'Candace', + ele: 'hydro', + name: 'skill_hydroShield', + }, + }, + c6: { + src: 'Candace', + name: 'c6', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Candace', + move: 'burst', + name: 'c6', + }, + }, + }, + Charlotte: { + normal1: { + src: 'Charlotte', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Charlotte', + move: 'normal', + name: 'normal1', + }, + }, + }, + Chongyun: { + normal1: { + src: 'Chongyun', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Chongyun', + move: 'normal', + name: 'normal1', + }, + }, + }, + Collei: { + normal1: { + src: 'Collei', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Collei', + move: 'normal', + name: 'normal1', + }, + }, + }, + Cyno: { + normal1: { + src: 'Cyno', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Cyno', + move: 'normal', + name: 'normal1', + }, + }, + }, + Dehya: { + normal1: { + src: 'Dehya', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Dehya', + move: 'normal', + name: 'normal1', + }, + }, + }, + Diluc: { + normal1: { + src: 'Diluc', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Diluc', + move: 'normal', + name: 'normal1', + }, + }, + }, + Diona: { + normal1: { + src: 'Diona', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Diona', + move: 'normal', + name: 'normal1', + }, + }, + }, + Dori: { + normal1: { + src: 'Dori', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Dori', + move: 'normal', + name: 'normal1', + }, }, }, - Nilou: { - a1AfterSkill: { - src: 'Nilou', - name: 'a1AfterSkill', - tag: { src: 'Nilou', name: 'a1AfterSkill' }, - type: 'bool', + Eula: { + normal1: { + src: 'Eula', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Eula', + move: 'normal', + name: 'normal1', + }, }, - a1AfterHit: { - src: 'Nilou', - name: 'a1AfterHit', - tag: { src: 'Nilou', name: 'a1AfterHit' }, - type: 'bool', + }, + Faruzan: { + normal1: { + src: 'Faruzan', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Faruzan', + move: 'normal', + name: 'normal1', + }, }, - c4AfterPirHit: { - src: 'Nilou', - name: 'c4AfterPirHit', - tag: { src: 'Nilou', name: 'c4AfterPirHit' }, - type: 'bool', + }, + Fischl: { + normal1: { + src: 'Fischl', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Fischl', + move: 'normal', + name: 'normal1', + }, }, - c2Hydro: { - src: 'Nilou', - name: 'c2Hydro', - tag: { src: 'Nilou', name: 'c2Hydro' }, - type: 'bool', + }, + Freminet: { + normal1: { + src: 'Freminet', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Freminet', + move: 'normal', + name: 'normal1', + }, }, - c2Dendro: { - src: 'Nilou', - name: 'c2Dendro', - tag: { src: 'Nilou', name: 'c2Dendro' }, - type: 'bool', + }, + Furina: { + normal1: { + src: 'Furina', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Furina', + move: 'normal', + name: 'normal1', + }, }, }, - CalamityQueller: { - stack: { - src: 'CalamityQueller', - name: 'stack', - tag: { src: 'CalamityQueller', name: 'stack' }, - type: 'num', - int_only: true, - min: 0, - max: 6, + Ganyu: { + normal1: { + src: 'Ganyu', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Ganyu', + move: 'normal', + name: 'normal1', + }, }, }, - KeyOfKhajNisut: { - afterSkillStacks: { - src: 'KeyOfKhajNisut', - name: 'afterSkillStacks', - tag: { src: 'KeyOfKhajNisut', name: 'afterSkillStacks' }, - type: 'num', - int_only: true, - min: 0, - max: 3, + Gorou: { + normal1: { + src: 'Gorou', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Gorou', + move: 'normal', + name: 'normal1', + }, }, }, - TulaytullahsRemembrance: { - timePassive: { - src: 'TulaytullahsRemembrance', - name: 'timePassive', - tag: { src: 'TulaytullahsRemembrance', name: 'timePassive' }, - type: 'num', - int_only: false, - min: 0, - max: 12, + HuTao: { + normal1: { + src: 'HuTao', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'HuTao', + move: 'normal', + name: 'normal1', + }, }, - hitPassive: { - src: 'TulaytullahsRemembrance', - name: 'hitPassive', - tag: { src: 'TulaytullahsRemembrance', name: 'hitPassive' }, - type: 'num', - int_only: true, - min: 0, - max: 5, + }, + Jean: { + normal1: { + src: 'Jean', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Jean', + move: 'normal', + name: 'normal1', + }, }, }, -} -export const formulas = { - Candace: { - normal_0: { - src: 'Candace', - name: 'normal_0', + KaedeharaKazuha: { + normal1: { + src: 'KaedeharaKazuha', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', + src: 'KaedeharaKazuha', move: 'normal', - name: 'normal_0', + name: 'normal1', }, }, - normal_1: { - src: 'Candace', - name: 'normal_1', + }, + Kaeya: { + normal1: { + src: 'Kaeya', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', + src: 'Kaeya', move: 'normal', - name: 'normal_1', + name: 'normal1', }, }, - normal_2: { - src: 'Candace', - name: 'normal_2', + }, + KamisatoAyaka: { + normal1: { + src: 'KamisatoAyaka', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', + src: 'KamisatoAyaka', move: 'normal', - name: 'normal_2', + name: 'normal1', }, }, - normal_3: { - src: 'Candace', - name: 'normal_3', + }, + KamisatoAyato: { + normal1: { + src: 'KamisatoAyato', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', + src: 'KamisatoAyato', move: 'normal', - name: 'normal_3', + name: 'normal1', }, }, - normal_4: { - src: 'Candace', - name: 'normal_4', + }, + Kaveh: { + normal1: { + src: 'Kaveh', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', + src: 'Kaveh', move: 'normal', - name: 'normal_4', + name: 'normal1', }, }, - charged: { - src: 'Candace', - name: 'charged', + }, + Keqing: { + normal1: { + src: 'Keqing', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'charged', - name: 'charged', + src: 'Keqing', + move: 'normal', + name: 'normal1', }, }, - plunging_dmg: { - src: 'Candace', - name: 'plunging_dmg', + }, + Kirara: { + normal1: { + src: 'Kirara', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'plunging', - name: 'plunging_dmg', + src: 'Kirara', + move: 'normal', + name: 'normal1', }, }, - plunging_low: { - src: 'Candace', - name: 'plunging_low', + }, + Klee: { + normal1: { + src: 'Klee', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'plunging', - name: 'plunging_low', + src: 'Klee', + move: 'normal', + name: 'normal1', }, }, - plunging_high: { - src: 'Candace', - name: 'plunging_high', + }, + KujouSara: { + normal1: { + src: 'KujouSara', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'plunging', - name: 'plunging_high', + src: 'KujouSara', + move: 'normal', + name: 'normal1', }, }, - skill_basic: { - src: 'Candace', - name: 'skill_basic', + }, + KukiShinobu: { + normal1: { + src: 'KukiShinobu', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'skill', - name: 'skill_basic', + src: 'KukiShinobu', + move: 'normal', + name: 'normal1', }, }, - skill_charged: { - src: 'Candace', - name: 'skill_charged', + }, + Layla: { + normal1: { + src: 'Layla', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'skill', - name: 'skill_charged', + src: 'Layla', + move: 'normal', + name: 'normal1', }, }, - burst_skill: { - src: 'Candace', - name: 'burst_skill', + }, + Lisa: { + normal1: { + src: 'Lisa', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'burst', - name: 'burst_skill', + src: 'Lisa', + move: 'normal', + name: 'normal1', }, }, - burst_wave: { - src: 'Candace', - name: 'burst_wave', + }, + Lynette: { + normal1: { + src: 'Lynette', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'burst', - name: 'burst_wave', + src: 'Lynette', + move: 'normal', + name: 'normal1', }, }, - skill_shield: { - src: 'Candace', - name: 'skill_shield', + }, + Lyney: { + normal1: { + src: 'Lyney', + name: 'normal1', tag: { et: 'self', qt: 'formula', - q: 'shield', - src: 'Candace', - name: 'skill_shield', + q: 'dmg', + src: 'Lyney', + move: 'normal', + name: 'normal1', }, }, - skill_hydroShield: { - src: 'Candace', - name: 'skill_hydroShield', + }, + Mika: { + normal1: { + src: 'Mika', + name: 'normal1', tag: { et: 'self', qt: 'formula', - q: 'shield', - src: 'Candace', - ele: 'hydro', - name: 'skill_hydroShield', + q: 'dmg', + src: 'Mika', + move: 'normal', + name: 'normal1', }, }, - c6: { - src: 'Candace', - name: 'c6', + }, + Mona: { + normal1: { + src: 'Mona', + name: 'normal1', tag: { et: 'self', qt: 'formula', q: 'dmg', - src: 'Candace', - move: 'burst', - name: 'c6', + src: 'Mona', + move: 'normal', + name: 'normal1', }, }, }, @@ -500,6 +7521,20 @@ export const formulas = { }, }, }, + Neuvillette: { + normal1: { + src: 'Neuvillette', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Neuvillette', + move: 'normal', + name: 'normal1', + }, + }, + }, Nilou: { normal_0: { src: 'Nilou', @@ -706,6 +7741,426 @@ export const formulas = { }, }, }, + Ningguang: { + normal1: { + src: 'Ningguang', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Ningguang', + move: 'normal', + name: 'normal1', + }, + }, + }, + Noelle: { + normal1: { + src: 'Noelle', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Noelle', + move: 'normal', + name: 'normal1', + }, + }, + }, + Qiqi: { + normal1: { + src: 'Qiqi', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Qiqi', + move: 'normal', + name: 'normal1', + }, + }, + }, + RaidenShogun: { + normal1: { + src: 'RaidenShogun', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'RaidenShogun', + move: 'normal', + name: 'normal1', + }, + }, + }, + Razor: { + normal1: { + src: 'Razor', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Razor', + move: 'normal', + name: 'normal1', + }, + }, + }, + Rosaria: { + normal1: { + src: 'Rosaria', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Rosaria', + move: 'normal', + name: 'normal1', + }, + }, + }, + SangonomiyaKokomi: { + normal1: { + src: 'SangonomiyaKokomi', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'SangonomiyaKokomi', + move: 'normal', + name: 'normal1', + }, + }, + }, + Sayu: { + normal1: { + src: 'Sayu', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Sayu', + move: 'normal', + name: 'normal1', + }, + }, + }, + Shenhe: { + normal1: { + src: 'Shenhe', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Shenhe', + move: 'normal', + name: 'normal1', + }, + }, + }, + ShikanoinHeizou: { + normal1: { + src: 'ShikanoinHeizou', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'ShikanoinHeizou', + move: 'normal', + name: 'normal1', + }, + }, + }, + Somnia: { + normal1: { + src: 'Somnia', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Somnia', + move: 'normal', + name: 'normal1', + }, + }, + }, + Sucrose: { + normal1: { + src: 'Sucrose', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Sucrose', + move: 'normal', + name: 'normal1', + }, + }, + }, + Tartaglia: { + normal1: { + src: 'Tartaglia', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Tartaglia', + move: 'normal', + name: 'normal1', + }, + }, + }, + Thoma: { + normal1: { + src: 'Thoma', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Thoma', + move: 'normal', + name: 'normal1', + }, + }, + }, + Tighnari: { + normal1: { + src: 'Tighnari', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Tighnari', + move: 'normal', + name: 'normal1', + }, + }, + }, + Venti: { + normal1: { + src: 'Venti', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Venti', + move: 'normal', + name: 'normal1', + }, + }, + }, + Wanderer: { + normal1: { + src: 'Wanderer', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Wanderer', + move: 'normal', + name: 'normal1', + }, + }, + }, + Wriothesley: { + normal1: { + src: 'Wriothesley', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Wriothesley', + move: 'normal', + name: 'normal1', + }, + }, + }, + Xiangling: { + normal1: { + src: 'Xiangling', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Xiangling', + move: 'normal', + name: 'normal1', + }, + }, + }, + Xiao: { + normal1: { + src: 'Xiao', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Xiao', + move: 'normal', + name: 'normal1', + }, + }, + }, + Xingqiu: { + normal1: { + src: 'Xingqiu', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Xingqiu', + move: 'normal', + name: 'normal1', + }, + }, + }, + Xinyan: { + normal1: { + src: 'Xinyan', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Xinyan', + move: 'normal', + name: 'normal1', + }, + }, + }, + YaeMiko: { + normal1: { + src: 'YaeMiko', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'YaeMiko', + move: 'normal', + name: 'normal1', + }, + }, + }, + Yanfei: { + normal1: { + src: 'Yanfei', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Yanfei', + move: 'normal', + name: 'normal1', + }, + }, + }, + Yaoyao: { + normal1: { + src: 'Yaoyao', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Yaoyao', + move: 'normal', + name: 'normal1', + }, + }, + }, + Yelan: { + normal1: { + src: 'Yelan', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Yelan', + move: 'normal', + name: 'normal1', + }, + }, + }, + Yoimiya: { + normal1: { + src: 'Yoimiya', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Yoimiya', + move: 'normal', + name: 'normal1', + }, + }, + }, + YunJin: { + normal1: { + src: 'YunJin', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'YunJin', + move: 'normal', + name: 'normal1', + }, + }, + }, + Zhongli: { + normal1: { + src: 'Zhongli', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'Zhongli', + move: 'normal', + name: 'normal1', + }, + }, + }, + TravelerAnemo: { + normal1: { + src: 'TravelerAnemo', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'TravelerAnemo', + move: 'normal', + name: 'normal1', + }, + }, + }, PrototypeAmber: { heal: { src: 'PrototypeAmber', From 40307347d5dd7793239b7c8806b7b25129af5c53 Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:54:02 -0700 Subject: [PATCH 05/10] Fix traveler --- .../gi-formula/src/data/char/TravelerAnemo.ts | 2 +- .../src/data/char/TravelerDendro.ts | 2 +- .../src/data/char/TravelerElectro.ts | 2 +- libs/gi-formula/src/data/char/TravelerGeo.ts | 2 +- .../gi-formula/src/data/char/TravelerHydro.ts | 2 +- libs/gi-formula/src/meta.ts | 144 ++++++++++++++++++ 6 files changed, 149 insertions(+), 5 deletions(-) diff --git a/libs/gi-formula/src/data/char/TravelerAnemo.ts b/libs/gi-formula/src/data/char/TravelerAnemo.ts index cde426f577..bb71aa0a97 100644 --- a/libs/gi-formula/src/data/char/TravelerAnemo.ts +++ b/libs/gi-formula/src/data/char/TravelerAnemo.ts @@ -32,7 +32,7 @@ const _dm = { burst: {}, } as const -const info = dataGenToCharInfo(data_gen) +const info = dataGenToCharInfo(data_gen, 'anemo') const { final: _final, char: { ascension: _ascension, constellation }, diff --git a/libs/gi-formula/src/data/char/TravelerDendro.ts b/libs/gi-formula/src/data/char/TravelerDendro.ts index 79db0008d0..47ec568dd3 100644 --- a/libs/gi-formula/src/data/char/TravelerDendro.ts +++ b/libs/gi-formula/src/data/char/TravelerDendro.ts @@ -32,7 +32,7 @@ const _dm = { burst: {}, } as const -const info = dataGenToCharInfo(data_gen) +const info = dataGenToCharInfo(data_gen, 'dendro') const { final: _final, char: { ascension: _ascension, constellation }, diff --git a/libs/gi-formula/src/data/char/TravelerElectro.ts b/libs/gi-formula/src/data/char/TravelerElectro.ts index 4b5c30c1c6..3501ba4bca 100644 --- a/libs/gi-formula/src/data/char/TravelerElectro.ts +++ b/libs/gi-formula/src/data/char/TravelerElectro.ts @@ -32,7 +32,7 @@ const _dm = { burst: {}, } as const -const info = dataGenToCharInfo(data_gen) +const info = dataGenToCharInfo(data_gen, 'electro') const { final: _final, char: { ascension: _ascension, constellation }, diff --git a/libs/gi-formula/src/data/char/TravelerGeo.ts b/libs/gi-formula/src/data/char/TravelerGeo.ts index 61e5e492c2..acf7d3465d 100644 --- a/libs/gi-formula/src/data/char/TravelerGeo.ts +++ b/libs/gi-formula/src/data/char/TravelerGeo.ts @@ -32,7 +32,7 @@ const _dm = { burst: {}, } as const -const info = dataGenToCharInfo(data_gen) +const info = dataGenToCharInfo(data_gen, 'geo') const { final: _final, char: { ascension: _ascension, constellation }, diff --git a/libs/gi-formula/src/data/char/TravelerHydro.ts b/libs/gi-formula/src/data/char/TravelerHydro.ts index a57ce2388a..0028123895 100644 --- a/libs/gi-formula/src/data/char/TravelerHydro.ts +++ b/libs/gi-formula/src/data/char/TravelerHydro.ts @@ -32,7 +32,7 @@ const _dm = { burst: {}, } as const -const info = dataGenToCharInfo(data_gen) +const info = dataGenToCharInfo(data_gen, 'hydro') const { final: _final, char: { ascension: _ascension, constellation }, diff --git a/libs/gi-formula/src/meta.ts b/libs/gi-formula/src/meta.ts index cc03947376..d4deb59722 100644 --- a/libs/gi-formula/src/meta.ts +++ b/libs/gi-formula/src/meta.ts @@ -2747,6 +2747,94 @@ export const conditionals = { int_only: false, }, }, + TravelerGeo: { + _someBoolConditional: { + src: 'TravelerGeo', + name: '_someBoolConditional', + tag: { src: 'TravelerGeo', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelerGeo', + name: '_someListConditional', + tag: { src: 'TravelerGeo', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelerGeo', + name: '_someNumConditional', + tag: { src: 'TravelerGeo', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TravelerElectro: { + _someBoolConditional: { + src: 'TravelerElectro', + name: '_someBoolConditional', + tag: { src: 'TravelerElectro', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelerElectro', + name: '_someListConditional', + tag: { src: 'TravelerElectro', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelerElectro', + name: '_someNumConditional', + tag: { src: 'TravelerElectro', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TravelerDendro: { + _someBoolConditional: { + src: 'TravelerDendro', + name: '_someBoolConditional', + tag: { src: 'TravelerDendro', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelerDendro', + name: '_someListConditional', + tag: { src: 'TravelerDendro', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelerDendro', + name: '_someNumConditional', + tag: { src: 'TravelerDendro', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, + TravelerHydro: { + _someBoolConditional: { + src: 'TravelerHydro', + name: '_someBoolConditional', + tag: { src: 'TravelerHydro', name: '_someBoolConditional' }, + type: 'bool', + }, + _someListConditional: { + src: 'TravelerHydro', + name: '_someListConditional', + tag: { src: 'TravelerHydro', name: '_someListConditional' }, + type: 'list', + list: [], + }, + _someNumConditional: { + src: 'TravelerHydro', + name: '_someNumConditional', + tag: { src: 'TravelerHydro', name: '_someNumConditional' }, + type: 'num', + int_only: false, + }, + }, AmenomaKageuchi: { _someBoolConditional: { src: 'AmenomaKageuchi', @@ -8161,6 +8249,62 @@ export const formulas = { }, }, }, + TravelerGeo: { + normal1: { + src: 'TravelerGeo', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'TravelerGeo', + move: 'normal', + name: 'normal1', + }, + }, + }, + TravelerElectro: { + normal1: { + src: 'TravelerElectro', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'TravelerElectro', + move: 'normal', + name: 'normal1', + }, + }, + }, + TravelerDendro: { + normal1: { + src: 'TravelerDendro', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'TravelerDendro', + move: 'normal', + name: 'normal1', + }, + }, + }, + TravelerHydro: { + normal1: { + src: 'TravelerHydro', + name: 'normal1', + tag: { + et: 'self', + qt: 'formula', + q: 'dmg', + src: 'TravelerHydro', + move: 'normal', + name: 'normal1', + }, + }, + }, PrototypeAmber: { heal: { src: 'PrototypeAmber', From ced41e1679bdf51b00e33202934bcf6211ef8fae Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:41:23 -0700 Subject: [PATCH 06/10] Fix lint --- libs/gi-formula/src/data/char/TravelerAnemo.ts | 2 +- libs/gi-formula/src/data/char/TravelerDendro.ts | 2 +- libs/gi-formula/src/data/char/TravelerElectro.ts | 2 +- libs/gi-formula/src/data/char/TravelerGeo.ts | 2 +- libs/gi-formula/src/data/char/TravelerHydro.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/gi-formula/src/data/char/TravelerAnemo.ts b/libs/gi-formula/src/data/char/TravelerAnemo.ts index bb71aa0a97..a9dcc44714 100644 --- a/libs/gi-formula/src/data/char/TravelerAnemo.ts +++ b/libs/gi-formula/src/data/char/TravelerAnemo.ts @@ -16,7 +16,7 @@ import { } from '../util' import { dataGenToCharInfo, dmg, entriesForChar } from './util' -const key: CharacterKey = 'TravelerAnemo' +const _key: CharacterKey = 'TravelerAnemo' const data_gen = allStats.char.data['Traveler'] // TODO: Fix gender 🏳️‍⚧️ const skillParam_gen = allStats.char.skillParam['TravelerAnemoF'] diff --git a/libs/gi-formula/src/data/char/TravelerDendro.ts b/libs/gi-formula/src/data/char/TravelerDendro.ts index 47ec568dd3..ad43d513b9 100644 --- a/libs/gi-formula/src/data/char/TravelerDendro.ts +++ b/libs/gi-formula/src/data/char/TravelerDendro.ts @@ -16,7 +16,7 @@ import { } from '../util' import { dataGenToCharInfo, dmg, entriesForChar } from './util' -const key: CharacterKey = 'TravelerDendro' +const _key: CharacterKey = 'TravelerDendro' const data_gen = allStats.char.data['Traveler'] // TODO: Fix gender 🏳️‍⚧️ const skillParam_gen = allStats.char.skillParam['TravelerDendroF'] diff --git a/libs/gi-formula/src/data/char/TravelerElectro.ts b/libs/gi-formula/src/data/char/TravelerElectro.ts index 3501ba4bca..d82532e46a 100644 --- a/libs/gi-formula/src/data/char/TravelerElectro.ts +++ b/libs/gi-formula/src/data/char/TravelerElectro.ts @@ -16,7 +16,7 @@ import { } from '../util' import { dataGenToCharInfo, dmg, entriesForChar } from './util' -const key: CharacterKey = 'TravelerElectro' +const _key: CharacterKey = 'TravelerElectro' const data_gen = allStats.char.data['Traveler'] // TODO: Fix gender 🏳️‍⚧️ const skillParam_gen = allStats.char.skillParam['TravelerElectroF'] diff --git a/libs/gi-formula/src/data/char/TravelerGeo.ts b/libs/gi-formula/src/data/char/TravelerGeo.ts index acf7d3465d..5716869539 100644 --- a/libs/gi-formula/src/data/char/TravelerGeo.ts +++ b/libs/gi-formula/src/data/char/TravelerGeo.ts @@ -16,7 +16,7 @@ import { } from '../util' import { dataGenToCharInfo, dmg, entriesForChar } from './util' -const key: CharacterKey = 'TravelerGeo' +const _key: CharacterKey = 'TravelerGeo' const data_gen = allStats.char.data['Traveler'] // TODO: Fix gender 🏳️‍⚧️ const skillParam_gen = allStats.char.skillParam['TravelerGeoF'] diff --git a/libs/gi-formula/src/data/char/TravelerHydro.ts b/libs/gi-formula/src/data/char/TravelerHydro.ts index 0028123895..b848212b24 100644 --- a/libs/gi-formula/src/data/char/TravelerHydro.ts +++ b/libs/gi-formula/src/data/char/TravelerHydro.ts @@ -16,7 +16,7 @@ import { } from '../util' import { dataGenToCharInfo, dmg, entriesForChar } from './util' -const key: CharacterKey = 'TravelerHydro' +const _key: CharacterKey = 'TravelerHydro' const data_gen = allStats.char.data['Traveler'] // TODO: Fix gender 🏳️‍⚧️ const skillParam_gen = allStats.char.skillParam['TravelerHydroF'] From 79d7df4c033750ea62362558a1f71e3ee7cf16cf Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:47:36 -0700 Subject: [PATCH 07/10] Fix type error --- .../src/generators/gen-sheet/single-generator.ts | 7 ++++--- libs/util/src/lib/util.ts | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/gi-formula/src/generators/gen-sheet/single-generator.ts b/libs/gi-formula/src/generators/gen-sheet/single-generator.ts index 4d6442ff82..44227b3d49 100644 --- a/libs/gi-formula/src/generators/gen-sheet/single-generator.ts +++ b/libs/gi-formula/src/generators/gen-sheet/single-generator.ts @@ -7,6 +7,7 @@ import type { Tree } from '@nx/devkit' import genSheet from './genSheet' import type { GenSheetGeneratorSchema } from './schema' import genIndex from './genIndex' +import { isIn } from '@genshin-optimizer/util' export default async function genSheetGenerator( tree: Tree, options: GenSheetGeneratorSchema @@ -14,15 +15,15 @@ export default async function genSheetGenerator( const { sheet_type, src } = options switch (sheet_type) { case 'char': - if (!allCharacterKeys.includes(src)) + if (!isIn(allCharacterKeys, src)) return console.error(`Character with key ${src} does not exist.`) break case 'weapon': - if (!allWeaponKeys.includes(src)) + if (!isIn(allWeaponKeys, src)) return console.error(`Weapon with key ${src} does not exist.`) break case 'artifact': - if (!allArtifactSetKeys.includes(src)) + if (!isIn(allArtifactSetKeys, src)) return console.error(`Artifact set with key ${src} does not exist.`) break default: diff --git a/libs/util/src/lib/util.ts b/libs/util/src/lib/util.ts index b730677ff2..e4fa2d3ecd 100644 --- a/libs/util/src/lib/util.ts +++ b/libs/util/src/lib/util.ts @@ -22,3 +22,7 @@ export function deepClone(obj: T): T { }) return ret } + +export function isIn(values: readonly T[], val: any): val is T { + return values.includes(val) +} From a2d566dcec2b28d209cab27a22f1bb0823f2a82e Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:18:15 -0700 Subject: [PATCH 08/10] Fix test, standardize templates --- .../src/data/artifact/Adventurer.ts | 14 +++++----- .../src/data/artifact/ArchaicPetra.ts | 14 +++++----- .../gi-formula/src/data/artifact/Berserker.ts | 14 +++++----- .../src/data/artifact/BlizzardStrayer.ts | 14 +++++----- .../src/data/artifact/BloodstainedChivalry.ts | 14 +++++----- .../src/data/artifact/BraveHeart.ts | 14 +++++----- .../src/data/artifact/CrimsonWitchOfFlames.ts | 14 +++++----- .../src/data/artifact/DeepwoodMemories.ts | 14 +++++----- .../src/data/artifact/DefendersWill.ts | 14 +++++----- .../data/artifact/DesertPavilionChronicle.ts | 14 +++++----- .../src/data/artifact/EchoesOfAnOffering.ts | 14 +++++----- .../src/data/artifact/EmblemOfSeveredFate.ts | 14 +++++----- .../src/data/artifact/FlowerOfParadiseLost.ts | 14 +++++----- libs/gi-formula/src/data/artifact/Gambler.ts | 14 +++++----- .../src/data/artifact/GildedDreams.ts | 14 +++++----- .../src/data/artifact/GladiatorsFinale.ts | 14 +++++----- .../src/data/artifact/GoldenTroupe.ts | 14 +++++----- .../src/data/artifact/HeartOfDepth.ts | 14 +++++----- .../src/data/artifact/HuskOfOpulentDreams.ts | 14 +++++----- .../src/data/artifact/Instructor.ts | 14 +++++----- .../src/data/artifact/Lavawalker.ts | 14 +++++----- libs/gi-formula/src/data/artifact/LuckyDog.ts | 14 +++++----- .../src/data/artifact/MaidenBeloved.ts | 14 +++++----- .../src/data/artifact/MarechausseeHunter.ts | 14 +++++----- .../src/data/artifact/MartialArtist.ts | 14 +++++----- .../src/data/artifact/NoblesseOblige.ts | 8 +++--- .../src/data/artifact/NymphsDream.ts | 14 +++++----- .../src/data/artifact/OceanHuedClam.ts | 14 +++++----- .../gi-formula/src/data/artifact/PaleFlame.ts | 14 +++++----- .../src/data/artifact/PrayersForDestiny.ts | 14 +++++----- .../data/artifact/PrayersForIllumination.ts | 14 +++++----- .../src/data/artifact/PrayersForWisdom.ts | 14 +++++----- .../src/data/artifact/PrayersToSpringtime.ts | 14 +++++----- .../data/artifact/ResolutionOfSojourner.ts | 14 +++++----- .../src/data/artifact/RetracingBolide.ts | 14 +++++----- libs/gi-formula/src/data/artifact/Scholar.ts | 14 +++++----- .../data/artifact/ShimenawasReminiscence.ts | 14 +++++----- .../data/artifact/TenacityOfTheMillelith.ts | 14 +++++----- libs/gi-formula/src/data/artifact/TheExile.ts | 14 +++++----- .../src/data/artifact/ThunderingFury.ts | 14 +++++----- .../src/data/artifact/Thundersoother.ts | 14 +++++----- .../src/data/artifact/TinyMiracle.ts | 14 +++++----- .../src/data/artifact/TravelingDoctor.ts | 14 +++++----- .../src/data/artifact/VermillionHereafter.ts | 14 +++++----- .../src/data/artifact/ViridescentVenerer.ts | 14 +++++----- .../src/data/artifact/VourukashasGlow.ts | 14 +++++----- .../src/data/artifact/WanderersTroupe.ts | 14 +++++----- libs/gi-formula/src/data/artifact/util.ts | 24 ++++++++--------- .../data/weapon/AThousandFloatingDreams.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Akuoumaru.ts | 14 +++++----- .../gi-formula/src/data/weapon/AlleyHunter.ts | 14 +++++----- .../src/data/weapon/AmenomaKageuchi.ts | 14 +++++----- libs/gi-formula/src/data/weapon/AmosBow.ts | 14 +++++----- .../src/data/weapon/ApprenticesNotes.ts | 14 +++++----- .../src/data/weapon/AquaSimulacra.ts | 14 +++++----- .../src/data/weapon/AquilaFavonia.ts | 14 +++++----- .../data/weapon/BalladOfTheBoundlessBlue.ts | 14 +++++----- .../src/data/weapon/BalladOfTheFjords.ts | 14 +++++----- .../src/data/weapon/BeaconOfTheReedSea.ts | 14 +++++----- .../src/data/weapon/BeginnersProtector.ts | 14 +++++----- .../gi-formula/src/data/weapon/BlackTassel.ts | 14 +++++----- .../src/data/weapon/BlackcliffAgate.ts | 14 +++++----- .../src/data/weapon/BlackcliffLongsword.ts | 14 +++++----- .../src/data/weapon/BlackcliffPole.ts | 14 +++++----- .../src/data/weapon/BlackcliffSlasher.ts | 14 +++++----- .../src/data/weapon/BlackcliffWarbow.ts | 14 +++++----- .../src/data/weapon/BloodtaintedGreatsword.ts | 14 +++++----- .../src/data/weapon/CalamityQueller.ts | 2 ++ .../src/data/weapon/CashflowSupervision.ts | 14 +++++----- .../src/data/weapon/CinnabarSpindle.ts | 14 +++++----- .../gi-formula/src/data/weapon/CompoundBow.ts | 14 +++++----- libs/gi-formula/src/data/weapon/CoolSteel.ts | 14 +++++----- .../src/data/weapon/CrescentPike.ts | 14 +++++----- .../src/data/weapon/DarkIronSword.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Deathmatch.ts | 14 +++++----- libs/gi-formula/src/data/weapon/DebateClub.ts | 14 +++++----- .../gi-formula/src/data/weapon/DodocoTales.ts | 14 +++++----- .../gi-formula/src/data/weapon/DragonsBane.ts | 14 +++++----- .../src/data/weapon/DragonspineSpear.ts | 14 +++++----- libs/gi-formula/src/data/weapon/DullBlade.ts | 14 +++++----- .../src/data/weapon/ElegyForTheEnd.ts | 14 +++++----- libs/gi-formula/src/data/weapon/EmeraldOrb.ts | 14 +++++----- .../src/data/weapon/EndOfTheLine.ts | 14 +++++----- .../src/data/weapon/EngulfingLightning.ts | 14 +++++----- .../src/data/weapon/EverlastingMoonglow.ts | 14 +++++----- .../src/data/weapon/EyeOfPerception.ts | 14 +++++----- .../src/data/weapon/FadingTwilight.ts | 14 +++++----- .../src/data/weapon/FavoniusCodex.ts | 14 +++++----- .../src/data/weapon/FavoniusGreatsword.ts | 14 +++++----- .../src/data/weapon/FavoniusLance.ts | 14 +++++----- .../src/data/weapon/FavoniusSword.ts | 14 +++++----- .../src/data/weapon/FavoniusWarbow.ts | 14 +++++----- .../src/data/weapon/FerrousShadow.ts | 14 +++++----- .../src/data/weapon/FesteringDesire.ts | 14 +++++----- .../gi-formula/src/data/weapon/FilletBlade.ts | 14 +++++----- .../src/data/weapon/FinaleOfTheDeep.ts | 14 +++++----- .../src/data/weapon/FleuveCendreFerryman.ts | 14 +++++----- .../src/data/weapon/FlowingPurity.ts | 14 +++++----- .../src/data/weapon/ForestRegalia.ts | 14 +++++----- .../src/data/weapon/FreedomSworn.ts | 14 +++++----- .../gi-formula/src/data/weapon/Frostbearer.ts | 14 +++++----- .../src/data/weapon/FruitOfFulfillment.ts | 14 +++++----- .../src/data/weapon/HakushinRing.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Halberd.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Hamayumi.ts | 14 +++++----- .../src/data/weapon/HaranGeppakuFutsu.ts | 14 +++++----- .../src/data/weapon/HarbingerOfDawn.ts | 14 +++++----- libs/gi-formula/src/data/weapon/HuntersBow.ts | 14 +++++----- .../gi-formula/src/data/weapon/HuntersPath.ts | 14 +++++----- .../gi-formula/src/data/weapon/IbisPiercer.ts | 14 +++++----- libs/gi-formula/src/data/weapon/IronPoint.ts | 14 +++++----- libs/gi-formula/src/data/weapon/IronSting.ts | 14 +++++----- .../src/data/weapon/JadefallsSplendor.ts | 14 +++++----- .../src/data/weapon/KagotsurubeIsshin.ts | 14 +++++----- .../src/data/weapon/KagurasVerity.ts | 14 +++++----- .../src/data/weapon/KatsuragikiriNagamasa.ts | 14 +++++----- .../src/data/weapon/KeyOfKhajNisut.ts | 2 ++ .../gi-formula/src/data/weapon/KingsSquire.ts | 14 +++++----- .../src/data/weapon/KitainCrossSpear.ts | 14 +++++----- .../src/data/weapon/LightOfFoliarIncision.ts | 14 +++++----- libs/gi-formula/src/data/weapon/LionsRoar.ts | 14 +++++----- .../gi-formula/src/data/weapon/LithicBlade.ts | 14 +++++----- .../gi-formula/src/data/weapon/LithicSpear.ts | 14 +++++----- .../data/weapon/LostPrayerToTheSacredWinds.ts | 14 +++++----- .../src/data/weapon/LuxuriousSeaLord.ts | 14 +++++----- libs/gi-formula/src/data/weapon/MagicGuide.ts | 14 +++++----- .../src/data/weapon/MailedFlower.ts | 14 +++++----- .../src/data/weapon/MakhairaAquamarine.ts | 14 +++++----- libs/gi-formula/src/data/weapon/MappaMare.ts | 14 +++++----- .../src/data/weapon/MemoryOfDust.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Messenger.ts | 14 +++++----- .../src/data/weapon/MissiveWindspear.ts | 14 +++++----- .../src/data/weapon/MistsplitterReforged.ts | 14 +++++----- .../src/data/weapon/MitternachtsWaltz.ts | 14 +++++----- .../gi-formula/src/data/weapon/Moonpiercer.ts | 14 +++++----- libs/gi-formula/src/data/weapon/MouunsMoon.ts | 14 +++++----- .../src/data/weapon/OathswornEye.ts | 14 +++++----- .../gi-formula/src/data/weapon/OldMercsPal.ts | 14 +++++----- .../src/data/weapon/OtherworldlyStory.ts | 14 +++++----- .../src/data/weapon/PocketGrimoire.ts | 14 +++++----- libs/gi-formula/src/data/weapon/PolarStar.ts | 14 +++++----- .../src/data/weapon/PortablePowerSaw.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Predator.ts | 14 +++++----- .../src/data/weapon/PrimordialJadeCutter.ts | 14 +++++----- .../data/weapon/PrimordialJadeWingedSpear.ts | 14 +++++----- .../src/data/weapon/ProspectorsDrill.ts | 14 +++++----- .../src/data/weapon/PrototypeAmber.ts | 2 ++ .../src/data/weapon/PrototypeArchaic.ts | 14 +++++----- .../src/data/weapon/PrototypeCrescent.ts | 14 +++++----- .../src/data/weapon/PrototypeRancour.ts | 14 +++++----- .../src/data/weapon/PrototypeStarglitter.ts | 14 +++++----- .../src/data/weapon/QuantumCatalyst.ts | 14 +++++----- .../gi-formula/src/data/weapon/Rainslasher.ts | 14 +++++----- libs/gi-formula/src/data/weapon/RangeGauge.ts | 14 +++++----- libs/gi-formula/src/data/weapon/RavenBow.ts | 14 +++++----- libs/gi-formula/src/data/weapon/RecurveBow.ts | 14 +++++----- .../src/data/weapon/RedhornStonethresher.ts | 14 +++++----- .../src/data/weapon/RightfulReward.ts | 14 +++++----- libs/gi-formula/src/data/weapon/RoyalBow.ts | 14 +++++----- .../src/data/weapon/RoyalGreatsword.ts | 14 +++++----- .../src/data/weapon/RoyalGrimoire.ts | 14 +++++----- .../src/data/weapon/RoyalLongsword.ts | 14 +++++----- libs/gi-formula/src/data/weapon/RoyalSpear.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Rust.ts | 14 +++++----- .../src/data/weapon/SacrificialBow.ts | 14 +++++----- .../src/data/weapon/SacrificialFragments.ts | 14 +++++----- .../src/data/weapon/SacrificialGreatsword.ts | 14 +++++----- .../src/data/weapon/SacrificialJade.ts | 14 +++++----- .../src/data/weapon/SacrificialSword.ts | 14 +++++----- .../src/data/weapon/SapwoodBlade.ts | 14 +++++----- .../src/data/weapon/ScionOfTheBlazingSun.ts | 14 +++++----- .../src/data/weapon/SeasonedHuntersBow.ts | 14 +++++----- .../src/data/weapon/SerpentSpine.ts | 14 +++++----- .../src/data/weapon/SharpshootersOath.ts | 14 +++++----- .../gi-formula/src/data/weapon/SilverSword.ts | 14 +++++----- .../src/data/weapon/SkyriderGreatsword.ts | 14 +++++----- .../src/data/weapon/SkyriderSword.ts | 14 +++++----- .../src/data/weapon/SkywardAtlas.ts | 14 +++++----- .../src/data/weapon/SkywardBlade.ts | 14 +++++----- .../gi-formula/src/data/weapon/SkywardHarp.ts | 14 +++++----- .../src/data/weapon/SkywardPride.ts | 14 +++++----- .../src/data/weapon/SkywardSpine.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Slingshot.ts | 14 +++++----- .../src/data/weapon/SnowTombedStarsilver.ts | 14 +++++----- libs/gi-formula/src/data/weapon/SolarPearl.ts | 14 +++++----- .../src/data/weapon/SongOfBrokenPines.ts | 14 +++++----- .../src/data/weapon/SongOfStillness.ts | 14 +++++----- .../data/weapon/SplendorOfTranquilWaters.ts | 14 +++++----- .../gi-formula/src/data/weapon/StaffOfHoma.ts | 14 +++++----- .../src/data/weapon/StaffOfTheScarletSands.ts | 14 +++++----- .../src/data/weapon/SummitShaper.ts | 14 +++++----- .../src/data/weapon/SwordOfDescension.ts | 14 +++++----- .../src/data/weapon/SwordOfNarzissenkreuz.ts | 14 +++++----- .../src/data/weapon/TalkingStick.ts | 14 +++++----- .../src/data/weapon/TheAlleyFlash.ts | 14 +++++----- libs/gi-formula/src/data/weapon/TheBell.ts | 14 +++++----- .../src/data/weapon/TheBlackSword.ts | 14 +++++----- libs/gi-formula/src/data/weapon/TheCatch.ts | 14 +++++----- .../src/data/weapon/TheDockhandsAssistant.ts | 14 +++++----- .../src/data/weapon/TheFirstGreatMagic.ts | 14 +++++----- libs/gi-formula/src/data/weapon/TheFlute.ts | 14 +++++----- .../src/data/weapon/TheStringless.ts | 14 +++++----- .../gi-formula/src/data/weapon/TheUnforged.ts | 14 +++++----- .../src/data/weapon/TheViridescentHunt.ts | 14 +++++----- libs/gi-formula/src/data/weapon/TheWidsith.ts | 14 +++++----- .../weapon/ThrillingTalesOfDragonSlayers.ts | 14 +++++----- .../src/data/weapon/ThunderingPulse.ts | 14 +++++----- .../gi-formula/src/data/weapon/TidalShadow.ts | 14 +++++----- .../src/data/weapon/TomeOfTheEternalFlow.ts | 14 +++++----- .../src/data/weapon/ToukabouShigure.ts | 14 +++++----- .../src/data/weapon/TravelersHandySword.ts | 14 +++++----- .../data/weapon/TulaytullahsRemembrance.ts | 1 + .../src/data/weapon/TwinNephrite.ts | 14 +++++----- .../src/data/weapon/VortexVanquisher.ts | 14 +++++----- .../src/data/weapon/WanderingEvenstar.ts | 14 +++++----- .../src/data/weapon/WasterGreatsword.ts | 14 +++++----- .../src/data/weapon/WavebreakersFin.ts | 14 +++++----- .../src/data/weapon/WhiteIronGreatsword.ts | 14 +++++----- .../gi-formula/src/data/weapon/WhiteTassel.ts | 14 +++++----- libs/gi-formula/src/data/weapon/Whiteblind.ts | 14 +++++----- .../src/data/weapon/WindblumeOde.ts | 14 +++++----- .../gi-formula/src/data/weapon/WineAndSong.ts | 14 +++++----- libs/gi-formula/src/data/weapon/WolfFang.ts | 14 +++++----- .../src/data/weapon/WolfsGravestone.ts | 14 +++++----- .../src/data/weapon/XiphosMoonlight.ts | 14 +++++----- libs/gi-formula/src/data/weapon/index.ts | 4 ++- libs/gi-formula/src/data/weapon/util.ts | 26 +++++++++++++++++++ .../gen-sheet/artifact/__src__.ts.template | 14 +++++----- .../gen-sheet/weapon/__src__.ts.template | 14 +++++----- 229 files changed, 1773 insertions(+), 1390 deletions(-) create mode 100644 libs/gi-formula/src/data/weapon/util.ts diff --git a/libs/gi-formula/src/data/artifact/Adventurer.ts b/libs/gi-formula/src/data/artifact/Adventurer.ts index 49f1a02784..566c362a91 100644 --- a/libs/gi-formula/src/data/artifact/Adventurer.ts +++ b/libs/gi-formula/src/data/artifact/Adventurer.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Adventurer' -const count = artCount(src) +const key: ArtifactSetKey = 'Adventurer' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/ArchaicPetra.ts b/libs/gi-formula/src/data/artifact/ArchaicPetra.ts index 3f7217a104..286fad47a5 100644 --- a/libs/gi-formula/src/data/artifact/ArchaicPetra.ts +++ b/libs/gi-formula/src/data/artifact/ArchaicPetra.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'ArchaicPetra' -const count = artCount(src) +const key: ArtifactSetKey = 'ArchaicPetra' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/Berserker.ts b/libs/gi-formula/src/data/artifact/Berserker.ts index c5ffea4890..9d82b091b1 100644 --- a/libs/gi-formula/src/data/artifact/Berserker.ts +++ b/libs/gi-formula/src/data/artifact/Berserker.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Berserker' -const count = artCount(src) +const key: ArtifactSetKey = 'Berserker' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/BlizzardStrayer.ts b/libs/gi-formula/src/data/artifact/BlizzardStrayer.ts index 91f70b78bd..7659feea09 100644 --- a/libs/gi-formula/src/data/artifact/BlizzardStrayer.ts +++ b/libs/gi-formula/src/data/artifact/BlizzardStrayer.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'BlizzardStrayer' -const count = artCount(src) +const key: ArtifactSetKey = 'BlizzardStrayer' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/BloodstainedChivalry.ts b/libs/gi-formula/src/data/artifact/BloodstainedChivalry.ts index 4d2c4206a2..88c39a30d5 100644 --- a/libs/gi-formula/src/data/artifact/BloodstainedChivalry.ts +++ b/libs/gi-formula/src/data/artifact/BloodstainedChivalry.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'BloodstainedChivalry' -const count = artCount(src) +const key: ArtifactSetKey = 'BloodstainedChivalry' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/BraveHeart.ts b/libs/gi-formula/src/data/artifact/BraveHeart.ts index 966dbd2324..5294232b89 100644 --- a/libs/gi-formula/src/data/artifact/BraveHeart.ts +++ b/libs/gi-formula/src/data/artifact/BraveHeart.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'BraveHeart' -const count = artCount(src) +const key: ArtifactSetKey = 'BraveHeart' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/CrimsonWitchOfFlames.ts b/libs/gi-formula/src/data/artifact/CrimsonWitchOfFlames.ts index 747b3f7c67..b72f4c1c81 100644 --- a/libs/gi-formula/src/data/artifact/CrimsonWitchOfFlames.ts +++ b/libs/gi-formula/src/data/artifact/CrimsonWitchOfFlames.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'CrimsonWitchOfFlames' -const count = artCount(src) +const key: ArtifactSetKey = 'CrimsonWitchOfFlames' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/DeepwoodMemories.ts b/libs/gi-formula/src/data/artifact/DeepwoodMemories.ts index 451589748c..e0a8e51cc7 100644 --- a/libs/gi-formula/src/data/artifact/DeepwoodMemories.ts +++ b/libs/gi-formula/src/data/artifact/DeepwoodMemories.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'DeepwoodMemories' -const count = artCount(src) +const key: ArtifactSetKey = 'DeepwoodMemories' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/DefendersWill.ts b/libs/gi-formula/src/data/artifact/DefendersWill.ts index fd1811d5db..5ba285b43f 100644 --- a/libs/gi-formula/src/data/artifact/DefendersWill.ts +++ b/libs/gi-formula/src/data/artifact/DefendersWill.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'DefendersWill' -const count = artCount(src) +const key: ArtifactSetKey = 'DefendersWill' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/DesertPavilionChronicle.ts b/libs/gi-formula/src/data/artifact/DesertPavilionChronicle.ts index 18f55f47c5..334d2156be 100644 --- a/libs/gi-formula/src/data/artifact/DesertPavilionChronicle.ts +++ b/libs/gi-formula/src/data/artifact/DesertPavilionChronicle.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'DesertPavilionChronicle' -const count = artCount(src) +const key: ArtifactSetKey = 'DesertPavilionChronicle' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/EchoesOfAnOffering.ts b/libs/gi-formula/src/data/artifact/EchoesOfAnOffering.ts index 0cb8adca44..93d66baaa2 100644 --- a/libs/gi-formula/src/data/artifact/EchoesOfAnOffering.ts +++ b/libs/gi-formula/src/data/artifact/EchoesOfAnOffering.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'EchoesOfAnOffering' -const count = artCount(src) +const key: ArtifactSetKey = 'EchoesOfAnOffering' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/EmblemOfSeveredFate.ts b/libs/gi-formula/src/data/artifact/EmblemOfSeveredFate.ts index c949d0ebbe..ea194b7f40 100644 --- a/libs/gi-formula/src/data/artifact/EmblemOfSeveredFate.ts +++ b/libs/gi-formula/src/data/artifact/EmblemOfSeveredFate.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'EmblemOfSeveredFate' -const count = artCount(src) +const key: ArtifactSetKey = 'EmblemOfSeveredFate' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/FlowerOfParadiseLost.ts b/libs/gi-formula/src/data/artifact/FlowerOfParadiseLost.ts index 4d1c2c1783..34dd5626ed 100644 --- a/libs/gi-formula/src/data/artifact/FlowerOfParadiseLost.ts +++ b/libs/gi-formula/src/data/artifact/FlowerOfParadiseLost.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'FlowerOfParadiseLost' -const count = artCount(src) +const key: ArtifactSetKey = 'FlowerOfParadiseLost' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/Gambler.ts b/libs/gi-formula/src/data/artifact/Gambler.ts index cb859d8209..f8a6838a2b 100644 --- a/libs/gi-formula/src/data/artifact/Gambler.ts +++ b/libs/gi-formula/src/data/artifact/Gambler.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Gambler' -const count = artCount(src) +const key: ArtifactSetKey = 'Gambler' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/GildedDreams.ts b/libs/gi-formula/src/data/artifact/GildedDreams.ts index 416399f129..d753b0c911 100644 --- a/libs/gi-formula/src/data/artifact/GildedDreams.ts +++ b/libs/gi-formula/src/data/artifact/GildedDreams.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'GildedDreams' -const count = artCount(src) +const key: ArtifactSetKey = 'GildedDreams' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/GladiatorsFinale.ts b/libs/gi-formula/src/data/artifact/GladiatorsFinale.ts index 27f3f9521e..0dc6bc290b 100644 --- a/libs/gi-formula/src/data/artifact/GladiatorsFinale.ts +++ b/libs/gi-formula/src/data/artifact/GladiatorsFinale.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'GladiatorsFinale' -const count = artCount(src) +const key: ArtifactSetKey = 'GladiatorsFinale' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/GoldenTroupe.ts b/libs/gi-formula/src/data/artifact/GoldenTroupe.ts index bc8c630a0d..5e127123a3 100644 --- a/libs/gi-formula/src/data/artifact/GoldenTroupe.ts +++ b/libs/gi-formula/src/data/artifact/GoldenTroupe.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'GoldenTroupe' -const count = artCount(src) +const key: ArtifactSetKey = 'GoldenTroupe' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/HeartOfDepth.ts b/libs/gi-formula/src/data/artifact/HeartOfDepth.ts index fa84ae6a89..79803dd298 100644 --- a/libs/gi-formula/src/data/artifact/HeartOfDepth.ts +++ b/libs/gi-formula/src/data/artifact/HeartOfDepth.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'HeartOfDepth' -const count = artCount(src) +const key: ArtifactSetKey = 'HeartOfDepth' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/HuskOfOpulentDreams.ts b/libs/gi-formula/src/data/artifact/HuskOfOpulentDreams.ts index ee2d1514a5..4c5ac65710 100644 --- a/libs/gi-formula/src/data/artifact/HuskOfOpulentDreams.ts +++ b/libs/gi-formula/src/data/artifact/HuskOfOpulentDreams.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'HuskOfOpulentDreams' -const count = artCount(src) +const key: ArtifactSetKey = 'HuskOfOpulentDreams' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/Instructor.ts b/libs/gi-formula/src/data/artifact/Instructor.ts index 6690b44de8..29c681ea8d 100644 --- a/libs/gi-formula/src/data/artifact/Instructor.ts +++ b/libs/gi-formula/src/data/artifact/Instructor.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Instructor' -const count = artCount(src) +const key: ArtifactSetKey = 'Instructor' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/Lavawalker.ts b/libs/gi-formula/src/data/artifact/Lavawalker.ts index d6d656405e..3ec0621039 100644 --- a/libs/gi-formula/src/data/artifact/Lavawalker.ts +++ b/libs/gi-formula/src/data/artifact/Lavawalker.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Lavawalker' -const count = artCount(src) +const key: ArtifactSetKey = 'Lavawalker' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/LuckyDog.ts b/libs/gi-formula/src/data/artifact/LuckyDog.ts index e7c3ba5e6d..a237b35836 100644 --- a/libs/gi-formula/src/data/artifact/LuckyDog.ts +++ b/libs/gi-formula/src/data/artifact/LuckyDog.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'LuckyDog' -const count = artCount(src) +const key: ArtifactSetKey = 'LuckyDog' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/MaidenBeloved.ts b/libs/gi-formula/src/data/artifact/MaidenBeloved.ts index a25ba30710..bac3e67834 100644 --- a/libs/gi-formula/src/data/artifact/MaidenBeloved.ts +++ b/libs/gi-formula/src/data/artifact/MaidenBeloved.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'MaidenBeloved' -const count = artCount(src) +const key: ArtifactSetKey = 'MaidenBeloved' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/MarechausseeHunter.ts b/libs/gi-formula/src/data/artifact/MarechausseeHunter.ts index 1f1775cc0a..bbf5459e08 100644 --- a/libs/gi-formula/src/data/artifact/MarechausseeHunter.ts +++ b/libs/gi-formula/src/data/artifact/MarechausseeHunter.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'MarechausseeHunter' -const count = artCount(src) +const key: ArtifactSetKey = 'MarechausseeHunter' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/MartialArtist.ts b/libs/gi-formula/src/data/artifact/MartialArtist.ts index b34c2f0701..d736d9b015 100644 --- a/libs/gi-formula/src/data/artifact/MartialArtist.ts +++ b/libs/gi-formula/src/data/artifact/MartialArtist.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'MartialArtist' -const count = artCount(src) +const key: ArtifactSetKey = 'MartialArtist' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/NoblesseOblige.ts b/libs/gi-formula/src/data/artifact/NoblesseOblige.ts index b3ef90d9c5..e1486ba6cd 100644 --- a/libs/gi-formula/src/data/artifact/NoblesseOblige.ts +++ b/libs/gi-formula/src/data/artifact/NoblesseOblige.ts @@ -9,10 +9,10 @@ import { } from '../util' import { artCount, registerArt } from './util' -const name: ArtifactSetKey = 'NoblesseOblige', - count = artCount(name) -const { set4 } = allBoolConditionals(name), - { canNO4 } = allStacks(name) +const key: ArtifactSetKey = 'NoblesseOblige', + count = artCount(key) +const { set4 } = allBoolConditionals(key), + { canNO4 } = allStacks(key) export default registerArt( name, diff --git a/libs/gi-formula/src/data/artifact/NymphsDream.ts b/libs/gi-formula/src/data/artifact/NymphsDream.ts index 9055f0e258..43f83beb1d 100644 --- a/libs/gi-formula/src/data/artifact/NymphsDream.ts +++ b/libs/gi-formula/src/data/artifact/NymphsDream.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'NymphsDream' -const count = artCount(src) +const key: ArtifactSetKey = 'NymphsDream' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/OceanHuedClam.ts b/libs/gi-formula/src/data/artifact/OceanHuedClam.ts index 1b9d483505..5a4fa4a508 100644 --- a/libs/gi-formula/src/data/artifact/OceanHuedClam.ts +++ b/libs/gi-formula/src/data/artifact/OceanHuedClam.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'OceanHuedClam' -const count = artCount(src) +const key: ArtifactSetKey = 'OceanHuedClam' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/PaleFlame.ts b/libs/gi-formula/src/data/artifact/PaleFlame.ts index 2246b1d670..360176bcef 100644 --- a/libs/gi-formula/src/data/artifact/PaleFlame.ts +++ b/libs/gi-formula/src/data/artifact/PaleFlame.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'PaleFlame' -const count = artCount(src) +const key: ArtifactSetKey = 'PaleFlame' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/PrayersForDestiny.ts b/libs/gi-formula/src/data/artifact/PrayersForDestiny.ts index 0dd7b871a6..9d0ed49244 100644 --- a/libs/gi-formula/src/data/artifact/PrayersForDestiny.ts +++ b/libs/gi-formula/src/data/artifact/PrayersForDestiny.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'PrayersForDestiny' -const count = artCount(src) +const key: ArtifactSetKey = 'PrayersForDestiny' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/PrayersForIllumination.ts b/libs/gi-formula/src/data/artifact/PrayersForIllumination.ts index ef35d762c2..9904114f1f 100644 --- a/libs/gi-formula/src/data/artifact/PrayersForIllumination.ts +++ b/libs/gi-formula/src/data/artifact/PrayersForIllumination.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'PrayersForIllumination' -const count = artCount(src) +const key: ArtifactSetKey = 'PrayersForIllumination' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/PrayersForWisdom.ts b/libs/gi-formula/src/data/artifact/PrayersForWisdom.ts index a969ee6446..e7b6ad1cd1 100644 --- a/libs/gi-formula/src/data/artifact/PrayersForWisdom.ts +++ b/libs/gi-formula/src/data/artifact/PrayersForWisdom.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'PrayersForWisdom' -const count = artCount(src) +const key: ArtifactSetKey = 'PrayersForWisdom' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/PrayersToSpringtime.ts b/libs/gi-formula/src/data/artifact/PrayersToSpringtime.ts index a05016c62e..b2aa540ff2 100644 --- a/libs/gi-formula/src/data/artifact/PrayersToSpringtime.ts +++ b/libs/gi-formula/src/data/artifact/PrayersToSpringtime.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'PrayersToSpringtime' -const count = artCount(src) +const key: ArtifactSetKey = 'PrayersToSpringtime' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/ResolutionOfSojourner.ts b/libs/gi-formula/src/data/artifact/ResolutionOfSojourner.ts index e2007a365b..f8e92d309d 100644 --- a/libs/gi-formula/src/data/artifact/ResolutionOfSojourner.ts +++ b/libs/gi-formula/src/data/artifact/ResolutionOfSojourner.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'ResolutionOfSojourner' -const count = artCount(src) +const key: ArtifactSetKey = 'ResolutionOfSojourner' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/RetracingBolide.ts b/libs/gi-formula/src/data/artifact/RetracingBolide.ts index c346910fbd..995f2f4d13 100644 --- a/libs/gi-formula/src/data/artifact/RetracingBolide.ts +++ b/libs/gi-formula/src/data/artifact/RetracingBolide.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'RetracingBolide' -const count = artCount(src) +const key: ArtifactSetKey = 'RetracingBolide' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/Scholar.ts b/libs/gi-formula/src/data/artifact/Scholar.ts index 8104d086ff..e061734e46 100644 --- a/libs/gi-formula/src/data/artifact/Scholar.ts +++ b/libs/gi-formula/src/data/artifact/Scholar.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Scholar' -const count = artCount(src) +const key: ArtifactSetKey = 'Scholar' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/ShimenawasReminiscence.ts b/libs/gi-formula/src/data/artifact/ShimenawasReminiscence.ts index 3648f5b7d4..80912afa4d 100644 --- a/libs/gi-formula/src/data/artifact/ShimenawasReminiscence.ts +++ b/libs/gi-formula/src/data/artifact/ShimenawasReminiscence.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'ShimenawasReminiscence' -const count = artCount(src) +const key: ArtifactSetKey = 'ShimenawasReminiscence' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/TenacityOfTheMillelith.ts b/libs/gi-formula/src/data/artifact/TenacityOfTheMillelith.ts index 59fc5cd886..9cfa929a26 100644 --- a/libs/gi-formula/src/data/artifact/TenacityOfTheMillelith.ts +++ b/libs/gi-formula/src/data/artifact/TenacityOfTheMillelith.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'TenacityOfTheMillelith' -const count = artCount(src) +const key: ArtifactSetKey = 'TenacityOfTheMillelith' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/TheExile.ts b/libs/gi-formula/src/data/artifact/TheExile.ts index c341f611b7..2219cc738a 100644 --- a/libs/gi-formula/src/data/artifact/TheExile.ts +++ b/libs/gi-formula/src/data/artifact/TheExile.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'TheExile' -const count = artCount(src) +const key: ArtifactSetKey = 'TheExile' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/ThunderingFury.ts b/libs/gi-formula/src/data/artifact/ThunderingFury.ts index 9369bd5d20..5cb0e1022e 100644 --- a/libs/gi-formula/src/data/artifact/ThunderingFury.ts +++ b/libs/gi-formula/src/data/artifact/ThunderingFury.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'ThunderingFury' -const count = artCount(src) +const key: ArtifactSetKey = 'ThunderingFury' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/Thundersoother.ts b/libs/gi-formula/src/data/artifact/Thundersoother.ts index b748330747..7ec5fa7530 100644 --- a/libs/gi-formula/src/data/artifact/Thundersoother.ts +++ b/libs/gi-formula/src/data/artifact/Thundersoother.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'Thundersoother' -const count = artCount(src) +const key: ArtifactSetKey = 'Thundersoother' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/TinyMiracle.ts b/libs/gi-formula/src/data/artifact/TinyMiracle.ts index 5482b882f6..56f80d5a8c 100644 --- a/libs/gi-formula/src/data/artifact/TinyMiracle.ts +++ b/libs/gi-formula/src/data/artifact/TinyMiracle.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'TinyMiracle' -const count = artCount(src) +const key: ArtifactSetKey = 'TinyMiracle' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/TravelingDoctor.ts b/libs/gi-formula/src/data/artifact/TravelingDoctor.ts index f0263ad046..c4c8b31c36 100644 --- a/libs/gi-formula/src/data/artifact/TravelingDoctor.ts +++ b/libs/gi-formula/src/data/artifact/TravelingDoctor.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'TravelingDoctor' -const count = artCount(src) +const key: ArtifactSetKey = 'TravelingDoctor' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/VermillionHereafter.ts b/libs/gi-formula/src/data/artifact/VermillionHereafter.ts index b08567fcdd..f9a895e45f 100644 --- a/libs/gi-formula/src/data/artifact/VermillionHereafter.ts +++ b/libs/gi-formula/src/data/artifact/VermillionHereafter.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'VermillionHereafter' -const count = artCount(src) +const key: ArtifactSetKey = 'VermillionHereafter' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/ViridescentVenerer.ts b/libs/gi-formula/src/data/artifact/ViridescentVenerer.ts index f42e7f3190..d3989500f8 100644 --- a/libs/gi-formula/src/data/artifact/ViridescentVenerer.ts +++ b/libs/gi-formula/src/data/artifact/ViridescentVenerer.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'ViridescentVenerer' -const count = artCount(src) +const key: ArtifactSetKey = 'ViridescentVenerer' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/VourukashasGlow.ts b/libs/gi-formula/src/data/artifact/VourukashasGlow.ts index a744762259..13d2ab346a 100644 --- a/libs/gi-formula/src/data/artifact/VourukashasGlow.ts +++ b/libs/gi-formula/src/data/artifact/VourukashasGlow.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'VourukashasGlow' -const count = artCount(src) +const key: ArtifactSetKey = 'VourukashasGlow' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/WanderersTroupe.ts b/libs/gi-formula/src/data/artifact/WanderersTroupe.ts index d5304c8d28..4a61219f03 100644 --- a/libs/gi-formula/src/data/artifact/WanderersTroupe.ts +++ b/libs/gi-formula/src/data/artifact/WanderersTroupe.ts @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = 'WanderersTroupe' -const count = artCount(src) +const key: ArtifactSetKey = 'WanderersTroupe' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/artifact/util.ts b/libs/gi-formula/src/data/artifact/util.ts index f9e9156435..0c4e8b2bb1 100644 --- a/libs/gi-formula/src/data/artifact/util.ts +++ b/libs/gi-formula/src/data/artifact/util.ts @@ -4,33 +4,33 @@ import type { TagMapNodeEntries, TagMapNodeEntry } from '../util' import { self, tag } from '../util' export function registerArt( - src: ArtifactSetKey, + key: ArtifactSetKey, ...data: (TagMapNodeEntry | TagMapNodeEntries)[] ): TagMapNodeEntries { /* Unlike character and weapon, artifact buff is all-or-nothing, so we can register every - * buff as `src:art` and tag the formula as `src:src`. This means that `src:art`, which is - * read on each `et:agg`, does not need to reread `src:src`. This greatly reduce `Read` - * traffic due to the sheer numbers of `et:agg` calculations and `src:src` it would require - * for each `src:art` read. + * buff as `key:art` and tag the formula as `key:key`. This means that `key:art`, which is + * read on each `et:agg`, does not need to reread `key:key`. This greatly reduce `Read` + * traffic due to the sheer numbers of `et:agg` calculations and `key:key` it would require + * for each `key:art` read. */ function internal({ tag: oldTag, value }: TagMapNodeEntry): TagMapNodeEntry { - if (oldTag.src === src) + if (oldTag.key === key) // Special entries (usually stack count) that override `stack` return { tag: oldTag, value } - // Add `src:art` to the tag and add `tag(src:<>, value)` to set tags for calculation + // Add `key:art` to the tag and add `tag(key:<>, value)` to set tags for calculation if (value.op === 'reread' || value.op === 'tag' || value.op === 'read') // Reuses `value` since it is already changing tags - value = { ...value, tag: { ...value.tag, src } } - else value = tag(value, { src }) - return { tag: { ...oldTag, src: 'art' }, value } + value = { ...value, tag: { ...value.tag, key } } + else value = tag(value, { key }) + return { tag: { ...oldTag, key: 'art' }, value } } return data.flatMap((data) => Array.isArray(data) ? data.map(internal) : internal(data) ) } -export function artCount(src: ArtifactSetKey): NumNode { - return self.common.count.src(src) +export function artCount(key: ArtifactSetKey): NumNode { + return self.common.count.key(key) } diff --git a/libs/gi-formula/src/data/weapon/AThousandFloatingDreams.ts b/libs/gi-formula/src/data/weapon/AThousandFloatingDreams.ts index 458e504394..dd15fa86f6 100644 --- a/libs/gi-formula/src/data/weapon/AThousandFloatingDreams.ts +++ b/libs/gi-formula/src/data/weapon/AThousandFloatingDreams.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'AThousandFloatingDreams' +const key: WeaponKey = 'AThousandFloatingDreams' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Akuoumaru.ts b/libs/gi-formula/src/data/weapon/Akuoumaru.ts index 87077c175d..15c8288ff4 100644 --- a/libs/gi-formula/src/data/weapon/Akuoumaru.ts +++ b/libs/gi-formula/src/data/weapon/Akuoumaru.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Akuoumaru' +const key: WeaponKey = 'Akuoumaru' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/AlleyHunter.ts b/libs/gi-formula/src/data/weapon/AlleyHunter.ts index 1095d44f9d..7044bb58f1 100644 --- a/libs/gi-formula/src/data/weapon/AlleyHunter.ts +++ b/libs/gi-formula/src/data/weapon/AlleyHunter.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'AlleyHunter' +const key: WeaponKey = 'AlleyHunter' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/AmenomaKageuchi.ts b/libs/gi-formula/src/data/weapon/AmenomaKageuchi.ts index 56ea685cd6..62582e9839 100644 --- a/libs/gi-formula/src/data/weapon/AmenomaKageuchi.ts +++ b/libs/gi-formula/src/data/weapon/AmenomaKageuchi.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'AmenomaKageuchi' +const key: WeaponKey = 'AmenomaKageuchi' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/AmosBow.ts b/libs/gi-formula/src/data/weapon/AmosBow.ts index 48d29cf28a..b21d068495 100644 --- a/libs/gi-formula/src/data/weapon/AmosBow.ts +++ b/libs/gi-formula/src/data/weapon/AmosBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'AmosBow' +const key: WeaponKey = 'AmosBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ApprenticesNotes.ts b/libs/gi-formula/src/data/weapon/ApprenticesNotes.ts index 88855db6d2..5944bbdeb9 100644 --- a/libs/gi-formula/src/data/weapon/ApprenticesNotes.ts +++ b/libs/gi-formula/src/data/weapon/ApprenticesNotes.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ApprenticesNotes' +const key: WeaponKey = 'ApprenticesNotes' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/AquaSimulacra.ts b/libs/gi-formula/src/data/weapon/AquaSimulacra.ts index c60da852d2..7dca746e1e 100644 --- a/libs/gi-formula/src/data/weapon/AquaSimulacra.ts +++ b/libs/gi-formula/src/data/weapon/AquaSimulacra.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'AquaSimulacra' +const key: WeaponKey = 'AquaSimulacra' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/AquilaFavonia.ts b/libs/gi-formula/src/data/weapon/AquilaFavonia.ts index f30815f1c9..ce99fa2b18 100644 --- a/libs/gi-formula/src/data/weapon/AquilaFavonia.ts +++ b/libs/gi-formula/src/data/weapon/AquilaFavonia.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'AquilaFavonia' +const key: WeaponKey = 'AquilaFavonia' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BalladOfTheBoundlessBlue.ts b/libs/gi-formula/src/data/weapon/BalladOfTheBoundlessBlue.ts index a198289fc8..41e45c5feb 100644 --- a/libs/gi-formula/src/data/weapon/BalladOfTheBoundlessBlue.ts +++ b/libs/gi-formula/src/data/weapon/BalladOfTheBoundlessBlue.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BalladOfTheBoundlessBlue' +const key: WeaponKey = 'BalladOfTheBoundlessBlue' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BalladOfTheFjords.ts b/libs/gi-formula/src/data/weapon/BalladOfTheFjords.ts index 5ab8df28d6..a023f5465a 100644 --- a/libs/gi-formula/src/data/weapon/BalladOfTheFjords.ts +++ b/libs/gi-formula/src/data/weapon/BalladOfTheFjords.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BalladOfTheFjords' +const key: WeaponKey = 'BalladOfTheFjords' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BeaconOfTheReedSea.ts b/libs/gi-formula/src/data/weapon/BeaconOfTheReedSea.ts index 42e4757649..2a8da3a3c6 100644 --- a/libs/gi-formula/src/data/weapon/BeaconOfTheReedSea.ts +++ b/libs/gi-formula/src/data/weapon/BeaconOfTheReedSea.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BeaconOfTheReedSea' +const key: WeaponKey = 'BeaconOfTheReedSea' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BeginnersProtector.ts b/libs/gi-formula/src/data/weapon/BeginnersProtector.ts index 764ed19521..981d4d06f9 100644 --- a/libs/gi-formula/src/data/weapon/BeginnersProtector.ts +++ b/libs/gi-formula/src/data/weapon/BeginnersProtector.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BeginnersProtector' +const key: WeaponKey = 'BeginnersProtector' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BlackTassel.ts b/libs/gi-formula/src/data/weapon/BlackTassel.ts index 5c75462055..e9ff0ac62c 100644 --- a/libs/gi-formula/src/data/weapon/BlackTassel.ts +++ b/libs/gi-formula/src/data/weapon/BlackTassel.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BlackTassel' +const key: WeaponKey = 'BlackTassel' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BlackcliffAgate.ts b/libs/gi-formula/src/data/weapon/BlackcliffAgate.ts index 5431a37975..b535551239 100644 --- a/libs/gi-formula/src/data/weapon/BlackcliffAgate.ts +++ b/libs/gi-formula/src/data/weapon/BlackcliffAgate.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BlackcliffAgate' +const key: WeaponKey = 'BlackcliffAgate' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BlackcliffLongsword.ts b/libs/gi-formula/src/data/weapon/BlackcliffLongsword.ts index e9db2be709..6f6c57a8cf 100644 --- a/libs/gi-formula/src/data/weapon/BlackcliffLongsword.ts +++ b/libs/gi-formula/src/data/weapon/BlackcliffLongsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BlackcliffLongsword' +const key: WeaponKey = 'BlackcliffLongsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BlackcliffPole.ts b/libs/gi-formula/src/data/weapon/BlackcliffPole.ts index c56fa47b44..d77a062f86 100644 --- a/libs/gi-formula/src/data/weapon/BlackcliffPole.ts +++ b/libs/gi-formula/src/data/weapon/BlackcliffPole.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BlackcliffPole' +const key: WeaponKey = 'BlackcliffPole' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BlackcliffSlasher.ts b/libs/gi-formula/src/data/weapon/BlackcliffSlasher.ts index ae6b98453f..42ebb10dbb 100644 --- a/libs/gi-formula/src/data/weapon/BlackcliffSlasher.ts +++ b/libs/gi-formula/src/data/weapon/BlackcliffSlasher.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BlackcliffSlasher' +const key: WeaponKey = 'BlackcliffSlasher' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BlackcliffWarbow.ts b/libs/gi-formula/src/data/weapon/BlackcliffWarbow.ts index d0849c5103..af4b64fa85 100644 --- a/libs/gi-formula/src/data/weapon/BlackcliffWarbow.ts +++ b/libs/gi-formula/src/data/weapon/BlackcliffWarbow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BlackcliffWarbow' +const key: WeaponKey = 'BlackcliffWarbow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/BloodtaintedGreatsword.ts b/libs/gi-formula/src/data/weapon/BloodtaintedGreatsword.ts index 6cf17a91f6..bbcd127234 100644 --- a/libs/gi-formula/src/data/weapon/BloodtaintedGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/BloodtaintedGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'BloodtaintedGreatsword' +const key: WeaponKey = 'BloodtaintedGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/CalamityQueller.ts b/libs/gi-formula/src/data/weapon/CalamityQueller.ts index 05d7ee4399..267e988e0e 100644 --- a/libs/gi-formula/src/data/weapon/CalamityQueller.ts +++ b/libs/gi-formula/src/data/weapon/CalamityQueller.ts @@ -2,6 +2,7 @@ import type { WeaponKey } from '@genshin-optimizer/consts' import { allElementKeys } from '@genshin-optimizer/consts' import { cmpEq, prod, subscript } from '@genshin-optimizer/pando' import { allNumConditionals, register, self, selfBuff } from '../util' +import { entriesForWeapon } from './util' const key: WeaponKey = 'CalamityQueller' const dmg_ = [NaN, 0.12, 0.15, 0.18, 0.21, 0.24] @@ -26,6 +27,7 @@ const atkInc = prod( export default register( key, + entriesForWeapon(key) allElementKeys.map((ele) => selfBuff.premod.dmg_[ele].add(subscript(refinement, dmg_)) ), diff --git a/libs/gi-formula/src/data/weapon/CashflowSupervision.ts b/libs/gi-formula/src/data/weapon/CashflowSupervision.ts index 64949a66bc..498cec269e 100644 --- a/libs/gi-formula/src/data/weapon/CashflowSupervision.ts +++ b/libs/gi-formula/src/data/weapon/CashflowSupervision.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'CashflowSupervision' +const key: WeaponKey = 'CashflowSupervision' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/CinnabarSpindle.ts b/libs/gi-formula/src/data/weapon/CinnabarSpindle.ts index 7ee8a8c5bb..785a36ad19 100644 --- a/libs/gi-formula/src/data/weapon/CinnabarSpindle.ts +++ b/libs/gi-formula/src/data/weapon/CinnabarSpindle.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'CinnabarSpindle' +const key: WeaponKey = 'CinnabarSpindle' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/CompoundBow.ts b/libs/gi-formula/src/data/weapon/CompoundBow.ts index 81cc2f7951..1b848b9658 100644 --- a/libs/gi-formula/src/data/weapon/CompoundBow.ts +++ b/libs/gi-formula/src/data/weapon/CompoundBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'CompoundBow' +const key: WeaponKey = 'CompoundBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/CoolSteel.ts b/libs/gi-formula/src/data/weapon/CoolSteel.ts index 17768ffea9..dc1636097a 100644 --- a/libs/gi-formula/src/data/weapon/CoolSteel.ts +++ b/libs/gi-formula/src/data/weapon/CoolSteel.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'CoolSteel' +const key: WeaponKey = 'CoolSteel' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/CrescentPike.ts b/libs/gi-formula/src/data/weapon/CrescentPike.ts index 017bbf3ca5..6bc96db592 100644 --- a/libs/gi-formula/src/data/weapon/CrescentPike.ts +++ b/libs/gi-formula/src/data/weapon/CrescentPike.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'CrescentPike' +const key: WeaponKey = 'CrescentPike' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/DarkIronSword.ts b/libs/gi-formula/src/data/weapon/DarkIronSword.ts index dd390256fb..f356975239 100644 --- a/libs/gi-formula/src/data/weapon/DarkIronSword.ts +++ b/libs/gi-formula/src/data/weapon/DarkIronSword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'DarkIronSword' +const key: WeaponKey = 'DarkIronSword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Deathmatch.ts b/libs/gi-formula/src/data/weapon/Deathmatch.ts index 0cb2101752..6393e47a89 100644 --- a/libs/gi-formula/src/data/weapon/Deathmatch.ts +++ b/libs/gi-formula/src/data/weapon/Deathmatch.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Deathmatch' +const key: WeaponKey = 'Deathmatch' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/DebateClub.ts b/libs/gi-formula/src/data/weapon/DebateClub.ts index a28daa816a..9b135e75d7 100644 --- a/libs/gi-formula/src/data/weapon/DebateClub.ts +++ b/libs/gi-formula/src/data/weapon/DebateClub.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'DebateClub' +const key: WeaponKey = 'DebateClub' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/DodocoTales.ts b/libs/gi-formula/src/data/weapon/DodocoTales.ts index f4c9cede99..cdfa7c1fe4 100644 --- a/libs/gi-formula/src/data/weapon/DodocoTales.ts +++ b/libs/gi-formula/src/data/weapon/DodocoTales.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'DodocoTales' +const key: WeaponKey = 'DodocoTales' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/DragonsBane.ts b/libs/gi-formula/src/data/weapon/DragonsBane.ts index 39057ff894..611f44592d 100644 --- a/libs/gi-formula/src/data/weapon/DragonsBane.ts +++ b/libs/gi-formula/src/data/weapon/DragonsBane.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'DragonsBane' +const key: WeaponKey = 'DragonsBane' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/DragonspineSpear.ts b/libs/gi-formula/src/data/weapon/DragonspineSpear.ts index c3b8abb27f..aee2de83cc 100644 --- a/libs/gi-formula/src/data/weapon/DragonspineSpear.ts +++ b/libs/gi-formula/src/data/weapon/DragonspineSpear.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'DragonspineSpear' +const key: WeaponKey = 'DragonspineSpear' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/DullBlade.ts b/libs/gi-formula/src/data/weapon/DullBlade.ts index d123491b68..d1cd5276d7 100644 --- a/libs/gi-formula/src/data/weapon/DullBlade.ts +++ b/libs/gi-formula/src/data/weapon/DullBlade.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'DullBlade' +const key: WeaponKey = 'DullBlade' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ElegyForTheEnd.ts b/libs/gi-formula/src/data/weapon/ElegyForTheEnd.ts index e7bceabd1d..01abb1cc6c 100644 --- a/libs/gi-formula/src/data/weapon/ElegyForTheEnd.ts +++ b/libs/gi-formula/src/data/weapon/ElegyForTheEnd.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ElegyForTheEnd' +const key: WeaponKey = 'ElegyForTheEnd' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/EmeraldOrb.ts b/libs/gi-formula/src/data/weapon/EmeraldOrb.ts index cf123d9598..f77063c9bb 100644 --- a/libs/gi-formula/src/data/weapon/EmeraldOrb.ts +++ b/libs/gi-formula/src/data/weapon/EmeraldOrb.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'EmeraldOrb' +const key: WeaponKey = 'EmeraldOrb' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/EndOfTheLine.ts b/libs/gi-formula/src/data/weapon/EndOfTheLine.ts index 546f13d4a4..999bb0e1dd 100644 --- a/libs/gi-formula/src/data/weapon/EndOfTheLine.ts +++ b/libs/gi-formula/src/data/weapon/EndOfTheLine.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'EndOfTheLine' +const key: WeaponKey = 'EndOfTheLine' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/EngulfingLightning.ts b/libs/gi-formula/src/data/weapon/EngulfingLightning.ts index d379ee3d06..a140c0c661 100644 --- a/libs/gi-formula/src/data/weapon/EngulfingLightning.ts +++ b/libs/gi-formula/src/data/weapon/EngulfingLightning.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'EngulfingLightning' +const key: WeaponKey = 'EngulfingLightning' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/EverlastingMoonglow.ts b/libs/gi-formula/src/data/weapon/EverlastingMoonglow.ts index 85aced2b45..555c38f5e9 100644 --- a/libs/gi-formula/src/data/weapon/EverlastingMoonglow.ts +++ b/libs/gi-formula/src/data/weapon/EverlastingMoonglow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'EverlastingMoonglow' +const key: WeaponKey = 'EverlastingMoonglow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/EyeOfPerception.ts b/libs/gi-formula/src/data/weapon/EyeOfPerception.ts index c1b71f8f4a..5324436cfb 100644 --- a/libs/gi-formula/src/data/weapon/EyeOfPerception.ts +++ b/libs/gi-formula/src/data/weapon/EyeOfPerception.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'EyeOfPerception' +const key: WeaponKey = 'EyeOfPerception' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FadingTwilight.ts b/libs/gi-formula/src/data/weapon/FadingTwilight.ts index ddae174165..7599c83c53 100644 --- a/libs/gi-formula/src/data/weapon/FadingTwilight.ts +++ b/libs/gi-formula/src/data/weapon/FadingTwilight.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FadingTwilight' +const key: WeaponKey = 'FadingTwilight' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FavoniusCodex.ts b/libs/gi-formula/src/data/weapon/FavoniusCodex.ts index 9a0ece65e4..5b5302449f 100644 --- a/libs/gi-formula/src/data/weapon/FavoniusCodex.ts +++ b/libs/gi-formula/src/data/weapon/FavoniusCodex.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FavoniusCodex' +const key: WeaponKey = 'FavoniusCodex' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FavoniusGreatsword.ts b/libs/gi-formula/src/data/weapon/FavoniusGreatsword.ts index c0bb3fdec7..e4c4cdfa7f 100644 --- a/libs/gi-formula/src/data/weapon/FavoniusGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/FavoniusGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FavoniusGreatsword' +const key: WeaponKey = 'FavoniusGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FavoniusLance.ts b/libs/gi-formula/src/data/weapon/FavoniusLance.ts index 4c7f93e075..834d8f5f7a 100644 --- a/libs/gi-formula/src/data/weapon/FavoniusLance.ts +++ b/libs/gi-formula/src/data/weapon/FavoniusLance.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FavoniusLance' +const key: WeaponKey = 'FavoniusLance' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FavoniusSword.ts b/libs/gi-formula/src/data/weapon/FavoniusSword.ts index ae74648e99..f0c3aea4dd 100644 --- a/libs/gi-formula/src/data/weapon/FavoniusSword.ts +++ b/libs/gi-formula/src/data/weapon/FavoniusSword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FavoniusSword' +const key: WeaponKey = 'FavoniusSword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FavoniusWarbow.ts b/libs/gi-formula/src/data/weapon/FavoniusWarbow.ts index b182341c42..cf7a578a58 100644 --- a/libs/gi-formula/src/data/weapon/FavoniusWarbow.ts +++ b/libs/gi-formula/src/data/weapon/FavoniusWarbow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FavoniusWarbow' +const key: WeaponKey = 'FavoniusWarbow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FerrousShadow.ts b/libs/gi-formula/src/data/weapon/FerrousShadow.ts index 45e1ae38cb..ad9b8cd1a0 100644 --- a/libs/gi-formula/src/data/weapon/FerrousShadow.ts +++ b/libs/gi-formula/src/data/weapon/FerrousShadow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FerrousShadow' +const key: WeaponKey = 'FerrousShadow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FesteringDesire.ts b/libs/gi-formula/src/data/weapon/FesteringDesire.ts index 02d47d6730..0b9015e8bd 100644 --- a/libs/gi-formula/src/data/weapon/FesteringDesire.ts +++ b/libs/gi-formula/src/data/weapon/FesteringDesire.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FesteringDesire' +const key: WeaponKey = 'FesteringDesire' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FilletBlade.ts b/libs/gi-formula/src/data/weapon/FilletBlade.ts index 5edc76081a..d6961cc4c9 100644 --- a/libs/gi-formula/src/data/weapon/FilletBlade.ts +++ b/libs/gi-formula/src/data/weapon/FilletBlade.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FilletBlade' +const key: WeaponKey = 'FilletBlade' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FinaleOfTheDeep.ts b/libs/gi-formula/src/data/weapon/FinaleOfTheDeep.ts index ce57b99c95..ba6290e57b 100644 --- a/libs/gi-formula/src/data/weapon/FinaleOfTheDeep.ts +++ b/libs/gi-formula/src/data/weapon/FinaleOfTheDeep.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FinaleOfTheDeep' +const key: WeaponKey = 'FinaleOfTheDeep' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FleuveCendreFerryman.ts b/libs/gi-formula/src/data/weapon/FleuveCendreFerryman.ts index 1800e273f4..08a5a12a16 100644 --- a/libs/gi-formula/src/data/weapon/FleuveCendreFerryman.ts +++ b/libs/gi-formula/src/data/weapon/FleuveCendreFerryman.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FleuveCendreFerryman' +const key: WeaponKey = 'FleuveCendreFerryman' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FlowingPurity.ts b/libs/gi-formula/src/data/weapon/FlowingPurity.ts index 2d9e84c805..26727bdddc 100644 --- a/libs/gi-formula/src/data/weapon/FlowingPurity.ts +++ b/libs/gi-formula/src/data/weapon/FlowingPurity.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FlowingPurity' +const key: WeaponKey = 'FlowingPurity' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ForestRegalia.ts b/libs/gi-formula/src/data/weapon/ForestRegalia.ts index 3d886c75ad..bd07371674 100644 --- a/libs/gi-formula/src/data/weapon/ForestRegalia.ts +++ b/libs/gi-formula/src/data/weapon/ForestRegalia.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ForestRegalia' +const key: WeaponKey = 'ForestRegalia' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FreedomSworn.ts b/libs/gi-formula/src/data/weapon/FreedomSworn.ts index 5aa8456a37..815d58eaaa 100644 --- a/libs/gi-formula/src/data/weapon/FreedomSworn.ts +++ b/libs/gi-formula/src/data/weapon/FreedomSworn.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FreedomSworn' +const key: WeaponKey = 'FreedomSworn' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Frostbearer.ts b/libs/gi-formula/src/data/weapon/Frostbearer.ts index 8985a61063..3d3c5e6a7e 100644 --- a/libs/gi-formula/src/data/weapon/Frostbearer.ts +++ b/libs/gi-formula/src/data/weapon/Frostbearer.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Frostbearer' +const key: WeaponKey = 'Frostbearer' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/FruitOfFulfillment.ts b/libs/gi-formula/src/data/weapon/FruitOfFulfillment.ts index 2eb63676dc..c92dec3f8e 100644 --- a/libs/gi-formula/src/data/weapon/FruitOfFulfillment.ts +++ b/libs/gi-formula/src/data/weapon/FruitOfFulfillment.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'FruitOfFulfillment' +const key: WeaponKey = 'FruitOfFulfillment' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/HakushinRing.ts b/libs/gi-formula/src/data/weapon/HakushinRing.ts index 3cb2af3954..ae3baa67a6 100644 --- a/libs/gi-formula/src/data/weapon/HakushinRing.ts +++ b/libs/gi-formula/src/data/weapon/HakushinRing.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'HakushinRing' +const key: WeaponKey = 'HakushinRing' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Halberd.ts b/libs/gi-formula/src/data/weapon/Halberd.ts index bac45701ff..7d973edc82 100644 --- a/libs/gi-formula/src/data/weapon/Halberd.ts +++ b/libs/gi-formula/src/data/weapon/Halberd.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Halberd' +const key: WeaponKey = 'Halberd' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Hamayumi.ts b/libs/gi-formula/src/data/weapon/Hamayumi.ts index f69fb31959..8035a97243 100644 --- a/libs/gi-formula/src/data/weapon/Hamayumi.ts +++ b/libs/gi-formula/src/data/weapon/Hamayumi.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Hamayumi' +const key: WeaponKey = 'Hamayumi' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/HaranGeppakuFutsu.ts b/libs/gi-formula/src/data/weapon/HaranGeppakuFutsu.ts index 025846d73d..89b5ea9437 100644 --- a/libs/gi-formula/src/data/weapon/HaranGeppakuFutsu.ts +++ b/libs/gi-formula/src/data/weapon/HaranGeppakuFutsu.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'HaranGeppakuFutsu' +const key: WeaponKey = 'HaranGeppakuFutsu' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/HarbingerOfDawn.ts b/libs/gi-formula/src/data/weapon/HarbingerOfDawn.ts index 7b708e1e69..bdaea55fba 100644 --- a/libs/gi-formula/src/data/weapon/HarbingerOfDawn.ts +++ b/libs/gi-formula/src/data/weapon/HarbingerOfDawn.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'HarbingerOfDawn' +const key: WeaponKey = 'HarbingerOfDawn' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/HuntersBow.ts b/libs/gi-formula/src/data/weapon/HuntersBow.ts index 745f362424..a1bf4bdb42 100644 --- a/libs/gi-formula/src/data/weapon/HuntersBow.ts +++ b/libs/gi-formula/src/data/weapon/HuntersBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'HuntersBow' +const key: WeaponKey = 'HuntersBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/HuntersPath.ts b/libs/gi-formula/src/data/weapon/HuntersPath.ts index eeb3fad7fb..93460c055d 100644 --- a/libs/gi-formula/src/data/weapon/HuntersPath.ts +++ b/libs/gi-formula/src/data/weapon/HuntersPath.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'HuntersPath' +const key: WeaponKey = 'HuntersPath' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/IbisPiercer.ts b/libs/gi-formula/src/data/weapon/IbisPiercer.ts index 0d4c99461e..a283d8680d 100644 --- a/libs/gi-formula/src/data/weapon/IbisPiercer.ts +++ b/libs/gi-formula/src/data/weapon/IbisPiercer.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'IbisPiercer' +const key: WeaponKey = 'IbisPiercer' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/IronPoint.ts b/libs/gi-formula/src/data/weapon/IronPoint.ts index 0eed008672..555e91af4c 100644 --- a/libs/gi-formula/src/data/weapon/IronPoint.ts +++ b/libs/gi-formula/src/data/weapon/IronPoint.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'IronPoint' +const key: WeaponKey = 'IronPoint' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/IronSting.ts b/libs/gi-formula/src/data/weapon/IronSting.ts index 44c6384250..8694feac50 100644 --- a/libs/gi-formula/src/data/weapon/IronSting.ts +++ b/libs/gi-formula/src/data/weapon/IronSting.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'IronSting' +const key: WeaponKey = 'IronSting' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/JadefallsSplendor.ts b/libs/gi-formula/src/data/weapon/JadefallsSplendor.ts index 7aafdeef23..5919c29abb 100644 --- a/libs/gi-formula/src/data/weapon/JadefallsSplendor.ts +++ b/libs/gi-formula/src/data/weapon/JadefallsSplendor.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'JadefallsSplendor' +const key: WeaponKey = 'JadefallsSplendor' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/KagotsurubeIsshin.ts b/libs/gi-formula/src/data/weapon/KagotsurubeIsshin.ts index 8d5fcd8730..a0126c1e47 100644 --- a/libs/gi-formula/src/data/weapon/KagotsurubeIsshin.ts +++ b/libs/gi-formula/src/data/weapon/KagotsurubeIsshin.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'KagotsurubeIsshin' +const key: WeaponKey = 'KagotsurubeIsshin' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/KagurasVerity.ts b/libs/gi-formula/src/data/weapon/KagurasVerity.ts index 34c864b7ad..01df45ef06 100644 --- a/libs/gi-formula/src/data/weapon/KagurasVerity.ts +++ b/libs/gi-formula/src/data/weapon/KagurasVerity.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'KagurasVerity' +const key: WeaponKey = 'KagurasVerity' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/KatsuragikiriNagamasa.ts b/libs/gi-formula/src/data/weapon/KatsuragikiriNagamasa.ts index 984fe3e903..cc12066fee 100644 --- a/libs/gi-formula/src/data/weapon/KatsuragikiriNagamasa.ts +++ b/libs/gi-formula/src/data/weapon/KatsuragikiriNagamasa.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'KatsuragikiriNagamasa' +const key: WeaponKey = 'KatsuragikiriNagamasa' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts b/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts index fdc0cb4187..44c5f8f939 100644 --- a/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts +++ b/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts @@ -8,6 +8,7 @@ import { selfBuff, teamBuff, } from '../util' +import { entriesForWeapon } from './util' const key: WeaponKey = 'KeyOfKhajNisut' const selfEmSrc = [NaN, 0.0012, 0.0015, 0.0018, 0.0021, 0.0024] @@ -31,6 +32,7 @@ const teamEleMas = cmpEq( export default register( key, + entriesForWeapon(key) selfBuff.final.eleMas.add(selfElemas), teamBuff.final.eleMas.add(teamEleMas) ) diff --git a/libs/gi-formula/src/data/weapon/KingsSquire.ts b/libs/gi-formula/src/data/weapon/KingsSquire.ts index 3fd182e38c..416b731f4f 100644 --- a/libs/gi-formula/src/data/weapon/KingsSquire.ts +++ b/libs/gi-formula/src/data/weapon/KingsSquire.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'KingsSquire' +const key: WeaponKey = 'KingsSquire' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/KitainCrossSpear.ts b/libs/gi-formula/src/data/weapon/KitainCrossSpear.ts index 7258c8ee05..90e49acb73 100644 --- a/libs/gi-formula/src/data/weapon/KitainCrossSpear.ts +++ b/libs/gi-formula/src/data/weapon/KitainCrossSpear.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'KitainCrossSpear' +const key: WeaponKey = 'KitainCrossSpear' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/LightOfFoliarIncision.ts b/libs/gi-formula/src/data/weapon/LightOfFoliarIncision.ts index 50f2555f7c..f4715914bd 100644 --- a/libs/gi-formula/src/data/weapon/LightOfFoliarIncision.ts +++ b/libs/gi-formula/src/data/weapon/LightOfFoliarIncision.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'LightOfFoliarIncision' +const key: WeaponKey = 'LightOfFoliarIncision' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/LionsRoar.ts b/libs/gi-formula/src/data/weapon/LionsRoar.ts index f1327d128e..368ae1e260 100644 --- a/libs/gi-formula/src/data/weapon/LionsRoar.ts +++ b/libs/gi-formula/src/data/weapon/LionsRoar.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'LionsRoar' +const key: WeaponKey = 'LionsRoar' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/LithicBlade.ts b/libs/gi-formula/src/data/weapon/LithicBlade.ts index f0be26e7f6..caa088f85a 100644 --- a/libs/gi-formula/src/data/weapon/LithicBlade.ts +++ b/libs/gi-formula/src/data/weapon/LithicBlade.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'LithicBlade' +const key: WeaponKey = 'LithicBlade' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/LithicSpear.ts b/libs/gi-formula/src/data/weapon/LithicSpear.ts index 8088d68e73..f77b4cbeac 100644 --- a/libs/gi-formula/src/data/weapon/LithicSpear.ts +++ b/libs/gi-formula/src/data/weapon/LithicSpear.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'LithicSpear' +const key: WeaponKey = 'LithicSpear' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/LostPrayerToTheSacredWinds.ts b/libs/gi-formula/src/data/weapon/LostPrayerToTheSacredWinds.ts index 9c793794b3..2f5d9f9995 100644 --- a/libs/gi-formula/src/data/weapon/LostPrayerToTheSacredWinds.ts +++ b/libs/gi-formula/src/data/weapon/LostPrayerToTheSacredWinds.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'LostPrayerToTheSacredWinds' +const key: WeaponKey = 'LostPrayerToTheSacredWinds' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/LuxuriousSeaLord.ts b/libs/gi-formula/src/data/weapon/LuxuriousSeaLord.ts index ddd5ebe007..9f468ccd71 100644 --- a/libs/gi-formula/src/data/weapon/LuxuriousSeaLord.ts +++ b/libs/gi-formula/src/data/weapon/LuxuriousSeaLord.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'LuxuriousSeaLord' +const key: WeaponKey = 'LuxuriousSeaLord' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MagicGuide.ts b/libs/gi-formula/src/data/weapon/MagicGuide.ts index d8ce449aae..21d1628e1c 100644 --- a/libs/gi-formula/src/data/weapon/MagicGuide.ts +++ b/libs/gi-formula/src/data/weapon/MagicGuide.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MagicGuide' +const key: WeaponKey = 'MagicGuide' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MailedFlower.ts b/libs/gi-formula/src/data/weapon/MailedFlower.ts index e0af31d010..f4c55e19e7 100644 --- a/libs/gi-formula/src/data/weapon/MailedFlower.ts +++ b/libs/gi-formula/src/data/weapon/MailedFlower.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MailedFlower' +const key: WeaponKey = 'MailedFlower' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MakhairaAquamarine.ts b/libs/gi-formula/src/data/weapon/MakhairaAquamarine.ts index 51d078c55b..c6308a35fd 100644 --- a/libs/gi-formula/src/data/weapon/MakhairaAquamarine.ts +++ b/libs/gi-formula/src/data/weapon/MakhairaAquamarine.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MakhairaAquamarine' +const key: WeaponKey = 'MakhairaAquamarine' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MappaMare.ts b/libs/gi-formula/src/data/weapon/MappaMare.ts index e8412e0449..9d943c8ca5 100644 --- a/libs/gi-formula/src/data/weapon/MappaMare.ts +++ b/libs/gi-formula/src/data/weapon/MappaMare.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MappaMare' +const key: WeaponKey = 'MappaMare' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MemoryOfDust.ts b/libs/gi-formula/src/data/weapon/MemoryOfDust.ts index 2348b552ee..cf900e2843 100644 --- a/libs/gi-formula/src/data/weapon/MemoryOfDust.ts +++ b/libs/gi-formula/src/data/weapon/MemoryOfDust.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MemoryOfDust' +const key: WeaponKey = 'MemoryOfDust' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Messenger.ts b/libs/gi-formula/src/data/weapon/Messenger.ts index 54ba990580..16d6b4294d 100644 --- a/libs/gi-formula/src/data/weapon/Messenger.ts +++ b/libs/gi-formula/src/data/weapon/Messenger.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Messenger' +const key: WeaponKey = 'Messenger' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MissiveWindspear.ts b/libs/gi-formula/src/data/weapon/MissiveWindspear.ts index 669e8720cc..79e69a8676 100644 --- a/libs/gi-formula/src/data/weapon/MissiveWindspear.ts +++ b/libs/gi-formula/src/data/weapon/MissiveWindspear.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MissiveWindspear' +const key: WeaponKey = 'MissiveWindspear' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MistsplitterReforged.ts b/libs/gi-formula/src/data/weapon/MistsplitterReforged.ts index 94e8d27e49..aebc2d5bfe 100644 --- a/libs/gi-formula/src/data/weapon/MistsplitterReforged.ts +++ b/libs/gi-formula/src/data/weapon/MistsplitterReforged.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MistsplitterReforged' +const key: WeaponKey = 'MistsplitterReforged' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MitternachtsWaltz.ts b/libs/gi-formula/src/data/weapon/MitternachtsWaltz.ts index f6dc3e0344..521139d0a8 100644 --- a/libs/gi-formula/src/data/weapon/MitternachtsWaltz.ts +++ b/libs/gi-formula/src/data/weapon/MitternachtsWaltz.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MitternachtsWaltz' +const key: WeaponKey = 'MitternachtsWaltz' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Moonpiercer.ts b/libs/gi-formula/src/data/weapon/Moonpiercer.ts index f27f95fd26..3cd07081cb 100644 --- a/libs/gi-formula/src/data/weapon/Moonpiercer.ts +++ b/libs/gi-formula/src/data/weapon/Moonpiercer.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Moonpiercer' +const key: WeaponKey = 'Moonpiercer' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/MouunsMoon.ts b/libs/gi-formula/src/data/weapon/MouunsMoon.ts index 17b5e934da..c910b9ab72 100644 --- a/libs/gi-formula/src/data/weapon/MouunsMoon.ts +++ b/libs/gi-formula/src/data/weapon/MouunsMoon.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'MouunsMoon' +const key: WeaponKey = 'MouunsMoon' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/OathswornEye.ts b/libs/gi-formula/src/data/weapon/OathswornEye.ts index ac5ac7227a..8cc92e784b 100644 --- a/libs/gi-formula/src/data/weapon/OathswornEye.ts +++ b/libs/gi-formula/src/data/weapon/OathswornEye.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'OathswornEye' +const key: WeaponKey = 'OathswornEye' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/OldMercsPal.ts b/libs/gi-formula/src/data/weapon/OldMercsPal.ts index 3c44fc4ed7..711805d4d2 100644 --- a/libs/gi-formula/src/data/weapon/OldMercsPal.ts +++ b/libs/gi-formula/src/data/weapon/OldMercsPal.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'OldMercsPal' +const key: WeaponKey = 'OldMercsPal' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/OtherworldlyStory.ts b/libs/gi-formula/src/data/weapon/OtherworldlyStory.ts index 2092ef1f36..f2cff84b57 100644 --- a/libs/gi-formula/src/data/weapon/OtherworldlyStory.ts +++ b/libs/gi-formula/src/data/weapon/OtherworldlyStory.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'OtherworldlyStory' +const key: WeaponKey = 'OtherworldlyStory' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PocketGrimoire.ts b/libs/gi-formula/src/data/weapon/PocketGrimoire.ts index 6acad5be40..b65e35a6dc 100644 --- a/libs/gi-formula/src/data/weapon/PocketGrimoire.ts +++ b/libs/gi-formula/src/data/weapon/PocketGrimoire.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PocketGrimoire' +const key: WeaponKey = 'PocketGrimoire' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PolarStar.ts b/libs/gi-formula/src/data/weapon/PolarStar.ts index 56c866fe56..9c140c1151 100644 --- a/libs/gi-formula/src/data/weapon/PolarStar.ts +++ b/libs/gi-formula/src/data/weapon/PolarStar.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PolarStar' +const key: WeaponKey = 'PolarStar' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PortablePowerSaw.ts b/libs/gi-formula/src/data/weapon/PortablePowerSaw.ts index 23e5cce8fa..4fbb04d60c 100644 --- a/libs/gi-formula/src/data/weapon/PortablePowerSaw.ts +++ b/libs/gi-formula/src/data/weapon/PortablePowerSaw.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PortablePowerSaw' +const key: WeaponKey = 'PortablePowerSaw' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Predator.ts b/libs/gi-formula/src/data/weapon/Predator.ts index 6b893b48aa..02ac7e8c48 100644 --- a/libs/gi-formula/src/data/weapon/Predator.ts +++ b/libs/gi-formula/src/data/weapon/Predator.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Predator' +const key: WeaponKey = 'Predator' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PrimordialJadeCutter.ts b/libs/gi-formula/src/data/weapon/PrimordialJadeCutter.ts index 0253ddbfb4..fcad29e7fe 100644 --- a/libs/gi-formula/src/data/weapon/PrimordialJadeCutter.ts +++ b/libs/gi-formula/src/data/weapon/PrimordialJadeCutter.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PrimordialJadeCutter' +const key: WeaponKey = 'PrimordialJadeCutter' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PrimordialJadeWingedSpear.ts b/libs/gi-formula/src/data/weapon/PrimordialJadeWingedSpear.ts index 9c4491f72c..398772ba10 100644 --- a/libs/gi-formula/src/data/weapon/PrimordialJadeWingedSpear.ts +++ b/libs/gi-formula/src/data/weapon/PrimordialJadeWingedSpear.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PrimordialJadeWingedSpear' +const key: WeaponKey = 'PrimordialJadeWingedSpear' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ProspectorsDrill.ts b/libs/gi-formula/src/data/weapon/ProspectorsDrill.ts index 4fae7ba1bd..848d60cbfe 100644 --- a/libs/gi-formula/src/data/weapon/ProspectorsDrill.ts +++ b/libs/gi-formula/src/data/weapon/ProspectorsDrill.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ProspectorsDrill' +const key: WeaponKey = 'ProspectorsDrill' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PrototypeAmber.ts b/libs/gi-formula/src/data/weapon/PrototypeAmber.ts index 89819aab13..a2a864aef5 100644 --- a/libs/gi-formula/src/data/weapon/PrototypeAmber.ts +++ b/libs/gi-formula/src/data/weapon/PrototypeAmber.ts @@ -1,6 +1,7 @@ import type { WeaponKey } from '@genshin-optimizer/consts' import { prod, subscript } from '@genshin-optimizer/pando' import { customHeal, register, self, target } from '../util' +import { entriesForWeapon } from './util' const key: WeaponKey = 'PrototypeAmber' const heal_arr = [0.04, 0.045, 0.05, 0.055, 0.06] @@ -11,6 +12,7 @@ const { export default register( key, + entriesForWeapon(key) customHeal('heal', prod(target.final.hp, subscript(refinement, heal_arr)), { team: true, }) diff --git a/libs/gi-formula/src/data/weapon/PrototypeArchaic.ts b/libs/gi-formula/src/data/weapon/PrototypeArchaic.ts index 51f8f58098..e4f9453ea7 100644 --- a/libs/gi-formula/src/data/weapon/PrototypeArchaic.ts +++ b/libs/gi-formula/src/data/weapon/PrototypeArchaic.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PrototypeArchaic' +const key: WeaponKey = 'PrototypeArchaic' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PrototypeCrescent.ts b/libs/gi-formula/src/data/weapon/PrototypeCrescent.ts index 3f8b93ae0a..765c229e26 100644 --- a/libs/gi-formula/src/data/weapon/PrototypeCrescent.ts +++ b/libs/gi-formula/src/data/weapon/PrototypeCrescent.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PrototypeCrescent' +const key: WeaponKey = 'PrototypeCrescent' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PrototypeRancour.ts b/libs/gi-formula/src/data/weapon/PrototypeRancour.ts index 46df9f5ff6..55f40707bb 100644 --- a/libs/gi-formula/src/data/weapon/PrototypeRancour.ts +++ b/libs/gi-formula/src/data/weapon/PrototypeRancour.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PrototypeRancour' +const key: WeaponKey = 'PrototypeRancour' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/PrototypeStarglitter.ts b/libs/gi-formula/src/data/weapon/PrototypeStarglitter.ts index 17bbd11b57..9862051906 100644 --- a/libs/gi-formula/src/data/weapon/PrototypeStarglitter.ts +++ b/libs/gi-formula/src/data/weapon/PrototypeStarglitter.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'PrototypeStarglitter' +const key: WeaponKey = 'PrototypeStarglitter' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/QuantumCatalyst.ts b/libs/gi-formula/src/data/weapon/QuantumCatalyst.ts index 832f2a7e49..88f9adff05 100644 --- a/libs/gi-formula/src/data/weapon/QuantumCatalyst.ts +++ b/libs/gi-formula/src/data/weapon/QuantumCatalyst.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'QuantumCatalyst' +const key: WeaponKey = 'QuantumCatalyst' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Rainslasher.ts b/libs/gi-formula/src/data/weapon/Rainslasher.ts index 8ebc8da33c..cdcbef2ca8 100644 --- a/libs/gi-formula/src/data/weapon/Rainslasher.ts +++ b/libs/gi-formula/src/data/weapon/Rainslasher.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Rainslasher' +const key: WeaponKey = 'Rainslasher' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RangeGauge.ts b/libs/gi-formula/src/data/weapon/RangeGauge.ts index 575477eb1c..afc2226730 100644 --- a/libs/gi-formula/src/data/weapon/RangeGauge.ts +++ b/libs/gi-formula/src/data/weapon/RangeGauge.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RangeGauge' +const key: WeaponKey = 'RangeGauge' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RavenBow.ts b/libs/gi-formula/src/data/weapon/RavenBow.ts index e4f01f7c32..ac20eacb46 100644 --- a/libs/gi-formula/src/data/weapon/RavenBow.ts +++ b/libs/gi-formula/src/data/weapon/RavenBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RavenBow' +const key: WeaponKey = 'RavenBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RecurveBow.ts b/libs/gi-formula/src/data/weapon/RecurveBow.ts index fcf12b1127..583c24022a 100644 --- a/libs/gi-formula/src/data/weapon/RecurveBow.ts +++ b/libs/gi-formula/src/data/weapon/RecurveBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RecurveBow' +const key: WeaponKey = 'RecurveBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RedhornStonethresher.ts b/libs/gi-formula/src/data/weapon/RedhornStonethresher.ts index 78d239ae3d..e7c69cf260 100644 --- a/libs/gi-formula/src/data/weapon/RedhornStonethresher.ts +++ b/libs/gi-formula/src/data/weapon/RedhornStonethresher.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RedhornStonethresher' +const key: WeaponKey = 'RedhornStonethresher' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RightfulReward.ts b/libs/gi-formula/src/data/weapon/RightfulReward.ts index 9148474f34..f365c3662c 100644 --- a/libs/gi-formula/src/data/weapon/RightfulReward.ts +++ b/libs/gi-formula/src/data/weapon/RightfulReward.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RightfulReward' +const key: WeaponKey = 'RightfulReward' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RoyalBow.ts b/libs/gi-formula/src/data/weapon/RoyalBow.ts index 717780c157..f5b407048a 100644 --- a/libs/gi-formula/src/data/weapon/RoyalBow.ts +++ b/libs/gi-formula/src/data/weapon/RoyalBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RoyalBow' +const key: WeaponKey = 'RoyalBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RoyalGreatsword.ts b/libs/gi-formula/src/data/weapon/RoyalGreatsword.ts index 88979b2588..0c8a195625 100644 --- a/libs/gi-formula/src/data/weapon/RoyalGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/RoyalGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RoyalGreatsword' +const key: WeaponKey = 'RoyalGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RoyalGrimoire.ts b/libs/gi-formula/src/data/weapon/RoyalGrimoire.ts index 78c8d9a154..dff3a78430 100644 --- a/libs/gi-formula/src/data/weapon/RoyalGrimoire.ts +++ b/libs/gi-formula/src/data/weapon/RoyalGrimoire.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RoyalGrimoire' +const key: WeaponKey = 'RoyalGrimoire' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RoyalLongsword.ts b/libs/gi-formula/src/data/weapon/RoyalLongsword.ts index df1199521a..4e3fb9ffb7 100644 --- a/libs/gi-formula/src/data/weapon/RoyalLongsword.ts +++ b/libs/gi-formula/src/data/weapon/RoyalLongsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RoyalLongsword' +const key: WeaponKey = 'RoyalLongsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/RoyalSpear.ts b/libs/gi-formula/src/data/weapon/RoyalSpear.ts index 8a7ff211d7..66aace66d8 100644 --- a/libs/gi-formula/src/data/weapon/RoyalSpear.ts +++ b/libs/gi-formula/src/data/weapon/RoyalSpear.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'RoyalSpear' +const key: WeaponKey = 'RoyalSpear' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Rust.ts b/libs/gi-formula/src/data/weapon/Rust.ts index 0c6c5afb39..5917c8adbc 100644 --- a/libs/gi-formula/src/data/weapon/Rust.ts +++ b/libs/gi-formula/src/data/weapon/Rust.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Rust' +const key: WeaponKey = 'Rust' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SacrificialBow.ts b/libs/gi-formula/src/data/weapon/SacrificialBow.ts index e338f91efd..b9d443ee9a 100644 --- a/libs/gi-formula/src/data/weapon/SacrificialBow.ts +++ b/libs/gi-formula/src/data/weapon/SacrificialBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SacrificialBow' +const key: WeaponKey = 'SacrificialBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SacrificialFragments.ts b/libs/gi-formula/src/data/weapon/SacrificialFragments.ts index a9a19c2712..c0b00a0996 100644 --- a/libs/gi-formula/src/data/weapon/SacrificialFragments.ts +++ b/libs/gi-formula/src/data/weapon/SacrificialFragments.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SacrificialFragments' +const key: WeaponKey = 'SacrificialFragments' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SacrificialGreatsword.ts b/libs/gi-formula/src/data/weapon/SacrificialGreatsword.ts index 8e152314d4..b7e08de08f 100644 --- a/libs/gi-formula/src/data/weapon/SacrificialGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/SacrificialGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SacrificialGreatsword' +const key: WeaponKey = 'SacrificialGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SacrificialJade.ts b/libs/gi-formula/src/data/weapon/SacrificialJade.ts index 4c1365f149..6dbd02ad6e 100644 --- a/libs/gi-formula/src/data/weapon/SacrificialJade.ts +++ b/libs/gi-formula/src/data/weapon/SacrificialJade.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SacrificialJade' +const key: WeaponKey = 'SacrificialJade' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SacrificialSword.ts b/libs/gi-formula/src/data/weapon/SacrificialSword.ts index d6a24b767e..a849ff7c8c 100644 --- a/libs/gi-formula/src/data/weapon/SacrificialSword.ts +++ b/libs/gi-formula/src/data/weapon/SacrificialSword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SacrificialSword' +const key: WeaponKey = 'SacrificialSword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SapwoodBlade.ts b/libs/gi-formula/src/data/weapon/SapwoodBlade.ts index 633ade1d17..dd7ad6ac13 100644 --- a/libs/gi-formula/src/data/weapon/SapwoodBlade.ts +++ b/libs/gi-formula/src/data/weapon/SapwoodBlade.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SapwoodBlade' +const key: WeaponKey = 'SapwoodBlade' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ScionOfTheBlazingSun.ts b/libs/gi-formula/src/data/weapon/ScionOfTheBlazingSun.ts index 11940a64d1..79a2095b47 100644 --- a/libs/gi-formula/src/data/weapon/ScionOfTheBlazingSun.ts +++ b/libs/gi-formula/src/data/weapon/ScionOfTheBlazingSun.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ScionOfTheBlazingSun' +const key: WeaponKey = 'ScionOfTheBlazingSun' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SeasonedHuntersBow.ts b/libs/gi-formula/src/data/weapon/SeasonedHuntersBow.ts index 07ce6b6bc1..c137655778 100644 --- a/libs/gi-formula/src/data/weapon/SeasonedHuntersBow.ts +++ b/libs/gi-formula/src/data/weapon/SeasonedHuntersBow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SeasonedHuntersBow' +const key: WeaponKey = 'SeasonedHuntersBow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SerpentSpine.ts b/libs/gi-formula/src/data/weapon/SerpentSpine.ts index fbe7a500fc..6f67bf86e3 100644 --- a/libs/gi-formula/src/data/weapon/SerpentSpine.ts +++ b/libs/gi-formula/src/data/weapon/SerpentSpine.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SerpentSpine' +const key: WeaponKey = 'SerpentSpine' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SharpshootersOath.ts b/libs/gi-formula/src/data/weapon/SharpshootersOath.ts index d517b85ae1..864d69a8c7 100644 --- a/libs/gi-formula/src/data/weapon/SharpshootersOath.ts +++ b/libs/gi-formula/src/data/weapon/SharpshootersOath.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SharpshootersOath' +const key: WeaponKey = 'SharpshootersOath' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SilverSword.ts b/libs/gi-formula/src/data/weapon/SilverSword.ts index 2cf759d943..ea463e3656 100644 --- a/libs/gi-formula/src/data/weapon/SilverSword.ts +++ b/libs/gi-formula/src/data/weapon/SilverSword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SilverSword' +const key: WeaponKey = 'SilverSword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkyriderGreatsword.ts b/libs/gi-formula/src/data/weapon/SkyriderGreatsword.ts index 91544bcd9b..b2f1fa558e 100644 --- a/libs/gi-formula/src/data/weapon/SkyriderGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/SkyriderGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkyriderGreatsword' +const key: WeaponKey = 'SkyriderGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkyriderSword.ts b/libs/gi-formula/src/data/weapon/SkyriderSword.ts index 2991009f08..5950ccb7c1 100644 --- a/libs/gi-formula/src/data/weapon/SkyriderSword.ts +++ b/libs/gi-formula/src/data/weapon/SkyriderSword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkyriderSword' +const key: WeaponKey = 'SkyriderSword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkywardAtlas.ts b/libs/gi-formula/src/data/weapon/SkywardAtlas.ts index b2b37fe247..a948334721 100644 --- a/libs/gi-formula/src/data/weapon/SkywardAtlas.ts +++ b/libs/gi-formula/src/data/weapon/SkywardAtlas.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkywardAtlas' +const key: WeaponKey = 'SkywardAtlas' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkywardBlade.ts b/libs/gi-formula/src/data/weapon/SkywardBlade.ts index d20b994e13..308ae08929 100644 --- a/libs/gi-formula/src/data/weapon/SkywardBlade.ts +++ b/libs/gi-formula/src/data/weapon/SkywardBlade.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkywardBlade' +const key: WeaponKey = 'SkywardBlade' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkywardHarp.ts b/libs/gi-formula/src/data/weapon/SkywardHarp.ts index 9e8d891de4..b5756f5f7a 100644 --- a/libs/gi-formula/src/data/weapon/SkywardHarp.ts +++ b/libs/gi-formula/src/data/weapon/SkywardHarp.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkywardHarp' +const key: WeaponKey = 'SkywardHarp' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkywardPride.ts b/libs/gi-formula/src/data/weapon/SkywardPride.ts index df0b7ab55d..901b783857 100644 --- a/libs/gi-formula/src/data/weapon/SkywardPride.ts +++ b/libs/gi-formula/src/data/weapon/SkywardPride.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkywardPride' +const key: WeaponKey = 'SkywardPride' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SkywardSpine.ts b/libs/gi-formula/src/data/weapon/SkywardSpine.ts index fea9cc50b8..51db0129ac 100644 --- a/libs/gi-formula/src/data/weapon/SkywardSpine.ts +++ b/libs/gi-formula/src/data/weapon/SkywardSpine.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SkywardSpine' +const key: WeaponKey = 'SkywardSpine' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Slingshot.ts b/libs/gi-formula/src/data/weapon/Slingshot.ts index 6ae52c1405..aaa4fe4649 100644 --- a/libs/gi-formula/src/data/weapon/Slingshot.ts +++ b/libs/gi-formula/src/data/weapon/Slingshot.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Slingshot' +const key: WeaponKey = 'Slingshot' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SnowTombedStarsilver.ts b/libs/gi-formula/src/data/weapon/SnowTombedStarsilver.ts index 9f8ad40e29..dacca3ba25 100644 --- a/libs/gi-formula/src/data/weapon/SnowTombedStarsilver.ts +++ b/libs/gi-formula/src/data/weapon/SnowTombedStarsilver.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SnowTombedStarsilver' +const key: WeaponKey = 'SnowTombedStarsilver' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SolarPearl.ts b/libs/gi-formula/src/data/weapon/SolarPearl.ts index d0a4738485..b4b1ecd928 100644 --- a/libs/gi-formula/src/data/weapon/SolarPearl.ts +++ b/libs/gi-formula/src/data/weapon/SolarPearl.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SolarPearl' +const key: WeaponKey = 'SolarPearl' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SongOfBrokenPines.ts b/libs/gi-formula/src/data/weapon/SongOfBrokenPines.ts index 4aff4ba78e..3ef6163a86 100644 --- a/libs/gi-formula/src/data/weapon/SongOfBrokenPines.ts +++ b/libs/gi-formula/src/data/weapon/SongOfBrokenPines.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SongOfBrokenPines' +const key: WeaponKey = 'SongOfBrokenPines' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SongOfStillness.ts b/libs/gi-formula/src/data/weapon/SongOfStillness.ts index 65e188c51f..0b77401019 100644 --- a/libs/gi-formula/src/data/weapon/SongOfStillness.ts +++ b/libs/gi-formula/src/data/weapon/SongOfStillness.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SongOfStillness' +const key: WeaponKey = 'SongOfStillness' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SplendorOfTranquilWaters.ts b/libs/gi-formula/src/data/weapon/SplendorOfTranquilWaters.ts index db4ebe0082..eee27e24c8 100644 --- a/libs/gi-formula/src/data/weapon/SplendorOfTranquilWaters.ts +++ b/libs/gi-formula/src/data/weapon/SplendorOfTranquilWaters.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SplendorOfTranquilWaters' +const key: WeaponKey = 'SplendorOfTranquilWaters' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/StaffOfHoma.ts b/libs/gi-formula/src/data/weapon/StaffOfHoma.ts index 61ac15f028..c0f9294e9d 100644 --- a/libs/gi-formula/src/data/weapon/StaffOfHoma.ts +++ b/libs/gi-formula/src/data/weapon/StaffOfHoma.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'StaffOfHoma' +const key: WeaponKey = 'StaffOfHoma' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/StaffOfTheScarletSands.ts b/libs/gi-formula/src/data/weapon/StaffOfTheScarletSands.ts index d86757e7ec..10bc6347cf 100644 --- a/libs/gi-formula/src/data/weapon/StaffOfTheScarletSands.ts +++ b/libs/gi-formula/src/data/weapon/StaffOfTheScarletSands.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'StaffOfTheScarletSands' +const key: WeaponKey = 'StaffOfTheScarletSands' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SummitShaper.ts b/libs/gi-formula/src/data/weapon/SummitShaper.ts index 493b44441c..9f292d3c03 100644 --- a/libs/gi-formula/src/data/weapon/SummitShaper.ts +++ b/libs/gi-formula/src/data/weapon/SummitShaper.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SummitShaper' +const key: WeaponKey = 'SummitShaper' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SwordOfDescension.ts b/libs/gi-formula/src/data/weapon/SwordOfDescension.ts index 4f0cc842d0..e67cfa40cb 100644 --- a/libs/gi-formula/src/data/weapon/SwordOfDescension.ts +++ b/libs/gi-formula/src/data/weapon/SwordOfDescension.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SwordOfDescension' +const key: WeaponKey = 'SwordOfDescension' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/SwordOfNarzissenkreuz.ts b/libs/gi-formula/src/data/weapon/SwordOfNarzissenkreuz.ts index 74abcd39b8..98a6c88dda 100644 --- a/libs/gi-formula/src/data/weapon/SwordOfNarzissenkreuz.ts +++ b/libs/gi-formula/src/data/weapon/SwordOfNarzissenkreuz.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'SwordOfNarzissenkreuz' +const key: WeaponKey = 'SwordOfNarzissenkreuz' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TalkingStick.ts b/libs/gi-formula/src/data/weapon/TalkingStick.ts index e2a493e879..441c81c9e4 100644 --- a/libs/gi-formula/src/data/weapon/TalkingStick.ts +++ b/libs/gi-formula/src/data/weapon/TalkingStick.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TalkingStick' +const key: WeaponKey = 'TalkingStick' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheAlleyFlash.ts b/libs/gi-formula/src/data/weapon/TheAlleyFlash.ts index 5d1f48f6eb..69b5a56220 100644 --- a/libs/gi-formula/src/data/weapon/TheAlleyFlash.ts +++ b/libs/gi-formula/src/data/weapon/TheAlleyFlash.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheAlleyFlash' +const key: WeaponKey = 'TheAlleyFlash' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheBell.ts b/libs/gi-formula/src/data/weapon/TheBell.ts index 3bdd91264a..bebf318632 100644 --- a/libs/gi-formula/src/data/weapon/TheBell.ts +++ b/libs/gi-formula/src/data/weapon/TheBell.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheBell' +const key: WeaponKey = 'TheBell' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheBlackSword.ts b/libs/gi-formula/src/data/weapon/TheBlackSword.ts index b7cb7b0ed6..ed2b4e1970 100644 --- a/libs/gi-formula/src/data/weapon/TheBlackSword.ts +++ b/libs/gi-formula/src/data/weapon/TheBlackSword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheBlackSword' +const key: WeaponKey = 'TheBlackSword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheCatch.ts b/libs/gi-formula/src/data/weapon/TheCatch.ts index dc400d426f..5034a1be17 100644 --- a/libs/gi-formula/src/data/weapon/TheCatch.ts +++ b/libs/gi-formula/src/data/weapon/TheCatch.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheCatch' +const key: WeaponKey = 'TheCatch' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheDockhandsAssistant.ts b/libs/gi-formula/src/data/weapon/TheDockhandsAssistant.ts index f74b262dea..b5148fe3a5 100644 --- a/libs/gi-formula/src/data/weapon/TheDockhandsAssistant.ts +++ b/libs/gi-formula/src/data/weapon/TheDockhandsAssistant.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheDockhandsAssistant' +const key: WeaponKey = 'TheDockhandsAssistant' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheFirstGreatMagic.ts b/libs/gi-formula/src/data/weapon/TheFirstGreatMagic.ts index 35eb97c46c..e564f77f33 100644 --- a/libs/gi-formula/src/data/weapon/TheFirstGreatMagic.ts +++ b/libs/gi-formula/src/data/weapon/TheFirstGreatMagic.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheFirstGreatMagic' +const key: WeaponKey = 'TheFirstGreatMagic' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheFlute.ts b/libs/gi-formula/src/data/weapon/TheFlute.ts index 1a404545d4..e6575632ad 100644 --- a/libs/gi-formula/src/data/weapon/TheFlute.ts +++ b/libs/gi-formula/src/data/weapon/TheFlute.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheFlute' +const key: WeaponKey = 'TheFlute' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheStringless.ts b/libs/gi-formula/src/data/weapon/TheStringless.ts index a8ae362052..eabd81bc57 100644 --- a/libs/gi-formula/src/data/weapon/TheStringless.ts +++ b/libs/gi-formula/src/data/weapon/TheStringless.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheStringless' +const key: WeaponKey = 'TheStringless' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheUnforged.ts b/libs/gi-formula/src/data/weapon/TheUnforged.ts index 9c92bd8342..276ff73d3b 100644 --- a/libs/gi-formula/src/data/weapon/TheUnforged.ts +++ b/libs/gi-formula/src/data/weapon/TheUnforged.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheUnforged' +const key: WeaponKey = 'TheUnforged' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheViridescentHunt.ts b/libs/gi-formula/src/data/weapon/TheViridescentHunt.ts index 1b4ca23497..3423a7cd3c 100644 --- a/libs/gi-formula/src/data/weapon/TheViridescentHunt.ts +++ b/libs/gi-formula/src/data/weapon/TheViridescentHunt.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheViridescentHunt' +const key: WeaponKey = 'TheViridescentHunt' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TheWidsith.ts b/libs/gi-formula/src/data/weapon/TheWidsith.ts index 7ea8c8b79c..ef152f8e46 100644 --- a/libs/gi-formula/src/data/weapon/TheWidsith.ts +++ b/libs/gi-formula/src/data/weapon/TheWidsith.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TheWidsith' +const key: WeaponKey = 'TheWidsith' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ThrillingTalesOfDragonSlayers.ts b/libs/gi-formula/src/data/weapon/ThrillingTalesOfDragonSlayers.ts index 6dd9339619..d67b0cf13a 100644 --- a/libs/gi-formula/src/data/weapon/ThrillingTalesOfDragonSlayers.ts +++ b/libs/gi-formula/src/data/weapon/ThrillingTalesOfDragonSlayers.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ThrillingTalesOfDragonSlayers' +const key: WeaponKey = 'ThrillingTalesOfDragonSlayers' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ThunderingPulse.ts b/libs/gi-formula/src/data/weapon/ThunderingPulse.ts index 153fecb873..8a957caff1 100644 --- a/libs/gi-formula/src/data/weapon/ThunderingPulse.ts +++ b/libs/gi-formula/src/data/weapon/ThunderingPulse.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ThunderingPulse' +const key: WeaponKey = 'ThunderingPulse' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TidalShadow.ts b/libs/gi-formula/src/data/weapon/TidalShadow.ts index 7fac2a23d6..5af0dc35b6 100644 --- a/libs/gi-formula/src/data/weapon/TidalShadow.ts +++ b/libs/gi-formula/src/data/weapon/TidalShadow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TidalShadow' +const key: WeaponKey = 'TidalShadow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TomeOfTheEternalFlow.ts b/libs/gi-formula/src/data/weapon/TomeOfTheEternalFlow.ts index cf6be6d13a..68f80849b4 100644 --- a/libs/gi-formula/src/data/weapon/TomeOfTheEternalFlow.ts +++ b/libs/gi-formula/src/data/weapon/TomeOfTheEternalFlow.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TomeOfTheEternalFlow' +const key: WeaponKey = 'TomeOfTheEternalFlow' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/ToukabouShigure.ts b/libs/gi-formula/src/data/weapon/ToukabouShigure.ts index bc7cf610cb..d1f6d176a3 100644 --- a/libs/gi-formula/src/data/weapon/ToukabouShigure.ts +++ b/libs/gi-formula/src/data/weapon/ToukabouShigure.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'ToukabouShigure' +const key: WeaponKey = 'ToukabouShigure' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TravelersHandySword.ts b/libs/gi-formula/src/data/weapon/TravelersHandySword.ts index 40605225a7..5d0749c4e4 100644 --- a/libs/gi-formula/src/data/weapon/TravelersHandySword.ts +++ b/libs/gi-formula/src/data/weapon/TravelersHandySword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TravelersHandySword' +const key: WeaponKey = 'TravelersHandySword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts b/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts index 60cc171ae6..5a7e7c6027 100644 --- a/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts +++ b/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts @@ -1,6 +1,7 @@ import type { WeaponKey } from '@genshin-optimizer/consts' import { min, prod, subscript, sum } from '@genshin-optimizer/pando' import { allNumConditionals, percent, register, self, selfBuff } from '../util' +import { entriesForWeapon } from './util' // const atkSPD_arr = [0.1, 0.125, 0.15, 0.175, 0.2] // premod atkSPD_ = subscript(refinement, atkSPD_arr) diff --git a/libs/gi-formula/src/data/weapon/TwinNephrite.ts b/libs/gi-formula/src/data/weapon/TwinNephrite.ts index e4dbdca83c..5a7e88367b 100644 --- a/libs/gi-formula/src/data/weapon/TwinNephrite.ts +++ b/libs/gi-formula/src/data/weapon/TwinNephrite.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'TwinNephrite' +const key: WeaponKey = 'TwinNephrite' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/VortexVanquisher.ts b/libs/gi-formula/src/data/weapon/VortexVanquisher.ts index 8dbd41729c..c8518af779 100644 --- a/libs/gi-formula/src/data/weapon/VortexVanquisher.ts +++ b/libs/gi-formula/src/data/weapon/VortexVanquisher.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'VortexVanquisher' +const key: WeaponKey = 'VortexVanquisher' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WanderingEvenstar.ts b/libs/gi-formula/src/data/weapon/WanderingEvenstar.ts index 7243e9051e..f7a64573dd 100644 --- a/libs/gi-formula/src/data/weapon/WanderingEvenstar.ts +++ b/libs/gi-formula/src/data/weapon/WanderingEvenstar.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WanderingEvenstar' +const key: WeaponKey = 'WanderingEvenstar' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WasterGreatsword.ts b/libs/gi-formula/src/data/weapon/WasterGreatsword.ts index b5cf968cc0..060d020cca 100644 --- a/libs/gi-formula/src/data/weapon/WasterGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/WasterGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WasterGreatsword' +const key: WeaponKey = 'WasterGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WavebreakersFin.ts b/libs/gi-formula/src/data/weapon/WavebreakersFin.ts index 9061b86d1c..8adb65c06d 100644 --- a/libs/gi-formula/src/data/weapon/WavebreakersFin.ts +++ b/libs/gi-formula/src/data/weapon/WavebreakersFin.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WavebreakersFin' +const key: WeaponKey = 'WavebreakersFin' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WhiteIronGreatsword.ts b/libs/gi-formula/src/data/weapon/WhiteIronGreatsword.ts index d9b0113da7..712b01a8be 100644 --- a/libs/gi-formula/src/data/weapon/WhiteIronGreatsword.ts +++ b/libs/gi-formula/src/data/weapon/WhiteIronGreatsword.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WhiteIronGreatsword' +const key: WeaponKey = 'WhiteIronGreatsword' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WhiteTassel.ts b/libs/gi-formula/src/data/weapon/WhiteTassel.ts index 4bff87638d..0efeda2e73 100644 --- a/libs/gi-formula/src/data/weapon/WhiteTassel.ts +++ b/libs/gi-formula/src/data/weapon/WhiteTassel.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WhiteTassel' +const key: WeaponKey = 'WhiteTassel' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/Whiteblind.ts b/libs/gi-formula/src/data/weapon/Whiteblind.ts index 3af72432ec..9068245e92 100644 --- a/libs/gi-formula/src/data/weapon/Whiteblind.ts +++ b/libs/gi-formula/src/data/weapon/Whiteblind.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'Whiteblind' +const key: WeaponKey = 'Whiteblind' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WindblumeOde.ts b/libs/gi-formula/src/data/weapon/WindblumeOde.ts index fd3ddf36d3..431826552f 100644 --- a/libs/gi-formula/src/data/weapon/WindblumeOde.ts +++ b/libs/gi-formula/src/data/weapon/WindblumeOde.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WindblumeOde' +const key: WeaponKey = 'WindblumeOde' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WineAndSong.ts b/libs/gi-formula/src/data/weapon/WineAndSong.ts index 47c61869ec..f852533702 100644 --- a/libs/gi-formula/src/data/weapon/WineAndSong.ts +++ b/libs/gi-formula/src/data/weapon/WineAndSong.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WineAndSong' +const key: WeaponKey = 'WineAndSong' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WolfFang.ts b/libs/gi-formula/src/data/weapon/WolfFang.ts index 9c96366df2..66735db6c4 100644 --- a/libs/gi-formula/src/data/weapon/WolfFang.ts +++ b/libs/gi-formula/src/data/weapon/WolfFang.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WolfFang' +const key: WeaponKey = 'WolfFang' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/WolfsGravestone.ts b/libs/gi-formula/src/data/weapon/WolfsGravestone.ts index 1b53364936..74bbdaf598 100644 --- a/libs/gi-formula/src/data/weapon/WolfsGravestone.ts +++ b/libs/gi-formula/src/data/weapon/WolfsGravestone.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'WolfsGravestone' +const key: WeaponKey = 'WolfsGravestone' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/XiphosMoonlight.ts b/libs/gi-formula/src/data/weapon/XiphosMoonlight.ts index 0f901151cc..53a21fef67 100644 --- a/libs/gi-formula/src/data/weapon/XiphosMoonlight.ts +++ b/libs/gi-formula/src/data/weapon/XiphosMoonlight.ts @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = 'XiphosMoonlight' +const key: WeaponKey = 'XiphosMoonlight' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/data/weapon/index.ts b/libs/gi-formula/src/data/weapon/index.ts index 58811b7a76..7ee61cfad0 100644 --- a/libs/gi-formula/src/data/weapon/index.ts +++ b/libs/gi-formula/src/data/weapon/index.ts @@ -1,4 +1,5 @@ import type { TagMapNodeEntries } from '../util' +import { entriesForWeapon } from './util' import AmenomaKageuchi from './AmenomaKageuchi' import AquilaFavonia from './AquilaFavonia' import BlackcliffLongsword from './BlackcliffLongsword' @@ -195,7 +196,8 @@ const data: TagMapNodeEntries[] = [ HarbingerOfDawn, IronSting, KagotsurubeIsshin, - KeyOfKhajNisut, + key, + entriesForWeapon(key)OfKhajNisut, LightOfFoliarIncision, LionsRoar, MistsplitterReforged, diff --git a/libs/gi-formula/src/data/weapon/util.ts b/libs/gi-formula/src/data/weapon/util.ts new file mode 100644 index 0000000000..737154d63b --- /dev/null +++ b/libs/gi-formula/src/data/weapon/util.ts @@ -0,0 +1,26 @@ +import { type WeaponKey } from '@genshin-optimizer/consts' +import { allStats } from '@genshin-optimizer/gi-stats' +import { prod, subscript } from '@genshin-optimizer/pando' +import type { TagMapNodeEntries } from '../util' +import { addStatCurve, allStatics, registerStatListing, self } from '../util' + +export function entriesForWeapon(key: WeaponKey): TagMapNodeEntries { + const gen = allStats.weapon.data[key] + const { refinement, ascension } = self.weapon + const specials = new Set(Object.keys(gen.ascensionBonus)) + + return [ + // Stats + ...gen.lvlCurves.map(({ key, base, curve }) => + addStatCurve(key, prod(base, allStatics('static')[curve])) + ), + ...Object.entries(gen.ascensionBonus).map(([key, values]) => + addStatCurve(key, subscript(ascension, values)) + ), + ...Object.entries(gen.refinementBonus).map(([key, values]) => + addStatCurve(key, subscript(refinement, values)) + ), + // Listing + ...[...specials].map((key) => registerStatListing(key)), + ] +} diff --git a/libs/gi-formula/src/generators/gen-sheet/artifact/__src__.ts.template b/libs/gi-formula/src/generators/gen-sheet/artifact/__src__.ts.template index 6ca0f526e3..437de9c0b6 100644 --- a/libs/gi-formula/src/generators/gen-sheet/artifact/__src__.ts.template +++ b/libs/gi-formula/src/generators/gen-sheet/artifact/__src__.ts.template @@ -11,17 +11,17 @@ import { } from '../util' import { artCount, registerArt } from './util' -const src: ArtifactSetKey = '<%= src %>' -const count = artCount(src) +const key: ArtifactSetKey = '<%= src %>' +const count = artCount(key) // TODO: Conditionals -const { someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { someStack } = allStacks(src) +const { someStack } = allStacks(key) export default registerArt( - src, + key, // TODO: // - Add self-buff formulas using `selfBuff..add()` diff --git a/libs/gi-formula/src/generators/gen-sheet/weapon/__src__.ts.template b/libs/gi-formula/src/generators/gen-sheet/weapon/__src__.ts.template index ffa361a27e..6ffb93d383 100644 --- a/libs/gi-formula/src/generators/gen-sheet/weapon/__src__.ts.template +++ b/libs/gi-formula/src/generators/gen-sheet/weapon/__src__.ts.template @@ -8,21 +8,23 @@ import { register, self, } from '../util' +import { entriesForWeapon } from './util' -const src: WeaponKey = '<%= src %>' +const key: WeaponKey = '<%= src %>' const { weapon: { refinement: _refinement }, } = self // TODO: Conditionals -const { _someBoolConditional } = allBoolConditionals(src) -const { _someListConditional } = allListConditionals(src, []) -const { _someNumConditional } = allNumConditionals(src, 'unique', false) +const { _someBoolConditional } = allBoolConditionals(key) +const { _someListConditional } = allListConditionals(key, []) +const { _someNumConditional } = allNumConditionals(key, 'unique', false) // TODO: Non-stack values -const { _someStack } = allStacks(src) +const { _someStack } = allStacks(key) export default register( - src + key, + entriesForWeapon(key) // TODO: // - Add self-buff formulas using `selfBuff..add()` From 195d292289689620e110cd8640d3ebbf21f611ed Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:28:02 -0700 Subject: [PATCH 09/10] Fix some oopsies --- libs/gi-formula/src/data/artifact/NoblesseOblige.ts | 2 +- libs/gi-formula/src/data/artifact/util.ts | 8 ++++---- libs/gi-formula/src/data/weapon/CalamityQueller.ts | 2 +- libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts | 2 +- libs/gi-formula/src/data/weapon/PrototypeAmber.ts | 2 +- .../gi-formula/src/data/weapon/TulaytullahsRemembrance.ts | 6 +++++- libs/gi-formula/src/data/weapon/index.ts | 3 +-- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libs/gi-formula/src/data/artifact/NoblesseOblige.ts b/libs/gi-formula/src/data/artifact/NoblesseOblige.ts index e1486ba6cd..003484f36d 100644 --- a/libs/gi-formula/src/data/artifact/NoblesseOblige.ts +++ b/libs/gi-formula/src/data/artifact/NoblesseOblige.ts @@ -15,7 +15,7 @@ const { set4 } = allBoolConditionals(key), { canNO4 } = allStacks(key) export default registerArt( - name, + key, selfBuff.premod.dmg_.burst.add(cmpGE(count, 2, percent(0.2))), canNO4.add(set4.ifOn(cmpGE(count, 4, 1))), diff --git a/libs/gi-formula/src/data/artifact/util.ts b/libs/gi-formula/src/data/artifact/util.ts index 0c4e8b2bb1..ef1deb5f92 100644 --- a/libs/gi-formula/src/data/artifact/util.ts +++ b/libs/gi-formula/src/data/artifact/util.ts @@ -15,7 +15,7 @@ export function registerArt( */ function internal({ tag: oldTag, value }: TagMapNodeEntry): TagMapNodeEntry { - if (oldTag.key === key) + if (oldTag.src === key) // Special entries (usually stack count) that override `stack` return { tag: oldTag, value } @@ -23,8 +23,8 @@ export function registerArt( if (value.op === 'reread' || value.op === 'tag' || value.op === 'read') // Reuses `value` since it is already changing tags value = { ...value, tag: { ...value.tag, key } } - else value = tag(value, { key }) - return { tag: { ...oldTag, key: 'art' }, value } + else value = tag(value, { src: key }) + return { tag: { ...oldTag, src: 'art' }, value } } return data.flatMap((data) => Array.isArray(data) ? data.map(internal) : internal(data) @@ -32,5 +32,5 @@ export function registerArt( } export function artCount(key: ArtifactSetKey): NumNode { - return self.common.count.key(key) + return self.common.count.src(key) } diff --git a/libs/gi-formula/src/data/weapon/CalamityQueller.ts b/libs/gi-formula/src/data/weapon/CalamityQueller.ts index 267e988e0e..160461df79 100644 --- a/libs/gi-formula/src/data/weapon/CalamityQueller.ts +++ b/libs/gi-formula/src/data/weapon/CalamityQueller.ts @@ -27,7 +27,7 @@ const atkInc = prod( export default register( key, - entriesForWeapon(key) + entriesForWeapon(key), allElementKeys.map((ele) => selfBuff.premod.dmg_[ele].add(subscript(refinement, dmg_)) ), diff --git a/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts b/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts index 44c5f8f939..0c86441b21 100644 --- a/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts +++ b/libs/gi-formula/src/data/weapon/KeyOfKhajNisut.ts @@ -32,7 +32,7 @@ const teamEleMas = cmpEq( export default register( key, - entriesForWeapon(key) + entriesForWeapon(key), selfBuff.final.eleMas.add(selfElemas), teamBuff.final.eleMas.add(teamEleMas) ) diff --git a/libs/gi-formula/src/data/weapon/PrototypeAmber.ts b/libs/gi-formula/src/data/weapon/PrototypeAmber.ts index a2a864aef5..59ad14b7fe 100644 --- a/libs/gi-formula/src/data/weapon/PrototypeAmber.ts +++ b/libs/gi-formula/src/data/weapon/PrototypeAmber.ts @@ -12,7 +12,7 @@ const { export default register( key, - entriesForWeapon(key) + entriesForWeapon(key), customHeal('heal', prod(target.final.hp, subscript(refinement, heal_arr)), { team: true, }) diff --git a/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts b/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts index 5a7e7c6027..9a21a0d456 100644 --- a/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts +++ b/libs/gi-formula/src/data/weapon/TulaytullahsRemembrance.ts @@ -31,4 +31,8 @@ const normal_dmg_ = min( sum(time_normal_dmg_, hit_normal_dmg_) ) -export default register(key, selfBuff.premod.dmg_.normal.add(normal_dmg_)) +export default register( + key, + entriesForWeapon(key), + selfBuff.premod.dmg_.normal.add(normal_dmg_) +) diff --git a/libs/gi-formula/src/data/weapon/index.ts b/libs/gi-formula/src/data/weapon/index.ts index 7ee61cfad0..4cfe01f3ed 100644 --- a/libs/gi-formula/src/data/weapon/index.ts +++ b/libs/gi-formula/src/data/weapon/index.ts @@ -196,8 +196,7 @@ const data: TagMapNodeEntries[] = [ HarbingerOfDawn, IronSting, KagotsurubeIsshin, - key, - entriesForWeapon(key)OfKhajNisut, + KeyOfKhajNisut, LightOfFoliarIncision, LionsRoar, MistsplitterReforged, From a7bf119344275926e91f878baedbcdcdf15aee2d Mon Sep 17 00:00:00 2001 From: Van Nguyen <36019388+nguyentvan7@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:36:09 -0700 Subject: [PATCH 10/10] Fix last oopsie --- libs/gi-formula/src/data/weapon/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/gi-formula/src/data/weapon/index.ts b/libs/gi-formula/src/data/weapon/index.ts index 4cfe01f3ed..58811b7a76 100644 --- a/libs/gi-formula/src/data/weapon/index.ts +++ b/libs/gi-formula/src/data/weapon/index.ts @@ -1,5 +1,4 @@ import type { TagMapNodeEntries } from '../util' -import { entriesForWeapon } from './util' import AmenomaKageuchi from './AmenomaKageuchi' import AquilaFavonia from './AquilaFavonia' import BlackcliffLongsword from './BlackcliffLongsword'