!56 组队计算中不可叠加类圣遗物不再会重复计算buff

* 组队计算中不可叠加类圣遗物不再会重复计算buff

resources/meta-gs/character/刻晴/calc_auto.js

@@ -100,10 +100,15 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '宗室天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤,攻击[atkPct]%',
+  title: '天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤',
   data: {
     atkPlus: 794.2,
-    cdmg: 60,
+    cdmg: 60
+  }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '九条-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
     atkPct: 20
   }
 }, {

resources/meta-gs/character/可莉/calc_auto.js

@@ -62,11 +62,16 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ params }) => params.team === true,
   title: '香菱6命：增加[dmg]%火伤',

resources/meta-gs/character/夏沃蕾/calc.js

@@ -0,0 +1,50 @@
+export const details = [{
+  title: 'E点按伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.e['点按伤害'], 'e',)
+},{
+  title: 'E长按伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.e['长按伤害'], 'e')
+},{
+  title: '「超量装药弹头」伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.e['「超量装药弹头」伤害'], 'e')
+},{
+  title: '2命额外伤害',
+  check: ({ cons }) => cons >= 2,
+  dmg: ({ talent, calc, attr }, { basic }) => basic(calc(attr.atk) * 120 / 100, 'e')
+},{
+  title: 'e持续治疗',
+  dmg: ({ attr, calc, talent }, { heal }) => heal(talent.e['持续治疗量2'][0] * calc(attr.hp) / 100 + talent.e['持续治疗量2'][1] * 1)
+},{
+  title: '圆阵掷弹爆轰术害',
+  dmg: ({ talent }, dmg) => dmg(talent.q['爆轰榴弹伤害'], 'q',)
+},{
+  title: 'Q分裂弹伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.q['二重毁伤弹伤害'], 'q')
+},{
+  title: '6命额外治疗',
+  check: ({ cons }) => cons >= 6,
+  dmg: ({ attr, calc, talent }, { heal }) => heal( calc(attr.hp) * 10 / 100 )
+}]
+
+export const defDmgIdx = 2
+export const mainAttr = 'atk,hp,cpct,cdmg'
+
+export const buffs = [{
+  title: '夏沃蕾天赋：火元素与雷元素抗性降低[kx]%',
+  data: {
+    kx: 40
+  }
+},{
+  title: '夏沃蕾天赋：发射「超量装药弹头」后攻击力提升[atkPct]%',
+  data: {
+    atkPct: ({ calc, attr }) => Math.min( 40 , calc(attr.hp) / 1000 )
+  }
+},{
+  title: '夏沃蕾6命：队伍中的角色受到「近迫式急促拦射」的治疗后，获得[dmg]%火元素伤害加成与雷元素伤害加成',
+  cons: 6,
+  data: {
+    dmg: 60
+  }
+}]
+
+export const createdBy = 'liangshi'

resources/meta-gs/character/夜兰/calc_auto.js

@@ -108,20 +108,26 @@ export const buffs = [{
   }
 }, {
   check: ({ cons, params }) => (cons >= 2 && params.team === true),
-  title: '千夜教官满命莫娜：获得[dmg]%增伤，双水,暴击[cpct]%,精通[mastery]',
+  title: '千夜满命莫娜：获得[dmg]%增伤，双水,暴击[cpct]%,精通[mastery]',
   data: {
     dmg: 60,
     vaporize: 15,
     hpPct: 25,
     cpct: 15,
-    mastery: 168
+    mastery: 48
   }
 }, {
   check: ({ cons, params }) => (cons < 2 && params.team === true),
-  title: '千夜教官0命莫娜：获得[dmg]%增伤，双水,精通[mastery]',
+  title: '千夜0命莫娜：获得[dmg]%增伤，双水,精通[mastery]',
   data: {
     dmg: 60,
     hpPct: 25,
-    mastery: 168
+    mastery: 48
   }
-}, 'vaporize']
+}, {
+  check: ({ params , artis }) => params.team === true && artis.教官 !== 4 ,
+  title: '莫娜-教官：精通提升[mastery]',
+  data: {
+    mastery: 120
+  }
+},'vaporize']

resources/meta-gs/character/妮露/calc_auto.js

@@ -164,10 +164,15 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => team2.is(params),
-  title: '千精草套纳西妲开Q：增加[mastery]点精通，减[kx]%草抗',
+  title: '千精纳西妲开Q：增加[mastery]点精通',
   sort: 7,
   data: {
-    mastery: 1000 * 0.25,
+    mastery: 1000 * 0.25
+  }
+}, {
+  check: ({ params , artis }) => team2.is(params) && artis.深林的记忆 !== 4 ,
+  title: '纳西妲-草套：草抗降低[kx]%',
+  data: {
     kx: 30
   }
 }, {

resources/meta-gs/character/娜维娅/calc.js

@@ -0,0 +1,76 @@
+export const details = [{
+  title: 'E后普通攻击一段',
+  dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a')
+},{
+  title: '0消耗典仪式晶火',
+  dmg: ({ talent }, dmg) => dmg(talent.e['玫瑰晶弹基础伤害'], 'e')
+},{
+  title: '3消耗典仪式晶火',
+  params: { jp: 3 },
+  dmg: ({ talent }, dmg) => dmg(talent.e['玫瑰晶弹基础伤害'] * 2 , 'e')
+},{
+  title: '4消耗典仪式晶火',
+  params: { jp: 4 },
+  dmg: ({ talent }, dmg) => dmg(talent.e['玫瑰晶弹基础伤害'] * 2 , 'e')
+},{
+  title: '5消耗典仪式晶火',
+  params: { jp: 5 },
+  dmg: ({ talent }, dmg) => dmg(talent.e['玫瑰晶弹基础伤害'] * 2 , 'e')
+},{
+  title: '6消耗典仪式晶火',
+  params: { jp: 6 },
+  dmg: ({ talent }, dmg) => dmg(talent.e['玫瑰晶弹基础伤害'] * 2 , 'e')
+},{
+  title: '如霰澄天的鸣礼伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
+},{
+  title: '支援炮击伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.q['支援炮击伤害'], 'q')
+}]
+
+export const defDmgIdx = 5
+export const mainAttr = 'atk,cpct,cdmg'
+
+export const buffs = [{
+  check: ({ params }) => params.jp > 3 ,
+  title: '典仪式晶火：消耗[_count]枚弹片将使本次射击造成的伤害额外提升[eDmg]%',
+  data: {
+    _count: ({ params }) => params.jp ,
+    eDmg: ({ params }) => ( params.jp - 3 ) * 15
+  }
+},{
+  title: '娜维娅天赋：施放典仪式晶火后娜维娅的普攻,重击，下落攻击造成的伤害提升[aDmg]%',
+  data: {
+    aDmg: 40,
+    a2Dmg: 40,
+    a3Dmg: 40
+  }
+},{
+  title: '娜维娅天赋：队伍中存在三位火雷冰水元素角色,攻击力提升[atkPct]%',
+  data: {
+    atkPct: 40
+  }
+},{
+  check: ({ params }) => params.jp !== undefined ,
+  title: '娜维娅2命：施放典仪式晶火时消耗「裂晶弹片」使本次典仪式晶火的暴击率提升[eCpct]%',
+  cons: 2,
+  data: {
+    eCpct :  ({ params }) => Math.min( 36 , params.jp * 12 )
+  }
+},{
+  title: '娜维娅4命：被如霰澄天的鸣礼命中的敌人抗性降低[kx]%',
+  cons: 4,
+  data: {
+    kx: 20
+  }
+},{
+  check: ({ params }) => params.jp > 3 ,
+  title: '娜维娅6命：消耗[_count]枚弹片,使典仪式晶火的暴击伤害提升[eCdmg]%',
+  cons: 6,
+  data: {
+    _count: ({ params }) => params.jp ,
+    eCdmg :  ({ params }) => Math.min( 135 , ( params.jp - 3 ) * 45 )
+  }
+}]
+
+export const createdBy = 'liangshi'

resources/meta-gs/character/宵宫/calc_auto.js

@@ -72,11 +72,16 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ cons, params }) => cons <= 1 && params.team === true,
   title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',

resources/meta-gs/character/提纳里/calc_auto.js

@@ -135,17 +135,21 @@ export const buffs = [{
   }
 }, {
   check: ({ cons, params }) => (cons >= 2 && params.team === true),
-  title: '精5千夜草套纳西妲：增加精通[mastery]（双草千夜）,减防[enemyDef]%,减抗[kx]%',
+  title: '精5千夜纳西妲：增加精通[mastery]（双草千夜）,减防[enemyDef]%',
   data: {
     mastery: 148,
-    enemyDef: 30,
-    kx: 30
+    enemyDef: 30
   }
 }, {
   check: ({ cons, params }) => (cons < 2 && params.team === true),
-  title: '精1千夜草套纳西妲：增加精通[mastery]（双草千夜）,减抗[kx]%',
+  title: '精1千夜纳西妲：增加精通[mastery]（双草千夜）',
+  data: {
+    mastery: 140
+  }
+}, {
+  check: ({ params, artis }) => ( params.team === true && artis.深林的记忆 !== 4 ),
+  title: '纳西妲-草套：减抗[kx]%',
   data: {
-    mastery: 140,
     kx: 30
   }
 }, {

resources/meta-gs/character/流浪者/calc_auto.js

@@ -120,11 +120,16 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ params }) => params.team === true,
   title: '满命珐露珊：获得[dmg]%增伤,获得[kx]%减抗,获得[cdmg]%爆伤',

resources/meta-gs/character/甘雨/calc_auto.js

@@ -137,10 +137,15 @@ export const buffs = [{
     mastery: 40
   }
 }, {
-  check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
 }, 'melt']

resources/meta-gs/character/神里绫人/calc_auto.js

@@ -68,10 +68,15 @@ export const buffs = [{
     aPlus: ({ attr, calc, talent }) => calc(attr.hp) * talent.e['浪闪伤害值提高'] / 100 * 5
   }
 }, {
-  check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
 }, {

resources/meta-gs/character/芙宁娜/calc.js

@@ -47,10 +47,10 @@ export const defDmgIdx = 3
 export const buffs = [{
   title: '芙宁娜天赋：消耗4队友生命值，E伤害提升140%'
 }, {
-  title: '天赋Q·万众狂欢：300层气氛值提升[dmg]%伤害，[heal]%治疗加成',
+  title: '天赋Q·万众狂欢：300层气氛值提升[dmg]%伤害，[healInc]%受治疗加成',
   data: {
     dmg: ({ talent }) => talent.q['气氛值转化提升伤害比例'] * 300,
-    heal: ({ talent }) => talent.q['气氛值转化受治疗加成比例'] * 300
+    healInc: ({ talent }) => talent.q['气氛值转化受治疗加成比例'] * 300
   }
 }, {
   title: '芙宁娜被动：基于生命值，提升召唤物伤害[eDmg]%',
@@ -63,7 +63,7 @@ export const buffs = [{
   cons: 1,
   data: {
     dmg: ({ talent }) => talent.q['气氛值转化提升伤害比例'] * 100,
-    heal: ({ talent }) => talent.q['气氛值转化受治疗加成比例'] * 100
+    healInc: ({ talent }) => talent.q['气氛值转化受治疗加成比例'] * 100
   }
 }, {
   title: '芙宁娜2命：万众狂欢持续期间，满气氛值提升芙宁娜140%生命值',

resources/meta-gs/character/达达利亚/calc_auto.js

@@ -29,11 +29,16 @@ export const defParams = {
 
 export const buffs = [{
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ cons, params }) => cons <= 1 && params.team === true,
   title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',

resources/meta-gs/character/迪希雅/calc_auto.js

@@ -93,10 +93,16 @@ export const buffs = [{
   check: ({ params }) => params.team === true,
   title: '风鹰宗室班+双火：增加[atkPlus]点攻击力与[atkPct]%攻击力,获得[dmg]%增伤',
   data: {
-    atkPct: 45,
+    atkPct: 25,
     dmg: 15,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ cons, params }) => cons <= 1 && params.team === true,
   title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',

resources/meta-gs/character/雷电将军/calc_auto.js

@@ -79,11 +79,16 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: ({ params }) => 20 * params.ban,
     atkPlus: ({ params }) => 1202.35 * params.ban
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: ({ params }) => 20 * params.ban
+  }
 }, {
   check: ({ cons, params }) => cons > 2 && params.team === true,
   title: '八重4命：增加20%雷伤',
@@ -126,11 +131,16 @@ export const buffs = [{
     mastery: 200
   }
 }, {
-  check: ({ params }) => params.team === true,
-  title: '教官天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤,精通[mastery]',
+  check: ({ params , artis }) => params.team === true && artis.教官 !== 4 ,
+  title: '九条-教官：精通提升[mastery]',
   data: {
-    atkPlus: 794.2,
-    cdmg: 60,
     mastery: 120
   }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤',
+  data: {
+    atkPlus: 794.2,
+    cdmg: 60
+  }
 }]

resources/meta-gs/character/香菱/calc_auto.js

@@ -37,11 +37,16 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ cons, params }) => cons <= 1 && params.team === true,
   title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',

resources/meta-gs/character/魈/calc_auto.js

@@ -69,11 +69,16 @@ export const buffs = [{
   }
 }, {
   check: ({ params }) => params.team === true,
-  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  title: '风鹰宗室班：增加[atkPlus]点攻击力',
   data: {
-    atkPct: 20,
     atkPlus: 1202.35
   }
+}, {
+  check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+  title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
+  data: {
+    atkPct: 20
+  }
 }, {
   check: ({ params }) => params.team === true,
   title: '满命珐露珊：获得[dmg]%增伤,获得[kx]%减抗,获得[cdmg]%爆伤',