diff --git a/resources/meta-gs/artifact/alias.js b/resources/meta-gs/artifact/alias.js index 429b2165..e09eff71 100644 --- a/resources/meta-gs/artifact/alias.js +++ b/resources/meta-gs/artifact/alias.js @@ -43,7 +43,9 @@ export const setAbbr = { 逐影猎人: '猎人', 黄金剧团: '剧团', 昔时之歌: '昔时', - 回声之林夜话: '回声' + 回声之林夜话: '回声', + 谐律异想断章: '谐律', + 未竟的遐思: '遐思' } export const setAlias = { @@ -91,5 +93,7 @@ export const setAlias = { 逐影猎人: '逐影,猎人', 黄金剧团: '黄金,剧团', 昔时之歌: '昔时', - 回声之林夜话: '回声,回声夜话,夜话' + 回声之林夜话: '回声,回声夜话,夜话', + 谐律异想断章: '谐律,断章', + 未竟的遐思: '遐思' } diff --git a/resources/meta-gs/artifact/artis-mark.js b/resources/meta-gs/artifact/artis-mark.js index 18b482bd..327e23df 100644 --- a/resources/meta-gs/artifact/artis-mark.js +++ b/resources/meta-gs/artifact/artis-mark.js @@ -82,5 +82,6 @@ export const usefulAttr = { 夏沃蕾: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 100 }, 闲云: { hp: 0, atk: 100, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 100 }, 嘉明: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 }, - 千织: { hp: 0, atk: 50, def: 75, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 } + 千织: { hp: 0, atk: 50, def: 75, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 }, + 阿蕾奇诺: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 } } diff --git a/resources/meta-gs/artifact/calc.js b/resources/meta-gs/artifact/calc.js index 3de541d4..776f4055 100644 --- a/resources/meta-gs/artifact/calc.js +++ b/resources/meta-gs/artifact/calc.js @@ -484,7 +484,28 @@ const buffs = { dmg: 50 } } + }, + + 谐律异想断章: { + 2: attr('atkPct', 18 ), + 4: { + title: '生命之契的数值提升或降低时,角色造成的伤害提升[dmg]%', + data: { + dmg: 18 * 3 + } + } + }, + + 未竟的遐思: { + 2: attr('atkPct', 18 ), + 4: { + title: '存在处于燃烧状态下的敌人时,伤害提升[dmg]%', + data: { + dmg: 10 * 5 + } + } } + } export default buffs diff --git a/resources/meta-gs/character/阿蕾奇诺/calc.js b/resources/meta-gs/character/阿蕾奇诺/calc.js new file mode 100644 index 00000000..85e96eb9 --- /dev/null +++ b/resources/meta-gs/character/阿蕾奇诺/calc.js @@ -0,0 +1,53 @@ +export const details = [{ + title: 'E后普攻一段伤害', + dmg: ({ talent }, dmg ) => dmg(talent.a['一段伤害'], 'a') +},{ + check: ({ cons }) => cons >= 2, + title: '血偿勒令回收伤害', + dmg: ({ attr }, { basic }) => basic(attr.atk * 900 / 100, 'e') +},{ + title: 'E切斩伤害', + dmg: ({ talent }, dmg ) => dmg(talent.e['切斩伤害'], 'e') +},{ + title: 'Q伤害', + dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q') +},{ + title: 'Q蒸发伤害', + dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q', 'vaporize') +},{ + title: 'Q治疗量', + params: { BondOfLife: 145 }, + dmg: ({ talent, attr, weapon }, { heal }) => heal(150 / 100 * ((weapon.name === '赤月之形' ? 170 : 145) / 100) * attr.hp + 150 / 100 * attr.atk) +}] + +export const defDmgIdx = 0 +export const mainAttr = 'atk,cpct,cdmg,mastery' +export const defParams = { BondOfLife: 130 }//生命之契在此调整,请勿超过200 + +export const buffs = [ +{ + title: '阿蕾奇诺天赋:[buffCount]%最大生命值的生命之契,普通攻击伤害提升[aPlus]', + data: { + buffCount: ({ params , weapon }) => Math.min(params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0), 200), + aPlus: ({ talent , attr , params , cons , weapon }) => attr.atk * ((Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 )) + } +}, +{ + title: '阿蕾奇诺天赋:在战斗状态下获得[dmg]%伤害加成', + data: { + dmg: 40 + } +}, +{ + title: '阿蕾奇诺6命:Q造成的伤害提高[qPlus],且释放后普通攻击与元素爆发的暴击率提高[aCpct]%,暴击伤害提高[aCdmg]%', + cons: 6, + data: { + qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * (700 / 100), + aCpct: 10 , + aCdmg: 70 , + qCpct: 10 , + qCdmg: 70 + } +}, 'vaporize'] + +export const createdBy = 'liangshi' \ No newline at end of file diff --git a/resources/meta-gs/character/阿蕾奇诺/calc_auto.js b/resources/meta-gs/character/阿蕾奇诺/calc_auto.js new file mode 100644 index 00000000..3ded60f7 --- /dev/null +++ b/resources/meta-gs/character/阿蕾奇诺/calc_auto.js @@ -0,0 +1,132 @@ +export const details = [{ + title: 'E后普攻一段伤害', + dmg: ({ talent }, dmg ) => dmg(talent.a['一段伤害'], 'a') +},{ + check: ({ cons }) => cons >= 2, + title: '血偿勒令回收伤害', + dmg: ({ attr }, { basic }) => basic(attr.atk * 900 / 100, 'e') +},{ + title: 'E切斩伤害', + dmg: ({ talent }, dmg ) => dmg(talent.e['切斩伤害'], 'e') +},{ + title: 'Q伤害', + dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q') +},{ + title: 'Q蒸发伤害', + dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q', 'vaporize') +},{ + title: '仆万香班 普攻尾段', + params: { team: true, Kazuha: true, BondOfLife: 200 }, + dmg: ({ talent }, dmg ) => dmg(talent.a['六段伤害'], 'a') +},{ + title: '仆万香班 Q伤害', + params: { team: true, Kazuha: true }, + dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q') +},{ + title: '仆万夜钟 普攻尾段蒸发', + params: { team2: true, Kazuha: true, BondOfLife: 200 }, + dmg: ({ talent }, dmg ) => dmg(talent.a['六段伤害'], 'a', 'vaporize') +}] + +export const defDmgIdx = 0 +export const mainAttr = 'atk,cpct,cdmg,mastery' +export const defParams = { BondOfLife: 130 }//生命之契在此调整 + +export const buffs = [ +{ + title: '阿蕾奇诺天赋:[buffCount]%最大生命值的生命之契,普通攻击伤害提升[aPlus]', + data: { + buffCount: ({ params , weapon }) => Math.min(params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0), 200), + aPlus: ({ talent , attr , params , cons , weapon }) => attr.atk * ((Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 )) + } +}, +{ + title: '阿蕾奇诺天赋:在战斗状态下获得[dmg]%伤害加成', + data: { + dmg: 40 + } +}, +{ + title: '阿蕾奇诺6命:Q造成的伤害提高[qPlus],且释放后普通攻击与元素爆发的暴击率提高[aCpct]%,暴击伤害提高[aCdmg]%', + cons: 6, + data: { + qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * (700 / 100), + aCpct: 10 , + aCdmg: 70 , + qCpct: 10 , + qCdmg: 70 + } +}, { + check: ({ params }) => params.team === true, + title: '火共鸣:增加攻击[atkPct]%', + data: { + atkPct: 25 + } +}, { + check: ({ params }) => params.team === true, + title: '风鹰班:增加[atkPlus]点攻击力', + data: { + atkPlus: 1202.35 + } +}, { + check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 , + title: '班尼特-昔日宗室之仪:增加攻击[atkPct]%', + data: { + atkPct: 20 + } +}, { + check: ({ params }) => params.team === true, + title: '香菱6命:增加[dmg]%火伤', + data: { + dmg: 15 + } +}, { + check: ({ cons, params }) => cons <= 1 && params.Kazuha === true, + title: '精1苍古0命万叶:获得[dmg]%增伤(苍古普攻16增伤),增加[atkPct]%攻击,减抗[kx]%', + data: { + aDmg: 16, + a2Dmg: 16, + a3Dmg: 16, + dmg: 40, + atkPct: 20, + kx: 40 + } +}, { + check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.Kazuha === true), + title: '精1苍古2命万叶:获得[dmg]%增伤(苍古普攻16增伤),增加[atkPct]%攻击,减抗[kx]%,精通[mastery]', + data: { + aDmg: 16, + a2Dmg: 16, + a3Dmg: 16, + dmg: 48, + atkPct: 20, + kx: 40, + mastery: 200 + } +}, { + check: ({ cons, params }) => (cons >= 6 && params.Kazuha === true), + title: '精5苍古6命万叶:获得[dmg]%增伤(苍古普攻32增伤),增加[atkPct]%攻击,减抗[kx]%,精通[mastery]', + data: { + aDmg: 32, + a2Dmg: 32, + a3Dmg: 32, + dmg: 48, + atkPct: 40, + kx: 40, + mastery: 200 + } +}, { + check: ({ params }) => params.team2 === true, + title: '钟离:降低敌人[kx]%全抗', + data: { + kx: 20 + } +}, { + check: ({ params }) => params.team2 === true , + title: '夜兰:获得[dmg]%增伤', + data: { + dmg: 35 + } +}, 'vaporize'] + +export const createdBy = 'liangshi' \ No newline at end of file diff --git a/resources/meta-gs/weapon/alias.js b/resources/meta-gs/weapon/alias.js index 3d0a51eb..ef85594c 100644 --- a/resources/meta-gs/weapon/alias.js +++ b/resources/meta-gs/weapon/alias.js @@ -137,6 +137,7 @@ export const alias = { 峡湾长歌: '峡湾,峡湾枪,峡湾长枪', 勘探钻机: '勘探,钻机,钻头,钻枪', 沙中伟贤的对答: '沙中,沙中对答,沙中伟贤', + 赤月之形: '赤月,镰刀', // 法器 四风原典: '四风,四风书,四风法器', diff --git a/resources/meta-gs/weapon/desc.js b/resources/meta-gs/weapon/desc.js index 80f00081..16162f6e 100644 --- a/resources/meta-gs/weapon/desc.js +++ b/resources/meta-gs/weapon/desc.js @@ -39,6 +39,7 @@ export const descFix = { 雪葬的星银: '普攻与重击命中敌人时,有$[0]概率造成$[1]攻击力的范围伤害。若敌人处于冰元素影响下,则造成$[2]攻击力的伤害。每10秒至多一次。', 裁断: '攻击力提升$[0];获取结晶晶片时,为装备者赋予1枚约印,使下一个战技伤害提升$[1],约印持续15秒,至多持有2枚。', 苇海信标: '战技命中敌人提升$[0]攻击力;受到伤害提升$[1]攻击力,各持续8秒,后台也能触发。无护盾时,生命值上限提高$[2]。', + 赤月之形: "重击命中敌人时,赋予生命值上限25%的生命之契。装备者具有生命之契时,造成的伤害提升$[0]。若生命之契的数值大于等于生命上限的30%。造成的伤害进一步提升$[1]", // 长柄武器 勘探钻机: '受到或进行治疗时,获得标记,最多3层,处于后台也能获得。施放战技或爆发时,消耗标记:每枚标记提高$[0]攻击力与$[1]元素伤害加成。', diff --git a/resources/meta-gs/weapon/polearm/calc.js b/resources/meta-gs/weapon/polearm/calc.js index 1a4945a4..df4d5e06 100644 --- a/resources/meta-gs/weapon/polearm/calc.js +++ b/resources/meta-gs/weapon/polearm/calc.js @@ -132,6 +132,12 @@ export default function (step, staticStep) { atkPlus: ({ attr, calc, refine }) => step(52 + 28 * 3)[refine] * calc(attr.mastery) / 100 } }, + 赤月之形: { + title: '生命之契大于等于生命上限30%,造成的伤害提升[dmg]%', + refine: { + dmg: step(36, 12) + } + }, 风信之锋: { title: '触发元素反应提升攻击力[atkPct]%, 精通[mastery]', refine: {