From 9206a8eab3a8cb0154bc5f613f223342d11081e6 Mon Sep 17 00:00:00 2001
From: yoimiya-kokomi <592981798@qq.com>
Date: Fri, 26 Aug 2022 08:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=E5=8F=8A?=
 =?UTF-8?q?=E5=9C=A3=E9=81=97=E7=89=A9=E8=AF=84=E5=88=86=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=BA=B3=E9=87=8C=E3=80=81=E6=9F=AF=E8=8E=B1=20?=
 =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=E6=9A=82=E6=9C=AA=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB3.0=E6=96=B0=E5=85=83=E7=B4=A0=E5=8F=8D=E5=BA=94?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E7=BB=9F=E4=B8=80=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=20=E8=8D=89=E5=85=83=E7=B4=A0=E5=9C=A3=E9=81=97=E7=89=A9?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=8A=E8=AF=84=E5=88=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                               | 14 ++---
 components/profile-data/enka-data.js       |  1 +
 components/profile-data/miao-meta.js       |  1 +
 models/profile-lib/calc-meta.js            |  3 +-
 resources/meta/character/提纳里/calc.js | 63 ++++++++++++++++++++++
 resources/meta/character/柯莱/calc.js    | 14 +++++
 resources/meta/reliquaries/artis-mark.js   |  8 +--
 resources/meta/weapons/calc.js             |  4 +-
 8 files changed, 97 insertions(+), 11 deletions(-)
 create mode 100644 resources/meta/character/提纳里/calc.js
 create mode 100644 resources/meta/character/柯莱/calc.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e1bbd57..dca26ff2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,10 @@
-# 1.9.10
+# 1.9.11
 
-* 伤害计算增加丽莎、云堇、五郎、北斗、托马、早柚、砂糖、辛焱
-* `#雷神面板`展示数据API及更新时间
-* 重构部分components、models逻辑，重构部分伤害计算逻辑
-* `#雷神圣遗物`页面部分展示问题修复
+* 伤害计算及圣遗物评分增加提纳里、柯莱
+* 伤害计算暂未包含3.0新元素反应，后续统一补充
+* 草元素圣遗物识别及评分逻辑补充
 
-# 1.9.1 ~ 1.9.9
+# 1.9.1 ~ 1.9.10
 
 * 新增`#面板练度统计`功能
     * 可展示当前角色天赋及圣遗物练度信息
@@ -16,6 +15,7 @@
     * 可在`#喵喵设置`中启用`#喵喵深渊`作为默认`#深渊`，默认关闭
     * 启用后不会覆盖`#上期深渊`以及`#深渊12层`具体楼层的命令
 * `#面板`、`#更新面板`命令使用图片渲染结果
+* `#雷神面板`展示数据API及更新时间
 * Enka面板服务支持配置代理 **@永恒的小黑屋**
     * 如需配置可在**miao-plugin/config/profile.js**文件中配置
 * `#更新面板`支持配置更新API，适配Enka新校验逻辑
@@ -27,6 +27,8 @@
 * 修正部分V3Yunzai下的适配问题
 * 对MiaoApi新版profile服务增加适配
 * 部分角色的圣遗物评分增加充能的词条评分权重
+* 伤害计算增加丽莎、云堇、五郎、北斗、托马、早柚、砂糖、辛焱
+* 重构部分components、models逻辑，重构部分伤害计算逻辑
 
 # 1.9.0
 
diff --git a/components/profile-data/enka-data.js b/components/profile-data/enka-data.js
index 99f54a8d..992a8f81 100644
--- a/components/profile-data/enka-data.js
+++ b/components/profile-data/enka-data.js
@@ -25,6 +25,7 @@ const attrMap = {
   WIND_ADD_HURT: '风元素伤害加成',
   WATER_ADD_HURT: '水元素伤害加成',
   PHYSICAL_ADD_HURT: '物理伤害加成',
+  GRASS_ADD_HURT: '草元素伤害加成',
   HEAL_ADD: '治疗加成',
   ELEMENT_MASTERY: '元素精通',
   CRITICAL: '暴击率',
diff --git a/components/profile-data/miao-meta.js b/components/profile-data/miao-meta.js
index c79a0790..00d7dc7b 100644
--- a/components/profile-data/miao-meta.js
+++ b/components/profile-data/miao-meta.js
@@ -39,6 +39,7 @@ export const attrMap = {
   WIND_ADD_HURT: '风元素伤害加成',
   WATER_ADD_HURT: '水元素伤害加成',
   PHYSICAL_ADD_HURT: '物理伤害加成',
+  GRASS_ADD_HURT: '草元素伤害加成',
   HEAL_ADD: '治疗加成',
   ELEMENT_MASTERY: '元素精通',
   CRITICAL: '暴击率',
diff --git a/models/profile-lib/calc-meta.js b/models/profile-lib/calc-meta.js
index 6deb8476..abdd1a06 100644
--- a/models/profile-lib/calc-meta.js
+++ b/models/profile-lib/calc-meta.js
@@ -98,7 +98,8 @@ export const eleMap = {
   electro: '雷',
   geo: '岩',
   hydro: '水',
-  pyro: '火'
+  pyro: '火',
+  dendro: '草'
 }
 
 // 元素反应类型及基数
diff --git a/resources/meta/character/提纳里/calc.js b/resources/meta/character/提纳里/calc.js
new file mode 100644
index 00000000..ee0568d0
--- /dev/null
+++ b/resources/meta/character/提纳里/calc.js
@@ -0,0 +1,63 @@
+export const details = [{
+  title: '花筥箭伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.a['花筥箭伤害'], 'a2')
+}, {
+  title: '单支藏蕴花矢伤害',
+  dmg: ({ talent, cons }, dmg) => dmg(talent.a['藏蕴花矢伤害'], 'a2')
+}, {
+  title: '二段重击总伤害',
+  dmg: ({ talent, cons }, dmg) => {
+    let d1 = dmg(talent.a['花筥箭伤害'], 'a2')
+    let d2 = dmg(talent.a['藏蕴花矢伤害'], 'a2')
+    let count = cons * 1 === 6 ? 5 : 4
+    return {
+      dmg: d1.dmg + d2.dmg * count,
+      avg: d1.avg + d2.avg * count
+    }
+  }
+}, {
+  title: 'Q总伤害',
+  params: { q: true },
+  dmg: ({ talent, cons }, dmg) => {
+    return dmg(talent.q['缠藤箭伤害'] * 6 + talent.q['次级缠藤箭伤害'] * 6, 'q')
+  }
+}]
+
+// 10144 6794&10596
+export const mainAttr = 'atk,cpct,cdmg,mastery'
+
+export const buffs = [{
+  title: '提纳里被动：发射花筥箭后，元素精通提升50点',
+  data: {
+    mastery: 50,
+    qMastery: 0
+  }
+}, {
+  title: '提纳里被动：基于元素精通提升重击及Q伤害[a2Dmg]%',
+  sort: 5,
+  data: {
+    a2Dmg: ({ calc, attr }) => Math.min(80, calc(attr.mastery) * 0.08),
+    qDmg: ({ calc, attr }) => Math.min(80, calc(attr.mastery) * 0.08)
+  }
+}, {
+  title: '提纳里1命：重击暴击率提高15%',
+  cons: 1,
+  data: {
+    a2Cpct: 15
+  }
+}, {
+  title: '提纳里2命：E范围中存在敌人时，获得20%草伤加成',
+  cons: 2,
+  data: {
+    dmg: 20
+  }
+}, {
+  title: '提纳里4命：释放Q时提高元素精通60，触发反应进一步提升60',
+  cons: 4,
+  data: {
+    mastery: ({ params }) => params.q ? 120 : 0
+  }
+}, {
+  title: '提纳里6命：花筥箭在命中后能产生1枚额外的藏蕴花矢',
+  cons: 6
+}]
diff --git a/resources/meta/character/柯莱/calc.js b/resources/meta/character/柯莱/calc.js
new file mode 100644
index 00000000..ed16b08d
--- /dev/null
+++ b/resources/meta/character/柯莱/calc.js
@@ -0,0 +1,14 @@
+export const details = [{
+  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')
+}]
+
+export const mainAttr = 'atk,cpct,cdmg'
+
+export const buffs = []
diff --git a/resources/meta/reliquaries/artis-mark.js b/resources/meta/reliquaries/artis-mark.js
index c4770133..b0b106cb 100644
--- a/resources/meta/reliquaries/artis-mark.js
+++ b/resources/meta/reliquaries/artis-mark.js
@@ -70,12 +70,12 @@ export const usefulAttr = {
   宵宫: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 },
   九条裟罗: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
   琴: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 55, heal: 100 },
-  菲谢尔: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 60, recharge: 0, heal: 0 },
+  菲谢尔: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 60, recharge: 0, heal: 0 },
   罗莎莉亚: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 70, phy: 80, recharge: 30, heal: 0 },
   可莉: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },
   凝光: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 },
   北斗: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 },
-  刻晴: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 },
+  刻晴: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 100, recharge: 0, heal: 0 },
   托马: { hp: 100, atk: 50, def: 0, cp: 50, cd: 50, mastery: 0, dmg: 75, phy: 0, recharge: 90, heal: 0 },
   迪卢克: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 },
   芭芭拉: { hp: 100, atk: 50, def: 0, cp: 50, cd: 50, mastery: 0, dmg: 80, phy: 0, recharge: 55, heal: 100 },
@@ -95,5 +95,7 @@ export const usefulAttr = {
   雷泽: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 50, phy: 100, recharge: 0, heal: 0 },
   夜兰: { hp: 80, atk: 0, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
   久岐忍: { hp: 100, atk: 50, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 100 },
-  鹿野院平藏: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 }
+  鹿野院平藏: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },
+  提纳里: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 90, dmg: 100, phy: 0, recharge: 30, heal: 0 },
+  柯莱: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },
 }
diff --git a/resources/meta/weapons/calc.js b/resources/meta/weapons/calc.js
index a6a1944c..939898fd 100644
--- a/resources/meta/weapons/calc.js
+++ b/resources/meta/weapons/calc.js
@@ -437,8 +437,10 @@ let bow = {
     }
   },
   猎人之径: {
-    title: '重击造成的伤害值提高[a2Plus]',
+    title: '元素伤害提高[dmg]%，重击造成的伤害值提高[a2Plus]',
+    sort: 5,
     data: {
+      dmg: ({ refine }) => step(12)[refine],
       a2Plus: ({ attr, calc, refine }) => calc(attr.mastery) * step(160)[refine] / 100
     }
   },