From 8ccda3e7b61dddf9fa9f9025d292bdf6204a47a5 Mon Sep 17 00:00:00 2001
From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com>
Date: Sat, 17 Dec 2022 04:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=90=E9=9C=B2=E7=8F=8A?=
 =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=EF=BC=8C=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 |  2 ++
 resources/meta/character/流浪者/calc.js   |  8 ++---
 resources/meta/character/珐露珊/calc.js   | 32 ++++++++++++++++++++
 resources/meta/character/珐露珊/data.json |  2 +-
 resources/meta/weapon/meta.js                |  2 +-
 5 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 resources/meta/character/珐露珊/calc.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88444383..1b27fa75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # 2.1.6
 
 * 增加瑶瑶、艾尔海森的信息，可通过`#瑶瑶天赋`、`#瑶瑶图鉴`等查看
+* 增加艾尔海森 **@panganqi**、珐露珊的伤害计算
+* 一些已知问题修复
 
 # 2.1.1~2.1.5
 
diff --git a/resources/meta/character/流浪者/calc.js b/resources/meta/character/流浪者/calc.js
index 4dd6d8d4..f7753577 100644
--- a/resources/meta/character/流浪者/calc.js
+++ b/resources/meta/character/流浪者/calc.js
@@ -7,11 +7,7 @@ export const details = [{
   params: { pyro: false, cryo: false },
   dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2')
 }, {
-  title: '开E满染火首段普攻',
-  params: { pyro: true, cryo: false },
-  dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a')
-}, {
-  title: '开E满染火染冰首段普攻',
+  title: '开E满染火冰首段普攻',
   params: { pyro: true, cryo: true },
   dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a')
 }, {
@@ -20,7 +16,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }]
 
-export const defDmgIdx = 3
+export const defDmgIdx = 2
 export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{
diff --git a/resources/meta/character/珐露珊/calc.js b/resources/meta/character/珐露珊/calc.js
new file mode 100644
index 00000000..ba1193ae
--- /dev/null
+++ b/resources/meta/character/珐露珊/calc.js
@@ -0,0 +1,32 @@
+export const details = [{
+  title: '开Q提供风系伤害',
+  dmg: ({ attr }) => {
+    return {
+      avg: (attr.atk.base || 0) * 0.32
+    }
+  }
+}, {
+  title: 'E减抗后Q伤害',
+  dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
+}]
+
+export const defDmgIdx = 1
+export const mainAttr = 'atk,cpct,cdmg'
+
+export const buffs = [{
+  title: '珐露珊6命：Q提升暴击伤害40%',
+  cons: 6,
+  data: {
+    cdmg: 40
+  }
+}, {
+  title: '诡风之祸：降低敌人风抗[kx]%',
+  data: {
+    kx: ({ talent }) => talent.q['风元素抗性降低']
+  }
+}, {
+  title: '祈风之赐：获得风伤加成[dmg]%',
+  data: {
+    dmg: ({ talent }) => talent.q['风元素伤害加成']
+  }
+}]
diff --git a/resources/meta/character/珐露珊/data.json b/resources/meta/character/珐露珊/data.json
index 9d1ce40a..b9bd4a69 100644
--- a/resources/meta/character/珐露珊/data.json
+++ b/resources/meta/character/珐露珊/data.json
@@ -26,7 +26,7 @@
   "talentKey": {
     "7631": "a",
     "7632": "e",
-    "7633": "q"
+    "7639": "q"
   },
   "talentId": {
     "10761": 7631,
diff --git a/resources/meta/weapon/meta.js b/resources/meta/weapon/meta.js
index c3995bf2..475b3d75 100644
--- a/resources/meta/weapon/meta.js
+++ b/resources/meta/weapon/meta.js
@@ -69,7 +69,7 @@ export const alias = {
   笼钓瓶一心: '妖刀,红刀,笼钓瓶,一心传名刀,一心传',
   东花坊时雨: '雨伞,伞剑',
   黑剑: '月卡剑',
-  裁叶萃光: '海哥专武',
+  裁叶萃光: '草剑,裁叶,萃光,海哥专武',
 
   // 大剑
   天空之傲: '天空大剑',