From 79964ac9387e40c87d4aadf6896aa27cf8c22e09 Mon Sep 17 00:00:00 2001
From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com>
Date: Fri, 16 Sep 2022 21:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9C=A3=E9=81=97=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E6=B4=BE=E5=88=A4=E5=AE=9A=E5=BE=AE=E8=B0=83=20(#189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/ProfileArtis.js                   | 1 +
 models/profile-lib/CharArtis.js          | 5 +++--
 resources/meta/character/宵宫/artis.js | 2 +-
 resources/meta/character/钟离/artis.js | 9 +++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/models/ProfileArtis.js b/models/ProfileArtis.js
index cfcb78a0..214452ab 100644
--- a/models/ProfileArtis.js
+++ b/models/ProfileArtis.js
@@ -180,6 +180,7 @@ export default class ProfileArtis extends Base {
       attrs[key] = ret
     })
     let maxMark = ArtisMark.getMaxMark(attrs)
+    // 返回内容待梳理简化
     return {
       attrs,
       classTitle: title,
diff --git a/models/profile-lib/CharArtis.js b/models/profile-lib/CharArtis.js
index de4ff5d5..ab74c88d 100644
--- a/models/profile-lib/CharArtis.js
+++ b/models/profile-lib/CharArtis.js
@@ -82,8 +82,9 @@ const CharArtis = {
         title.push('纺锤')
       }
 
-      // 圣遗物判定
-      if (artis.is('绝缘4') && check('recharge', 75, 45, false)) {
+      // 圣遗物判定，如果是绝缘4，将充能权重拉高至沙漏圣遗物当前最高权重齐平
+      let maxWeight = Math.max(weight.atk || 0, weight.hp || 0, weight.def || 0, weight.mastery || 0)
+      if (artis.is('绝缘4') && check('recharge', maxWeight, 75, false)) {
         title.push('绝缘4')
       }
 
diff --git a/resources/meta/character/宵宫/artis.js b/resources/meta/character/宵宫/artis.js
index fee2c0ed..1ec1ef0f 100644
--- a/resources/meta/character/宵宫/artis.js
+++ b/resources/meta/character/宵宫/artis.js
@@ -1,6 +1,6 @@
 export default function ({ attr, artis, rule, def }) {
   // 宵宫纯色流派
-  if (attr.mastery < 50 && attr.cp * 2 + attr.cd > 320) {
+  if (attr.mastery < 50 && attr.cpct * 2 + attr.cdmg > 320) {
     return rule('宵宫-纯火', { atk: 85, cp: 100, cd: 100, dmg: 100 })
   }
   if (attr.mastery > 200 && artis.is('mastery', 3)) {
diff --git a/resources/meta/character/钟离/artis.js b/resources/meta/character/钟离/artis.js
index fba1c929..f1d95382 100644
--- a/resources/meta/character/钟离/artis.js
+++ b/resources/meta/character/钟离/artis.js
@@ -1,10 +1,7 @@
 export default function ({ attr, artis, rule, def }) {
-  if (artis.is('hp', '4,5')) {
-    if (artis.is('绝缘4') && artis.is('hp,recharge', 3)) {
-      return rule('绝缘血牛钟离', { hp: 100, atk: 50, cp: 50, cd: 50, recharge: 100 })
-    } else if (artis.is('hp', 3)) {
-      return rule('血牛钟离', { hp: 100, atk: 50, cp: 50, cd: 50, recharge: 50 })
-    }
+  if (artis.is('hp', '3,4,5') && attr.hp > 40000 && attr.cpct * 2 + attr.cdmg < 100) {
+    // 血牛钟离，其余词缀权重不高于27.89，确保小生命命中副词缀最高权重
+    return rule('钟离-血牛', { hp: 100, atk: 27, cp: 27, cd: 27, recharge: 27 })
   }
   return def({ hp: 80, atk: 75, cp: 100, cd: 100, dmg: 100, phy: 50, recharge: 55 })
 }