Merge pull request #3093 from Xiazhiliao/PR-Branch

bugfix；国战部分函数提示补全

Author: xizifu

character/extra/skill.js

@@ -216,29 +216,48 @@ const skills = {
 						_status.zc26_huaxiu ??= {};
 						_status.zc26_huaxiu[name] ??= [];
 						_status.zc26_huaxiu[name].add(player);
+						lib.init.sheet(`
+							.card[data-card-name = "${name}"]>.image {
+								background-image: url(${lib.assetURL}image/card/${map[name]}.png) !important;
+							}
+						`);
 					},
 					name,
 					player,
 					map
 				);
-				function check(name, target) {
-					if (target.hasVCard({ name }, "e")) {
-						return true;
+				function check(name, target, method) {
+					if (method == "e") {
+						return target.hasVCard({ name }, "e");
+					} else if (method == "j") {
+						return target.hasVCard(card => {
+							if (!card.storage?.equipEnable) {
+								return false;
+							}
+							return card.cards.some(cardx => cardx.name == name);
+						}, "j");
 					}
-					return target.hasVCard(card => {
-						if (!card.storage?.equipEnable) {
-							return false;
-						}
-						return card.cards.some(cardx => cardx.name == name);
-					}, "j");
+					return false;
 				}
 				const removeSkill = get.skillsFromEquips([{ name }]),
 					addSkill = get.skillsFromEquips([{ name: map[name] }]);
 				for (let current of game.players) {
-					current.removeSkill(removeSkill);
-					if (check(name, current)) {
+					let keepSkills = Object.values(current.additionalSkills).flat(),
+						removeSkill2 = removeSkill.slice().removeArray(keepSkills);
+					if (removeSkill2.length) {
+						current.removeSkill(removeSkill2);
+					}
+					if (check(name, current, "j")) {
 						current.addSkill(addSkill);
 					}
+					if (check(name, current, "e")) {
+						current.addEquipTrigger({ name: map[name] });
+					}
+					let vcards = current.getVCards("e", { name });
+					while (vcards.length) {
+						let vcard = vcards.shift();
+						current.$addVirtualEquip(vcard, vcard.cards);
+					}
 				}
 			}
 		},
@@ -267,19 +286,26 @@ const skills = {
 						for (let name of ["duanjian", "serafuku", "yonglv"]) {
 							if (_status.zc26_huaxiu?.[name]?.includes(player)) {
 								_status.zc26_huaxiu[name].remove(player);
+								lib.init.sheet(`
+									.card[data-card-name = "${name}"]>.image {
+										background-image: url(${lib.assetURL}image/card/${name}.png) !important;
+									}
+								`);
 							}
 						}
 					}, player);
-					function check(name, target) {
-						if (target.hasVCard({ name }, "e")) {
-							return true;
+					function check(name, target, method) {
+						if (method == "e") {
+							return target.hasVCard({ name }, "e");
+						} else if (method == "j") {
+							return target.hasVCard(card => {
+								if (!card.storage?.equipEnable) {
+									return false;
+								}
+								return card.cards.some(cardx => cardx.name == name);
+							}, "j");
 						}
-						return target.hasVCard(card => {
-							if (!card.storage?.equipEnable) {
-								return false;
-							}
-							return card.cards.some(cardx => cardx.name == name);
-						}, "j");
+						return false;
 					}
 					const map = {
 						duanjian: "zc26_zhuge",
@@ -289,6 +315,9 @@ const skills = {
 					for (let name of ["duanjian", "serafuku", "yonglv"]) {
 						if (name in _status.zc26_huaxiu && !_status.zc26_huaxiu[name].length) {
 							game.log(`#y${get.translation({ name })}`, "的效果还原了");
+							game.broadcastAll(function (name) {
+								delete _status.zc26_huaxiu[name];
+							}, name);
 							lib.card[name] = _status.zc26_huaxiu_origin[name].info;
 							lib.translate[name] = _status.zc26_huaxiu_origin[name].translate;
 							lib.translate[`${name}_info`] = _status.zc26_huaxiu_origin[name].translate2;
@@ -300,8 +329,15 @@ const skills = {
 								if (removeSkill2.length) {
 									current.removeSkill(removeSkill2);
 								}
-								if (check(name, current)) {
+								if (check(name, current, "j")) {
 									current.addSkill(addSkill);
+								} else if (check(name, current, "e")) {
+									current.addEquipTrigger({ name });
+								}
+								let vcards = current.getVCards("e", { name });
+								while (vcards.length) {
+									let vcard = vcards.shift();
+									current.$addVirtualEquip(vcard, vcard.cards);
 								}
 							}
 						}
@@ -393,7 +429,7 @@ const skills = {
 						return;
 					}
 					const { result } = await current
-						.chooseCardButton(`请选择重铸${trigger.target}的一张手牌`, cards)
+						.chooseCardButton(`请选择重铸${get.translation(trigger.target)}的一张手牌`, cards)
 						.set("ai", ({ link }) => {
 							const { player, target } = get.event();
 							if (get.attitude(player, target) > 0) {
@@ -586,7 +622,7 @@ const skills = {
 				const targets = game.dead.slice();
 				const map = await game.chooseAnyOL(targets, get.info(event.name).chooseControl, [player, event.indexedData]).forResult();
 				for (const target of targets) {
-					let source = game.findPlayer(current => current.hasCards(card => card == event.indexedData, "ej")),
+					let source = game.findPlayer(current => current.hasCard(card => card == event.indexedData, "ej")),
 						aim;
 					const control = map.get(target).control;
 					if (control == "上家") {

character/huicui/skill.js

@@ -2009,6 +2009,9 @@ const skills = {
 			if (event.card.name != "sha" && get.type(event.card) != "trick") {
 				return false;
 			}
+			if (!event.isFirstTarget) {
+				return false;
+			}
 			return event.target != player;
 		},
 		logTarget: "target",
@@ -11278,7 +11281,9 @@ const skills = {
 				)
 				.set("filterButton", button => {
 					const { link } = button;
-					if (!ui.selected.buttons.length) return typeof link == "number";
+					if (!ui.selected.buttons.length) {
+						return typeof link == "number";
+					}
 					return get.itemtype(link) == "card";
 				})
 				.set("source", source)
@@ -15905,14 +15910,12 @@ const skills = {
 			let result;
 			if (!target.isIn()) {
 				return event.finish();
-			}
-			else if (!target.countDiscardableCards(player, "he")) {
+			} else if (!target.countDiscardableCards(player, "he")) {
 				result = { index: 1 };
-			}
-			else {
+			} else {
 				result = await player
 					.chooseControl()
-					.set("choiceList", ["弃置" + str + "的" + get.cnNumber(num) + "张牌", "对" + str + "造成1点伤害"])
+					.set("choiceList", ["弃置" + get.translation(target) + "的" + get.cnNumber(num) + "张牌", "对" + get.translation(target) + "造成1点伤害"])
 					.set("ai", function () {
 						const player = _status.event.player;
 						const eff0 = get.effect(target, { name: "guohe_copy2" }, player, player) * Math.min(1.7, target.countCards("he"));

character/onlyOL/skill.js

@@ -898,7 +898,7 @@ const skills = {
 		},
 		async content(event, trigger, player) {
 			const target = event.targets[0];
-			const { result } = await player.discardPlayerCard(Math.max(true, target, "he", target.countCards("h") - target.hp, 1), "allowChooseAll", target);
+			const { result } = await player.discardPlayerCard(true, target, "he", Math.max(target.countCards("h") - target.hp, 1), "allowChooseAll");
 			if (result?.bool && result.cards?.length) {
 				const num = result.cards.reduce((sum, card) => (sum + get.type(card) != "equip" ? 1 : 0), 0);
 				if (num == 0) {
@@ -1583,8 +1583,8 @@ const skills = {
 			player.addTempSkill("olsbmengshi_effect", { player: "dieAfter" });
 			player.markAuto("olsbmengshi_effect", event.targets);
 			const list = target2.getHp() > target1.getHp() ? [num, -num] : [-num, num];
-			await target1.changeHp(list[0]).set("_triggered", null);
-			await target2.changeHp(list[1]).set("_triggered", null);
+			await target1[list[0] > 0 ? "recover" : "loseHp"](Math.abs(list[0]));
+			await target2[list[1] > 0 ? "recover" : "loseHp"](Math.abs(list[1]));
 		},
 		subSkill: {
 			effect: {

character/sp2/skill.js

@@ -931,7 +931,7 @@ const skills = {
 				if (!result?.bool) {
 					return;
 				}
-				player.addTempSkill("stardangchen_buff");
+				player.addTempSkill("stardangchen_buff", { player: "phaseUseEnd" });
 				player.addMark("stardangchen_buff", num, false);
 			}
 		},

character/sp2/translate.js

@@ -614,7 +614,7 @@ const translates = {
 	star_dingfeng: "星丁奉",
 	star_dingfeng_prefix: "星",
 	stardangchen: "荡尘",
-	stardangchen_info: "出牌阶段开始时，你可以令一名角色交给你任意张牌，然后你可以弃置X张牌（X为其交给你的牌数）。若你因此弃牌，则当你于本回合使用基本牌或普通锦囊牌时，可以进行一次判定，若判定的点数为X的倍数，则此牌额外结算一次。",
+	stardangchen_info: "出牌阶段开始时，你可以令一名角色交给你任意张牌，然后你可以弃置X张牌（X为其交给你的牌数）。若你因此弃牌，则当你于本阶段使用基本牌或普通锦囊牌时，可以进行一次判定，若判定的点数为X的倍数，则此牌额外结算一次。",
 	starjianyu: "翦羽",
 	starjianyu_info: "锁定技，其他角色在你回合内失去装备区的牌后，你摸一张牌。",
 	star_wenchou: "星文丑",

character/tw/skill.js

@@ -9186,6 +9186,9 @@ const skills = {
 			if (!player.hasZhuSkill("twpolu")) {
 				return false;
 			}
+			if (event.player != player && player.isDead()) {
+				return false;
+			}
 			if (name == "dieAfter" && event.source && event.source.group == "wu") {
 				return true;
 			}

character/xianding/skill.js

@@ -8800,15 +8800,26 @@ const skills = {
 	//威孙权
 	dcwoheng: {
 		audio: 2,
+		mark: true,
+		intro: {
+			markcount() {
+				const useCnt = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length;
+				return useCnt + 1;
+			},
+			content() {
+				const useCnt = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length;
+				return `令一名其他角色摸${get.cnNumber(useCnt + 1)}张牌或弃置${get.cnNumber(useCnt + 1)}张牌`;
+			},
+		},
 		trigger: { player: "damageEnd" },
 		enable: "phaseUse",
 		filterTarget: lib.filter.notMe,
 		prompt() {
-			const num = get.player().countMark("dcwoheng");
+			const num = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length;
 			return `令一名其他角色摸${get.cnNumber(num + 1)}张牌或弃置${get.cnNumber(num + 1)}张牌`;
 		},
 		async cost(event, trigger, player) {
-			const num = player.countMark("dcwoheng");
+			const num = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length;
 			event.result = await player
 				.chooseTarget(get.prompt(event.skill), `令一名其他角色摸${get.cnNumber(num + 1)}张牌或弃置${get.cnNumber(num + 1)}张牌`, lib.filter.notMe)
 				.set("ai", target => {
@@ -8819,14 +8830,9 @@ const skills = {
 		},
 		async content(event, trigger, player) {
 			const target = event.target || event.targets[0];
-			game.countPlayer(current => {
-				if (current.hasSkill("dcwoheng", null, null, false)) {
-					current.addTempSkill("dcwoheng_used", "roundStart");
-					current.addMark("dcwoheng", 1, false);
-				}
-			});
-			const goon = event.getParent(2).name !== "dcyuhui_buff";
-			const num = goon ? player.countMark("dcwoheng") : 1;
+			const goon = event.getParent(2).name !== "dcyuhui_buff",
+				useCnt = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length;
+			const num = goon ? useCnt : 1;
 			if (!target?.isIn()) {
 				return;
 			}
@@ -8845,7 +8851,7 @@ const skills = {
 						"choice",
 						get.effect(target, { name: "draw" }, player, player) *
 							(() => {
-								if (goon && player.countMark("dcwoheng") <= 3) {
+								if (goon && useCnt <= 3) {
 									if (target.countCards("h") + num === player.countCards("h")) {
 										return 100 * num;
 									}
@@ -8855,7 +8861,7 @@ const skills = {
 							get.effect(target, { name: "guohe_copy2" }, target, player) *
 								(() => {
 									const numx = Math.min(num, target.countDiscardableCards(target, "he"));
-									if (goon && player.countMark("dcwoheng") <= 3) {
+									if (goon && useCnt <= 3) {
 										if (target.countCards("h") - numx === player.countCards("h")) {
 											return 100 * numx;
 										}
@@ -8872,16 +8878,28 @@ const skills = {
 			} else {
 				await target.chooseToDiscard(num, true, "he");
 			}
-			if (player.countMark("dcwoheng") > 3 || player.countCards("h") !== target.countCards("h")) {
+			if (useCnt > 3 || player.countCards("h") !== target.countCards("h")) {
 				await player.draw(2);
 				if (player.hasSkill("dcwoheng", null, null, false)) {
 					player.tempBanSkill("dcwoheng");
 				}
 			}
 		},
+		group: "dcwoheng_refresh",
+		subSkill: {
+			refresh: {
+				charlotte: true,
+				trigger: { global: "roundStart" },
+				forced: true,
+				popup: false,
+				async content(event, trigger, player) {
+					player.markSkill("dcwoheng");
+				},
+			},
+		},
 		ai: {
 			order(item, player) {
-				const num = player.countMark("dcwoheng") + 1;
+				const num = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length + 1;
 				if (
 					game.hasPlayer(target => {
 						if (get.effect(target, { name: "draw" }, player, player) > 0) {
@@ -8904,12 +8922,13 @@ const skills = {
 			},
 			result: {
 				player(player, target) {
-					const goon = !get.event()?.getParent()?.name.includes("dcyuhui_buff");
-					const num = goon ? player.countMark("dcwoheng") + 1 : 1;
+					const goon = !get.event()?.getParent()?.name.includes("dcyuhui_buff"),
+						useCnt = game.getRoundHistory("everything", evt => evt.name == "dcwoheng", 0).length;
+					const num = goon ? useCnt + 1 : 1;
 					return Math.max(
 						get.effect(target, { name: "draw" }, player, player) *
 							(() => {
-								if (goon && player.countMark("dcwoheng") < 3) {
+								if (goon && useCnt < 3) {
 									if (target.countCards("h") + num === player.countCards("h")) {
 										return 100 * num;
 									}
@@ -8919,7 +8938,7 @@ const skills = {
 						get.effect(target, { name: "guohe_copy2" }, target, player) *
 							(() => {
 								const numx = Math.min(num, target.countDiscardableCards(target, "he"));
-								if (goon && player.countMark("dcwoheng") < 3) {
+								if (goon && useCnt < 3) {
 									if (target.countCards("h") - numx === player.countCards("h")) {
 										return 100 * numx;
 									}
@@ -8930,41 +8949,6 @@ const skills = {
 				},
 			},
 		},
-		init(player) {
-			const num = (() => {
-				let num = 0,
-					globalHistory = _status.globalHistory;
-				for (let i = globalHistory.length - 1; i >= 0; i--) {
-					num += globalHistory[i].everything.filter(evt => evt.name === "dcwoheng").length;
-					if (globalHistory[i].isRound) {
-						break;
-					}
-				}
-				return num;
-			})();
-			if (num) {
-				player.addTempSkill("dcwoheng_used", "roundStart");
-				player.addMark("dcwoheng", num, false);
-			}
-		},
-		onremove: true,
-		mark: true,
-		intro: {
-			markcount(num = 0) {
-				return num + 1;
-			},
-			content(num = 0) {
-				return `令一名其他角色摸${get.cnNumber(num + 1)}张牌或弃置${get.cnNumber(num + 1)}张牌`;
-			},
-		},
-		subSkill: {
-			used: {
-				charlotte: true,
-				onremove(player) {
-					player.clearMark("dcwoheng", false);
-				},
-			},
-		},
 	},
 	dcyuhui: {
 		audio: 2,