Merge pull request #1301 from PZ157/PR-Branch

标签补充，ai优化

card/gujian.js

@@ -733,11 +733,6 @@ game.import("card", function () {
 					}
 					ui.arena.classList.remove("thrownhighlight");
 					game.addVideo("thrownhighlight2");
-					"step 4";
-					// if(cards&&cards.length){
-					//     player.gain(cards,'gain2');
-					//     target.addTempSkill('bingpotong');
-					// }
 				},
 				ai: {
 					basic: {
@@ -1619,7 +1614,6 @@ game.import("card", function () {
 					player.removeSkill("dinvxuanshuang_skill");
 				},
 			},
-			bingpotong: {},
 			heilonglinpian: {
 				mark: true,
 				marktext: "鳞",

character/huicui.js

@@ -1284,6 +1284,9 @@ game.import("character", function () {
 					await player.draw(2);
 					await player.loseHp();
 				},
+				ai: {
+					halfneg: true
+				},
 			},
 			dckuizhen: {
 				audio: 2,

character/jsrg.js

@@ -6102,6 +6102,7 @@ game.import("character", function () {
 					},
 				},
 				ai: {
+					halfneg: true,
 					effect: {
 						player_use: function (card, player, target) {
 							if (card.name == "jiu") return [1, 1];

character/key/skill.js

@@ -9921,6 +9921,9 @@ const skills = {
 			await trigger.player.changeGroup(player.group);
 			await trigger.player.draw();
 		},
+		ai: {
+			combo: "yuri_xingdong"
+		},
 	},
 	//枣恭介
 	nk_shekong: {

character/mobile.js

@@ -14622,6 +14622,7 @@ game.import("character", function () {
 					player.loseMaxHp();
 				},
 				ai: {
+					halfneg: true,
 					filterDamage: true,
 					skillTagFilter: function (player, tag, arg) {
 						if (arg && arg.card && arg.card.name == "sha") return true;
@@ -16503,6 +16504,9 @@ game.import("character", function () {
 					"step 1";
 					player.draw(event.num);
 				},
+				ai: {
+					halfneg: true
+				},
 			},
 			yixiang: {
 				audio: 2,

character/refresh.js

@@ -9528,6 +9528,9 @@ game.import("character", function () {
 					player.addSkills("jixi");
 					player.insertPhase();
 				},
+				ai: {
+					combo: "oltuntian"
+				},
 			},
 			rejunxing: {
 				enable: "phaseUse",
@@ -13190,6 +13193,9 @@ game.import("character", function () {
 						event.goto(1);
 					}
 				},
+				ai: {
+					combo: "rehuasheng"
+				},
 			},
 			reguhuo: {
 				audio: 2,

character/sb.js

@@ -1859,6 +1859,9 @@ game.import("character", function () {
 					player.markAuto("sbyijue", [trigger.player]);
 					player.markAuto("sbyijue_effect", [trigger.player]);
 				},
+				ai: {
+					halfneg: true
+				},
 				marktext: "绝",
 				intro: { content: "已放$一马" },
 				subSkill: {

character/shenhua.js

@@ -4444,6 +4444,9 @@ game.import("character", function () {
 					player.loseMaxHp();
 					player.addSkills("jixi");
 				},
+				ai: {
+					combo: "tuntian"
+				},
 			},
 			jixi: {
 				audio: 2,
@@ -5346,6 +5349,9 @@ game.import("character", function () {
 						event.goto(1);
 					}
 				},
+				ai: {
+					combo: "huashen"
+				},
 			},
 			huoshou: {
 				audio: "huoshou1",

character/sp.js

@@ -16472,6 +16472,9 @@ game.import("character", function () {
 					player.awakenSkill("xinmoucheng");
 					player.changeSkills(["xinjingong"], ["xinlianji"]);
 				},
+				ai: {
+					combo: "xinlianji"
+				},
 			},
 			xinjingong: {
 				audio: "jingong",
@@ -20272,6 +20275,9 @@ game.import("character", function () {
 					"step 3";
 					if (player.isMinHp()) player.recover();
 				},
+				ai: {
+					combo: "refanghun"
+				},
 			},
 			refanghun: {
 				mod: {
@@ -24225,7 +24231,7 @@ game.import("character", function () {
 				zhuSkill: true,
 				locked: true,
 				ai: {
-					combo: "canshi",
+					combo: "recanshi",
 				},
 			},
 			canshi: {

character/sp2.js

@@ -3209,6 +3209,7 @@ game.import("character", function () {
 					player.loseMaxHp();
 				},
 				ai: {
+					halfneg: true,
 					filterDamage: true,
 					skillTagFilter: function (player, tag, arg) {
 						if (arg && arg.card && arg.card.name == "sha") return true;
@@ -12181,6 +12182,9 @@ game.import("character", function () {
 					player.storage.bingzhao = group;
 					player.markSkill("bingzhao");
 				},
+				ai: {
+					combo: "guju"
+				},
 			},
 			baijia: {
 				audio: 2,

character/tw.js

@@ -6017,6 +6017,9 @@ game.import("character", function () {
 						},
 					},
 				},
+				ai: {
+					combo: "twxiongzheng"
+				},
 			},
 			//鲍信
 			twmutao: {
@@ -17394,6 +17397,9 @@ game.import("character", function () {
 						//for(var i of skills) target.addSkillLog(i);
 					}
 				},
+				ai: {
+					combo: "twyujue"
+				},
 			},
 			twsidai: {
 				audio: 2,

character/xianding.js

@@ -8455,6 +8455,9 @@ game.import("character", function () {
 					player.awakenSkill("dcmoucheng");
 					player.changeSkills(["xinjingong"], ["dclianji"]);
 				},
+				ai: {
+					combo: "dclianji"
+				},
 			},
 			//周宣
 			dcwumei: {
@@ -11501,7 +11504,11 @@ game.import("character", function () {
 				},
 				check: function (card) {
 					var player = _status.event.player;
-					if (!player.hasSkill("dcpingxi")) return 0;
+					if (!player.hasSkill("dcpingxi")) {
+						if (ui.selected.cards.length) return 0;
+						if (player.needsToDiscard()) return 12 - get.value(card);
+						return 2 * player.hp + 1.5 - get.value(card);
+					}
 					var num = lib.skill.dcpingxi.getNum() + ui.selected.cards.length;
 					if (
 						num <