diff --git a/resources/meta/character/那维莱特/calc.js b/resources/meta/character/那维莱特/calc.js index 9af11010..0d62cfcc 100644 --- a/resources/meta/character/那维莱特/calc.js +++ b/resources/meta/character/那维莱特/calc.js @@ -1,6 +1,9 @@ export const details = [{ title: '重击伤害', - dmg: ({ talent, attr, calc }, { basic }) => basic(talent.a['重击·衡平推裁持续伤害'] * calc(attr.hp) / 100, 'a2') + dmg: ({ talent, attr, calc, cons }, { basic }) => { + const a2Multi = cons >= 1 ? 1.6 : 1.25 + return basic(a2Multi * talent.a['重击·衡平推裁持续伤害'] * calc(attr.hp) / 100, 'a2') + } }, { title: 'E伤害', dmg: ({ talent, attr, calc }, { basic }) => basic(talent.e['技能伤害'] * calc(attr.hp) / 100, 'e') @@ -19,7 +22,8 @@ export const details = [{ const count = cons >= 6 ? 30 : 8 const td = talent.a['重击·衡平推裁持续伤害'] * count const extraTd = cons >= 6 ? 20 * 6 : 0 - return basic((td + extraTd) * calc(attr.hp) / 100, 'a2') + const a2Multi = cons >= 1 ? 1.6 : 1.25 + return basic(a2Multi * (td + extraTd) * calc(attr.hp) / 100, 'a2') } }] @@ -28,16 +32,10 @@ export const mainAttr = 'hp,dmg,cpct,cdmg' export const buffs = [{ title: '天赋-古海孑遗的权柄:按两层计算,重击·衡平推裁造成原本125%的伤害', - check: ({ cons }) => cons < 1, - data: { - a2Multi: 25 - } + check: ({ cons }) => cons < 1 }, { title: '天赋-古海孑遗的权柄:按三层计算,重击·衡平推裁造成原本160%的伤害', - cons: 1, - data: { - a2Multi: 60 - } + cons: 1 }, { title: '天赋-至高仲裁的纪律:基于当前生命值超出生命值上限30%的部分,提升[dmg]%水元素伤害', data: { @@ -47,7 +45,7 @@ export const buffs = [{ title: '那维2命:重击·衡平推裁的暴击伤害提升[cdmg]%', cons: 2, data: { - cdmg: 42 + a2Cdmg: 42 } }, { title: '那维6命:延长重击持续时间至12s,同时每2s,额外造成20%生命倍率的视为重击·衡平推裁的伤害',