Merge branch 'PR-Branch' of https://github.com/Xiazhiliao/noname into player

Author: Xiazhiliao

audio/die/matie.mp3

@@ -666,16 +666,8 @@ game.import("card", function () {
 						.forResult();
 				},
 				async content(event, trigger, player) {
-					const { ResultEvent, logSkill } = event.cost_data;
-					event.next.push(ResultEvent);
-					/*if (logSkill) {
-						if (typeof logSkill == "string") {
-							ResultEvent.player.logSkill(logSkill);
-						} else if (Array.isArray(logSkill)) {
-							ResultEvent.player.logSkill.call(ResultEvent.player, ...logSkill);
-						}
-					}*/
-					await ResultEvent;
+					const { result } = event.cost_data;
+					await player.useResult(result, event);
 				},
 			},
 			caomu_skill: {

audio/skill/dcquxian1.mp3

@@ -208,7 +208,7 @@ const skills = {
 						: {
 								bool: true,
 								links: skills,
-						  };
+							};
 				if (result2?.bool && result2?.links?.length) {
 					await player.removeSkills(result2.links);
 				}
@@ -1114,19 +1114,11 @@ const skills = {
 		async cost(event, trigger, player) {
 			event.result = await player.chooseToUse(get.prompt2(event.skill)).set("chooseonly", true).set("logSkill", event.name.slice(0, -5)).forResult();
 		},
-		popup: false,
 		async content(event, trigger, player) {
-			const { ResultEvent, logSkill } = event.cost_data;
-			event.next.push(ResultEvent);
-			if (logSkill) {
-				if (typeof logSkill == "string") {
-					ResultEvent.player.logSkill(logSkill);
-				} else if (Array.isArray(logSkill)) {
-					ResultEvent.player.logSkill.call(ResultEvent.player, ...logSkill);
-				}
-			}
-			await ResultEvent;
-			const card = ResultEvent.card;
+			const { result, logSkill } = event.cost_data;
+			const next = player.useResult(result, event);
+			await next;
+			const { card } = next;
 			const target = _status.currentPhase;
 			if (!player.hasHistory("sourceDamage", evt => evt.card == card) && target?.canAddJudge("lebu")) {
 				await player
@@ -3631,7 +3623,7 @@ const skills = {
 				str += "，然后摸" + get.cnNumber(player.getDamagedHp()) + "张牌";
 			}
 			event.result = await player
-				.chooseToDiscard(get.prompt(event.skill), "横置武将牌并弃置" + get.cnNumber(num) + "张牌" + str, "he", num)
+				.chooseToDiscard(get.prompt(event.skill), "横置武将牌并弃置" + get.cnNumber(num) + "张牌" + str, "he", num, "chooseonly")
 				.set("ai", function (card) {
 					var player = _status.event.player;
 					var num = _status.event.num;
@@ -3648,15 +3640,15 @@ const skills = {
 					return 0;
 				})
 				.set("num", num)
-				.set("logSkill", "clanxieshu")
+				//.set("logSkill", "clanxieshu")
 				.forResult();
 		},
-		popup: false,
-		*content(event, map) {
-			const player = map.player;
-			yield player.link(true);
+		//popup: false,
+		async content(event, trigger, player) {
+			await player.discard(event.cards);
+			await player.link(true);
 			if (player.getDamagedHp() > 0) {
-				yield player.draw(player.getDamagedHp());
+				await player.draw(player.getDamagedHp());
 			}
 			if (
 				game.getGlobalHistory("everything", evt => {
@@ -4865,12 +4857,15 @@ const skills = {
 					"step 6";
 					var current = targets.shift();
 					current
-						.chooseToUse(function (card, player, event) {
-							if (get.name(card) != "sha") {
-								return false;
-							}
-							return lib.filter.filterCard.apply(this, arguments);
-						}, "联诛：是否对" + get.translation(event.targetx) + "使用一张杀？")
+						.chooseToUse(
+							function (card, player, event) {
+								if (get.name(card) != "sha") {
+									return false;
+								}
+								return lib.filter.filterCard.apply(this, arguments);
+							},
+							"联诛：是否对" + get.translation(event.targetx) + "使用一张杀？"
+						)
 						.set("targetRequired", true)
 						.set("complexSelect", true)
 						.set("complexTarget", true)

audio/skill/dcquxian2.mp3

@@ -183,7 +183,7 @@ const translates = {
 	clan_yangbiao: "族杨彪",
 	clan_yangbiao_prefix: "族",
 	clanjiannan: "间难",
-	clanjiannan_info: "出牌阶段开始时，你可以摸两张牌。若如此做，此阶段一名角色失去所有“间难”牌或最后的手牌后，若没有角色处于濒死状态，你令一名角色选择一项：1.弃置两张牌；2.摸两张牌；3.重铸所有装备牌；4.将一张锦囊牌置于牌堆顶或失去1点体力（每回合每项各限一次）。",
+	clanjiannan_info: "出牌阶段开始时，你可以摸两张牌。若如此做，此阶段一名角色失去所有“间难”牌或最后的手牌后，若没有角色处于濒死状态，你令一名角色执行一项：1.弃置两张牌；2.摸两张牌；3.重铸所有装备牌；4.将一张锦囊牌置于牌堆顶或失去1点体力（每回合每项各限一次）。",
 	clanyichi: "义叱",
 	clanyichi_info: "结束阶段，你可以拼点。若你赢，没赢的角色依次执行〖间难〗的前X个选项（X为你本回合发动〖间难〗的次数）。",
 	clan_luji: "族陆绩",