技能修改

1.吉吉国王增加动态翻译以及优化部分代码
2.新杀谋刘协结算调整

Author: xjm0708

character/huicui/dynamicTranslate.js

@@ -1,6 +1,9 @@
 import { lib, game, ui, get, ai, _status } from "../../noname.js";
 
 const dynamicTranslates = {
+	dcyanxi(player) {
+		return lib.translate["dcyanxi_info"].replace(/零/, get.cnNumber(player.countMark("dcyanxi")));
+	},
 	dcboxuan(player) {
 		if (player.storage.dcboxuan) {
 			return lib.translate["dcboxuan_rewrite_info"];

character/huicui/skill.js

@@ -9,7 +9,7 @@ const skills = {
 		usable: 1,
 		chooseButton: {
 			dialog(event, player) {
-				return ui.create.dialog(`###诹议###`, [
+				return ui.create.dialog(`###诹议###${get.translation("dczouyi_info")}`, [
 					[
 						["draw", "你摸2张牌并可弃置一名其他角色1张牌"],
 						["discard", "你弃置1张牌并可令一名其他角色摸2张牌"],
@@ -67,11 +67,8 @@ const skills = {
 								await target.draw(2);
 							}
 						}
-						player.addMark(
-							"dcyanxi",
-							game.countPlayer(target => target.countCards("h") == player.countCards("h")),
-							false
-						);
+						const num = game.countPlayer(target => target.countCards("h") == player.countCards("h"));
+						player.addMark("dcyanxi", num, false);
 					},
 				};
 			},
@@ -102,8 +99,9 @@ const skills = {
 				card = get.autoViewAs({ name: "sha", isCard: true });
 			let isFirst = true;
 			while (player.countMark(event.name) > 0 && player.canUse(card, target, false, false) && target.isIn()) {
-				if (!isFirst) {
+				if (isFirst) {
 					isFirst = false;
+				} else {
 					player.logSkill(event.name, target);
 				}
 				player.removeMark(event.name, 1, false);

character/xianding/skill.js

@@ -1056,65 +1056,33 @@ const skills = {
 			backup(links) {
 				return {
 					audio: "dcsbzhanban",
-					link: links[0],
 					filterTarget: lib.filter.notMe,
 					selectTarget: -1,
 					log: false,
-					multitarget: true,
-					multiline: true,
-					line: false,
-					async content(event, trigger, player) {
-						const link = lib.skill.dcsbzhanban_backup.link;
+					async precontent(event, trigger, player) {
+						player.logSkill("dcsbzhanban", event.result.targets);
+						const link = links[0];
 						if (link > 0) {
 							await player.draw(link);
 						} else if (link < 0) {
 							await player.chooseToDiscard(`斩绊：弃置至多三张牌`, "he", [1, 3], true);
 						}
-						let targets = event.targets;
-						if (player.hasZhuSkill("dcsbtiancheng") && targets.some(target => target.group == "qun")) {
-							const result = await player
-								.chooseTarget(`斩绊：你可以选择任意名群雄角色不成为目标或取消不选择`, [1, Infinity], (card, player, target) => {
-									return target != player && target.group == "qun";
-								})
-								.set("ai", target => {
-									const num = get.player().countCards("h"),
-										numx = num - target.countCards("h"),
-										att = get.attitude(get.player(), target);
-									let val;
-									if (numx > 0) {
-										val = numx - 3;
-									} else if (numx < 0) {
-										val = numx + 3;
-									} else {
-										val = -2;
-									}
-									val = val == 0 ? 0.5 : val;
-									return val * att < 0;
-								})
-								.forResult();
-							if (result?.targets?.length) {
-								targets.removeArray(result.targets);
-							}
-						}
-						targets = targets.sortBySeat();
-						player.logSkill("dcsbzhanban", targets);
-						const num = player.countCards("h");
-						for (const target of targets) {
-							const numx = num - target.countCards("h");
-							if (numx > 0) {
-								await target.draw(numx, "nodelay");
-							} else if (numx < 0) {
-								await target.chooseToDiscard(-numx, "h", true);
-							}
-						}
-						for (const target of targets) {
-							if (target.hasHistory("gain", evt => evt.getParent(2) == event)) {
-								await target.chooseToDiscard(3, "h", true);
-							} else if (target.hasHistory("lose", evt => evt.type == "discard" && evt.getlx !== false && evt.getParent(3) == event)) {
-								await target.draw(3, "nodelay");
-							} else {
-								await target.damage();
-							}
+					},
+					async content(event, trigger, player) {
+						const num = player.countCards("h"),
+							{ target } = event;
+						const numx = num - target.countCards("h");
+						if (numx > 0) {
+							await target.draw(numx, "nodelay");
+						} else if (numx < 0) {
+							await target.chooseToDiscard(-numx, "h", true);
+						}
+						if (target.hasHistory("gain", evt => evt.getParent(2) == event)) {
+							await target.chooseToDiscard(3, "h", true);
+						} else if (target.hasHistory("lose", evt => evt.type == "discard" && evt.getlx !== false && evt.getParent(3) == event)) {
+							await target.draw(3, "nodelay");
+						} else {
+							await target.damage();
 						}
 					},
 				};
@@ -1126,6 +1094,9 @@ const skills = {
 				player: 1,
 			},
 		},
+		subSkill: {
+			backup: {},
+		},
 	},
 	dcsbchensheng: {
 		audio: 2,
@@ -1142,6 +1113,37 @@ const skills = {
 	dcsbtiancheng: {
 		audio: 2,
 		zhuSkill: true,
+		trigger: { player: "pre_dcsbzhanban_backupBegin" },
+		filter(event, player) {
+			return event.player == player && game.hasPlayer(target => target != player && target.group == "qun" && event.result.targets.includes(target)) && player.hasZhuSkill("dcsbtiancheng");
+		},
+		async cost(event, trigger, player) {
+			event.result = await player
+				.chooseTarget(get.prompt2(event.skill), [1, Infinity], (card, player, target) => {
+					return target != player && target.group == "qun" && get.event().getTrigger().result.targets.includes(target);
+				})
+				.set("ai", target => {
+					const num = get.player().countCards("h"),
+						numx = num - target.countCards("h"),
+						att = get.attitude(get.player(), target);
+					let val;
+					if (numx > 0) {
+						val = numx - 3;
+					} else if (numx < 0) {
+						val = numx + 3;
+					} else {
+						val = -2;
+					}
+					val = val == 0 ? 0.5 : val;
+					return val * att < 0;
+				})
+				.forResult();
+		},
+		async content(event, trigger, player) {
+			const { targets } = event;
+			trigger.result.targets.removeArray(targets);
+			await game.delayx();
+		},
 		ai: { combo: "dcsbzhanban" },
 	},
 	//谋曹洪