diff --git a/resources/meta-gs/artifact/calc.js b/resources/meta-gs/artifact/calc.js index 58871f01..ac9fb678 100644 --- a/resources/meta-gs/artifact/calc.js +++ b/resources/meta-gs/artifact/calc.js @@ -376,9 +376,12 @@ const buffs = { 饰金之梦: { 2: attr('mastery', 80), 4: { - title: '队伍存在其他3个不同元素类型角色时,精通提高150', + title: '队伍存在[mArtisDiffCount]个不同元素类型角色,[sameCount]个相同类型角色,精通提高[mastery],攻击力提高[atkPct]%', data: { - mastery: 150 + mArtisDiffCount: ({ params }) => params.mArtisDiffCount || 3, + sameCount: ({ params }) => 3 - (params.mArtisDiffCount || 3), + mastery: ({ params }) => (params.mArtisDiffCount || 3) * 50, + atkPct: ({ params }) => (3 - (params.mArtisDiffCount || 3)) * 14 } } }, diff --git a/resources/meta-gs/character/八重神子/calc_auto.js b/resources/meta-gs/character/八重神子/calc_auto.js index 6b077034..a82a75ca 100644 --- a/resources/meta-gs/character/八重神子/calc_auto.js +++ b/resources/meta-gs/character/八重神子/calc_auto.js @@ -23,13 +23,13 @@ export const details = [{ }, { check: ({ cons }) => cons < 2, dmgKey: 'e_t', - params: { team: true, team2: false }, + params: { team: true, team2: false, mArtisDiffCount: 1 }, title: '温三雷叄阶杀生樱伤害', dmg: ({ talent }, dmg) => dmg(talent.e['杀生樱伤害·叁阶'], 'e') }, { check: ({ cons }) => cons >= 2, dmgKey: 'e_t', - params: { team: true, team2: false }, + params: { team: true, team2: false, mArtisDiffCount: 1 }, title: '温三雷肆阶杀生樱伤害', dmg: ({ talent }, dmg) => dmg(talent.e['杀生樱伤害·肆阶'], 'e') }, { @@ -49,7 +49,7 @@ export const details = [{ } }, { title: '温三雷四段Q总伤害', - params: { team: true, team2: false }, + params: { team: true, team2: false, mArtisDiffCount: 1 }, dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'] + talent.q['天狐霆雷伤害'] * 3, 'q') }, { check: ({ cons }) => cons < 2, @@ -80,7 +80,9 @@ export const mainAttr = 'atk,cpct,cdmg,mastery,dmg' export const defDmgKey = 'e_j' export const defParams = { - team: true, team2: true + team: true, + team2: true, + mArtisDiffCount: 3 } export const buffs = [{ diff --git a/resources/meta-gs/character/提纳里/calc.js b/resources/meta-gs/character/提纳里/calc.js index d0de8058..d54ea6c5 100644 --- a/resources/meta-gs/character/提纳里/calc.js +++ b/resources/meta-gs/character/提纳里/calc.js @@ -52,6 +52,7 @@ export const details = [{ export const mainAttr = 'atk,cpct,cdmg,mastery' export const defDmgKey = 'a2_j' +export const defParams = { mArtisDiffCount: 2 } export const buffs = [{ title: '提纳里被动:发射花筥箭后,元素精通提升50点', diff --git a/resources/meta-gs/character/提纳里/calc_auto.js b/resources/meta-gs/character/提纳里/calc_auto.js index 8dd4790c..2fb4832e 100644 --- a/resources/meta-gs/character/提纳里/calc_auto.js +++ b/resources/meta-gs/character/提纳里/calc_auto.js @@ -70,6 +70,7 @@ export const details = [{ export const mainAttr = 'atk,cpct,cdmg,mastery' export const defDmgIdx = 5 +export const defParams = { mArtisDiffCount: 2 } export const buffs = [{ title: '提纳里被动:发射花筥箭后,元素精通提升50点', @@ -124,7 +125,7 @@ export const buffs = [{ mastery: 140 } }, { - check: ({ params, artis }) => ( params.team === true && artis.深林的记忆 !== 4 ), + check: ({ params, artis }) => (params.team === true && artis.深林的记忆 !== 4), title: '纳西妲-草套:减抗[kx]%', data: { kx: 30 diff --git a/resources/meta-gs/character/纳西妲/calc.js b/resources/meta-gs/character/纳西妲/calc.js index dae71e9e..1e7db4e5 100644 --- a/resources/meta-gs/character/纳西妲/calc.js +++ b/resources/meta-gs/character/纳西妲/calc.js @@ -50,6 +50,7 @@ export const details = [{ export const defDmgIdx = 4 export const mainAttr = 'atk,mastery,cpct,cdmg' +export const defParams = { mArtisDiffCount: 2 } export const buffs = [{ title: '草神1命:火元素队友额外计入1位', diff --git a/resources/meta-gs/character/纳西妲/calc_auto.js b/resources/meta-gs/character/纳西妲/calc_auto.js index 7aa6a9e6..cdc5baa8 100644 --- a/resources/meta-gs/character/纳西妲/calc_auto.js +++ b/resources/meta-gs/character/纳西妲/calc_auto.js @@ -58,7 +58,9 @@ export const details = [{ }] export const defParams = { - q: true, team: true + q: true, + team: true, + mArtisDiffCount: 2 } export const defDmgIdx = 5 diff --git a/resources/meta-gs/character/艾尔海森/calc.js b/resources/meta-gs/character/艾尔海森/calc.js index 0e2502c3..93d06f9e 100644 --- a/resources/meta-gs/character/艾尔海森/calc.js +++ b/resources/meta-gs/character/艾尔海森/calc.js @@ -61,7 +61,8 @@ export const mainAttr = 'atk,cpct,cdmg,mastery' export const defParams = { q: false, - e: true + e: true, + mArtisDiffCount: 2 } export const buffs = [{ diff --git a/resources/meta-gs/character/赛诺/calc.js b/resources/meta-gs/character/赛诺/calc.js index d763ca4b..9e92feaa 100644 --- a/resources/meta-gs/character/赛诺/calc.js +++ b/resources/meta-gs/character/赛诺/calc.js @@ -97,6 +97,7 @@ export const details = [{ export const defDmgKey = 'q' export const mainAttr = 'atk,cpct,cdmg,mastery' +export const defParams = { mArtisDiffCount: 2 } export const buffs = [{ title: '圣仪·煟煌随狼行:Q状态下提升元素精通100点',