Merge pull request #1235 from PZ157/PR-Branch

标签补充，部分技能描述修复

character/ddd.js

@@ -3361,6 +3361,9 @@ game.import("character", function () {
 				content() {
 					player.draw(3);
 				},
+				ai: {
+					combo: "dddfusi"
+				},
 			},
 			dddchashi: {
 				trigger: { global: "phaseUseBegin" },
@@ -5113,6 +5116,9 @@ game.import("character", function () {
 						},
 					},
 				},
+				ai: {
+					combo: "dddyouxue"
+				},
 			},
 			dddyouxue_old: {
 				audio: 2,
@@ -6624,7 +6630,7 @@ game.import("character", function () {
 					"锁定技。出牌阶段开始时，你选择一名角色，其弃置两张牌，然后你对一名角色造成1点伤害。" +
 					(player.storage["dddxiaheng_del"]
 						? ""
-						: "。“若两名角色：均不为你，你失去一点体力上限；为同一名角色，你失去一点体力；然后若以此法对包括你在内三名不同的角色造成伤害，删除双引号里的描述内容”")
+						: "“若两名角色：均不为你，你失去一点体力上限；为同一名角色，你失去一点体力；然后若以此法对包括你在内三名不同的角色造成伤害，删除双引号里的描述内容”")
 				);
 			},
 			dddshichao(player) {
@@ -6638,9 +6644,8 @@ game.import("character", function () {
 				return (
 					"转换技，摸牌阶段，你" +
 					(player.hasMark("dddxuanlun_del") ? "" : "可") +
-					"展示手牌（无牌则不展示），并改为摸其中" +
-					(!player.storage["dddlanghuai"] ? "包含" : "缺少") +
-					"花色数的牌。"
+					"展示手牌（无牌则不展示），并改为摸其中：" +
+					(player.storage["dddlanghuai"] ? '阴：包含花色数的牌；<span class="bluetext">阳：缺少花色数的牌。</span>' : '<span class="bluetext">阴：包含花色数的牌；</span>阳：缺少花色数的牌。')
 				);
 			},
 			dddxuanlun(player) {

character/huicui.js

@@ -8005,6 +8005,9 @@ game.import("character", function () {
 							return false;
 					},
 				},
+				ai: {
+					neg: true
+				},
 			},
 			//公孙度
 			dczhenze: {
@@ -10831,7 +10834,10 @@ game.import("character", function () {
 						player.addTempSkill("zhishi_mark", { player: "phaseBegin" });
 					}
 				},
-				ai: { expose: 0.3 },
+				ai: {
+					combo: "xunli",
+					expose: 0.3
+				},
 				subSkill: {
 					mark: {
 						trigger: {
@@ -12096,6 +12102,9 @@ game.import("character", function () {
 						}
 					}
 				},
+				ai: {
+					combo: "huguan"
+				},
 			},
 			mingluan: {
 				audio: 2,
@@ -15060,6 +15069,10 @@ game.import("character", function () {
 				content: function () {
 					player.removeMark("recangchu", Math.min(player.countMark("recangchu"), trigger.num || 1));
 				},
+				ai: {
+					combo: "recangchu",
+					neg: true
+				},
 				group: "reshishou2",
 			},
 			reshishou2: {
@@ -15493,7 +15506,7 @@ game.import("character", function () {
 				var list = ["sha", "shan", "tao", "jiu"];
 				for (var i of list) {
 					var strx = "【" + get.translation(i) + "】";
-					if (!info || !info[0].includes(i))
+					if (info && !info[0].includes(i))
 						strx = '<span style="text-decoration:line-through;">' + strx + "</span>";
 					str += strx;
 					if (i != "jiu") str += "/";

character/jsrg.js

@@ -8741,6 +8741,9 @@ game.import("character", function () {
 							.set("cards", trigger.cards);
 					}
 				},
+				ai: {
+					combo: "jsrglirang"
+				},
 			},
 			//朱儁
 			jsrgfendi: {

character/offline.js

@@ -4049,6 +4049,7 @@ game.import("character", function () {
 					result: {
 						player: 1,
 					},
+					combo: "zyquanji"
 				},
 			},
 			//孙綝
@@ -6954,6 +6955,9 @@ game.import("character", function () {
 					player.loseToDiscardpile(cards);
 					if (num <= 1) player.draw();
 				},
+				ai: {
+					combo: "spyicong"
+				},
 			},
 			sptuji2: {
 				onremove: true,

character/old.js

@@ -1169,7 +1169,13 @@ game.import("character", function () {
 				content: function () {
 					player.addToExpansion(cards, player, "give").gaintag.add("old_jijun");
 				},
-				ai: { order: 1, result: { player: 1 } },
+				ai: {
+					order: 1,
+					result: {
+						player: 1
+					},
+					combo: "old_fangtong"
+				},
 			},
 			old_fangtong: {
 				trigger: {
@@ -1186,6 +1192,9 @@ game.import("character", function () {
 					var winners = player.getFriends();
 					game.over(player == game.me || winners.includes(game.me));
 				},
+				ai:{
+					combo: "oldjijun"
+				},
 			},
 			oldanxu: {
 				enable: "phaseUse",

character/sp.js

@@ -32648,6 +32648,9 @@ game.import("character", function () {
 						player.gain(event.togain, "gain2");
 					}
 				},
+				ai: {
+					combo: "xinfu_falu"
+				},
 			},
 			zhenyi_spade: {
 				trigger: {