Merge pull request #1216 from PZ157/PR-Branch

增补/修复部分技能标签

character/diy.js

@@ -4765,6 +4765,9 @@ game.import("character", function () {
 					if (player.isHealthy()) player.draw(2);
 					player.addSkills("tenzen_tianquan");
 				},
+				ai: {
+					combo: "tenzen_yixing"
+				},
 			},
 			tenzen_tianquan: {
 				trigger: { player: "useCardToPlayered" },
@@ -7007,6 +7010,7 @@ game.import("character", function () {
 					tag: {
 						rejudge: 0.6,
 					},
+					combo: "shiroha_yuzhao"
 				},
 				derivation: ["umi_chaofan", "ao_xishi", "tsumugi_mugyu", "kamome_jieban"],
 			},
@@ -10050,6 +10054,9 @@ game.import("character", function () {
 					player.gainMaxHp();
 					player.recover();
 				},
+				ai: {
+					combo: "ao_kuihun"
+				},
 			},
 			ao_diegui: {
 				enable: "phaseUse",
@@ -10741,6 +10748,9 @@ game.import("character", function () {
 					player.recover();
 					player.addSkills("riki_chongzhen");
 				},
+				ai: {
+					combo: "riki_spwenji"
+				},
 			},
 			riki_chongzhen: {
 				trigger: {
@@ -14163,6 +14173,9 @@ game.import("character", function () {
 					player.addSkill("nsliegong");
 				},
 				derivation: "nsliegong",
+				ai: {
+					combo: "nsdiewu"
+				},
 			},
 			nsliegong: {
 				inherit: "xinliegong",
@@ -14692,6 +14705,9 @@ game.import("character", function () {
 					player.gainMaxHp(2);
 				},
 				derivation: ["nsdiemou", "nszhihuang"],
+				ai: {
+					combo: "nsjiquan"
+				},
 			},
 			nsdiemou: {
 				trigger: { player: "phaseUseBegin" },
@@ -14706,6 +14722,9 @@ game.import("character", function () {
 					player.loseToDiscardpile(cards);
 					if (cards.length > 4) player.turnOver();
 				},
+				ai: {
+					combo: "nsjiquan"
+				},
 			},
 			nszhihuang: {
 				group: "nszhihuang_damage",
@@ -14741,6 +14760,9 @@ game.import("character", function () {
 					player.loseToDiscardpile(result.links);
 					player.gain(trigger.cards.filterInD(), "gain2", "log");
 				},
+				ai: {
+					combo: "nsjiquan"
+				},
 			},
 			nszhihuang_damage: {
 				trigger: { source: "damageBegin1" },
@@ -18580,6 +18602,9 @@ game.import("character", function () {
 						event.goto(1);
 					}
 				},
+				ai: {
+					combo: "nshuanxian"
+				},
 			},
 			nsshoudao: {
 				group: ["nsshoudao_gain", "nsshoudao_die"],
@@ -18660,6 +18685,9 @@ game.import("character", function () {
 						},
 					},
 				},
+				ai: {
+					combo: "nshuanxian"
+				},
 			},
 			nshuanxian: {
 				trigger: { global: "gameStart", player: "enterGame" },

character/extra.js

@@ -4865,7 +4865,6 @@ game.import("character", function () {
 					},
 				},
 				ai: {
-					combo: "yingba",
 					effect: {
 						target(card, player, target) {
 							if (

character/huicui.js

@@ -446,6 +446,9 @@ game.import("character", function () {
 					await player.changeSkills(["dcfudou"], ["dcjianzhuan"]);
 				},
 				derivation: "dcfudou",
+				ai: {
+					combo: "dcjianzhuan"
+				},
 			},
 			dcfudou: {
 				audio: 2,
@@ -899,9 +902,6 @@ game.import("character", function () {
 				ai: {
 					combo: "dcjichou",
 				},
-				ai:{
-					combo:'dcjichou'
-				}
 			},
 			dczifu: {
 				audio: 2,

character/jsrg.js

@@ -9476,6 +9476,9 @@ game.import("character", function () {
 					"step 1";
 					player.addSkills(["jsrgpingrong", "feiying"]);
 				},
+				ai: {
+					combo: "jsrgzhenglve"
+				},
 			},
 			jsrgpingrong: {
 				audio: 2,

character/mobile.js

@@ -13198,6 +13198,9 @@ game.import("character", function () {
 						event.chara[event.skills.indexOf(result.control)],
 					]);
 				},
+				ai: {
+					combo: "baiyi"
+				},
 			},
 			hongyi: {
 				audio: 2,
@@ -15255,6 +15258,9 @@ game.import("character", function () {
 					player.addSkills("reqingce");
 					player.loseMaxHp();
 				},
+				ai: {
+					combo: "rezhengrong"
+				},
 			},
 			reqingce: {
 				enable: "phaseUse",
@@ -17044,6 +17050,9 @@ game.import("character", function () {
 					player.gainMaxHp();
 					player.recover();
 				},
+				ai: {
+					combo: "relianji"
+				},
 			},
 			shouye: {
 				audio: 2,

character/offline.js

@@ -6233,9 +6233,10 @@ game.import("character", function () {
 					if (event.lose && event.lose.loseHp) player.draw();
 				},
 				ai: {
+					halfneg: true,
 					filterDamage: true,
 					skillTagFilter: function (player, tag, arg) {
-						if (arg && arg.player) {
+						if (tag === "filterDamage" && arg && arg.player) {
 							if (arg.player.hasSkillTag("jueqing", false, player)) return false;
 						}
 					},

character/sb.js

@@ -4772,6 +4772,9 @@ game.import("character", function () {
 						},
 					},
 				},
+				ai: {
+					combo: "sbtiaoxin"
+				},
 			},
 			//刘备
 			sbrende: {

character/shenhua.js

@@ -881,6 +881,9 @@ game.import("character", function () {
 					game.log(player, "获得了技能", "#g【清侧】");
 					player.loseMaxHp();
 				},
+				ai: {
+					combo: "zhengrong"
+				},
 			},
 			qingce: {
 				enable: "phaseUse",
@@ -1054,6 +1057,9 @@ game.import("character", function () {
 					player.addSkills("drlt_qingce");
 					player.loseMaxHp();
 				},
+				ai: {
+					combo: "drlt_zhengrong"
+				},
 			},
 			drlt_qingce: {
 				audio: 2,

character/sp.js

@@ -6910,6 +6910,9 @@ game.import("character", function () {
 					var stat = player.getStat().skill;
 					delete stat.gushe;
 				},
+				ai: {
+					combo: "gushe"
+				},
 			},
 			//OL刘老板
 			olpianan: {
@@ -21827,6 +21830,9 @@ game.import("character", function () {
 						},
 					},
 				},
+				ai: {
+					combo: "wylianji"
+				},
 			},
 			jingong: {
 				audio: 2,
@@ -27090,6 +27096,7 @@ game.import("character", function () {
 					content: "mark",
 				},
 				ai: {
+					neg: true,
 					effect: {
 						target: function (card, player, target, current) {
 							if (card.name == "sha") {
@@ -28757,6 +28764,9 @@ game.import("character", function () {
 					player.recover();
 					player.changeSkills(["xiaoji"], ["liangzhu"]);
 				},
+				ai: {
+					combo: "liangzhu"
+				},
 			},
 			mingshi: {
 				audio: 2,

character/tw.js

@@ -9500,6 +9500,9 @@ game.import("character", function () {
 						game.delayx();
 					}
 				},
+				ai: {
+					combo: "twzhengrong"
+				},
 			},
 			twqingce: {
 				enable: "phaseUse",

character/xianding.js

@@ -14688,6 +14688,9 @@ game.import("character", function () {
 						if (event.goon) player.recover();
 					}
 				},
+				ai: {
+					combo: "yuqi"
+				},
 			},
 			xianjing: {
 				audio: 2,
@@ -14776,6 +14779,9 @@ game.import("character", function () {
 						player.markSkill("yuqi");
 					}
 				},
+				ai: {
+					combo: "yuqi"
+				},
 			},
 			//周夷
 			zhukou: {
@@ -17263,6 +17269,9 @@ game.import("character", function () {
 						target.addSkills("hmxili");
 					}
 				},
+				ai: {
+					combo: "mansi"
+				},
 			},
 			hmxili: {
 				trigger: { global: "damageBegin1" },

character/yijiang.js

@@ -2629,6 +2629,9 @@ game.import("character", function () {
 				content: function () {
 					player.loseMaxHp();
 				},
+				ai: {
+					neg: true
+				},
 			},
 			xindanshou: {
 				audio: 2,