From b602539b2f4517669e02bfd7bfc4a68718152773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Fri, 9 Apr 2021 19:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E9=98=9F=E9=95=BF?=
 =?UTF-8?q?=E6=8A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 languages/zh-CN.js           | 18 ++++++++++--------
 script-universal_function.js |  3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/languages/zh-CN.js b/languages/zh-CN.js
index 8c5e3d64..3ce7b681 100644
--- a/languages/zh-CN.js
+++ b/languages/zh-CN.js
@@ -1232,7 +1232,7 @@ function parseSkillDescription(skill) {
 			str = `${sk[0]}回合内，${sk[1]}%概率掉落强化宝珠`;
 			break;
 		case 182:
-			str = `相连消除${sk[1]}个或以上的${getOrbsAttrString(sk[0])}宝珠时`;
+			str = `相连消除${sk[1]}个或以上的${getOrbsAttrString(sk[0], true)}宝珠时`;
 			if (sk[2] && sk[2] !== 100) str += `，所有宠物的${getFixedHpAtkRcvString({atk:sk[2]})}`;
 			if (sk[3]) str += `，受到的伤害减少${sk[3]}%`;
 			break;
@@ -1268,17 +1268,14 @@ function parseSkillDescription(skill) {
 		case 191:
 			str = `${sk[0]}回合内，可以贯穿伤害无效盾`;
 			break;
-		case 192:
+		case 192: //192同时消除多色中所有色,219任意消除多色中1色
 			//相連消除9個或以上的火寶珠時攻擊力4倍、結算增加2COMBO
 			//同時消除光寶珠和水寶珠各4個或以上時攻擊力3倍、結算增加1COMBO；
-			fullColor = nb(sk[0], attrsName);
-			str = fullColor.length>1?"同时":"相连";
-			str += `消除${sk[1]}个或以上的${getOrbsAttrString(sk[0])}宝珠时`;
+			str = `${flags(sk[0]).length>1?"同时且":""}相连消除${sk[1]}个或以上的${getOrbsAttrString(sk[0])}宝珠时`;
 			if (sk[2] && sk[2] != 100) str += `，所有宠物的攻击力×${sk[2]/100}倍`;
 			if (sk[3]) str += `，结算时连击数+${sk[3]}`;
 			break;
 		case 193:
-			fullColor = nb(sk[0], attrsName);
 			str = `以L字形消除5个${getOrbsAttrString(sk[0])}宝珠时`;
 			if (sk[1] && sk[1] != 100 || sk[2] && sk[2] != 100) str+=`，所有宠物的${getFixedHpAtkRcvString({atk:sk[1],rcv:sk[2]})}`;
 			if (sk[3]) str+=`，受到的伤害减少${sk[3]}%`;
@@ -1437,6 +1434,9 @@ function parseSkillDescription(skill) {
 		case 218: //坐自己
 			str = `自身以外的宠物技能坐下↓${sk[0]}${sk[0]!=sk[1]?`~${sk[1]}`:""}回合`;
 			break;
+		case 219: //192同时消除多色中所有色,219任意消除多色中1色
+			str = `相连消除${sk[1]}个或以上的${getOrbsAttrString(sk[0], true)}宝珠时，结算时连击数+${sk[2]}`;
+			break;
 		default:
 			str = `未知的技能类型${type}(No.${id})`;
 			//开发部分
@@ -1702,7 +1702,7 @@ function parseSkillDescription(skill) {
 				return document.createTextNode(value.bigNumberToString() + "固伤");
 			}},
 			{name:"队长技+C（按+C数排序）",function:cards=>{
-				const searchTypeArray = [192,194,206,209,210];
+				const searchTypeArray = [192,194,206,209,210,219];
 				function getSkillAddCombo(skill)
 				{
 					switch (skill.type)
@@ -1714,6 +1714,7 @@ function parseSkillDescription(skill) {
 						case 209:
 							return skill.params[0];
 						case 210:
+						case 219:
 							return skill.params[2];
 						default:
 							return 0;
@@ -1728,7 +1729,7 @@ function parseSkillDescription(skill) {
 					return a_pC - b_pC;
 				});
 			},addition:card=>{
-				const searchTypeArray = [192,194,206,209,210];
+				const searchTypeArray = [192,194,206,209,210,219];
 				function getSkillAddCombo(skill)
 				{
 					switch (skill.type)
@@ -1740,6 +1741,7 @@ function parseSkillDescription(skill) {
 						case 209:
 							return skill.params[0];
 						case 210:
+						case 219:
 							return skill.params[2];
 						default:
 							return 0;
diff --git a/script-universal_function.js b/script-universal_function.js
index 8026e9f3..2fbb0fab 100644
--- a/script-universal_function.js
+++ b/script-universal_function.js
@@ -755,7 +755,7 @@ function tIf_Effect_poisonNoEffect(leader1id, leader2id) {
 }
 //计算队伍的+C
 function tIf_Effect_addCombo(leader1id, leader2id) {
-	const searchTypeArray = [192, 194, 206, 209, 210];
+	const searchTypeArray = [192, 194, 206, 209, 210, 219];
 	const ls1 = getCardLeaderSkills(Cards[leader1id], searchTypeArray)[0];
 	const ls2 = getCardLeaderSkills(Cards[leader2id], searchTypeArray)[0];
 
@@ -770,6 +770,7 @@ function tIf_Effect_addCombo(leader1id, leader2id) {
 			case 209:
 				return skill.params[0];
 			case 210:
+			case 219:
 				return skill.params[2];
 			default:
 				return 0;