From 4b46032854640b1e1e7da0ace66b838345537940 Mon Sep 17 00:00:00 2001
From: CUZNIL <76582404+CUZNIL@users.noreply.github.com>
Date: Tue, 14 Mar 2023 21:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=AF=E8=8E=89=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99=20(#517)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/meta/character/可莉/artis.js     |  2 +-
 resources/meta/character/可莉/calc.js      |  2 +-
 resources/meta/character/可莉/calc_auto.js | 19 +++++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/resources/meta/character/可莉/artis.js b/resources/meta/character/可莉/artis.js
index 0cb3c4f5..94c41ed9 100644
--- a/resources/meta/character/可莉/artis.js
+++ b/resources/meta/character/可莉/artis.js
@@ -1,5 +1,5 @@
 export default function ({ attr, weapon, rule, def }) {
-  if (attr.mastery < 50 && attr.cpct * 2 + attr.cdmg > 320) {
+  if ( attr.mastery * 2 < attr.atk ) {
     return rule('可莉-纯火', { atk: 85, cpct: 100, cdmg: 100, dmg: 100, recharge: 55 })
   }
   return def({ atk: 75, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, recharge: 30 })
diff --git a/resources/meta/character/可莉/calc.js b/resources/meta/character/可莉/calc.js
index 325ef3f5..318d66a6 100644
--- a/resources/meta/character/可莉/calc.js
+++ b/resources/meta/character/可莉/calc.js
@@ -11,7 +11,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.q['轰轰火花伤害'], 'q')
 }]
 
-export const defDmgIdx = 1
+export const defDmgIdx = 5
 export const mainAttr = 'atk,cpct,cdmg,mastery'
 
 export const buffs = [{
diff --git a/resources/meta/character/可莉/calc_auto.js b/resources/meta/character/可莉/calc_auto.js
index 133ab8a3..614ccef0 100644
--- a/resources/meta/character/可莉/calc_auto.js
+++ b/resources/meta/character/可莉/calc_auto.js
@@ -18,10 +18,25 @@ export const details = [{
     title: '可莉三火轰轰火花伤害',
     params: { team: true },
     dmg: ({ talent }, dmg) => dmg(talent.q['轰轰火花伤害'], 'q')
+  },{
+    title: '可莉三火可莉一轮总伤',
+    params: { q: 1, team: true },
+    dmg: ({ talent }, dmg) => {
+      let ta = dmg(talent.a['一段伤害'] , 'a')
+      let tz = dmg(talent.a['重击伤害'] , 'a')
+      let tz2 = dmg(talent.a['重击伤害'] , 'a2')
+      let tejump = dmg(talent.e['技能伤害'] , 'e')
+      let tebomb = dmg(talent.e['技能伤害'] , 'e')
+      let tq = dmg(talent.q['轰轰火花伤害'] , 'q')
+      return {
+        dmg:  ta.dmg * 8 +  tz.dmg * 4 +  tz2.dmg * 2 +  tejump.dmg * 3 +  tebomb.dmg * 8 +  tq.dmg * 16,
+        avg:  ta.avg * 8 +  tz.avg * 4 +  tz2.avg * 2 +  tejump.avg * 3 +  tebomb.avg * 8 +  tq.avg * 16
+      }
+    }
   }
   ]
   
-  export const defDmgIdx = 1
+  export const defDmgIdx = 5
   export const mainAttr = 'atk,cpct,cdmg,mastery'
   
   export const defParams = {
@@ -99,4 +114,4 @@ export const details = [{
       mastery: 200
     }
   }, 'vaporize']
-  
\ No newline at end of file
+