Merge remote-tracking branch 'upstream/PR-Branch' into PR-branch

character/extra/skill.js

@@ -3757,6 +3757,9 @@ const skills = {
 				},
 			},
 		},
+		ai: {
+			combo: "yuheng"
+		},
 	},
 	yuheng: {
 		audio: 2,

character/offline/skill.js

@@ -5592,7 +5592,7 @@ const skills = {
 			if (event.lose && event.lose.loseHp) player.draw();
 		},
 		ai: {
-			halfneg: true,
+			neg: true,
 			filterDamage: true,
 			skillTagFilter: function (player, tag, arg) {
 				if (tag === "filterDamage" && arg && arg.player) {

character/sp/skill.js

@@ -24761,6 +24761,9 @@ const skills = {
 			return event.targets.includes(player) && player != event.player && event.card.name == "sha" && player.hp < player.countCards("h");
 		},
 		content: function () {},
+		ai: {
+			neg: true
+		},
 		unique: true,
 		gainable: true,
 		subSkill: {

character/standard/skill.js

@@ -3126,7 +3126,7 @@ const skills = {
 			trigger.source.chooseDrawRecover(true);
 		},
 		ai: {
-			halfneg: true,
+			neg: true,
 			effect: {
 				target(card, player, target, current) {
 					if (card.name == "sha" && get.color(card) == "red") {

character/yijiang/skill.js

@@ -8776,7 +8776,7 @@ const skills = {
 				if (player.hp != 1) return false;
 			},
 			respondSha: true,
-			halfneg: true,
+			neg: true,
 		},
 		audio: 2,
 		audioname: ["xin_zhangyi"],