Merge pull request #1323 from PZ157/PR-Branch

bugfix，ai优化

character/diy/skill.js

@@ -5178,7 +5178,7 @@ const skills = {
 		trigger: { player: "dieBefore" },
 		forced: true,
 		filter(event, player) {
-			return player.maxHp > 0;
+			return player.maxHp > 0 && event.getParent().name != "giveup";
 		},
 		content() {
 			trigger.cancel();

character/extra/skill.js

@@ -6323,6 +6323,7 @@ const skills = {
 			combo: "sbaiyin",
 			effect: {
 				target(card, player, target) {
+					if (!target.hasSkill("sbaiyin") && !target.hasSkill("jilue") || !target.hasFriend()) return;
 					if (player.hasSkillTag("jueqing", false, target)) return [1, -2];
 					if (get.tag(card, "damage")) {
 						if (target.hp == target.maxHp) {

character/huicui/skill.js

@@ -12437,7 +12437,7 @@ const skills = {
 			var target = event.player;
 			var att = get.attitude(player, target);
 			var num2 = Math.min(5, target.hp) - target.countCards("h");
-			if (num2 <= 0) return att <= 0;
+			if (num2 <= 0) return false;
 			var num = target.countCards("h", function (card) {
 				return target.hasValueTarget(card, null, true);
 			});

character/mobile/skill.js

@@ -7170,10 +7170,11 @@ const skills = {
 		},
 		check: function (event, player) {
 			return (
-				get.damageEffect(event.player, player, player) < 0 ||
-				(!event.player.hasSkillTag("noe") &&
+				get.damageEffect(event.player, player, player) <= 0 ||
+				(get.attitude(player, event.player) <= 0 &&
+					!event.player.hasSkillTag("noe") &&
 					event.player.hasCard(function (card) {
-						return get.value(card) > 6;
+						return get.value(card) > 9 - event.player.hp;
 					}, "e"))
 			);
 		},

character/sp/skill.js

@@ -2828,7 +2828,7 @@ const skills = {
 		},
 		checkx: function (event, player) {
 			var target = event.source;
-			return get.damageEffect(player, target, target) <= 0;
+			return get.damageEffect(player, target, player) <= 0;
 		},
 		forced: true,
 		content: function () {
@@ -22183,6 +22183,7 @@ const skills = {
 			player.awakenSkill("zhiri");
 			player.loseMaxHp();
 			player.storage.zhiri = true;
+			player.addSkills("xintan");
 		},
 		ai: {
 			combo: "fentian",

character/tw/skill.js

@@ -14737,12 +14737,12 @@ const skills = {
 			order: 2.9,
 			result: {
 				target: function (player, target) {
+					if (get.attitude(player, target) >= 0) return -20;
 					var cards = ui.selected.cards.slice(0);
 					var names = [];
 					for (var i of cards) names.add(i.name);
 					if (names.length < player.hp) return 0;
 					if (player.hasUnknown() && (player.identity != "fan" || !target.isZhu)) return 0;
-					if (get.attitude(player, target) >= 0) return -20;
 					return lib.card.sha.ai.result.target.apply(this, arguments);
 				},
 			},

character/yijiang/skill.js

@@ -11661,7 +11661,7 @@ const skills = {
 			threaten: 0.8,
 			effect: {
 				target: function (card, player, target) {
-					if (get.tag(card, "damage")) {
+					if (get.tag(card, "damage") && (player.hasSkill("paiyi") || player.hasSkill("zili"))) {
 						if (player.hasSkillTag("jueqing", false, target)) return [1, -2];
 						if (!target.hasFriend()) return;
 						if (target.hp >= 4) return [0.5, get.tag(card, "damage") * 2];