diff --git a/character/shenhua.js b/character/shenhua.js
index 9df90bd42..1c61beb90 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -140,7 +140,7 @@ game.import("character", function () {
 			guanqiujian: ["wenqin"],
 		},
 		characterFilter: {
-			zuoci: function (mode) {
+			zuoci(mode) {
 				return mode != "guozhan";
 			},
 		},
@@ -224,15 +224,16 @@ game.import("character", function () {
 			chendao:
 				"陈到，字叔至，生卒年不详，豫州汝南（今河南驻马店平舆县）人。三国时期蜀汉将领，刘备帐下白毦兵统领，名位常亚于赵云，以忠勇著称。蜀汉建兴年间，任征西将军、永安都督，封亭侯。在任期间去世。",
 		},
+		/** @type { importCharacterConfig['skill'] } */
 		skill: {
 			//庞统写法修改
 			lianhuan: {
 				audio: 2,
-				hiddenCard: (player, name) => {
+				hiddenCard(player, name) {
 					return name == "tiesuo" && player.hasCard((card) => get.suit(card) == "club", "sh");
 				},
 				enable: "chooseToUse",
-				filter: function (event, player) {
+				filter(event, player) {
 					if (!player.hasCard((card) => get.suit(card) == "club", "sh")) return false;
 					return (
 						event.type == "phase" ||
@@ -240,7 +241,7 @@ game.import("character", function () {
 					);
 				},
 				position: "hs",
-				filterCard: function (card, player, event) {
+				filterCard(card, player, event) {
 					if (!event) event = _status.event;
 					if (get.suit(card) != "club") return false;
 					if (event.type == "phase" && get.position(card) != "s" && player.canRecast(card)) {
@@ -252,7 +253,7 @@ game.import("character", function () {
 						return event._backup.filterCard(cardx, player, event);
 					}
 				},
-				filterTarget: function (fuck, player, target) {
+				filterTarget(fuck, player, target) {
 					const card = ui.selected.cards[0],
 						event = _status.event,
 						backup = event._backup;
@@ -263,7 +264,7 @@ game.import("character", function () {
 						backup.filterCard(cardx, player, event) && backup.filterTarget(cardx, player, target)
 					);
 				},
-				selectTarget: function () {
+				selectTarget() {
 					const card = ui.selected.cards[0],
 						event = _status.event,
 						player = event.player,
@@ -282,7 +283,7 @@ game.import("character", function () {
 						return select;
 					}
 				},
-				filterOk: function () {
+				filterOk() {
 					const card = ui.selected.cards[0],
 						event = _status.event,
 						player = event.player,
@@ -306,13 +307,13 @@ game.import("character", function () {
 				discard: false,
 				lose: false,
 				delay: false,
-				precontent: function () {
+				async precontent(event, trigger, player) {
 					var result = event.result;
 					if (result.targets.length > 0)
 						result.card = get.autoViewAs({ name: "tiesuo" }, result.cards);
 				},
-				content: function () {
-					player.recast(cards);
+				async content(event, trigger, player) {
+					player.recast(event.cards);
 				},
 			},
 			//新杀小加强 陈到
@@ -320,20 +321,20 @@ game.import("character", function () {
 				audio: "drlt_wanglie",
 				locked: false,
 				mod: {
-					targetInRange: function (card, player, target) {
+					targetInRange(card, player, target) {
 						if (player.hasSkill("dcwanglie_effect", null, null, false)) return true;
 					},
 				},
 				trigger: {
 					player: "useCard",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.isPhaseUsing() && (event.card.name == "sha" || get.type(event.card) == "trick")
 					);
 				},
 				preHidden: true,
-				check: function (event, player) {
+				check(event, player) {
 					if (player.hasSkill("dcwanglie2", null, null, false)) return true;
 					if (["wuzhong", "kaihua", "dongzhuxianji"].includes(event.card.name)) return false;
 					player._wanglie_temp = true;
@@ -359,7 +360,7 @@ game.import("character", function () {
 						return true;
 					return false;
 				},
-				prompt2: function (event) {
+				prompt2(event) {
 					return (
 						"令" +
 						get.translation(event.card) +
@@ -367,7 +368,7 @@ game.import("character", function () {
 					);
 				},
 				group: "dcwanglie_startup",
-				content: function () {
+				async content(event, trigger, player) {
 					trigger.nowuxie = true;
 					trigger.directHit.addArray(game.players);
 					player.addTempSkill("dcwanglie2", "phaseUseAfter");
@@ -377,7 +378,7 @@ game.import("character", function () {
 						trigger: { player: "phaseUseBegin" },
 						forced: true,
 						popup: false,
-						content: function () {
+						async content(event, trigger, player) {
 							player.addTempSkill("dcwanglie_effect", "phaseUseAfter");
 						},
 					},
@@ -387,10 +388,10 @@ game.import("character", function () {
 						firstDo: true,
 						popup: false,
 						trigger: { player: "useCard1" },
-						filter: function (event, player) {
+						filter(event, player) {
 							return event.targets.some((target) => target != player);
 						},
-						content: function () {
+						async content(event, trigger, player) {
 							player.addMark("dcwanglie_effect", 1, false);
 							if (player.countMark("dcwanglie_effect") >= 2)
 								player.removeSkill("dcwanglie_effect");
@@ -401,7 +402,7 @@ game.import("character", function () {
 				ai: {
 					//pretao:true,
 					directHit_ai: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						//if(tag=='pretao') return true;
 						if (player._wanglie_temp) return false;
 						player._wanglie_temp = true;
@@ -438,7 +439,7 @@ game.import("character", function () {
 			dcwanglie2: {
 				charlotte: true,
 				mod: {
-					playerEnabled: function (card, player, target) {
+					playerEnabled(card, player, target) {
 						if (player != target) return false;
 					},
 				},
@@ -449,7 +450,7 @@ game.import("character", function () {
 				trigger: {
 					global: ["loseAfter", "addToExpansionAfter", "cardsGotoSpecialAfter", "loseAsyncAfter"],
 				},
-				filter: function (event, player, name) {
+				filter(event, player, name) {
 					if (event.name == "lose" || event.name == "loseAsync")
 						return event.getlx !== false && event.toStorage == true;
 					if (event.name == "cardsGotoSpecial") return !event.notrigger;
@@ -457,7 +458,7 @@ game.import("character", function () {
 				},
 				direct: true,
 				usable: 1,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseTarget(
@@ -539,14 +540,14 @@ game.import("character", function () {
 							],
 						},
 						direct: true,
-						filter: function (event, player) {
+						filter(event, player) {
 							return game.hasPlayer(function (current) {
 								var evt = event.getl(current);
 								return evt && (evt.xs.length > 0 || evt.ss.length > 0);
 							});
 						},
 						usable: 1,
-						content: function () {
+						content() {
 							"step 0";
 							if (
 								!player.countCards("he") ||
@@ -561,10 +562,10 @@ game.import("character", function () {
 									prompt2: "弃置一张牌，并令一名其他角色也弃置一张牌",
 									position: "he",
 									filterCard: lib.filter.cardDiscardable,
-									filterTarget: function (card, player, target) {
+									filterTarget(card, player, target) {
 										return target != player && target.countCards("he") > 0;
 									},
-									ai1: function (card) {
+									ai1(card) {
 										let player = _status.event.player;
 										if (_status.event.me) {
 											if (get.position(card) === _status.event.me)
@@ -573,7 +574,7 @@ game.import("character", function () {
 										}
 										return 5 - get.value(card);
 									},
-									ai2: function (target) {
+									ai2(target) {
 										let player = _status.event.player,
 											att = get.attitude(player, target);
 										if (att > 0 && (_status.event.me || target.isHealthy())) return -att;
@@ -659,10 +660,10 @@ game.import("character", function () {
 				audio: "kongsheng",
 				trigger: { player: "phaseZhunbeiBegin" },
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("he") > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseCard(
@@ -706,7 +707,7 @@ game.import("character", function () {
 						player.addToExpansion(result.cards, player, "give").gaintag.add("olkongsheng");
 					}
 				},
-				onremove: function (player, skill) {
+				onremove(player, skill) {
 					var cards = player.getExpansions(skill);
 					if (cards.length) player.loseToDiscardpile(cards);
 				},
@@ -720,14 +721,14 @@ game.import("character", function () {
 						trigger: { player: "phaseJieshuBegin" },
 						forced: true,
 						locked: false,
-						filter: function (event, player) {
+						filter(event, player) {
 							return (
 								player.getExpansions("olkongsheng").filter(function (card) {
 									return get.type(card, false) != "equip";
 								}).length > 0
 							);
 						},
-						content: function () {
+						content() {
 							"step 0";
 							var cards = player.getExpansions("olkongsheng").filter(function (card) {
 								return get.type(card, false) != "equip";
@@ -776,7 +777,7 @@ game.import("character", function () {
 				trigger: { player: "useCardToPlayered" },
 				direct: true,
 				audio: "drlt_zhenrong",
-				filter: function (event, player) {
+				filter(event, player) {
 					if (!event.isFirstTarget) return false;
 					if (!["basic", "trick"].includes(get.type(event.card))) return false;
 					if (get.tag(event.card, "damage"))
@@ -789,7 +790,7 @@ game.import("character", function () {
 						});
 					return false;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseTarget(
@@ -820,7 +821,7 @@ game.import("character", function () {
 						player.addToExpansion(card, "give", "log", target).gaintag.add("zhengrong");
 					}
 				},
-				onremove: function (player, skill) {
+				onremove(player, skill) {
 					var cards = player.getExpansions(skill);
 					if (cards.length) player.loseToDiscardpile(cards);
 				},
@@ -839,10 +840,10 @@ game.import("character", function () {
 				skillAnimation: true,
 				animationColor: "thunder",
 				derivation: "qingce",
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getExpansions("zhengrong").length >= 3;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("hongju");
 					var cards = player.getExpansions("zhengrong");
@@ -888,23 +889,23 @@ game.import("character", function () {
 			qingce: {
 				enable: "phaseUse",
 				audio: "drlt_qingce",
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getExpansions("zhengrong").length > 0 && player.countCards("h") > 0;
 				},
 				chooseButton: {
-					dialog: function (event, player) {
+					dialog(event, player) {
 						return ui.create.dialog(
 							"请选择要获得的「荣」",
 							player.getExpansions("zhengrong"),
 							"hidden"
 						);
 					},
-					backup: function (links, player) {
+					backup(links, player) {
 						return {
 							card: links[0],
 							filterCard: true,
 							position: "h",
-							filterTarget: function (card, player, target) {
+							filterTarget(card, player, target) {
 								return target.countDiscardableCards(player, "ej") > 0;
 							},
 							delay: false,
@@ -912,7 +913,7 @@ game.import("character", function () {
 							content: lib.skill.qingce.contentx,
 							ai: {
 								result: {
-									target: function (player, target) {
+									target(player, target) {
 										var att = get.attitude(player, target);
 										if (
 											att > 0 &&
@@ -934,7 +935,7 @@ game.import("character", function () {
 							},
 						};
 					},
-					prompt: function (links, player) {
+					prompt(links, player) {
 						return (
 							"选择弃置一张手牌，获得" +
 							get.translation(links[0]) +
@@ -942,7 +943,7 @@ game.import("character", function () {
 						);
 					},
 				},
-				contentx: function () {
+				contentx() {
 					"step 0";
 					var card = lib.skill.qingce_backup.card;
 					player.gain(card, "gain2", "log");
@@ -954,7 +955,7 @@ game.import("character", function () {
 				ai: {
 					order: 8,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (
 								game.hasPlayer(function (current) {
 									var att = get.attitude(player, current);
@@ -984,11 +985,11 @@ game.import("character", function () {
 				trigger: {
 					source: "damageSource",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.player != player && event.player.countCards("h") > player.countCards("h");
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.choosePlayerCard("hej", get.prompt("drlt_zhenrong"), trigger.player)
@@ -1016,10 +1017,10 @@ game.import("character", function () {
 				unique: true,
 				juexingji: true,
 				derivation: ["drlt_qingce"],
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getExpansions("drlt_zhenrong").length >= 3 && game.dead.length > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("drlt_hongju");
 					var cards = player.getExpansions("drlt_zhenrong");
@@ -1064,13 +1065,13 @@ game.import("character", function () {
 			drlt_qingce: {
 				audio: 2,
 				enable: "phaseUse",
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getExpansions("drlt_zhenrong").length > 0;
 				},
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return target.countDiscardableCards(player, "ej") > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseCardButton(
 						player.getExpansions("drlt_zhenrong"),
@@ -1090,7 +1091,7 @@ game.import("character", function () {
 				ai: {
 					order: 13,
 					result: {
-						target: function (player, target) {
+						target(player, target) {
 							if (get.attitude(player, target) > 0 && target.countCards("j") > 0) return 1;
 							return -1;
 						},
@@ -1103,7 +1104,7 @@ game.import("character", function () {
 					player: "phaseJieshuBegin",
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseTarget(get.prompt2("drlt_zhenggu"), function (card, player, target) {
@@ -1128,7 +1129,7 @@ game.import("character", function () {
 						lib.skill.drlt_zhenggu.sync(player, target);
 					}
 				},
-				sync: function (player, target) {
+				sync(player, target) {
 					var num = player.countCards("h");
 					var num2 = target.countCards("h");
 					if (num < num2) {
@@ -1144,13 +1145,13 @@ game.import("character", function () {
 				forced: true,
 				charlotte: true,
 				logTarget: "player",
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						event.player.storage.drlt_zhenggu_mark &&
 						event.player.storage.drlt_zhenggu_mark.includes(player)
 					);
 				},
-				content: function () {
+				content() {
 					while (trigger.player.storage.drlt_zhenggu_mark.includes(player)) {
 						trigger.player.storage.drlt_zhenggu_mark.remove(player);
 					}
@@ -1160,7 +1161,7 @@ game.import("character", function () {
 				},
 			},
 			drlt_zhenggu_mark: {
-				init: function (player, skill) {
+				init(player, skill) {
 					if (!player.storage[skill]) player.storage[skill] = [];
 				},
 				marktext: "镇",
@@ -1174,7 +1175,7 @@ game.import("character", function () {
 				trigger: {
 					player: "phaseJieshuBegin",
 				},
-				check: function (event, player) {
+				check(event, player) {
 					var num = 0;
 					if (
 						player.hasHistory("lose", function (evt) {
@@ -1187,7 +1188,7 @@ game.import("character", function () {
 					if (num == 3) return player.hp >= 2;
 					return true;
 				},
-				prompt: function (event, player) {
+				prompt(event, player) {
 					var num = 3;
 					if (
 						player.hasHistory("lose", function (evt) {
@@ -1199,7 +1200,7 @@ game.import("character", function () {
 					if (!player.getStat("damage")) num--;
 					return get.prompt("xinfu_zuilun") + "（可获得" + get.cnNumber(num) + "张牌）";
 				},
-				content: function () {
+				content() {
 					"step 0";
 					event.num = 0;
 					event.cards = get.cards(3);
@@ -1292,7 +1293,7 @@ game.import("character", function () {
 				},
 				forced: true,
 				audio: 2,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.player.countCards("h") < player.countCards("h")) return false;
 					if (event.card.name != "sha" && event.card.name != "juedou") return false;
 					return !game.hasPlayer2(function (current) {
@@ -1308,12 +1309,12 @@ game.import("character", function () {
 						);
 					});
 				},
-				content: function () {
+				content() {
 					trigger.getParent().excluded.add(player);
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							let hs = player.getCards(
 									"h",
 									(i) => i !== card && (!card.cards || !card.cards.includes(i))
@@ -1360,7 +1361,7 @@ game.import("character", function () {
 				locked: true,
 				ai: {
 					effect: {
-						target: function (card) {
+						target(card) {
 							if (card.name == "tiesuo") return "zeroplayertarget";
 						},
 					},
@@ -1372,16 +1373,16 @@ game.import("character", function () {
 							player: "linkBegin",
 						},
 						forced: true,
-						filter: function (event, player) {
+						filter(event, player) {
 							return !player.isLinked();
 						},
-						content: function () {
+						content() {
 							trigger.cancel();
 						},
 					},
 					2: {
 						mod: {
-							targetEnabled: function (card, player, target) {
+							targetEnabled(card, player, target) {
 								if (get.type(card) == "delay") return false;
 							},
 						},
@@ -1395,7 +1396,7 @@ game.import("character", function () {
 				audio: 2,
 				enable: "phaseUse",
 				usable: 1,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.hasEnabledSlot(1) ||
 						player.hasEnabledSlot(2) ||
@@ -1403,7 +1404,7 @@ game.import("character", function () {
 						player.hasEnabledSlot("horse")
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseToDisable(true).set("ai", function (event, player, list) {
 						if (list.includes("equip2")) return "equip2";
@@ -1444,7 +1445,7 @@ game.import("character", function () {
 				ai: {
 					order: 13,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (player.hasEnabledSlot("equip2")) return 1;
 							if (
 								player.hasEnabledSlot("equip1") &&
@@ -1470,7 +1471,7 @@ game.import("character", function () {
 			},
 			drlt_jueyan1: {
 				mod: {
-					cardUsable: function (card, player, num) {
+					cardUsable(card, player, num) {
 						if (card.name == "sha") return num + 3;
 					},
 				},
@@ -1480,7 +1481,7 @@ game.import("character", function () {
 			},
 			drlt_jueyan2: {
 				mod: {
-					targetInRange: function (card, player, target, now) {
+					targetInRange(card, player, target, now) {
 						return true;
 					},
 				},
@@ -1490,7 +1491,7 @@ game.import("character", function () {
 			},
 			drlt_jueyan3: {
 				mod: {
-					maxHandcard: function (player, num) {
+					maxHandcard(player, num) {
 						return num + 3;
 					},
 				},
@@ -1509,10 +1510,10 @@ game.import("character", function () {
 				unique: true,
 				juexingji: true,
 				derivation: ["drlt_huairou"],
-				filter: function (event, player) {
+				filter(event, player) {
 					return !player.hasEnabledSlot() || player.hp == 1;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("drlt_poshi");
 					player.loseMaxHp();
@@ -1532,11 +1533,11 @@ game.import("character", function () {
 						lib.skill.drlt_huairou.position
 					),
 				filterCard: (card, player) => get.type(card) == "equip" && player.canRecast(card),
-				check: function (card) {
+				check(card) {
 					if (!_status.event.player.canEquip(card)) return 5;
 					return 3 - get.value(card);
 				},
-				content: function () {
+				content() {
 					player.recast(cards);
 				},
 				discard: false,
@@ -1561,10 +1562,10 @@ game.import("character", function () {
 							player: "phaseDrawBegin2",
 						},
 						forced: true,
-						filter: function (event, player) {
+						filter(event, player) {
 							return !event.numFixed;
 						},
-						content: function () {
+						content() {
 							trigger.num = game.countGroup();
 						},
 					},
@@ -1574,14 +1575,14 @@ game.import("character", function () {
 							player: "phaseUseEnd",
 						},
 						forced: true,
-						filter: function (event, player) {
+						filter(event, player) {
 							var num = 0;
 							player.getHistory("sourceDamage", function (evt) {
 								if (evt.getParent("phaseUse") == event) num += evt.num;
 							});
 							return !num || num > 1;
 						},
-						content: function () {
+						content() {
 							var numx = 0;
 							player.getHistory("sourceDamage", function (evt) {
 								if (evt.getParent("phaseUse") == trigger) numx += evt.num;
@@ -1598,7 +1599,7 @@ game.import("character", function () {
 			},
 			drlt_yongsi1: {
 				mod: {
-					maxHandcard: function (player, num) {
+					maxHandcard(player, num) {
 						return num + player.maxHp - 2 * Math.max(0, player.hp);
 					},
 				},
@@ -1612,7 +1613,7 @@ game.import("character", function () {
 					player: "phaseDiscardBegin",
 				},
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (!player.hasZhuSkill("drlt_weidi")) return false;
 					return (
 						player.needsToDiscard() > 0 &&
@@ -1621,7 +1622,7 @@ game.import("character", function () {
 						}) > 0
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var num = Math.min(
 						player.needsToDiscard(),
@@ -1638,17 +1639,17 @@ game.import("character", function () {
 								get.cnNumber(num) +
 								"张手牌交给等量的其他群势力角色。先按顺序选中所有要给出的手牌，然后再按顺序选择等量的目标角色",
 							selectCard: [1, num],
-							selectTarget: function () {
+							selectTarget() {
 								return ui.selected.cards.length;
 							},
-							filterTarget: function (card, player, target) {
+							filterTarget(card, player, target) {
 								return target != player && target.group == "qun";
 							},
 							complexSelect: true,
-							filterOk: function () {
+							filterOk() {
 								return ui.selected.cards.length == ui.selected.targets.length;
 							},
-							ai1: function (card) {
+							ai1(card) {
 								var player = _status.event.player;
 								var value = get.value(card, player, "raw");
 								if (
@@ -1664,7 +1665,7 @@ game.import("character", function () {
 									return 1 / Math.max(1, get.useful(card));
 								return -1;
 							},
-							ai2: function (target) {
+							ai2(target) {
 								var player = _status.event.player;
 								var card = ui.selected.cards[ui.selected.targets.length];
 								if (card && get.value(card, player, "raw") < 0)
@@ -1700,13 +1701,13 @@ game.import("character", function () {
 				skillAnimation: true,
 				animationColor: "gray",
 				limited: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return !player.isDisabledJudge() || player.hasEnabledSlot();
 				},
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return target != player;
 				},
-				content: function () {
+				content() {
 					player.awakenSkill("drlt_xiongluan");
 					var disables = [];
 					for (var i = 1; i <= 5; i++) {
@@ -1755,18 +1756,18 @@ game.import("character", function () {
 				},
 			},
 			drlt_xiongluan1: {
-				onremove: function (player) {
+				onremove(player) {
 					player.storage.drlt_xiongluan1.removeSkill("drlt_xiongluan2");
 					player.storage.drlt_xiongluan1.unmarkSkill("drlt_xiongluan1");
 					delete player.storage.drlt_xiongluan1;
 				},
 				mod: {
-					targetInRange: function (card, player, target) {
+					targetInRange(card, player, target) {
 						if (target.hasSkill("drlt_xiongluan2")) {
 							return true;
 						}
 					},
-					cardUsableTarget: function (card, player, target) {
+					cardUsableTarget(card, player, target) {
 						if (target.hasSkill("drlt_xiongluan2")) return true;
 					},
 				},
@@ -1774,13 +1775,13 @@ game.import("character", function () {
 			},
 			drlt_xiongluan2: {
 				mod: {
-					cardEnabled2: function (card, player) {
+					cardEnabled2(card, player) {
 						if (get.position(card) == "h") return false;
 					},
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (get.tag(card, "damage")) return [0, -999999];
 						},
 					},
@@ -1794,29 +1795,29 @@ game.import("character", function () {
 					target: "useCardToTargeted",
 				},
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						get.type(event.card) == "trick" &&
 						event.targets.length > 1 &&
 						player.countCards("he") > 0
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseCardTarget({
 						filterCard: true,
 						selectCard: 1,
 						position: "he",
-						filterTarget: function (card, player, target) {
+						filterTarget(card, player, target) {
 							return player != target && _status.event.targets.includes(target);
 						},
-						ai1: function (card) {
+						ai1(card) {
 							if (card.name == "du") return 20;
 							if (_status.event.player.storage.drlt_xiongluan && get.type(card) == "equip")
 								return 15;
 							return 6 - get.value(card);
 						},
-						ai2: function (target) {
+						ai2(target) {
 							var att = get.attitude(_status.event.player, target);
 							if (ui.selected.cards.length && ui.selected.cards[0].name == "du") {
 								if (target.hasSkillTag("nodu")) return 0.1;
@@ -1841,7 +1842,7 @@ game.import("character", function () {
 			drlt_wanglie: {
 				locked: false,
 				mod: {
-					targetInRange: function (card, player, target, now) {
+					targetInRange(card, player, target, now) {
 						if (game.online) {
 							if (!player.countUsed()) return true;
 						} else {
@@ -1861,13 +1862,13 @@ game.import("character", function () {
 				trigger: {
 					player: "useCard",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.isPhaseUsing() && (event.card.name == "sha" || get.type(event.card) == "trick")
 					);
 				},
 				preHidden: true,
-				check: function (event, player) {
+				check(event, player) {
 					if (["wuzhong", "kaihua", "dongzhuxianji"].includes(event.card.name)) return false;
 					player._wanglie_temp = true;
 					var eff = 0;
@@ -1892,10 +1893,10 @@ game.import("character", function () {
 						return true;
 					return false;
 				},
-				prompt2: function (event) {
+				prompt2(event) {
 					return "令" + get.translation(event.card) + "不能被响应，然后本阶段不能再使用牌";
 				},
-				content: function () {
+				content() {
 					trigger.nowuxie = true;
 					trigger.directHit.addArray(game.players);
 					player.addTempSkill("drlt_wanglie2", "phaseUseAfter");
@@ -1903,7 +1904,7 @@ game.import("character", function () {
 				ai: {
 					pretao: true,
 					directHit_ai: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						if (tag == "pretao") return true;
 						if (player._wanglie_temp) return false;
 						player._wanglie_temp = true;
@@ -1939,7 +1940,7 @@ game.import("character", function () {
 			},
 			drlt_wanglie2: {
 				mod: {
-					cardEnabled: function (card, player) {
+					cardEnabled(card, player) {
 						return false;
 					},
 				},
@@ -1957,14 +1958,14 @@ game.import("character", function () {
 								"loseAsyncAfter",
 							],
 						},
-						filter: function (event, player, name) {
+						filter(event, player, name) {
 							if (event.name == "lose" || event.name == "loseAsync")
 								return event.getlx !== false && event.toStorage == true;
 							if (event.name == "cardsGotoSpecial") return !event.notrigger;
 							return true;
 						},
 						direct: true,
-						content: function () {
+						content() {
 							"step 0";
 							player.chooseTarget(
 								"是否发动【良姻】令手牌数大于你的一名角色摸一张牌？",
@@ -1988,7 +1989,7 @@ game.import("character", function () {
 						trigger: {
 							global: "gainAfter",
 						},
-						filter: function (event, player) {
+						filter(event, player) {
 							return (
 								event.fromStorage == true ||
 								game.hasPlayer2(function (current) {
@@ -1998,7 +1999,7 @@ game.import("character", function () {
 							);
 						},
 						direct: true,
-						content: function () {
+						content() {
 							"step 0";
 							player.chooseTarget(
 								"是否发动【良姻】令手牌数小于你的一名角色弃置一张牌？",
@@ -2028,10 +2029,10 @@ game.import("character", function () {
 					player: "phaseZhunbeiBegin",
 				},
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("he") > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseCard(get.prompt("kongsheng"), "将任意张牌置于武将牌上", "he", [
@@ -2063,12 +2064,12 @@ game.import("character", function () {
 				trigger: {
 					player: "phaseJieshuBegin",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getExpansions("kongsheng2").length > 0;
 				},
 				forced: true,
 				charlotte: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.addTempSkill("kongsheng_ai", "kongsheng2After");
 					"step 1";
@@ -2099,7 +2100,7 @@ game.import("character", function () {
 				zhuanhuanji: true,
 				marktext: "☯",
 				intro: {
-					content: function (storage, player, skill) {
+					content(storage, player, skill) {
 						if (player.storage.nzry_juzhan == true)
 							return "当你使用【杀】指定一名角色为目标后，你可以获得其一张牌，然后你本回合内不能再对其使用牌";
 						return "当你成为其他角色【杀】的目标后，你可以与其各摸一张牌，然后其本回合内不能再对你使用牌";
@@ -2114,11 +2115,11 @@ game.import("character", function () {
 						},
 						prompt2:
 							"当你成为其他角色【杀】的目标后，你可以与其各摸一张牌，然后其本回合内不能再对你使用牌。",
-						filter: function (event, player) {
+						filter(event, player) {
 							return event.card.name == "sha" && !player.storage.nzry_juzhan;
 						},
 						logTarget: "player",
-						content: function () {
+						content() {
 							"step 0";
 							game.asyncDraw([player, trigger.player]);
 							trigger.player.addTempSkill("nzry_juzhany");
@@ -2135,14 +2136,14 @@ game.import("character", function () {
 						},
 						prompt2:
 							"当你使用【杀】指定一名角色为目标后，你可以获得其一张牌，然后你本回合内不能再对其使用牌",
-						filter: function (event, player) {
+						filter(event, player) {
 							return (
 								event.card.name == "sha" &&
 								player.storage.nzry_juzhan == true &&
 								event.target.countGainableCards(player, "he") > 0
 							);
 						},
-						check: function (event, player) {
+						check(event, player) {
 							return (
 								event.player.countCards("he") > 0 &&
 								event.targets &&
@@ -2150,7 +2151,7 @@ game.import("character", function () {
 							);
 						},
 						logTarget: "target",
-						content: function () {
+						content() {
 							player.gainPlayerCard(trigger.targets[0], "he", true);
 							player.changeZhuanhuanji("nzry_juzhan");
 							trigger.target.addTempSkill("nzry_juzhanx");
@@ -2161,7 +2162,7 @@ game.import("character", function () {
 			},
 			nzry_juzhanx: {
 				mod: {
-					targetEnabled: function (card, player, target) {
+					targetEnabled(card, player, target) {
 						if (player.hasSkill("nzry_juzhany")) return false;
 					},
 				},
@@ -2172,7 +2173,7 @@ game.import("character", function () {
 					if (!Array.isArray(player.storage.nzry_feijun)) player.storage.nzry_feijun = [];
 				},
 				intro: {
-					content: function (storage) {
+					content(storage) {
 						if (!storage || !storage.length) return "尚未发动";
 						var str = get.translation(storage);
 						return "已对" + str + "发动过〖飞军〗";
@@ -2183,7 +2184,7 @@ game.import("character", function () {
 				usable: 1,
 				position: "he",
 				audio: 2,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						game.hasPlayer(function (current) {
 							return current.countCards("h") >= player.countCards("h");
@@ -2194,10 +2195,10 @@ game.import("character", function () {
 					);
 				},
 				filterCard: true,
-				check: function (card) {
+				check(card) {
 					return 5 - get.value(card);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var list = [];
 					if (
@@ -2285,7 +2286,7 @@ game.import("character", function () {
 				ai: {
 					order: 11,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (
 								game.hasPlayer(function (current) {
 									return (
@@ -2318,10 +2319,10 @@ game.import("character", function () {
 				audio: 2,
 				trigger: { player: "nzry_feijunAfter" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event._nzry_binglve == true;
 				},
-				content: function () {
+				content() {
 					player.draw(2);
 				},
 				ai: { combo: "nzry_feijun" },
@@ -2330,7 +2331,7 @@ game.import("character", function () {
 				charlotte: true,
 				ai: {
 					filterDamage: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						if (!player.hasMark("nzry_huaiju")) return false;
 						if (
 							!game.hasPlayer(function (current) {
@@ -2357,10 +2358,10 @@ game.import("character", function () {
 					player: "enterGame",
 				},
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.name != "phase" || game.phaseNumber == 0;
 				},
-				content: function () {
+				content() {
 					player.addMark("nzry_huaiju", 3);
 					player.addSkill("nzry_huaiju_ai");
 				},
@@ -2373,10 +2374,10 @@ game.import("character", function () {
 					global: ["damageBegin4", "phaseDrawBegin2"],
 				},
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.player.hasMark("nzry_huaiju") && (event.name == "damage" || !event.numFixed);
 				},
-				content: function () {
+				content() {
 					player.line(trigger.player, "green");
 					if (trigger.name == "damage") {
 						trigger.cancel();
@@ -2390,7 +2391,7 @@ game.import("character", function () {
 					player: "phaseUseBegin",
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseTarget(
 						get.prompt("nzry_yili"),
@@ -2438,13 +2439,13 @@ game.import("character", function () {
 				trigger: {
 					player: "phaseDrawBefore",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return !player.hasMark("nzry_huaiju");
 				},
-				check: function (event, player) {
+				check(event, player) {
 					return player.countCards("h") >= 2 || player.skipList.includes("phaseUse");
 				},
-				content: function () {
+				content() {
 					trigger.cancel();
 					player.addMark("nzry_huaiju", 1);
 				},
@@ -2458,7 +2459,7 @@ game.import("character", function () {
 					player: "phaseDiscardAfter",
 				},
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					var cards = [];
 					player.getHistory("lose", function (evt) {
 						if (evt.type == "discard" && evt.getParent("phaseDiscard") == event)
@@ -2466,7 +2467,7 @@ game.import("character", function () {
 					});
 					return cards.length > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var cards = [];
 					player.getHistory("lose", function (evt) {
@@ -2556,17 +2557,17 @@ game.import("character", function () {
 			rechezheng: {
 				audio: "nzry_zhizheng",
 				trigger: { source: "damageBegin2" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.isPhaseUsing() && !player.inRangeOf(event.player);
 				},
 				forced: true,
 				logTarget: "player",
-				content: function () {
+				content() {
 					trigger.cancel();
 				},
 				ai: {
 					effect: {
-						player: function (card, player, target) {
+						player(card, player, target) {
 							if (get.tag(card, "damage") && !player.inRangeOf(target)) return "zerotarget";
 						},
 					},
@@ -2584,7 +2585,7 @@ game.import("character", function () {
 					player: "phaseUseEnd",
 				},
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.getHistory("useCard", function (evt) {
 							return evt.getParent("phaseUse") == event;
@@ -2601,7 +2602,7 @@ game.import("character", function () {
 						})
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseTarget(
 						"请选择〖掣政〗的目标",
@@ -2633,7 +2634,7 @@ game.import("character", function () {
 			},
 			nzry_lijun2: {
 				mod: {
-					cardUsable: function (card, player, num) {
+					cardUsable(card, player, num) {
 						if (card.name == "sha") return num + player.countMark("nzry_lijun2");
 					},
 				},
@@ -2645,7 +2646,7 @@ game.import("character", function () {
 				trigger: {
 					player: "useCardAfter",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.card.name != "sha" || player.group != "wu") return false;
 					if (player.hasSkill("nzry_lijun2")) return false;
 					if (!player.isPhaseUsing()) return false;
@@ -2663,7 +2664,7 @@ game.import("character", function () {
 					return false;
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					var list = game.filterPlayer(function (target) {
 						return player != target && target.hasZhuSkill("nzry_lijun", player);
@@ -2715,7 +2716,7 @@ game.import("character", function () {
 				zhuanhuanji: true,
 				marktext: "☯",
 				intro: {
-					content: function (storage, player, skill) {
+					content(storage, player, skill) {
 						var str = player.storage.nzry_chenglve
 							? "出牌阶段限一次，你可以摸两张牌，然后弃置一张手牌。若如此做，直到本回合结束，你使用与弃置牌花色相同的牌无距离和次数限制"
 							: "出牌阶段限一次，你可以摸一张牌，然后弃置两张手牌。若如此做，直到本回合结束，你使用与弃置牌花色相同的牌无距离和次数限制";
@@ -2729,7 +2730,7 @@ game.import("character", function () {
 				enable: "phaseUse",
 				usable: 1,
 				audio: 2,
-				content: function () {
+				content() {
 					"step 0";
 					if (player.storage.nzry_chenglve == true) {
 						player.draw(2);
@@ -2752,7 +2753,7 @@ game.import("character", function () {
 				ai: {
 					order: 2.7,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (!player.storage.nzry_chenglve && player.countCards("h") < 3) return 0;
 							return 1;
 						},
@@ -2761,12 +2762,12 @@ game.import("character", function () {
 			},
 			nzry_chenglve1: {
 				mod: {
-					cardUsable: function (card, player) {
+					cardUsable(card, player) {
 						const suit = get.suit(card);
 						if (suit == "unsure" || player.getStorage("nzry_chenglve1").includes(suit))
 							return Infinity;
 					},
-					targetInRange: function (card, player) {
+					targetInRange(card, player) {
 						const suit = get.suit(card);
 						if (suit == "unsure" || player.getStorage("nzry_chenglve1").includes(suit))
 							return true;
@@ -2777,7 +2778,7 @@ game.import("character", function () {
 			nzry_shicai: {
 				audio: "nzry_shicai_2",
 				trigger: { player: ["useCardAfter", "useCardToTargeted"] },
-				prompt2: function (event, player) {
+				prompt2(event, player) {
 					const cards = event.cards.filterInD("oe");
 					return (
 						"你可以将" +
@@ -2786,7 +2787,7 @@ game.import("character", function () {
 						"置于牌堆顶，然后摸一张牌"
 					);
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (!event.cards.someInD()) return false;
 					let evt = event,
 						type = get.type2(evt.card, false);
@@ -2804,7 +2805,7 @@ game.import("character", function () {
 						evt
 					);
 				},
-				check: function (event, player) {
+				check(event, player) {
 					if (get.type(event.card) == "equip") {
 						if (get.subtype(event.card) == "equip6") return true;
 						if (get.equipResult(player, player, event.card.name) <= 0) return true;
@@ -2818,7 +2819,7 @@ game.import("character", function () {
 					}
 					return true;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var cards = trigger.cards.filterInD();
 					if (cards.length == 1) {
@@ -2852,7 +2853,7 @@ game.import("character", function () {
 				subSkill: { 2: { audio: 2 } },
 				ai: {
 					reverseOrder: true,
-					skillTagFilter: function (player) {
+					skillTagFilter(player) {
 						if (
 							player.getHistory("useCard", function (evt) {
 								return get.type(evt.card) == "equip";
@@ -2861,7 +2862,7 @@ game.import("character", function () {
 							return false;
 					},
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (
 								player == target &&
 								get.type(card) == "equip" &&
@@ -2881,7 +2882,7 @@ game.import("character", function () {
 					player: "drawBegin",
 				},
 				forced: true,
-				content: function () {
+				content() {
 					trigger.bottom = true;
 				},
 			},
@@ -2893,7 +2894,7 @@ game.import("character", function () {
 					content: "expansion",
 					markcount: "expansion",
 				},
-				onremove: function (player, skill) {
+				onremove(player, skill) {
 					var cards = player.getExpansions(skill);
 					if (cards.length) player.loseToDiscardpile(cards);
 				},
@@ -2908,13 +2909,13 @@ game.import("character", function () {
 						},
 						forced: true,
 						locked: false,
-						filter: function (event, player) {
+						filter(event, player) {
 							return (
 								(event.name != "phase" || game.phaseNumber == 0) &&
 								!player.getExpansions("nzry_mingren").length
 							);
 						},
-						content: function () {
+						content() {
 							"step 0";
 							player.draw(2);
 							"step 1";
@@ -2937,13 +2938,13 @@ game.import("character", function () {
 						trigger: {
 							player: "phaseJieshuBegin",
 						},
-						filter: function (event, player) {
+						filter(event, player) {
 							return (
 								player.countCards("h") > 0 && player.getExpansions("nzry_mingren").length > 0
 							);
 						},
 						direct: true,
-						content: function () {
+						content() {
 							"step 0";
 							player
 								.chooseCard(
@@ -2998,7 +2999,7 @@ game.import("character", function () {
 				zhuanhuanji: true,
 				marktext: "☯",
 				intro: {
-					content: function (storage, player, skill) {
+					content(storage, player, skill) {
 						if (player.storage.nzry_zhenliang == true)
 							return "当你于回合外使用或打出的牌结算完成后，若此牌与“任”颜色相同，则你可以令一名角色摸一张牌。";
 						return "出牌阶段限一次，你可以弃置一张与“任”颜色相同的牌并对攻击范围内的一名角色造成1点伤害。";
@@ -3010,7 +3011,7 @@ game.import("character", function () {
 						prompt: "弃置一张与“任”颜色相同的牌，并对攻击范围内的一名角色造成1点伤害。",
 						audio: 2,
 						enable: "phaseUse",
-						filter: function (event, player) {
+						filter(event, player) {
 							if (player.storage.nzry_zhenliang) return false;
 							var storage = player.getExpansions("nzry_mingren");
 							if (!storage.length) return false;
@@ -3026,23 +3027,23 @@ game.import("character", function () {
 							});
 						},
 						position: "he",
-						filterCard: function (card, player) {
+						filterCard(card, player) {
 							return get.color(card) == get.color(player.getExpansions("nzry_mingren")[0]);
 						},
-						filterTarget: function (card, player, target) {
+						filterTarget(card, player, target) {
 							return player.inRange(target);
 						},
-						check: function (card) {
+						check(card) {
 							return 6.5 - get.value(card);
 						},
-						content: function () {
+						content() {
 							player.changeZhuanhuanji("nzry_zhenliang");
 							target.damage("nocard");
 						},
 						ai: {
 							order: 5,
 							result: {
-								player: function (player, target) {
+								player(player, target) {
 									return get.damageEffect(target, player, player);
 								},
 							},
@@ -3052,14 +3053,14 @@ game.import("character", function () {
 						trigger: {
 							player: ["useCardAfter", "respondAfter"],
 						},
-						filter: function (event, player) {
+						filter(event, player) {
 							if (_status.currentPhase == player || !player.storage.nzry_zhenliang)
 								return false;
 							var card = player.getExpansions("nzry_mingren")[0];
 							return card && get.color(event.card) == get.color(card);
 						},
 						direct: true,
-						content: function () {
+						content() {
 							"step 0";
 							player.chooseTarget(get.prompt("nzry_zhenliang"), "令一名角色摸一张牌").ai =
 								function (target) {
@@ -3085,11 +3086,11 @@ game.import("character", function () {
 				trigger: {
 					target: "useCardToTargeted",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.player != player;
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseTarget(
 						get.prompt("nzry_jianxiang"),
@@ -3114,7 +3115,7 @@ game.import("character", function () {
 				zhuanhuanji: true,
 				marktext: "☯",
 				intro: {
-					content: function (storage, player, skill) {
+					content(storage, player, skill) {
 						if (player.storage.nzry_shenshi == true)
 							return "其他角色对你造成伤害后，你可以观看该角色的手牌，然后交给其一张牌，当前角色回合结束时，若此牌仍在该角色的区域内，你将手牌摸至四张";
 						return "出牌阶段限一次，你可以将一张牌交给一名手牌数最多的角色，然后对其造成1点伤害，若该角色因此死亡，则你可以令一名角色将手牌摸至四张";
@@ -3127,7 +3128,7 @@ game.import("character", function () {
 						prompt: "出牌阶段限一次，你可以将一张牌交给一名手牌数最多的角色，然后对其造成1点伤害，若该角色因此死亡，则你可以令一名角色将手牌摸至四张",
 						enable: "phaseUse",
 						usable: 1,
-						filter: function (event, player) {
+						filter(event, player) {
 							return player.countCards("he") > 0 && player.storage.nzry_shenshi != true;
 						},
 						discard: false,
@@ -3136,7 +3137,7 @@ game.import("character", function () {
 						delay: false,
 						position: "he",
 						filterCard: true,
-						filterTarget: function (card, player, target) {
+						filterTarget(card, player, target) {
 							return (
 								target != player &&
 								!game.hasPlayer(function (current) {
@@ -3146,10 +3147,10 @@ game.import("character", function () {
 								})
 							);
 						},
-						check: function (card) {
+						check(card) {
 							return 5 - get.value(card);
 						},
-						content: function () {
+						content() {
 							"step 0";
 							player.changeZhuanhuanji("nzry_shenshi");
 							player.give(cards, target);
@@ -3178,7 +3179,7 @@ game.import("character", function () {
 						ai: {
 							order: 1,
 							result: {
-								target: function (player, target) {
+								target(player, target) {
 									return -1;
 								},
 							},
@@ -3189,7 +3190,7 @@ game.import("character", function () {
 						trigger: {
 							player: "damageEnd",
 						},
-						filter: function (event, player) {
+						filter(event, player) {
 							return (
 								player.countCards("he") > 0 &&
 								event.source &&
@@ -3197,7 +3198,7 @@ game.import("character", function () {
 								player.storage.nzry_shenshi == true
 							);
 						},
-						check: function (event, player) {
+						check(event, player) {
 							return (
 								event.source &&
 								event.source.countCards("h") <= 2 &&
@@ -3207,7 +3208,7 @@ game.import("character", function () {
 						logTarget: "source",
 						prompt2:
 							"其他角色对你造成伤害后，你可以观看该角色的手牌，然后交给其一张牌，当前角色回合结束时，若此牌仍在该角色的区域内，你将手牌摸至四张",
-						content: function () {
+						content() {
 							"step 0";
 							player.changeZhuanhuanji("nzry_shenshi");
 							player.viewHandcards(trigger.source);
@@ -3235,12 +3236,12 @@ game.import("character", function () {
 				forced: true,
 				popup: false,
 				charlotte: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.storage.nzry_shenshi1 != undefined && player.storage.nzry_shenshi2 != undefined
 					);
 				},
-				content: function () {
+				content() {
 					var pl = player.storage.nzry_shenshi2;
 					var card = player.storage.nzry_shenshi1;
 					if (player.getCards("he").includes(card) && 4 - pl.countCards("h") > 0) {
@@ -3255,7 +3256,7 @@ game.import("character", function () {
 			xinjushou: {
 				audio: 2,
 				trigger: { player: "phaseJieshuBegin" },
-				content: function () {
+				content() {
 					"step 0";
 					player.draw(4);
 					player.turnOver();
@@ -3281,7 +3282,7 @@ game.import("character", function () {
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (card.name == "guiyoujie") return [0, 1];
 						},
 					},
@@ -3293,14 +3294,14 @@ game.import("character", function () {
 				filterCard: true,
 				position: "e",
 				viewAs: { name: "wuxie" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("e") > 0;
 				},
-				viewAsFilter: function (player) {
+				viewAsFilter(player) {
 					return player.countCards("e") > 0;
 				},
 				prompt: "将一张装备区内的牌当无懈可击使用",
-				check: function (card) {
+				check(card) {
 					return 8 - get.equipValue(card);
 				},
 				threaten: 1.2,
@@ -3310,10 +3311,10 @@ game.import("character", function () {
 						trigger: { player: "turnOverEnd" },
 						direct: true,
 						audio: "jiewei",
-						filter: function (event, player) {
+						filter(event, player) {
 							return !player.isTurnedOver() && player.canMoveCard();
 						},
-						content: function () {
+						content() {
 							"step 0";
 							player
 								.chooseToDiscard(
@@ -3343,15 +3344,15 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_pangde"],
 				trigger: { player: "useCardToPlayered" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "sha" && event.target.countDiscardableCards(player, "he") > 0;
 				},
 				preHidden: true,
-				check: function (event, player) {
+				check(event, player) {
 					return get.attitude(player, event.target) <= 0;
 				},
 				logTarget: "target",
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.discardPlayerCard(trigger.target, get.prompt("jianchu", trigger.target), true)
@@ -3386,7 +3387,7 @@ game.import("character", function () {
 				ai: {
 					unequip_ai: true,
 					directHit_ai: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						if (tag == "directHit_ai")
 							return (
 								arg.card.name == "sha" &&
@@ -3404,7 +3405,7 @@ game.import("character", function () {
 				enable: "phaseUse",
 				usable: 1,
 				position: "he",
-				filterCard: function () {
+				filterCard() {
 					if (ui.selected.targets.length == 2) return false;
 					return true;
 				},
@@ -3412,7 +3413,7 @@ game.import("character", function () {
 				selectTarget: 2,
 				complexCard: true,
 				complexSelect: true,
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					if (player == target) return false;
 					if (ui.selected.targets.length == 0) return true;
 					return (
@@ -3422,7 +3423,7 @@ game.import("character", function () {
 				},
 				multitarget: true,
 				multiline: true,
-				content: function () {
+				content() {
 					"step 0";
 					var cards = targets[0].getCards("h").concat(targets[1].getCards("h"));
 					var dialog = ui.create.dialog("缔盟", true);
@@ -3556,7 +3557,7 @@ game.import("character", function () {
 					game.addVideo("cardDialog", null, dialog.videoId);
 				},
 				targetprompt: ["先拿牌", "后拿牌"],
-				find: function (type) {
+				find(type) {
 					var list = game.filterPlayer(function (current) {
 						return current != player && get.attitude(player, current) > 3;
 					});
@@ -3592,7 +3593,7 @@ game.import("character", function () {
 					if (type == 3) return count;
 					return list[i];
 				},
-				check: function (card) {
+				check(card) {
 					var count = lib.skill.redimeng.find(3);
 					if (count == null) return -1;
 					if (ui.selected.cards.length < count) return 7 - get.value(card);
@@ -3603,7 +3604,7 @@ game.import("character", function () {
 					threaten: 1.6,
 					expose: 0.5,
 					result: {
-						player: function (player, target) {
+						player(player, target) {
 							if (ui.selected.targets.length == 0) {
 								if (target == lib.skill.redimeng.find(1)) return 1;
 								return 0;
@@ -3619,13 +3620,13 @@ game.import("character", function () {
 				audio: 2,
 				enable: "phaseUse",
 				viewAs: { name: "wanjian" },
-				filterCard: function (card, player) {
+				filterCard(card, player) {
 					if (!player.storage.reluanji) return true;
 					return !player.storage.reluanji.includes(get.suit(card));
 				},
 				position: "hs",
 				selectCard: 2,
-				check: function (card) {
+				check(card) {
 					var player = _status.event.player;
 					var targets = game.filterPlayer(function (current) {
 						return player.canUse("wanjian", current);
@@ -3663,7 +3664,7 @@ game.import("character", function () {
 					reset: {
 						trigger: { player: "phaseAfter" },
 						silent: true,
-						content: function () {
+						content() {
 							delete player.storage.reluanji;
 							delete player.storage.reluanji2;
 						},
@@ -3671,10 +3672,10 @@ game.import("character", function () {
 					count: {
 						trigger: { player: "useCard" },
 						silent: true,
-						filter: function (event) {
+						filter(event) {
 							return event.skill == "reluanji";
 						},
-						content: function () {
+						content() {
 							player.storage.reluanji2 = trigger.card;
 							if (!player.storage.reluanji) {
 								player.storage.reluanji = [];
@@ -3687,10 +3688,10 @@ game.import("character", function () {
 					respond: {
 						trigger: { global: "respond" },
 						silent: true,
-						filter: function (event) {
+						filter(event) {
 							return event.getParent(2).skill == "reluanji";
 						},
-						content: function () {
+						content() {
 							trigger.player.draw();
 						},
 					},
@@ -3699,10 +3700,10 @@ game.import("character", function () {
 						forced: true,
 						silent: true,
 						popup: false,
-						filter: function (event, player) {
+						filter(event, player) {
 							return player.storage.reluanji2 && event.card == player.storage.reluanji2;
 						},
-						content: function () {
+						content() {
 							delete player.storage.reluanji2;
 						},
 					},
@@ -3711,10 +3712,10 @@ game.import("character", function () {
 						forced: true,
 						silent: true,
 						popup: false,
-						filter: function (event, player) {
+						filter(event, player) {
 							return player.storage.reluanji2 && event.card == player.storage.reluanji2;
 						},
-						content: function () {
+						content() {
 							player.draw(trigger.targets.length);
 							delete player.storage.reluanji2;
 						},
@@ -3726,10 +3727,10 @@ game.import("character", function () {
 				limited: true,
 				audio: 2,
 				enable: "phaseUse",
-				filter: function (event, player) {
+				filter(event, player) {
 					return !player.storage.qimou;
 				},
-				init: function (player) {
+				init(player) {
 					player.storage.qimou = false;
 				},
 				mark: true,
@@ -3738,7 +3739,7 @@ game.import("character", function () {
 				},
 				skillAnimation: true,
 				animationColor: "orange",
-				content: function () {
+				content() {
 					"step 0";
 					var shas = player.getCards("h", "sha");
 					var num;
@@ -3774,7 +3775,7 @@ game.import("character", function () {
 				ai: {
 					order: 2,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (player.hp == 1) return 0;
 							var shas = player.getCards("h", "sha");
 							if (!shas.length) return 0;
@@ -3809,12 +3810,12 @@ game.import("character", function () {
 			qimou2: {
 				onremove: true,
 				mod: {
-					cardUsable: function (card, player, num) {
+					cardUsable(card, player, num) {
 						if (typeof player.storage.qimou2 == "number" && card.name == "sha") {
 							return num + player.storage.qimou2;
 						}
 					},
-					globalFrom: function (from, to, distance) {
+					globalFrom(from, to, distance) {
 						if (typeof from.storage.qimou2 == "number") {
 							return distance - from.storage.qimou2;
 						}
@@ -3825,12 +3826,12 @@ game.import("character", function () {
 				audio: "kuanggu",
 				audioname: ["re_weiyan", "ol_weiyan"],
 				trigger: { source: "damageSource" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.kuangguCheck && event.num > 0;
 				},
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					event.num = trigger.num;
 					"step 1";
@@ -3867,10 +3868,10 @@ game.import("character", function () {
 			xinliegong: {
 				shaRelated: true,
 				mod: {
-					aiOrder: function (player, card, num) {
+					aiOrder(player, card, num) {
 						if (num > 0 && (card.name === "sha" || get.tag(card, "draw"))) return num + 6;
 					},
-					targetInRange: function (card, player, target) {
+					targetInRange(card, player, target) {
 						if (card.name == "sha" && typeof get.number(card) == "number") {
 							if (get.distance(player, target) <= get.number(card)) return true;
 						}
@@ -3881,16 +3882,16 @@ game.import("character", function () {
 				trigger: { player: "useCardToTargeted" },
 				logTarget: "target",
 				locked: false,
-				check: function (event, player) {
+				check(event, player) {
 					return get.attitude(player, event.target) <= 0;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.card.name != "sha") return false;
 					if (event.target.countCards("h") <= player.countCards("h")) return true;
 					if (event.target.hp >= player.hp) return true;
 					return false;
 				},
-				content: function () {
+				content() {
 					if (trigger.target.countCards("h") <= player.countCards("h"))
 						trigger.getParent().directHit.push(trigger.target);
 					if (trigger.target.hp >= player.hp) {
@@ -3906,7 +3907,7 @@ game.import("character", function () {
 				ai: {
 					threaten: 0.5,
 					directHit_ai: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						if (
 							get.attitude(player, arg.target) <= 0 &&
 							arg.card.name == "sha" &&
@@ -3929,10 +3930,10 @@ game.import("character", function () {
 				},
 				enable: "phaseUse",
 				usable: 1,
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return target != player && target.inRange(player) && target.countCards("he") > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					target
 						.chooseToUse(function (card, player, event) {
@@ -3962,7 +3963,7 @@ game.import("character", function () {
 					expose: 0.2,
 					result: {
 						target: -1,
-						player: function (player, target) {
+						player(player, target) {
 							if (target.countCards("h") == 0) return 0;
 							if (target.countCards("h") == 1) return -0.1;
 							if (player.hp <= 2) return -2;
@@ -3985,11 +3986,11 @@ game.import("character", function () {
 				derivation: "reguanxing",
 				trigger: { player: "phaseZhunbeiBegin" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.storage.zhiji) return false;
 					return player.countCards("h") == 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("zhiji");
 					player.chooseDrawRecover(2, true);
@@ -4004,10 +4005,10 @@ game.import("character", function () {
 				trigger: { target: "useCardToTargeted" },
 				forced: true,
 				preHidden: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "sha";
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var eff = get.effect(player, trigger.card, trigger.player, trigger.player);
 					trigger.player
@@ -4031,7 +4032,7 @@ game.import("character", function () {
 				},
 				ai: {
 					effect: {
-						target_use: function (card, player, target, current) {
+						target_use(card, player, target, current) {
 							if (card.name == "sha" && get.attitude(player, target) < 0) {
 								if (_status.event.name == "xiangle") return;
 								if (get.attitude(player, target) > 0 && current < 0) return "zerotarget";
@@ -4058,12 +4059,12 @@ game.import("character", function () {
 			fangquan: {
 				audio: 2,
 				trigger: { player: "phaseUseBefore" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("h") > 0 && !player.hasSkill("fangquan3");
 				},
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					var fang =
 						player.countMark("fangquan2") == 0 &&
@@ -4105,7 +4106,7 @@ game.import("character", function () {
 				audio: false,
 				//priority:-50,
 				onremove: true,
-				content: function () {
+				content() {
 					"step 0";
 					event.count = player.countMark(event.name);
 					player.removeMark(event.name, event.count);
@@ -4144,7 +4145,7 @@ game.import("character", function () {
 				forced: true,
 				popup: false,
 				audio: false,
-				content: function () {
+				content() {
 					player.unmarkSkill("fangquan");
 					player.removeSkill("fangquan3");
 				},
@@ -4161,10 +4162,10 @@ game.import("character", function () {
 				derivation: "rejijiang",
 				trigger: { player: "phaseZhunbeiBegin" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.isMinHp();
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("ruoyu");
 					player.gainMaxHp();
@@ -4178,12 +4179,12 @@ game.import("character", function () {
 				trigger: {
 					player: ["phaseJudgeBefore", "phaseDrawBefore", "phaseUseBefore", "phaseDiscardBefore"],
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("h") > 0;
 				},
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					var check,
 						str = "弃置一张手牌并跳过";
@@ -4304,13 +4305,13 @@ game.import("character", function () {
 				},
 				frequent: true,
 				preHidden: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player == _status.currentPhase) return false;
 					if (event.name == "gain" && event.player == player) return false;
 					var evt = event.getl(player);
 					return evt && evt.cards2 && evt.cards2.length > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var next = player.judge(function (card) {
 						if (get.suit(card) == "heart") return -1;
@@ -4340,7 +4341,7 @@ game.import("character", function () {
 					}
 					player.addToExpansion(event.card, "gain2").gaintag.add("tuntian");
 				},
-				callback: function () {
+				callback() {
 					if (!event.judgeResult.bool) {
 						event.finish();
 						return;
@@ -4352,7 +4353,7 @@ game.import("character", function () {
 					content: "expansion",
 					markcount: "expansion",
 				},
-				onremove: function (player, skill) {
+				onremove(player, skill) {
 					var cards = player.getExpansions(skill);
 					if (cards.length) player.loseToDiscardpile(cards);
 				},
@@ -4362,7 +4363,7 @@ game.import("character", function () {
 					dist: {
 						locked: false,
 						mod: {
-							globalFrom: function (from, to, distance) {
+							globalFrom(from, to, distance) {
 								var num = distance - from.getExpansions("tuntian").length;
 								if (
 									_status.event.skill == "jixi_backup" ||
@@ -4376,7 +4377,7 @@ game.import("character", function () {
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target, current) {
+						target(card, player, target, current) {
 							if (
 								typeof card === "object" &&
 								get.name(card) === "sha" &&
@@ -4423,7 +4424,7 @@ game.import("character", function () {
 							}
 						},
 					},
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (target.countCards("h") == 0) return 2;
 						return 0.5;
 					},
@@ -4440,11 +4441,11 @@ game.import("character", function () {
 				juexingji: true,
 				trigger: { player: "phaseZhunbeiBegin" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getExpansions("tuntian").length >= 3;
 				},
 				derivation: "jixi",
-				content: function () {
+				content() {
 					player.awakenSkill("zaoxian");
 					player.loseMaxHp();
 					player.addSkills("jixi");
@@ -4454,23 +4455,23 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_dengai", "gz_dengai", "ol_dengai"],
 				enable: "phaseUse",
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.getExpansions("tuntian").length > 0 &&
 						event.filterCard({ name: "shunshou" }, player, event)
 					);
 				},
 				chooseButton: {
-					dialog: function (event, player) {
+					dialog(event, player) {
 						return ui.create.dialog("急袭", player.getExpansions("tuntian"), "hidden");
 					},
-					filter: function (button, player) {
+					filter(button, player) {
 						var card = button.link;
 						if (!game.checkMod(card, player, "unchanged", "cardEnabled2", player)) return false;
 						var evt = _status.event.getParent();
 						return evt.filterCard(get.autoViewAs({ name: "shunshou" }, [card]), player, evt);
 					},
-					backup: function (links, player) {
+					backup(links, player) {
 						var skill = _status.event.buttoned;
 						return {
 							audio: "jixi",
@@ -4485,14 +4486,14 @@ game.import("character", function () {
 							card: links[0],
 						};
 					},
-					prompt: function (links, player) {
+					prompt(links, player) {
 						return "选择 顺手牵羊（" + get.translation(links[0]) + "）的目标";
 					},
 				},
 				ai: {
 					order: 10,
 					result: {
-						player: function (player) {
+						player(player) {
 							return player.getExpansions("tuntian").length - 1;
 						},
 					},
@@ -4505,7 +4506,7 @@ game.import("character", function () {
 				preHidden: true,
 				audioname: ["sp_lvmeng", "re_sunben", "re_sunce"],
 				mod: {
-					aiOrder: function (player, card, num) {
+					aiOrder(player, card, num) {
 						if (get.color(card) === "red" && get.name(card) === "sha")
 							return get.order({ name: "sha" }) + 0.15;
 					},
@@ -4514,7 +4515,7 @@ game.import("character", function () {
 					player: "useCardToPlayered",
 					target: "useCardToTargeted",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (
 						!(
 							event.card.name == "juedou" ||
@@ -4526,15 +4527,15 @@ game.import("character", function () {
 				},
 				locked: false,
 				frequent: true,
-				content: function () {
+				content() {
 					player.draw();
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (card.name == "sha" && get.color(card) == "red") return [1, 0.6];
 						},
-						player: function (card, player, target) {
+						player(card, player, target) {
 							if (card.name == "sha" && get.color(card) == "red") return [1, 1];
 						},
 					},
@@ -4549,24 +4550,24 @@ game.import("character", function () {
 				derivation: ["reyingzi", "gzyinghun"],
 				unique: true,
 				trigger: { player: "phaseZhunbeiBegin" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.hp <= 1 && !player.storage.hunzi;
 				},
 				forced: true,
 				//priority:3,
-				content: function () {
+				content() {
 					player.awakenSkill(event.name);
 					player.loseMaxHp();
 					player.addSkills(["reyingzi", "gzyinghun"]);
 				},
 				ai: {
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (target.hp == 1) return 2;
 						return 0.5;
 					},
 					maixie: true,
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (!target.hasFriend()) return;
 							if (
 								target.hp === 2 &&
@@ -4600,7 +4601,7 @@ game.import("character", function () {
 				audioname: ["re_sunben"],
 				//forceaudio:true,
 				enable: "phaseUse",
-				prompt: function () {
+				prompt() {
 					var player = _status.event.player;
 					var list = game.filterPlayer(function (target) {
 						return target.hasZhuSkill("zhiba", player) && player.canCompare(target);
@@ -4610,21 +4611,21 @@ game.import("character", function () {
 					str += "进行拼点。若你没赢，其可以获得两张拼点牌。";
 					return str;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.group != "wu" || player.countCards("h") == 0) return false;
 					return game.hasPlayer(function (target) {
 						return target.hasZhuSkill("zhiba", player) && player.canCompare(target);
 					});
 				},
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return target.hasZhuSkill("zhiba", player) && player.canCompare(target);
 				},
 				log: false,
-				prepare: function (cards, player, targets) {
+				prepare(cards, player, targets) {
 					targets[0].logSkill("zhiba");
 				},
 				usable: 1,
-				content: function () {
+				content() {
 					"step 0";
 					if (target.storage.hunzi || target.storage.rehunzi) {
 						target
@@ -4674,7 +4675,7 @@ game.import("character", function () {
 					},
 					expose: 0.2,
 					result: {
-						target: function (player, target) {
+						target(player, target) {
 							if (player.countCards("h", "du") && get.attitude(player, target) < 0) return -1;
 							if (player.countCards("h") <= player.hp) return 0;
 							var maxnum = 0;
@@ -4698,20 +4699,20 @@ game.import("character", function () {
 			zhijian: {
 				audio: 2,
 				enable: "phaseUse",
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("h", { type: "equip" }) > 0;
 				},
-				filterCard: function (card) {
+				filterCard(card) {
 					return get.type(card) == "equip";
 				},
-				check: function (card) {
+				check(card) {
 					var player = _status.currentPhase;
 					if (player.countCards("he", { subtype: get.subtype(card) }) > 1) {
 						return 11 - get.equipValue(card);
 					}
 					return 6 - get.value(card);
 				},
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					if (target.isMin()) return false;
 					return player != target && target.canEquip(card);
 				},
@@ -4721,7 +4722,7 @@ game.import("character", function () {
 				},
 				discard: false,
 				lose: false,
-				prepare: function (cards, player, targets) {
+				prepare(cards, player, targets) {
 					player.$give(cards, targets[0], false);
 				},
 				ai: {
@@ -4729,7 +4730,7 @@ game.import("character", function () {
 						order: 10,
 					},
 					result: {
-						target: function (player, target) {
+						target(player, target) {
 							var card = ui.selected.cards[0];
 							if (card) return get.effect(target, card, target, target);
 							return 0;
@@ -4742,7 +4743,7 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_zhangzhang"],
 				trigger: { global: "phaseDiscardAfter" },
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.player != player && event.player.isIn()) {
 						return (
 							event.player.getHistory("lose", function (evt) {
@@ -4756,7 +4757,7 @@ game.import("character", function () {
 					}
 					return false;
 				},
-				checkx: function (event, player, cards, cards2) {
+				checkx(event, player, cards, cards2) {
 					if (cards.length > 2 || get.attitude(player, event.player) > 0) return true;
 					for (var i = 0; i < cards2.length; i++) {
 						if (get.value(cards2[i], event.player, "raw") < 0) return true;
@@ -4765,7 +4766,7 @@ game.import("character", function () {
 				},
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					var cards = [],
 						cards2 = [];
@@ -4878,7 +4879,7 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_caiwenji", "ol_caiwenji"],
 				trigger: { global: "damageEnd" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						event.card &&
 						event.card.name == "sha" &&
@@ -4888,13 +4889,13 @@ game.import("character", function () {
 					);
 				},
 				direct: true,
-				checkx: function (event, player) {
+				checkx(event, player) {
 					var att1 = get.attitude(player, event.player);
 					var att2 = get.attitude(player, event.source);
 					return att1 > 0 && att2 <= 0;
 				},
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					var next = player.chooseToDiscard("he", get.prompt2("beige", trigger.player));
 					var check = lib.skill.beige.checkx(trigger, player);
@@ -4940,21 +4941,21 @@ game.import("character", function () {
 				forceDie: true,
 				skillAnimation: true,
 				animationColor: "gray",
-				filter: function (event) {
+				filter(event) {
 					return event.source && event.source.isIn();
 				},
-				content: function () {
+				content() {
 					trigger.source.clearSkills();
 				},
 				logTarget: "source",
 				ai: {
 					maixie_defend: true,
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (target.hp == 1) return 0.2;
 						return 1.5;
 					},
 					effect: {
-						target: function (card, player, target, current) {
+						target(card, player, target, current) {
 							if (!target.hasFriend()) return;
 							if (target.hp <= 1 && get.tag(card, "damage")) {
 								if (player.hasSkillTag("jueqing", false, target)) return 3;
@@ -4967,7 +4968,7 @@ game.import("character", function () {
 			huashen: {
 				audio: "huashen2",
 				unique: true,
-				init: function (player) {
+				init(player) {
 					if (!player.storage.huashen) {
 						player.storage.huashen = {
 							owned: {},
@@ -4993,7 +4994,7 @@ game.import("character", function () {
 					});
 				},
 				intro: {
-					content: function (storage, player) {
+					content(storage, player) {
 						var str = "";
 						var list = Object.keys(storage.owned);
 						if (list.length) {
@@ -5008,11 +5009,11 @@ game.import("character", function () {
 						}
 						return str;
 					},
-					onunmark: function (storage, player) {
+					onunmark(storage, player) {
 						_status.characterlist.addArray(Object.keys(storage.owned));
 						storage.owned = [];
 					},
-					mark: function (dialog, content, player) {
+					mark(dialog, content, player) {
 						var list = Object.keys(content.owned);
 						if (list.length) {
 							var skill = player.storage.huashen.current2;
@@ -5060,7 +5061,7 @@ game.import("character", function () {
 						}
 					},
 				},
-				addHuashen: function (player) {
+				addHuashen(player) {
 					if (!player.storage.huashen) return;
 					if (!_status.characterlist) {
 						lib.skill.pingjian.initList();
@@ -5087,7 +5088,7 @@ game.import("character", function () {
 						}
 					}
 				},
-				addHuashens: function (player, num) {
+				addHuashens(player, num) {
 					var list = [];
 					for (var i = 0; i < num; i++) {
 						var name = lib.skill.huashen.addHuashen(player);
@@ -5104,13 +5105,13 @@ game.import("character", function () {
 					global: "phaseBefore",
 					player: ["enterGame", "phaseBegin", "phaseEnd"],
 				},
-				filter: function (event, player, name) {
+				filter(event, player, name) {
 					if (event.name != "phase") return true;
 					if (name == "phaseBefore") return game.phaseNumber == 0;
 					return !get.is.empty(player.storage.huashen.owned);
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					var name = event.triggername;
 					if (trigger.name != "phase" || (name == "phaseBefore" && game.phaseNumber == 0)) {
@@ -5332,7 +5333,7 @@ game.import("character", function () {
 				unique: true,
 				trigger: { player: "damageEnd" },
 				frequent: true,
-				content: function () {
+				content() {
 					"step 0";
 					event.num = trigger.num;
 					"step 1";
@@ -5360,7 +5361,7 @@ game.import("character", function () {
 				preHidden: ["huoshou1", "huoshou2"],
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (card.name == "nanman") return 0;
 						},
 					},
@@ -5372,10 +5373,10 @@ game.import("character", function () {
 				trigger: { target: "useCardToBefore" },
 				forced: true,
 				priority: 15,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "nanman";
 				},
-				content: function () {
+				content() {
 					trigger.cancel();
 				},
 			},
@@ -5384,10 +5385,10 @@ game.import("character", function () {
 				audioname: ["re_menghuo"],
 				trigger: { global: "useCard" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card && event.card.name == "nanman" && event.player != player;
 				},
-				content: function () {
+				content() {
 					trigger.customArgs.default.customSource = player;
 				},
 			},
@@ -5398,10 +5399,10 @@ game.import("character", function () {
 			zaiqi: {
 				audio: 2,
 				trigger: { player: "phaseDrawBegin1" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return !event.numFixed && player.hp < player.maxHp;
 				},
-				check: function (event, player) {
+				check(event, player) {
 					if (player.getDamagedHp() < 2) {
 						return false;
 					} else if (player.getDamagedHp() == 2) {
@@ -5409,7 +5410,7 @@ game.import("character", function () {
 					}
 					return true;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					trigger.changeToZero();
 					event.cards = get.cards(player.getDamagedHp() + (event.name == "zaiqi" ? 0 : 1));
@@ -5432,7 +5433,7 @@ game.import("character", function () {
 					}
 				},
 				ai: {
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (target.hp == 1) return 2;
 						if (target.hp == 2) return 1.5;
 						return 1;
@@ -5448,7 +5449,7 @@ game.import("character", function () {
 				preHidden: ["juxiang1", "juxiang2"],
 				ai: {
 					effect: {
-						target: function (card) {
+						target(card) {
 							if (card.name == "nanman") return [0, 1];
 						},
 					},
@@ -5460,10 +5461,10 @@ game.import("character", function () {
 				trigger: { target: "useCardToBefore" },
 				forced: true,
 				priority: 15,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "nanman";
 				},
-				content: function () {
+				content() {
 					trigger.cancel();
 				},
 			},
@@ -5472,10 +5473,10 @@ game.import("character", function () {
 				audioname: ["re_zhurong", "ol_zhurong"],
 				trigger: { global: "useCardAfter" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "nanman" && event.player != player && event.cards.someInD();
 				},
-				content: function () {
+				content() {
 					player.gain(trigger.cards.filterInD(), "gain2");
 				},
 			},
@@ -5484,7 +5485,7 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["boss_lvbu3", "ol_zhurong"],
 				trigger: { source: "damageSource" },
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event._notrigger.includes(event.player)) return false;
 					return (
 						event.card &&
@@ -5494,11 +5495,11 @@ game.import("character", function () {
 						player.canCompare(event.player)
 					);
 				},
-				check: function (event, player) {
+				check(event, player) {
 					return get.attitude(player, event.player) < 0 && player.countCards("h") > 1;
 				},
 				//priority:5,
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseToCompare(trigger.player);
 					"step 1";
@@ -5511,10 +5512,10 @@ game.import("character", function () {
 				audio: 2,
 				trigger: { global: "die" },
 				preHidden: true,
-				filter: function (event) {
+				filter(event) {
 					return event.player.countCards("he") > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					event.togain = trigger.player.getCards("he");
 					player.gain(event.togain, trigger.player, "giveAuto", "bySelf");
@@ -5525,7 +5526,7 @@ game.import("character", function () {
 				trigger: { player: "damageEnd" },
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					var draw = player.getDamagedHp();
 					player
@@ -5580,7 +5581,7 @@ game.import("character", function () {
 					maixie: true,
 					maixie_hp: true,
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (get.tag(card, "damage")) {
 								if (player.hasSkillTag("jueqing", false, target)) return [1, -2];
 								if (target.hp <= 1) return;
@@ -5617,13 +5618,13 @@ game.import("character", function () {
 				audioname: ["re_caopi"],
 				forceaudio: true,
 				trigger: { global: "judgeEnd" },
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.player == player || event.player.group != "wei") return false;
 					if (event.result.color != "black") return false;
 					return player.hasZhuSkill("songwei", event.player);
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					trigger.player
 						.chooseBool("是否发动【颂威】，令" + get.translation(player) + "摸一张牌？")
@@ -5640,10 +5641,10 @@ game.import("character", function () {
 				trigger: { global: ["phaseDrawSkipped", "phaseDrawCancelled"] },
 				audio: 2,
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.player != player;
 				},
-				content: function () {
+				content() {
 					player.draw();
 				},
 			},
@@ -5667,17 +5668,17 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_xuhuang"],
 				enable: "chooseToUse",
-				filterCard: function (card) {
+				filterCard(card) {
 					if (get.type(card) != "basic" && get.type(card) != "equip") return false;
 					return get.color(card) == "black";
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("hes", { type: ["basic", "equip"], color: "black" });
 				},
 				position: "hes",
 				viewAs: { name: "bingliang" },
 				prompt: "将一黑色的基本牌或装备牌当兵粮寸断使用",
-				check: function (card) {
+				check(card) {
 					return 6 - get.value(card);
 				},
 				ai: {
@@ -5686,7 +5687,7 @@ game.import("character", function () {
 			},
 			duanliang2: {
 				mod: {
-					targetInRange: function (card, player, target) {
+					targetInRange(card, player, target) {
 						if (card.name == "bingliang") {
 							if (get.distance(player, target) <= 2) return true;
 						}
@@ -5695,7 +5696,7 @@ game.import("character", function () {
 			},
 			duanliang3: {
 				mod: {
-					targetInRange: function (card, player, target) {
+					targetInRange(card, player, target) {
 						if (card.name == "bingliang") {
 							if (target.countCards("h") >= player.countCards("h")) return true;
 						}
@@ -5705,11 +5706,11 @@ game.import("character", function () {
 			haoshi: {
 				audio: 2,
 				trigger: { player: "phaseDrawBegin2" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return !event.numFixed;
 				},
 				preHidden: true,
-				check: function (event, player) {
+				check(event, player) {
 					return (
 						player.countCards("h") + 2 + event.num <= 5 ||
 						game.hasPlayer(function (target) {
@@ -5727,14 +5728,14 @@ game.import("character", function () {
 						})
 					);
 				},
-				content: function () {
+				content() {
 					trigger.num += 2;
 					player.addSkill("haoshi2");
 				},
 				ai: {
 					threaten: 2,
 					noh: true,
-					skillTagFilter: function (player, tag) {
+					skillTagFilter(player, tag) {
 						if (tag == "noh") {
 							if (player.countCards("h") != 2) return false;
 						}
@@ -5746,7 +5747,7 @@ game.import("character", function () {
 				forced: true,
 				popup: false,
 				audio: false,
-				content: function () {
+				content() {
 					"step 0";
 					player.removeSkill("haoshi2");
 					if (player.countCards("h") <= 5) {
@@ -5755,12 +5756,12 @@ game.import("character", function () {
 					}
 					player.chooseCardTarget({
 						selectCard: Math.floor(player.countCards("h") / 2),
-						filterTarget: function (card, player, target) {
+						filterTarget(card, player, target) {
 							return target.isMinHandcard();
 						},
 						prompt: "将一半的手牌交给场上手牌数最少的一名角色",
 						forced: true,
-						ai2: function (target) {
+						ai2(target) {
 							return get.attitude(_status.event.player, target);
 						},
 					});
@@ -5775,7 +5776,7 @@ game.import("character", function () {
 				enable: "phaseUse",
 				usable: 1,
 				position: "he",
-				filterCard: function () {
+				filterCard() {
 					var targets = ui.selected.targets;
 					if (targets.length == 2) {
 						if (
@@ -5789,11 +5790,11 @@ game.import("character", function () {
 				selectCard: [0, Infinity],
 				selectTarget: 2,
 				complexCard: true,
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					if (player == target) return false;
 					return true;
 				},
-				filterOk: function () {
+				filterOk() {
 					var targets = ui.selected.targets;
 					if (targets.length != 2) return false;
 					return (
@@ -5803,10 +5804,10 @@ game.import("character", function () {
 				},
 				multitarget: true,
 				multiline: true,
-				content: function () {
+				content() {
 					targets[0].swapHandcards(targets[1]);
 				},
-				check: function (card) {
+				check(card) {
 					var list = [],
 						player = _status.event.player;
 					var num = player.countCards("he");
@@ -5847,7 +5848,7 @@ game.import("character", function () {
 					threaten: 3,
 					expose: 0.9,
 					result: {
-						target: function (player, target) {
+						target(player, target) {
 							var list = [];
 							var num = player.countCards("he");
 							var players = game.filterPlayer();
@@ -5898,7 +5899,7 @@ game.import("character", function () {
 					tw_ol_sunjian: "yinghun_ol_sunjian",
 				},
 				mod: {
-					aiOrder: function (player, card, num) {
+					aiOrder(player, card, num) {
 						if (
 							num > 0 &&
 							_status.event &&
@@ -5914,7 +5915,7 @@ game.import("character", function () {
 				trigger: { player: "phaseZhunbeiBegin" },
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseTarget(get.prompt2("yinghun"), function (card, player, target) {
@@ -5966,7 +5967,7 @@ game.import("character", function () {
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (
 								get.tag(card, "damage") &&
 								get.itemtype(player) === "player" &&
@@ -5981,7 +5982,7 @@ game.import("character", function () {
 								return [1, 1];
 						},
 					},
-					threaten: function (player, target) {
+					threaten(player, target) {
 						return Math.max(0.5, target.getDamagedHp() / 2);
 					},
 					maixie: true,
@@ -5995,7 +5996,7 @@ game.import("character", function () {
 					tw_ol_sunjian: "yinghun_ol_sunjian",
 				},
 				mod: {
-					aiOrder: function (player, card, num) {
+					aiOrder(player, card, num) {
 						if (
 							num > 0 &&
 							_status.event &&
@@ -6009,12 +6010,12 @@ game.import("character", function () {
 				},
 				locked: false,
 				trigger: { player: "phaseZhunbeiBegin" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.getDamagedHp() > 0;
 				},
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseTarget(get.prompt2("gzyinghun"), function (card, player, target) {
@@ -6065,7 +6066,7 @@ game.import("character", function () {
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (
 								get.tag(card, "damage") &&
 								get.itemtype(player) === "player" &&
@@ -6080,7 +6081,7 @@ game.import("character", function () {
 								return [1, 1];
 						},
 					},
-					threaten: function (player, target) {
+					threaten(player, target) {
 						return Math.max(0.5, target.getDamagedHp() / 2);
 					},
 					maixie: true,
@@ -6091,16 +6092,16 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_dongzhuo"],
 				enable: "chooseToUse",
-				filterCard: function (card) {
+				filterCard(card) {
 					return get.suit(card) == "spade";
 				},
 				viewAs: { name: "jiu" },
-				viewAsFilter: function (player) {
+				viewAsFilter(player) {
 					if (!player.countCards("hs", { suit: "spade" })) return false;
 					return true;
 				},
 				prompt: "将一张黑桃手牌当酒使用",
-				check: function (card) {
+				check(card) {
 					if (_status.event.type == "dying") return 1 / Math.max(0.1, get.value(card));
 					return 4 - get.value(card);
 				},
@@ -6113,17 +6114,17 @@ game.import("character", function () {
 				audioname: ["re_dongzhuo", "ol_dongzhuo"],
 				trigger: { player: "useCardToPlayered", target: "useCardToTargeted" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.card.name != "sha") return false;
 					if (player == event.player) {
 						return event.target.hasSex("female");
 					}
 					return event.player.hasSex("female");
 				},
-				check: function (event, player) {
+				check(event, player) {
 					return player == event.player;
 				},
-				content: function () {
+				content() {
 					var id = (player == trigger.player ? trigger.target : player).playerid;
 					var map = trigger.getParent().customArgs;
 					if (!map[id]) map[id] = {};
@@ -6136,7 +6137,7 @@ game.import("character", function () {
 				ai: {
 					halfneg: true,
 					directHit_ai: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						if (tag === "directHit_ai") return;
 						if (
 							arg.card.name != "sha" ||
@@ -6152,17 +6153,17 @@ game.import("character", function () {
 				audioname: ["zhugedan", "re_dongzhuo", "ol_dongzhuo", "re_zhugedan"],
 				trigger: { player: "phaseJieshuBegin" },
 				forced: true,
-				check: function () {
+				check() {
 					return false;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						!player.isMinHp() &&
 						!player.hasSkill("rejiuchi_air") &&
 						!player.hasSkill("oljiuchi_air")
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseControl("baonue_hp", "baonue_maxHp", function (event, player) {
@@ -6195,12 +6196,12 @@ game.import("character", function () {
 				audioname: ["re_dongzhuo"],
 				//forceaudio:true,
 				trigger: { global: "damageSource" },
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player == event.source || !event.source || event.source.group != "qun") return false;
 					return player.hasZhuSkill("baonue", event.source);
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					trigger.source
 						.chooseBool("是否对" + get.translation(player) + "发动【暴虐】？")
@@ -6232,13 +6233,13 @@ game.import("character", function () {
 				limited: true,
 				skillAnimation: "epic",
 				animationColor: "thunder",
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return target != player;
 				},
 				selectTarget: -1,
 				multitarget: true,
 				multiline: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("luanwu");
 					event.current = player.next;
@@ -6283,7 +6284,7 @@ game.import("character", function () {
 				ai: {
 					order: 1,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (lib.config.mode == "identity" && game.zhu.isZhu && player.identity == "fan") {
 								if (game.zhu.hp == 1 && game.zhu.countCards("h") <= 2) return 1;
 							}
@@ -6320,14 +6321,14 @@ game.import("character", function () {
 				priority: 15,
 				forced: true,
 				preHidden: true,
-				filter: function (event, player, name) {
+				filter(event, player, name) {
 					return _status.currentPhase == player && event.player != player;
 				},
-				content: function () {},
+				content() {},
 			},
 			wansha2: {
 				mod: {
-					cardSavable: function (card, player) {
+					cardSavable(card, player) {
 						if (
 							card.name == "tao" &&
 							_status.currentPhase &&
@@ -6338,7 +6339,7 @@ game.import("character", function () {
 							if (!player.isDying()) return false;
 						}
 					},
-					cardEnabled: function (card, player) {
+					cardEnabled(card, player) {
 						if (
 							card.name == "tao" &&
 							_status.currentPhase &&
@@ -6356,7 +6357,7 @@ game.import("character", function () {
 				audio: 2,
 				forced: true,
 				firstDo: true,
-				filter: function (event, player, card) {
+				filter(event, player, card) {
 					if (get.color(event.card) != "black") return false;
 					return (
 						(event.card.name == "nanman" && player != event.player) ||
@@ -6365,9 +6366,9 @@ game.import("character", function () {
 						event.card.name == "wugu"
 					);
 				},
-				content: function () {},
+				content() {},
 				mod: {
-					targetEnabled: function (card) {
+					targetEnabled(card) {
 						if (
 							(get.type(card) == "trick" || get.type(card) == "delay") &&
 							get.color(card) == "black"
@@ -6379,16 +6380,16 @@ game.import("character", function () {
 			huoji: {
 				audio: 2,
 				enable: "chooseToUse",
-				filterCard: function (card) {
+				filterCard(card) {
 					return get.color(card) == "red";
 				},
 				viewAs: { name: "huogong" },
-				viewAsFilter: function (player) {
+				viewAsFilter(player) {
 					if (!player.countCards("hs", { color: "red" })) return false;
 				},
 				position: "hs",
 				prompt: "将一张红色牌当火攻使用",
-				check: function (card) {
+				check(card) {
 					var player = get.player();
 					if (player.countCards("h") > player.hp) {
 						return 6 - get.value(card);
@@ -6411,7 +6412,7 @@ game.import("character", function () {
 				equipSkill: true,
 				noHidden: true,
 				inherit: "bagua_skill",
-				filter: function (event, player) {
+				filter(event, player) {
 					if (!lib.skill.bagua_skill.filter(event, player)) return false;
 					if (!player.hasEmptySlot(2)) return false;
 					return true;
@@ -6432,7 +6433,7 @@ game.import("character", function () {
 						return true;
 					},
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (player == target && get.subtype(card) == "equip2") {
 								if (get.equipValue(card) <= 7.5) return 0;
 							}
@@ -6444,7 +6445,7 @@ game.import("character", function () {
 			},
 			kanpo: {
 				mod: {
-					aiValue: function (player, card, num) {
+					aiValue(player, card, num) {
 						if (get.name(card) != "wuxie" && get.color(card) != "black") return;
 						var cards = player.getCards("hs", function (card) {
 							return get.name(card) == "wuxie" || get.color(card) == "black";
@@ -6462,23 +6463,23 @@ game.import("character", function () {
 							return Math.min(num, [6, 4, 3][Math.min(geti(), 2)]) * 0.6;
 						return Math.max(num, [6, 4, 3][Math.min(geti(), 2)]);
 					},
-					aiUseful: function () {
+					aiUseful() {
 						return lib.skill.kanpo.mod.aiValue.apply(this, arguments);
 					},
 				},
 				locked: false,
 				audio: 2,
 				enable: "chooseToUse",
-				filterCard: function (card) {
+				filterCard(card) {
 					return get.color(card) == "black";
 				},
-				viewAsFilter: function (player) {
+				viewAsFilter(player) {
 					return player.countCards("hs", { color: "black" }) > 0;
 				},
 				viewAs: { name: "wuxie" },
 				position: "hs",
 				prompt: "将一张黑色手牌当无懈可击使用",
-				check: function (card) {
+				check(card) {
 					var tri = _status.event.getTrigger();
 					if (tri && tri.card && tri.card.name == "chiling") return -1;
 					return 8 - get.value(card);
@@ -6494,10 +6495,10 @@ game.import("character", function () {
 				limited: true,
 				skillAnimation: true,
 				animationColor: "fire",
-				init: function (player) {
+				init(player) {
 					player.storage.niepan = false;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.storage.niepan) return false;
 					if (event.type == "dying") {
 						if (player != event.dying) return false;
@@ -6507,7 +6508,7 @@ game.import("character", function () {
 					}
 					return false;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("niepan");
 					player.storage.niepan = true;
@@ -6525,18 +6526,18 @@ game.import("character", function () {
 				},
 				ai: {
 					order: 0.5,
-					skillTagFilter: function (player, tag, target) {
+					skillTagFilter(player, tag, target) {
 						if (player != target || player.storage.niepan) return false;
 					},
 					save: true,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (player.hp <= 0) return 10;
 							if (player.hp <= 1 && player.countCards("he") <= 1) return 10;
 							return 0;
 						},
 					},
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (!target.storage.niepan) return 0.6;
 					},
 				},
@@ -6552,10 +6553,10 @@ game.import("character", function () {
 				skillAnimation: true,
 				limited: true,
 				animationColor: "orange",
-				init: function (player) {
+				init(player) {
 					player.storage.oldniepan = false;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.storage.oldniepan) return false;
 					if (event.type == "dying") {
 						if (player != event.dying) return false;
@@ -6563,7 +6564,7 @@ game.import("character", function () {
 					}
 					return false;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.awakenSkill("oldniepan");
 					player.storage.oldniepan = true;
@@ -6581,18 +6582,18 @@ game.import("character", function () {
 				},
 				ai: {
 					order: 1,
-					skillTagFilter: function (player, arg, target) {
+					skillTagFilter(player, arg, target) {
 						if (player != target || player.storage.oldniepan) return false;
 					},
 					save: true,
 					result: {
-						player: function (player) {
+						player(player) {
 							if (player.hp <= 0) return 10;
 							if (player.hp <= 2 && player.countCards("he") <= 1) return 10;
 							return 0;
 						},
 					},
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (!target.storage.oldniepan) return 0.6;
 					},
 				},
@@ -6605,16 +6606,16 @@ game.import("character", function () {
 				audioname: ["re_xunyu", "ol_xunyu"],
 				enable: "phaseUse",
 				usable: 1,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.countCards("h") == 0) return false;
 					return game.hasPlayer(function (current) {
 						return current.hp > player.hp && player.canCompare(current);
 					});
 				},
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return target.hp > player.hp && player.canCompare(target);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseToCompare(target);
 					"step 1";
@@ -6649,7 +6650,7 @@ game.import("character", function () {
 				ai: {
 					order: 0.5,
 					result: {
-						target: function (player, target) {
+						target(player, target) {
 							var att = get.attitude(player, target);
 							var oc = target.countCards("h") == 1;
 							if (att > 0 && oc) return 0;
@@ -6667,7 +6668,7 @@ game.import("character", function () {
 							}
 							return 0;
 						},
-						player: function (player, target) {
+						player(player, target) {
 							if (target.hasSkillTag("jueqing", false, target)) return -10;
 							var mn = 1;
 							var hs = player.getCards("h");
@@ -6706,7 +6707,7 @@ game.import("character", function () {
 				audio: 2,
 				trigger: { player: "damageEnd" },
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					event.count = trigger.num;
 					"step 1";
@@ -6736,7 +6737,7 @@ game.import("character", function () {
 					maixie: true,
 					maixie_hp: true,
 					effect: {
-						target: function (card, player, target, current) {
+						target(card, player, target, current) {
 							if (get.tag(card, "damage") && target.hp > 1) {
 								if (player.hasSkillTag("jueqing", false, target)) return [1, -2];
 								var max = 0;
@@ -6775,7 +6776,7 @@ game.import("character", function () {
 				audioname: ["boss_lvbu3"],
 				audio: "qiangxi",
 				usable: 2,
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					if (player == target) return false;
 					if (target.hasSkill("reqiangxi_off")) return false;
 					return true;
@@ -6786,15 +6787,15 @@ game.import("character", function () {
 				enable: "phaseUse",
 				usable: 1,
 				audioname: ["boss_lvbu3"],
-				filterCard: function (card) {
+				filterCard(card) {
 					return get.subtype(card) == "equip1";
 				},
 				selectCard: [0, 1],
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					if (player == target) return false;
 					return player.inRange(target);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					if (cards.length == 0) {
 						player.loseHp();
@@ -6802,7 +6803,7 @@ game.import("character", function () {
 					"step 1";
 					target.damage("nocard");
 				},
-				check: function (card) {
+				check(card) {
 					return 10 - get.value(card);
 				},
 				position: "he",
@@ -6810,13 +6811,13 @@ game.import("character", function () {
 					damage: true,
 					order: 8,
 					result: {
-						player: function (player, target) {
+						player(player, target) {
 							if (ui.selected.cards.length) return 0;
 							if (player.hp >= target.hp) return -0.9;
 							if (player.hp <= 2) return -10;
 							return -2;
 						},
-						target: function (player, target) {
+						target(player, target) {
 							if (!ui.selected.cards.length) {
 								if (player.hp < 2) return 0;
 								if (player.hp == 2 && target.hp >= 2) return 0;
@@ -6831,7 +6832,7 @@ game.import("character", function () {
 			xinqiangxi: {
 				audio: "qiangxi",
 				enable: "phaseUse",
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.hasSkill("xinqiangxi2")) {
 						return !player.hasSkill("xinqiangxi3");
 					} else if (player.hasSkill("xinqiangxi3")) {
@@ -6842,22 +6843,22 @@ game.import("character", function () {
 						return true;
 					}
 				},
-				filterCard: function (card) {
+				filterCard(card) {
 					var player = _status.event.player;
 					if (player.hasSkill("xinqiangxi2")) return false;
 					return get.type(card) == "equip";
 				},
-				selectCard: function () {
+				selectCard() {
 					var player = _status.event.player;
 					if (player.hasSkill("xinqiangxi2")) return -1;
 					if (player.hasSkill("xinqiangxi3")) return [1, 1];
 					return [0, 1];
 				},
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					if (player == target) return false;
 					return player.inRange(target);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					if (cards.length == 0) {
 						player.loseHp();
@@ -6868,14 +6869,14 @@ game.import("character", function () {
 					"step 1";
 					target.damage("nocard");
 				},
-				check: function (card) {
+				check(card) {
 					return 10 - get.value(card);
 				},
 				position: "he",
 				ai: {
 					order: 8.5,
 					result: {
-						target: function (player, target) {
+						target(player, target) {
 							if (!ui.selected.cards.length) {
 								if (player.hp < 2) return 0;
 								if (target.hp >= player.hp) return 0;
@@ -6893,13 +6894,13 @@ game.import("character", function () {
 				audioname: ["re_taishici"],
 				enable: "phaseUse",
 				usable: 1,
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return player.canCompare(target);
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("h") > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseToCompare(target);
 					"step 1";
@@ -6910,7 +6911,7 @@ game.import("character", function () {
 					}
 				},
 				ai: {
-					order: function (name, player) {
+					order(name, player) {
 						var cards = player.getCards("h");
 						if (player.countCards("h", "sha") == 0) {
 							return 1;
@@ -6927,7 +6928,7 @@ game.import("character", function () {
 						return get.order({ name: "sha" }) - 1;
 					},
 					result: {
-						player: function (player) {
+						player(player) {
 							if (player.countCards("h", "sha") > 0) return 0.6;
 							var num = player.countCards("h");
 							if (num > player.hp) return 0;
@@ -6935,7 +6936,7 @@ game.import("character", function () {
 							if (num == 2) return -1;
 							return -0.7;
 						},
-						target: function (player, target) {
+						target(player, target) {
 							var num = target.countCards("h");
 							if (num == 1) return -1;
 							if (num == 2) return -0.7;
@@ -6947,13 +6948,13 @@ game.import("character", function () {
 			},
 			tianyi2: {
 				mod: {
-					targetInRange: function (card, player, target, now) {
+					targetInRange(card, player, target, now) {
 						if (card.name == "sha") return true;
 					},
-					selectTarget: function (card, player, range) {
+					selectTarget(card, player, range) {
 						if (card.name == "sha" && range[1] != -1) range[1]++;
 					},
-					cardUsable: function (card, player, num) {
+					cardUsable(card, player, num) {
 						if (card.name == "sha") return num + 1;
 					},
 				},
@@ -6961,7 +6962,7 @@ game.import("character", function () {
 			},
 			tianyi3: {
 				mod: {
-					cardEnabled: function (card) {
+					cardEnabled(card) {
 						if (card.name == "sha") return false;
 					},
 				},
@@ -6979,21 +6980,21 @@ game.import("character", function () {
 			shuangxiong1: {
 				audio: true,
 				trigger: { player: "phaseDrawBegin1" },
-				check: function (event, player) {
+				check(event, player) {
 					if (player.countCards("h") > player.hp) return true;
 					if (player.countCards("h") > 3) return true;
 					return false;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					return !event.numFixed;
 				},
 				preHidden: true,
 				prompt2: () => "进行一次判定，本回合可以将一张与此牌颜色不同的手牌当作【决斗】使用",
-				content: function () {
+				content() {
 					player.judge().set("callback", lib.skill.shuangxiong1.callback);
 					trigger.changeToZero();
 				},
-				callback: function () {
+				callback() {
 					player.gain(card, "gain2");
 					player.addTempSkill("shuangxiong2");
 					player.markAuto("shuangxiong2", [event.judgeResult.color]);
@@ -7009,10 +7010,10 @@ game.import("character", function () {
 				enable: "chooseToUse",
 				viewAs: { name: "juedou" },
 				position: "hs",
-				viewAsFilter: function (player) {
+				viewAsFilter(player) {
 					return player.hasCard((card) => lib.skill.shuangxiong2.filterCard(card, player), "hs");
 				},
-				filterCard: function (card, player) {
+				filterCard(card, player) {
 					var color = get.color(card),
 						colors = player.getStorage("shuangxiong2");
 					for (var i of colors) {
@@ -7020,7 +7021,7 @@ game.import("character", function () {
 					}
 					return false;
 				},
-				prompt: function () {
+				prompt() {
 					var colors = _status.event.player.getStorage("shuangxiong2");
 					var str = "将一张颜色";
 					for (var i = 0; i < colors.length; i++) {
@@ -7031,7 +7032,7 @@ game.import("character", function () {
 					str += "的牌当做【决斗】使用";
 					return str;
 				},
-				check: function (card) {
+				check(card) {
 					var player = _status.event.player;
 					var raw = player.getUseValue(card, null, true);
 					var eff = player.getUseValue(get.autoViewAs({ name: "juedou" }, [card]));
@@ -7044,7 +7045,7 @@ game.import("character", function () {
 				enable: "phaseUse",
 				position: "hs",
 				viewAs: { name: "wanjian" },
-				filterCard: function (card, player) {
+				filterCard(card, player) {
 					if (ui.selected.cards.length) {
 						return get.suit(card) == get.suit(ui.selected.cards[0]);
 					}
@@ -7058,7 +7059,7 @@ game.import("character", function () {
 				},
 				selectCard: 2,
 				complexCard: true,
-				check: function (card) {
+				check(card) {
 					var player = _status.event.player;
 					var targets = game.filterPlayer(function (current) {
 						return player.canUse("wanjian", current);
@@ -7092,7 +7093,7 @@ game.import("character", function () {
 				audioname: ["re_yuanshao"],
 				forced: true,
 				firstDo: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.hasZhuSkill("xueyi") &&
 						game.hasPlayer(function (current) {
@@ -7101,9 +7102,9 @@ game.import("character", function () {
 						player.countCards("h") > player.hp
 					);
 				},
-				content: function () {},
+				content() {},
 				mod: {
-					maxHandcard: function (player, num) {
+					maxHandcard(player, num) {
 						if (player.hasZhuSkill("xueyi")) {
 							return (
 								num +
@@ -7122,14 +7123,14 @@ game.import("character", function () {
 				audio: 2,
 				trigger: { player: "shaMiss" },
 				//priority:-1,
-				filter: function (event) {
+				filter(event) {
 					return event.target.countCards("he") > 0;
 				},
-				check: function (event, player) {
+				check(event, player) {
 					return get.attitude(player, event.target) < 0;
 				},
 				logTarget: "target",
-				content: function () {
+				content() {
 					player.discardPlayerCard("he", trigger.target, true);
 				},
 			},
@@ -7138,7 +7139,7 @@ game.import("character", function () {
 				//direct:true,
 				frequent: true,
 				audio: "xinjiewei",
-				content: function () {
+				content() {
 					"step 0";
 					player.draw();
 					player.chooseToUse(function (card) {
@@ -7200,11 +7201,11 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["boss_qinglong"],
 				trigger: { player: ["useCard", "respond"] },
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "shan";
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseTarget(get.prompt2("releiji"), function (card, player, target) {
 						return target != player;
@@ -7243,7 +7244,7 @@ game.import("character", function () {
 				ai: {
 					useShan: true,
 					effect: {
-						target: function (card, player, target, current) {
+						target(card, player, target, current) {
 							if (
 								get.tag(card, "respondShan") &&
 								!player.hasSkillTag(
@@ -7336,7 +7337,7 @@ game.import("character", function () {
 				},
 				trigger: { player: "phaseJudgeBefore" },
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseTarget(
@@ -7370,7 +7371,7 @@ game.import("character", function () {
 				},
 				trigger: { player: "phaseUseBefore" },
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.countCards("he", function (card) {
 							if (_status.connectMode) return true;
@@ -7378,25 +7379,25 @@ game.import("character", function () {
 						}) > 0
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseCardTarget({
 							prompt: get.prompt("shensu"),
 							prompt2: "弃置一张装备牌并跳过出牌阶段，视为对一名其他角色使用一张【杀】",
-							filterCard: function (card, player) {
+							filterCard(card, player) {
 								return get.type(card) == "equip" && lib.filter.cardDiscardable(card, player);
 							},
 							position: "he",
-							filterTarget: function (card, player, target) {
+							filterTarget(card, player, target) {
 								if (player == target) return false;
 								return player.canUse({ name: "sha" }, target, false);
 							},
-							ai1: function (card) {
+							ai1(card) {
 								if (_status.event.check) return 0;
 								return 6 - get.value(card);
 							},
-							ai2: function (target) {
+							ai2(target) {
 								if (_status.event.check) return 0;
 								return get.effect(target, { name: "sha" }, _status.event.player);
 							},
@@ -7424,7 +7425,7 @@ game.import("character", function () {
 				},
 				trigger: { player: "phaseDiscardBefore" },
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					var check =
 						player.needsToDiscard() ||
@@ -7461,16 +7462,16 @@ game.import("character", function () {
 			jushou: {
 				audio: 2,
 				trigger: { player: "phaseJieshuBegin" },
-				check: function (event, player) {
+				check(event, player) {
 					return event.player.hp + player.countCards("h") < 4;
 				},
-				content: function () {
+				content() {
 					player.draw(3);
 					player.turnOver();
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (card.name == "guiyoujie") return [0, 1];
 						},
 					},
@@ -7479,16 +7480,16 @@ game.import("character", function () {
 			moon_jushou: {
 				audio: "xinjushou",
 				trigger: { player: "phaseJieshuBegin" },
-				check: function (event, player) {
+				check(event, player) {
 					return event.player.hp + player.countCards("h") < 4;
 				},
-				content: function () {
+				content() {
 					player.draw();
 					player.turnOver();
 				},
 				ai: {
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (card.name == "guiyoujie") return [0, 1];
 						},
 					},
@@ -7499,28 +7500,28 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["re_huangzhong"],
 				trigger: { player: "useCardToPlayered" },
-				check: function (event, player) {
+				check(event, player) {
 					return get.attitude(player, event.target) <= 0;
 				},
 				logTarget: "target",
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.card.name != "sha") return false;
 					var length = event.target.countCards("h");
 					return length >= player.hp || length <= player.getAttackRange();
 				},
 				preHidden: true,
-				content: function () {
+				content() {
 					trigger.getParent().directHit.push(trigger.target);
 				},
 				locked: false,
 				mod: {
-					attackRange: function (player, distance) {
+					attackRange(player, distance) {
 						if (get.zhu(player, "shouyue")) return distance + 1;
 					},
 				},
 				ai: {
 					directHit_ai: true,
-					skillTagFilter: function (player, tag, arg) {
+					skillTagFilter(player, tag, arg) {
 						if (get.attitude(player, arg.target) > 0 || arg.card.name != "sha") return false;
 						var length = arg.target.countCards("h");
 						return length >= player.hp || length <= player.getAttackRange();
@@ -7532,10 +7533,10 @@ game.import("character", function () {
 				audioname: ["re_weiyan", "ol_weiyan"],
 				trigger: { source: "damageSource" },
 				forced: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.kuangguCheck && player.isDamaged();
 				},
-				content: function () {
+				content() {
 					player.recover(trigger.num);
 				},
 				group: "kuanggu_check",
@@ -7543,12 +7544,12 @@ game.import("character", function () {
 					check: {
 						charlotte: true,
 						trigger: { source: "damage" },
-						filter: function (event, player) {
+						filter(event, player) {
 							return get.distance(player, event.player) <= 1;
 						},
 						firstDo: true,
 						silent: true,
-						content: function () {
+						content() {
 							trigger.kuangguCheck = true;
 						},
 					},
@@ -7559,22 +7560,22 @@ game.import("character", function () {
 				audioname: ["daxiaoqiao", "re_xiaoqiao", "ol_xiaoqiao"],
 				trigger: { player: "damageBegin3" },
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("h", { suit: "heart" }) > 0 && event.num > 0;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseCardTarget({
-						filterCard: function (card, player) {
+						filterCard(card, player) {
 							return get.suit(card) == "heart" && lib.filter.cardDiscardable(card, player);
 						},
-						filterTarget: function (card, player, target) {
+						filterTarget(card, player, target) {
 							return player != target;
 						},
-						ai1: function (card) {
+						ai1(card) {
 							return 10 - get.value(card);
 						},
-						ai2: function (target) {
+						ai2(target) {
 							var att = get.attitude(_status.event.player, target);
 							var trigger = _status.event.getTrigger();
 							var da = 0;
@@ -7620,12 +7621,12 @@ game.import("character", function () {
 				ai: {
 					maixie_defend: true,
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (player.hasSkillTag("jueqing", false, target)) return;
 							if (get.tag(card, "damage") && target.countCards("h") > 1) return 0.7;
 						},
 					},
-					threaten: function (player, target) {
+					threaten(player, target) {
 						if (target.countCards("h") == 0) return 2;
 					},
 				},
@@ -7637,7 +7638,7 @@ game.import("character", function () {
 				audio: false,
 				vanish: true,
 				charlotte: true,
-				content: function () {
+				content() {
 					if (player.getDamagedHp()) player.draw(player.getDamagedHp());
 					player.removeSkill("tianxiang2");
 					player.popup("tianxiang");
@@ -7649,27 +7650,27 @@ game.import("character", function () {
 				trigger: { player: "damageBegin4" },
 				direct: true,
 				preHidden: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.countCards("h", function (card) {
 							return _status.connectMode || get.suit(card, player) == "heart";
 						}) > 0 && event.num > 0
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseCardTarget({
-							filterCard: function (card, player) {
+							filterCard(card, player) {
 								return get.suit(card) == "heart" && lib.filter.cardDiscardable(card, player);
 							},
-							filterTarget: function (card, player, target) {
+							filterTarget(card, player, target) {
 								return player != target;
 							},
-							ai1: function (card) {
+							ai1(card) {
 								return 10 - get.value(card);
 							},
-							ai2: function (target) {
+							ai2(target) {
 								var att = get.attitude(_status.event.player, target);
 								var trigger = _status.event.getTrigger();
 								var da = 0;
@@ -7743,7 +7744,7 @@ game.import("character", function () {
 				ai: {
 					maixie_defend: true,
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (player.hasSkillTag("jueqing", false, target)) return;
 							if (get.tag(card, "damage") && target.countCards("he") > 1) return 0.7;
 						},
@@ -7754,17 +7755,17 @@ game.import("character", function () {
 				trigger: { player: "loseHpAfter" },
 				forced: true,
 				popup: false,
-				filter: function (event) {
+				filter(event) {
 					return event.type == "retianxiang";
 				},
 				vanish: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.gain(player.storage.retianxiang3, "gain2");
 					"step 1";
 					player.removeSkill("retianxiang3");
 				},
-				onremove: function (player) {
+				onremove(player) {
 					var card = player.storage.retianxiang3;
 					if (get.position(card) == "s") {
 						game.cardsDiscard(card);
@@ -7776,11 +7777,11 @@ game.import("character", function () {
 				trigger: { player: "damageAfter" },
 				forced: true,
 				popup: false,
-				filter: function (event) {
+				filter(event) {
 					return event.type == "retianxiang";
 				},
 				vanish: true,
-				content: function () {
+				content() {
 					if (player.isDamaged()) {
 						player.draw(player.getDamagedHp());
 					}
@@ -7791,27 +7792,27 @@ game.import("character", function () {
 				audio: "tianxiang",
 				trigger: { player: "damageBefore" },
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						player.countCards("he", { suit: "heart" }) > 0 &&
 						event.num > 0 &&
 						!player.hasSkill("xintianxiang3")
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseCardTarget({
-						filterCard: function (card, player) {
+						filterCard(card, player) {
 							return get.suit(card) == "heart" && lib.filter.cardDiscardable(card, player);
 						},
-						filterTarget: function (card, player, target) {
+						filterTarget(card, player, target) {
 							return player != target;
 						},
 						position: "he",
-						ai1: function (card) {
+						ai1(card) {
 							return 10 - get.value(card);
 						},
-						ai2: function (target) {
+						ai2(target) {
 							var att = get.attitude(_status.event.player, target);
 							var trigger = _status.event.getTrigger();
 							var da = 0;
@@ -7860,7 +7861,7 @@ game.import("character", function () {
 				ai: {
 					maixie_defend: true,
 					effect: {
-						target: function (card, player, target) {
+						target(card, player, target) {
 							if (player.hasSkillTag("jueqing", false, target)) return;
 							if (get.tag(card, "damage") && target.countCards("he") > 1) return 0.7;
 						},
@@ -7873,7 +7874,7 @@ game.import("character", function () {
 				popup: false,
 				audio: false,
 				vanish: true,
-				content: function () {
+				content() {
 					"step 0";
 					var source = player.storage.xintianxiang;
 					if (source.isDead()) {
@@ -7920,7 +7921,7 @@ game.import("character", function () {
 			xintianxiang3: {
 				trigger: { player: ["phaseZhunbeiBegin", "dieBegin"] },
 				silent: true,
-				content: function () {
+				content() {
 					if (player.storage.xintianxiang3) {
 						player.storage.xintianxiang3.removeSkill("xintianxiang4");
 						delete player.storage.xintianxiang3;
@@ -7936,7 +7937,7 @@ game.import("character", function () {
 					content: "防止造成和受到的一切伤害",
 				},
 				priority: 15,
-				content: function () {
+				content() {
 					trigger.cancel();
 				},
 				ai: {
@@ -7946,12 +7947,12 @@ game.import("character", function () {
 					notrick: true,
 					notricksource: true,
 					effect: {
-						target: function (card, player, target, current) {
+						target(card, player, target, current) {
 							if (get.tag(card, "damage")) {
 								return "zeroplayertarget";
 							}
 						},
-						player: function (card, player, target, current) {
+						player(card, player, target, current) {
 							if (get.tag(card, "damage")) {
 								return "zeroplayertarget";
 							}
@@ -7961,7 +7962,7 @@ game.import("character", function () {
 			},
 			hongyan: {
 				mod: {
-					suit: function (card, suit) {
+					suit(card, suit) {
 						if (suit == "spade") return "heart";
 					},
 				},
@@ -7970,17 +7971,17 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["sb_xiaoqiao"],
 				mod: {
-					suit: function (card, suit) {
+					suit(card, suit) {
 						if (suit == "spade") return "heart";
 					},
 				},
 				trigger: { global: "judge" },
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.fixedResult && event.fixedResult.suit) return event.fixedResult.suit == "heart";
 					return get.suit(event.player.judging[0], event.player) == "heart";
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var str =
 						"红颜：" +
@@ -8035,7 +8036,7 @@ game.import("character", function () {
 			gzbuqu: {
 				audio: 2,
 				trigger: { player: "changeHp" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.hp <= 0 && event.num < 0;
 				},
 				marktext: "创",
@@ -8046,7 +8047,7 @@ game.import("character", function () {
 				group: "gzbuqu_recover",
 				frequent: true,
 				ondisable: true,
-				onremove: function (player, skill) {
+				onremove(player, skill) {
 					var cards = player.getExpansions(skill);
 					if (cards.length) {
 						//delete player.nodying;
@@ -8054,7 +8055,7 @@ game.import("character", function () {
 						if (player.hp <= 0) player.dying({});
 					}
 				},
-				process: function (player) {
+				process(player) {
 					//delete player.nodying;
 					var nums = [];
 					var cards = player.getExpansions("gzbuqu");
@@ -8071,12 +8072,12 @@ game.import("character", function () {
 				subSkill: {
 					recover: {
 						trigger: { player: "recoverAfter" },
-						filter: function (event, player) {
+						filter(event, player) {
 							return player.getExpansions("gzbuqu").length > 0 && event.num > 0;
 						},
 						forced: true,
 						popup: false,
-						content: function () {
+						content() {
 							"step 0";
 							event.count = trigger.num;
 							"step 1";
@@ -8122,7 +8123,7 @@ game.import("character", function () {
 						},
 					},
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var num = -trigger.num - Math.max(player.hp - trigger.num, 1) + 1;
 					player.addToExpansion(get.cards(num), "gain2").gaintag.add("gzbuqu");
@@ -8144,7 +8145,7 @@ game.import("character", function () {
 				trigger: { player: "chooseToUseBefore" },
 				forced: true,
 				preHidden: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						event.type == "dying" &&
 						player.isDying() &&
@@ -8152,7 +8153,7 @@ game.import("character", function () {
 						!event.getParent()._buqu
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					trigger.getParent()._buqu = true;
 					var card = get.cards()[0];
@@ -8175,7 +8176,7 @@ game.import("character", function () {
 					}
 				},
 				mod: {
-					maxHandcardBase: function (player, num) {
+					maxHandcardBase(player, num) {
 						if (get.mode() != "guozhan" && player.getExpansions("buqu").length)
 							return player.getExpansions("buqu").length;
 					},
@@ -8183,7 +8184,7 @@ game.import("character", function () {
 				ai: {
 					save: true,
 					mingzhi: true,
-					skillTagFilter: function (player, tag, target) {
+					skillTagFilter(player, tag, target) {
 						if (player != target) return false;
 					},
 				},
@@ -8198,7 +8199,7 @@ game.import("character", function () {
 					global: ["gainAfter", "loseAfter", "loseAsyncAfter"],
 				},
 				direct: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.name == "lose") {
 						if (event.type != "discard" || !event.player.isIn()) return false;
 						if ((event.discarder || event.getParent(2).player) == event.player) return false;
@@ -8234,7 +8235,7 @@ game.import("character", function () {
 					}
 					return false;
 				},
-				content: function () {
+				content() {
 					"step 0";
 					var targets = [];
 					if (trigger.name == "gain") {
@@ -8290,15 +8291,15 @@ game.import("character", function () {
 				trigger: {
 					global: "phaseJieshuBegin",
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (event.player.countCards("h") == 0 && event.player.isIn()) return true;
 					return false;
 				},
 				preHidden: true,
-				check: function (event, player) {
+				check(event, player) {
 					return get.attitude(player, event.player) > 2;
 				},
-				content: function () {
+				content() {
 					player.line(trigger.player, "green");
 					trigger.player.draw(2);
 					player.loseHp();
@@ -8307,12 +8308,12 @@ game.import("character", function () {
 			leiji: {
 				audio: 2,
 				trigger: { player: ["useCard", "respond"] },
-				filter: function (event, player) {
+				filter(event, player) {
 					return event.card.name == "shan";
 				},
 				direct: true,
 				preHidden: true,
-				content: function () {
+				content() {
 					"step 0";
 					player.chooseTarget(get.prompt2("leiji")).setHiddenSkill(event.name).ai = function (
 						target
@@ -8347,7 +8348,7 @@ game.import("character", function () {
 					mingzhi: false,
 					useShan: true,
 					effect: {
-						target: function (card, player, target, current) {
+						target(card, player, target, current) {
 							if (
 								get.tag(card, "respondShan") &&
 								!player.hasSkillTag(
@@ -8401,11 +8402,11 @@ game.import("character", function () {
 				audio: 2,
 				audioname: ["sp_zhangjiao"],
 				trigger: { global: "judge" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.countCards("hes", { color: "black" }) > 0;
 				},
 				direct: true,
-				content: function () {
+				content() {
 					"step 0";
 					player
 						.chooseCard(
@@ -8550,10 +8551,10 @@ game.import("character", function () {
 				lose: false,
 				delay: false,
 				line: true,
-				prepare: function (cards, player, targets) {
+				prepare(cards, player, targets) {
 					targets[0].logSkill("huangtian");
 				},
-				prompt: function () {
+				prompt() {
 					var player = _status.event.player;
 					var list = game.filterPlayer(function (target) {
 						return target != player && target.hasZhuSkill("huangtian", player);
@@ -8562,7 +8563,7 @@ game.import("character", function () {
 					if (list.length > 1) str += "中的一人";
 					return str;
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.group != "qun") return false;
 					if (player.countCards("h", "shan") + player.countCards("h", "shandian") == 0) return 0;
 					return game.hasPlayer(function (target) {
@@ -8573,12 +8574,12 @@ game.import("character", function () {
 						);
 					});
 				},
-				filterCard: function (card) {
+				filterCard(card) {
 					return card.name == "shan" || card.name == "shandian";
 				},
 				log: false,
 				visible: true,
-				filterTarget: function (card, player, target) {
+				filterTarget(card, player, target) {
 					return (
 						target != player &&
 						target.hasZhuSkill("huangtian", player) &&
@@ -8587,7 +8588,7 @@ game.import("character", function () {
 				},
 				//usable:1,
 				//forceaudio:true,
-				content: function () {
+				content() {
 					player.give(cards, target);
 					target.addTempSkill("huangtian3", "phaseUseEnd");
 				},
@@ -8604,14 +8605,14 @@ game.import("character", function () {
 				audio: "guhuo_guess",
 				derivation: ["chanyuan"],
 				enable: ["chooseToUse", "chooseToRespond"],
-				hiddenCard: function (player, name) {
+				hiddenCard(player, name) {
 					return (
 						lib.inpile.includes(name) &&
 						player.countCards("hs") > 0 &&
 						!player.hasSkill("guhuo_phase")
 					);
 				},
-				filter: function (event, player) {
+				filter(event, player) {
 					if (player.hasSkill("guhuo_phase")) return false;
 					if (!player.countCards("hs")) return false;
 					for (var i of lib.inpile) {
@@ -8637,7 +8638,7 @@ game.import("character", function () {
 					return false;
 				},
 				chooseButton: {
-					dialog: function (event, player) {
+					dialog(event, player) {
 						var list = [];
 						for (var i of lib.inpile) {
 							if (event.type != "phase")
@@ -8660,11 +8661,11 @@ game.import("character", function () {
 						}
 						return ui.create.dialog("蛊惑", [list, "vcard"]);
 					},
-					filter: function (button, player) {
+					filter(button, player) {
 						var evt = _status.event.getParent();
 						return evt.filterCard({ name: button.link[2], nature: button.link[3] }, player, evt);
 					},
-					check: function (button) {
+					check(button) {
 						var player = _status.event.player;
 						var enemyNum = game.countPlayer(function (current) {
 							return (
@@ -8695,9 +8696,9 @@ game.import("character", function () {
 						}
 						return val;
 					},
-					backup: function (links, player) {
+					backup(links, player) {
 						return {
-							filterCard: function (card, player, target) {
+							filterCard(card, player, target) {
 								var result = true;
 								var suit = card.suit,
 									number = card.number;
@@ -8719,7 +8720,7 @@ game.import("character", function () {
 								suit: "none",
 								number: null,
 							},
-							ai1: function (card) {
+							ai1(card) {
 								var player = _status.event.player;
 								var enemyNum = game.countPlayer(function (current) {
 									return (
@@ -8740,7 +8741,7 @@ game.import("character", function () {
 								}
 								return 6 - get.value(card);
 							},
-							precontent: function () {
+							precontent() {
 								player.logSkill("xinfu_guhuo");
 								player.addTempSkill("guhuo_guess");
 								var card = event.result.cards[0];
@@ -8749,7 +8750,7 @@ game.import("character", function () {
 							},
 						};
 					},
-					prompt: function (links, player) {
+					prompt(links, player) {
 						return (
 							"将一张手牌当做" +
 							get.translation(links[0][2]) +
@@ -8762,7 +8763,7 @@ game.import("character", function () {
 					respondSha: true,
 					respondShan: true,
 					fireAttack: true,
-					skillTagFilter: function (player) {
+					skillTagFilter(player) {
 						if (!player.countCards("hs") || player.hasSkill("guhuo_phase")) return false;
 					},
 					threaten: 1.2,
@@ -8780,13 +8781,13 @@ game.import("character", function () {
 				popup: false,
 				firstDo: true,
 				charlotte: true,
-				filter: function (event, player) {
+				filter(event, player) {
 					return (
 						event.skill &&
 						(event.skill.indexOf("guhuo_") == 0 || event.skill.indexOf("xinfu_guhuo_") == 0)
 					);
 				},
-				content: function () {
+				content() {
 					"step 0";
 					player.addTempSkill("guhuo_phase");
 					event.fake = false;
@@ -8933,14 +8934,14 @@ game.import("character", function () {
 				},
 			},
 			chanyuan: {
-				init: function (player, skill) {
+				init(player, skill) {
 					if (player.hp == 1) player.logSkill(skill);
 					player.addSkillBlocker(skill);
 				},
-				onremove: function (player, skill) {
+				onremove(player, skill) {
 					player.removeSkillBlocker(skill);
 				},
-				skillBlocker: function (skill, player) {
+				skillBlocker(skill, player) {
 					return (
 						skill != "chanyuan" &&
 						skill != "rechanyuan" &&
@@ -8950,7 +8951,7 @@ game.import("character", function () {
 				},
 				mark: true,
 				intro: {
-					content: function (storage, player, skill) {
+					content(storage, player, skill) {
 						var str =
 							"<li>锁定技。你不能于〖蛊惑〗的结算流程中进行质疑。当你的体力值为1时，你的其他技能失效。";
 						var list = player.getSkills(null, false, false).filter(function (i) {
@@ -8962,32 +8963,32 @@ game.import("character", function () {
 				},
 				audio: 2,
 				trigger: { player: "changeHp" },
-				filter: function (event, player) {
+				filter(event, player) {
 					return player.hp == 1;
 				},
 				forced: true,
-				content: function () {},
+				content() {},
 			},
 			guhuo_phase: {},
 		},
 		card: {},
 		dynamicTranslate: {
-			nzry_juzhan: function (player) {
+			nzry_juzhan(player) {
 				if (player.storage.nzry_juzhan == true)
 					return '转换技，阴：当你成为其他角色【杀】的目标后，你可以与其各摸一张牌，然后其本回合内不能再对你使用牌。<span class="bluetext">阳：当你使用【杀】指定一名角色为目标后，你可以获得其一张牌，然后你本回合内不能再对其使用牌。</span>';
 				return '转换技，<span class="bluetext">阴：当你成为其他角色【杀】的目标后，你可以与其各摸一张牌，然后其本回合内不能再对你使用牌。</span>阳：当你使用【杀】指定一名角色为目标后，你可以获得其一张牌，然后你本回合内不能再对其使用牌。';
 			},
-			nzry_zhenliang: function (player) {
+			nzry_zhenliang(player) {
 				if (player.storage.nzry_zhenliang == true)
 					return '转换技，阴：出牌阶段限一次，你可以弃置一张与“任”颜色相同的牌并对攻击范围内的一名角色造成1点伤害。<span class="bluetext">阳：当你于回合外使用或打出的牌结算完成后，若此牌与“任”颜色相同，则你可以令一名角色摸一张牌。</span>';
 				return '转换技，<span class="bluetext">阴：出牌阶段限一次，你可以弃置一张与“任”颜色相同的牌并对攻击范围内的一名角色造成1点伤害。</span>阳：当你于回合外使用或打出的牌结算完成后，若此牌与“任”颜色相同，则你可以令一名角色摸一张牌。';
 			},
-			nzry_chenglve: function (player) {
+			nzry_chenglve(player) {
 				if (player.storage.nzry_chenglve == true)
 					return '转换技，出牌阶段限一次，阴：你可以摸一张牌，然后弃置两张手牌。<span class="bluetext">阳：你可以摸两张牌，然后弃置一张手牌。</span>若如此做，直到本回合结束，你使用与弃置牌花色相同的牌无距离和次数限制。';
 				return '转换技，出牌阶段限一次，<span class="bluetext">阴：你可以摸一张牌，然后弃置两张手牌。</span>阳：你可以摸两张牌，然后弃置一张手牌。若如此做，直到本回合结束，你使用与弃置牌花色相同的牌无距离和次数限制。';
 			},
-			nzry_shenshi: function (player) {
+			nzry_shenshi(player) {
 				if (player.storage.nzry_shenshi == true)
 					return '转换技，阴：出牌阶段限一次，你可以将一张牌交给一名手牌数最多的角色，然后对其造成1点伤害，若该角色因此死亡，则你可以令一名角色将手牌摸至四张。<span class="bluetext">阳：其他角色对你造成伤害后，你可以观看该角色的手牌，然后交给其一张牌，当前角色回合结束时，若此牌仍在该角色的区域内，你将手牌摸至四张。</span>';
 				return '转换技，<span class="bluetext">阴：出牌阶段限一次，你可以将一张牌交给一名手牌数最多的角色，然后对其造成1点伤害，若该角色因此死亡，则你可以令一名角色将手牌摸至四张。</span>阳：其他角色对你造成伤害后，你可以观看该角色的手牌，然后交给其一张牌，当前角色回合结束时，若此牌仍在该角色的区域内，你将手牌摸至四张。';
diff --git a/character/standard.js b/character/standard.js
index 6f2226595..7b5f1c003 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -129,6 +129,7 @@ game.import("character", function () {
 			ganning: ["lingtong", "xf_sufei"],
 			guanyu: ["zhangfei", "liaohua"],
 		},
+		/** @type { importCharacterConfig['skill'] } */
 		skill: {
 			//标准版甘夫人
 			stdshushen: {
@@ -578,7 +579,7 @@ game.import("character", function () {
 				async cost(event, trigger, player) {
 					let num = game.countPlayer(
 						(current) =>
-							current != player && current.countCards("h") && get.attitude(player, current) <= 0
+							current != player && current.countCards("h") > 0 && get.attitude(player, current) <= 0
 					);
 					let check = num >= 2;
 					const { result } = await player
@@ -2611,7 +2612,7 @@ game.import("character", function () {
 					global: ["dying", "gainAfter", "loseAsyncAfter"],
 				},
 				audio: 2,
-				getIndex: function (event, player) {
+				getIndex(event, player) {
 					if (event.name !== "loseAsync") return [event.player];
 					else
 						return game
diff --git a/node_modules/@types/noname-typings/Result.d.ts b/node_modules/@types/noname-typings/Result.d.ts
index 24bfb85aa..80a75be54 100644
--- a/node_modules/@types/noname-typings/Result.d.ts
+++ b/node_modules/@types/noname-typings/Result.d.ts
@@ -37,7 +37,12 @@ declare interface Result {
 	 * 当前有“视为”操作，该card参数特供给视为牌，不需要cards[0]获取视为牌 ；
 	 * 判断是否为视为牌：card.isCard，false为视为牌
 	 */
-	card: Card;
+	card: Card | CardBaseUIData;
+
+	
+	cost_data: {
+		[key: string]: any;
+	};
 
 	[key: string]: any;
 }
\ No newline at end of file
diff --git a/node_modules/@types/noname-typings/Skill.d.ts b/node_modules/@types/noname-typings/Skill.d.ts
index cbc602a8a..1fbb75517 100644
--- a/node_modules/@types/noname-typings/Skill.d.ts
+++ b/node_modules/@types/noname-typings/Skill.d.ts
@@ -442,7 +442,7 @@ declare interface Skill {
 	 * 
 	 * 若该属性值是“check”，则调用当前技能得check方法检测
 	 */
-	frequent?: boolean | string | TwoParmFun<SkillTrigger, Player, number | boolean>;
+	frequent?: boolean | string | TwoParmFun<GameEventPromise, Player, number | boolean>;
 	/** 
 	 * 此技能是否可以被设置为自动发动2 
 	 * 
@@ -1285,7 +1285,7 @@ declare interface Skill {
 	 * 
 	 * @param target v1.10.11 触发的目标
 	 */
-	logTarget?: string | ((event?: GameEventPromise, player?: Player, triggername?: string, target?: Player) => string | Player | Player[] | null);
+	logTarget?: string | ((event?: GameEventPromise, player?: Player, triggername?: string, target?: Player) => string | Player | Player[] | null | undefined);
 	/**
 	 * 是否通过logTarget显示触发者的目标日志；
 	 * 
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts
index ae25557a7..9971c369c 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts
@@ -33,6 +33,10 @@ export class Game {
      * @type { boolean }
      */
     chess: boolean;
+    /**
+     * @type { Player }
+     */
+    zhu: Player;
     globalEventHandlers: {
         _handlers: {};
         getHandler(name: any, type: any): any;
@@ -350,7 +354,7 @@ export class Game {
      * @param { ...Parameters<typeof lib.message.client[T]> } args
      * @returns { void }
      */
-    broadcast<T_6 extends "cancel" | "onclose" | "init" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "reinit" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: T_6, ...args: Parameters<{
+    broadcast<T_6 extends "cancel" | "onclose" | "init" | "reinit" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: T_6, ...args: Parameters<{
         log: (arr: any) => void;
         opened: () => void;
         onconnection: (id: any) => void;
@@ -382,7 +386,7 @@ export class Game {
      * @param { ...T } args
      * @returns { void }
      */
-    broadcast<T_6 extends "cancel" | "onclose" | "init" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "reinit" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: (...args: T_6) => void, ...args: T_6 | undefined): void;
+    broadcast<T_6 extends "cancel" | "onclose" | "init" | "reinit" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: (...args: T_6) => void, ...args: T_6 | undefined): void;
     /**
      * @template { keyof typeof lib.message.client } T
      * @overload
@@ -390,7 +394,7 @@ export class Game {
      * @param { ...Parameters<typeof lib.message.client[T]> } args
      * @returns { void }
      */
-    broadcastAll<T_7 extends "cancel" | "onclose" | "init" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "reinit" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: T_7, ...args: Parameters<{
+    broadcastAll<T_7 extends "cancel" | "onclose" | "init" | "reinit" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: T_7, ...args: Parameters<{
         log: (arr: any) => void;
         opened: () => void;
         onconnection: (id: any) => void;
@@ -422,7 +426,7 @@ export class Game {
      * @param { ...T } args
      * @returns { void }
      */
-    broadcastAll<T_7 extends "cancel" | "onclose" | "init" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "reinit" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: (...args: T_7) => void, ...args: T_7 | undefined): void;
+    broadcastAll<T_7 extends "cancel" | "onclose" | "init" | "reinit" | "log" | "opened" | "onconnection" | "onmessage" | "selfclose" | "reloadroom" | "createroom" | "enterroomfailed" | "roomlist" | "updaterooms" | "updateclients" | "updateevents" | "eventsdenied" | "exec" | "denied" | "closeDialog" | "createDialog" | "gameStart" | "updateWaiting">(func: (...args: T_7) => void, ...args: T_7 | undefined): void;
     syncState(): void;
     updateWaiting(): void;
     /**
@@ -1155,11 +1159,11 @@ export class Game {
     updateRoundNumber(): void;
     /**
      * @param { Player[] } players
-     * @param { number | number[] | (player: Player) => number } num
+     * @param { number | number[] | (player: Player) => number } [num]
      * @param { { drawDeck: boolean } } [drawDeck]
      * @param { boolean } [bottom]
      */
-    asyncDraw(players: Player[], num: number | number[] | ((player: Player) => number), drawDeck?: {
+    asyncDraw(players: Player[], num?: number | number[] | ((player: Player) => number) | undefined, drawDeck?: {
         drawDeck: boolean;
     } | undefined, bottom?: boolean | undefined): void;
     /**
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts
index 1f94ae2ae..b4290be5e 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts
@@ -99,7 +99,7 @@ export class Get {
     infoHp(hp: any): number;
     infoMaxHp(hp: any): number;
     infoHujia(hp: any): number;
-    bottomCards(num: any, putBack: any): any;
+    bottomCards(num: any, putBack: any): Node | Node[];
     discarded(): any;
     cardOffset(): number;
     colorspan(str: any): any;
@@ -355,7 +355,7 @@ export class Get {
      * @returns {string[]}
      */
     natureList(card: string[] | string, player?: false | import("noname-typings/nonameModules/noname/library/element/player.js").Player | undefined): string[];
-    cards(num: any, putBack: any): any;
+    cards(num: any, putBack: any): Node | Node[];
     judge(card: any): any;
     judge2(card: any): any;
     distance(from: any, to: any, method: any): number;
@@ -390,7 +390,7 @@ export class Get {
      * @returns {GameEvent[T]}
      */
     event<T_2 extends keyof import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent>(key: T_2): import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent[T_2];
-    player(): any;
+    player(): import("noname-typings/nonameModules/noname/library/element/player.js").Player;
     players(sort: any, dead: any, out: any): import("noname-typings/nonameModules/noname/library/element/player.js").Player[];
     position(card: any, ordering: any): number | "e" | "j" | "x" | "s" | "h" | "c" | "d" | "o" | null | undefined;
     skillTranslation(str: any, player: any): string;
@@ -476,7 +476,7 @@ export class Get {
     /**
      * @returns { number }
      */
-    order(item: any, player?: any): number;
+    order(item: any, player?: import("noname-typings/nonameModules/noname/library/element/player.js").Player): number;
     result(item: any, skill: any): any;
     cacheEffectUse(target: any, card: any, player: any, player2: any, isLink: any): number;
     effect_use(target: any, card: any, player: any, player2: any, isLink: any): number;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts
index f2da42ab5..dfcf107d3 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts
@@ -49,7 +49,7 @@ export class Is {
      * 是否是实体牌
      * @param { Card | VCard } card
      */
-    ordinaryCard(card: Card | VCard): any;
+    ordinaryCard(card: Card | VCard): boolean;
     /**
      * 押韵判断
      * @param { string } str1
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts
index 025d7e6b9..d0e622684 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts
@@ -34,6 +34,10 @@ export class Card extends HTMLDivElement {
      * @type { string }
      */
     name: string;
+    /**
+     * @type { boolean }
+     */
+    isCard: boolean;
     selfDestroy(event: any): void;
     willBeDestroyed(targetPosition: any, player: any, event: any): any;
     hasNature(nature: any, player: any): boolean;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts
index 09863751b..de20fcee0 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts
@@ -125,9 +125,37 @@ export class GameEvent {
      */
     parent: GameEventPromise | void | null;
     /**
-     * @type { Function | void | null }
+     * @type { (this: GameEventPromise) => any | undefined | void | null }
      */
-    filterStop: Function | void | null;
+    filterStop: (this: GameEventPromise) => any | undefined | void | null;
+    /**
+     * @type { Result['cost_data'] }
+     */
+    cost_data: Result['cost_data'];
+    /**
+     * @type { boolean }
+     */
+    responded: boolean;
+    /**
+     * @type { string | undefined }
+     */
+    judgestr: string | undefined;
+    /**
+     * @type { boolean }
+     */
+    judging: boolean;
+    /**
+     * @type { Function | undefined }
+     */
+    judge2: Function | undefined;
+    /**
+     * @type { Card[] }
+     */
+    orderingCards: Card[];
+    /**
+     * @type { Function | undefined }
+     */
+    ai: Function | undefined;
     /**
      * @param {keyof this} key
      * @param {number} [value]
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/player.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/player.d.ts
index f27ba6702..be00c0882 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/player.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/player.d.ts
@@ -69,29 +69,9 @@ export class Player extends HTMLDivElement {
         skill: {};
     }[];
     /**
-     * @type { {
-     * 	useCard: GameEventPromise[],
-     * 	respond: GameEventPromise[],
-     * 	skipped: GameEventPromise[],
-     * 	lose: GameEventPromise[],
-     * 	gain: GameEventPromise[],
-     * 	sourceDamage: GameEventPromise[],
-     * 	damage: GameEventPromise[],
-     * 	custom: GameEventPromise[],
-     * 	useSkill: GameEventPromise[],
-     * }[] }
+     * @type { ActionHistory[] }
      */
-    actionHistory: {
-        useCard: GameEventPromise[];
-        respond: GameEventPromise[];
-        skipped: GameEventPromise[];
-        lose: GameEventPromise[];
-        gain: GameEventPromise[];
-        sourceDamage: GameEventPromise[];
-        damage: GameEventPromise[];
-        custom: GameEventPromise[];
-        useSkill: GameEventPromise[];
-    }[];
+    actionHistory: ActionHistory[];
     /**
      * @type { SMap<string[]> }
      */
@@ -117,7 +97,8 @@ export class Player extends HTMLDivElement {
      * 	friend: [],
      * 	enemy: [],
      * 	neutral: [],
-     * 	handcards: {
+     * 	shown?: number,
+     * 	handcards?: {
      * 		global: [],
      * 		source: [],
      * 		viewed: []
@@ -128,7 +109,8 @@ export class Player extends HTMLDivElement {
         friend: [];
         enemy: [];
         neutral: [];
-        handcards: {
+        shown?: number;
+        handcards?: {
             global: [];
             source: [];
             viewed: [];
@@ -208,6 +190,18 @@ export class Player extends HTMLDivElement {
      * @type { ((player: this) => any)[] }
      */
     _inits: ((player: this) => any)[];
+    /**
+     * @type { boolean }
+     */
+    isZhu: boolean;
+    /**
+     * @type { string }
+     */
+    identity: string;
+    /**
+     * @type { boolean | undefined }
+     */
+    identityShown: boolean | undefined;
     /**
      * 怒气
      * @param { number } amount
@@ -516,10 +510,10 @@ export class Player extends HTMLDivElement {
     /**
      * 向target发起协力
      * @param { Player } target
-     * @param {*} type
+     * @param { string } type
      * @param {*} reason
      */
-    cooperationWith(target: Player, type: any, reason: any): void;
+    cooperationWith(target: Player, type: string, reason: any): void;
     chooseCooperationFor(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     checkCooperationStatus(target: any, reason: any): boolean;
     removeCooperation(info: any): void;
@@ -634,8 +628,9 @@ export class Player extends HTMLDivElement {
     /**
      * @param { string } name
      * @param { string } type
+     * @returns { boolean }
      */
-    hasUsableCard(name: string, type: string): true | undefined;
+    hasUsableCard(name: string, type: string): boolean;
     /**
      * @param { Player } to
      * @returns { boolean }
@@ -768,9 +763,9 @@ export class Player extends HTMLDivElement {
         position: number;
         hujia: number;
         side: any;
-        identityShown: any;
+        identityShown: boolean | undefined;
         identityNode: (string | undefined)[];
-        identity: any;
+        identity: string;
         dead: boolean;
         linked: boolean;
         turnedover: boolean;
@@ -806,7 +801,13 @@ export class Player extends HTMLDivElement {
     countUsed(card: any, type: any): number;
     getCacheKey(): string;
     countSkill(skill: any): any;
-    getStockSkills(unowned: any, unique: any, hidden: any): any[];
+    /**
+     * @param {*} [unowned]
+     * @param {*} [unique]
+     * @param {*} [hidden]
+     * @returns { string[] }
+     */
+    getStockSkills(unowned?: any, unique?: any, hidden?: any): string[];
     /**
      * @param { string } [arg1='h']
      * @param { string | Record<string, any> | ((card: Card) => boolean) } [arg2]
@@ -821,16 +822,41 @@ export class Player extends HTMLDivElement {
     getCards(arg1?: string | undefined, arg2?: string | Record<string, any> | ((card: Card) => boolean) | undefined): Card[];
     iterableGetDiscardableCards(player: any, arg1: any, arg2: any): Generator<import("noname-typings/nonameModules/noname/library/element/card.js").Card, void, unknown>;
     getDiscardableCards(player: any, arg1: any, arg2: any): import("noname-typings/nonameModules/noname/library/element/card.js").Card[];
-    iterableGetGainableCards(player: any, arg1: any, arg2: any): Generator<import("noname-typings/nonameModules/noname/library/element/card.js").Card, void, unknown>;
-    getGainableCards(player: any, arg1: any, arg2: any): import("noname-typings/nonameModules/noname/library/element/card.js").Card[];
+    /**
+     * @param {Parameters<lib['filter']['canBeGained']>[1]} player
+     * @param {Parameters<this['iterableGetCards']>[0]} arg1
+     * @param {Parameters<this['iterableGetCards']>[1]} arg2
+     */
+    iterableGetGainableCards(player: [card?: any, player?: any, target?: any, event?: any][1], arg1: Parameters<this['iterableGetCards']>[0], arg2: Parameters<this['iterableGetCards']>[1]): Generator<import("noname-typings/nonameModules/noname/library/element/card.js").Card, void, unknown>;
+    /**
+     *
+     * @param {Parameters<this['iterableGetGainableCards']>[0]} player
+     * @param {Parameters<this['iterableGetGainableCards']>[1]} [arg1]
+     * @param {Parameters<this['iterableGetGainableCards']>[2]} [arg2]
+     */
+    getGainableCards(player: Parameters<this['iterableGetGainableCards']>[0], arg1?: Parameters<this["iterableGetGainableCards"]>[1] | undefined, arg2?: Parameters<this["iterableGetGainableCards"]>[2] | undefined): import("noname-typings/nonameModules/noname/library/element/card.js").Card[];
     getGainableSkills(func: any): any[];
-    countCards(arg1: any, arg2: any): number;
+    /**
+     * @param { Parameters<typeof this['iterableGetCards']>[0] } [arg1]
+     * @param { Parameters<typeof this['iterableGetCards']>[1] } [arg2]
+     */
+    countCards(arg1?: Parameters<this["iterableGetCards"]>[0] | undefined, arg2?: Parameters<this["iterableGetCards"]>[1] | undefined): number;
     getCardIndex(arg1: any, name: any, card: any, max: any): number;
     countDiscardableCards(player: any, arg1: any, arg2: any): number;
-    countGainableCards(player: any, arg1: any, arg2: any): number;
+    /**
+     * @param {Parameters<this['getGainableCards']>[0]} player
+     * @param {Parameters<this['getGainableCards']>[1]} [arg1]
+     * @param {Parameters<this['getGainableCards']>[2]} [arg2]
+     */
+    countGainableCards(player: Parameters<this['getGainableCards']>[0], arg1?: Parameters<this["getGainableCards"]>[1] | undefined, arg2?: Parameters<this["getGainableCards"]>[2] | undefined): number;
     getOriginalSkills(): any[];
     getModableSkills(): any[];
-    getSkills(arg2: any, arg3: any, arg4: any): any[];
+    /**
+     * @param { string | boolean | null } [arg2]
+     * @param { boolean | null} [arg3]
+     * @param {boolean} [arg4]
+     */
+    getSkills(arg2?: string | boolean | null | undefined, arg3?: boolean | null | undefined, arg4?: boolean | undefined): any[];
     get(arg1: any, arg2: any, arg3: any, arg4: any, ...args: any[]): any[] | ChildNode | undefined;
     syncStorage(skill: any): void;
     syncSkills(): void;
@@ -889,16 +915,30 @@ export class Player extends HTMLDivElement {
     $addToExpansion(cards: any, broadcast: any, gaintag: any): this;
     directgain(cards: any, broadcast: any, gaintag: any): this;
     directgains(cards: any, broadcast: any, gaintag: any): this;
-    gainMultiple(targets: any, position: any): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
+    /**
+     *
+     * @param { Player[] } targets
+     * @param { string } [position]
+     */
+    gainMultiple(targets: Player[], position?: string | undefined): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     gain(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     addToExpansion(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
-    give(cards: any, target: any, visible: any): any;
+    /**
+     *
+     * @param { Card | Card[] } cards
+     * @param { Player } target
+     * @param { boolean } [visible]
+     */
+    give(cards: Card | Card[], target: Player, visible?: boolean | undefined): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     lose(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     damage(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     recover(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     recoverTo(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     doubleDraw(): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
-    loseHp(num: any): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
+    /**
+     * @param { number } [num]
+     */
+    loseHp(num?: number | undefined): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     loseMaxHp(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     gainMaxHp(...args: any[]): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
     changeHp(num: any, popup: any): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
@@ -930,11 +970,23 @@ export class Player extends HTMLDivElement {
     wait(callback: any): void;
     unwait(result: any): void;
     tempUnwait(result: any): void;
-    logSkill(name: any, targets: any, nature: any, logv: any): void;
+    /**
+     * @param { string | string[] } name
+     * @param { Player | Player[] } [targets]
+     * @param { boolean | string } [nature]
+     * @param { boolean } [logv]
+     */
+    logSkill(name: string | string[], targets?: Player | Player[] | undefined, nature?: string | boolean | undefined, logv?: boolean | undefined): void;
     unprompt(): void;
     prompt(str: any, nature: any): void;
     prompt_old(name2: any, className: any): void;
-    popup(name: any, className: any, nobroadcast: any): void;
+    /**
+     *
+     * @param { string } name
+     * @param { string } className
+     * @param { Parameters<this["damagepop"]>[3] } [nobroadcast]
+     */
+    popup(name: string, className?: string, nobroadcast?: Parameters<this["damagepop"]>[3] | undefined): void;
     popup_old(name: any, className: any): HTMLDivElement;
     _popup(): void;
     showTimer(time: any): void;
@@ -961,7 +1013,14 @@ export class Player extends HTMLDivElement {
     unmark(name: any, info: any): void;
     addLink(): void;
     removeLink(): void;
-    canUse(card: any, target: any, distance: any, includecard: any): any;
+    /**
+     * @param { string | Card | VCard } card
+     * @param { Player } target
+     * @param { boolean } [distance]
+     * @param { GameEventPromise | boolean } [includecard]
+     * @returns { boolean }
+     */
+    canUse(card: string | Card | VCard, target: Player, distance?: boolean | undefined, includecard?: boolean | import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): boolean;
     hasUseTarget(card: any, distance: any, includecard: any): boolean;
     hasValueTarget(card: any, distance: any, includecard: any): boolean;
     getUseValue(card: any, distance: any, includecard: any): number;
@@ -997,7 +1056,20 @@ export class Player extends HTMLDivElement {
     removeSkillTrigger(skills: any, triggeronly: any): this;
     removeSkill(skill: any, ...args: any[]): any;
     addTempSkills(skillsToAdd: any, expire: any): import("./gameEvent.js").GameEvent & import("./gameEventPromise.js").GameEventPromise;
-    addTempSkill(skill: any, expire: any, checkConflict: any): any;
+    /**
+     * @overload
+     * @param { string } skill
+     * @param { SkillTrigger | string } [expire]
+     * @param { boolean } [checkConflict]
+     */
+    addTempSkill(skill: string, expire?: string | SkillTrigger | undefined, checkConflict?: boolean | undefined): any;
+    /**
+     * @overload
+     * @param { string[] } skill
+     * @param { SkillTrigger } [expire]
+     * @param { boolean } [checkConflict]
+     */
+    addTempSkill(skill: string[], expire?: SkillTrigger | undefined, checkConflict?: boolean | undefined): any;
     tempBanSkill(skill: any, expire: any, log: any): any;
     isTempBanned(skill: any): boolean;
     attitudeTo(target: any): any;
@@ -1019,14 +1091,68 @@ export class Player extends HTMLDivElement {
      * @param { string | function | number | boolean | object } map
      */
     getRoundHistory(key: any, filter: any, num: any, keep: any, last: any): any[];
-    getHistory(key: any, filter: any, last: any): any;
-    checkHistory(key: any, filter: any, last: any): void;
-    hasHistory(key: any, filter: any, last: any): any;
-    getLastHistory(key: any, filter: any, last: any): any;
-    checkAllHistory(key: any, filter: any, last: any): void;
-    getAllHistory(key: any, filter: any, last: any): any[];
-    hasAllHistory(key: any, filter: any, last: any): boolean;
-    getLastUsed(num: any): any;
+    /**
+     * @overload
+     * @returns { ActionHistory }
+     */
+    getHistory(): ActionHistory;
+    /**
+     * @template { keyof ActionHistory } T
+     * @overload
+     * @param { T } key
+     * @param { (event: GameEventPromise) => boolean } [filter]
+     * @param { GameEventPromise } [last]
+     * @returns { ActionHistory[T] }
+     */
+    getHistory<T extends keyof ActionHistory>(key: T, filter?: ((event: GameEventPromise) => boolean) | undefined, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): ActionHistory[T];
+    /**
+     * @template { keyof ActionHistory } T
+     * @param { T } key
+     * @param { (event: GameEventPromise) => boolean } filter
+     * @param { GameEventPromise } [last]
+     */
+    checkHistory<T_1 extends keyof ActionHistory>(key: T_1, filter: (event: GameEventPromise) => boolean, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): void;
+    /**
+     * @template { keyof ActionHistory } T
+     * @param { T } key
+     * @param { (event: GameEventPromise) => boolean } [filter]
+     * @param { GameEventPromise } [last]
+     * @returns { boolean }
+     */
+    hasHistory<T_2 extends keyof ActionHistory>(key: T_2, filter?: ((event: GameEventPromise) => boolean) | undefined, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): boolean;
+    /**
+     * @template { keyof ActionHistory } T
+     * @overload
+     * @param { T } [key]
+     * @param { (event: GameEventPromise) => boolean } [filter]
+     * @param { GameEventPromise } [last]
+     * @returns { null | ActionHistory[T] | boolean }
+     */
+    getLastHistory<T_3 extends keyof ActionHistory>(key?: T_3 | undefined, filter?: ((event: GameEventPromise) => boolean) | undefined, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): boolean | ActionHistory[T_3] | null;
+    /**
+     * @template { keyof ActionHistory } T
+     * @param { T } key
+     * @param { (event: GameEventPromise) => boolean } filter
+     * @param { GameEventPromise } [last]
+     */
+    checkAllHistory<T_4 extends keyof ActionHistory>(key: T_4, filter: (event: GameEventPromise) => boolean, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): void;
+    /**
+     * @template { keyof ActionHistory } T
+     * @param { T } [key]
+     * @param { (event: GameEventPromise) => boolean } [filter]
+     * @param { GameEventPromise } [last]
+     * @returns { ActionHistory[T] }
+     */
+    getAllHistory<T_5 extends keyof ActionHistory>(key?: T_5 | undefined, filter?: ((event: GameEventPromise) => boolean) | undefined, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): ActionHistory[T_5];
+    /**
+     * @template { keyof ActionHistory } T
+     * @param { T } key
+     * @param { (event: GameEventPromise) => boolean } filter
+     * @param { GameEventPromise } [last]
+     * @returns { boolean }
+     */
+    hasAllHistory<T_6 extends keyof ActionHistory>(key: T_6, filter: (event: GameEventPromise) => boolean, last?: import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | undefined): boolean;
+    getLastUsed(num: any): import("noname-typings/nonameModules/noname/library/index.js").GameEventPromise | null;
     getStat(key: any): any;
     getLastStat(key: any): any;
     queue(time: any): void;
@@ -1067,23 +1193,59 @@ export class Player extends HTMLDivElement {
     isOnline2(): boolean;
     isOffline(): boolean;
     checkShow(skill: any, showonly: any): false | "main" | "vice";
-    needsToDiscard(add: any, filter: any, pure: any): number;
+    /**
+     *
+     * @param { number | Card[] | Card } [add]
+     * @param { (card?: Card, player?: Player) => boolean } [filter]
+     * @param { boolean } [pure]
+     */
+    needsToDiscard(add?: number | import("noname-typings/nonameModules/noname/library/element/card.js").Card | import("noname-typings/nonameModules/noname/library/element/card.js").Card[] | undefined, filter?: ((card?: Card, player?: Player) => boolean) | undefined, pure?: boolean | undefined): number;
     distanceTo(target: any, method: any): number;
     distanceFrom(target: any, method: any): number;
-    hasSkill(skill: any, arg2: any, arg3: any, arg4: any): boolean;
-    hasStockSkill(skill: any, arg1: any, arg2: any, arg3: any): boolean;
+    /**
+     * @param { string } skill
+     * @param { Parameters<this['getSkills']>[0] } arg2
+     * @param { Parameters<this['getSkills']>[1] } arg3
+     * @param { Parameters<this['getSkills']>[2] } arg4
+     * @returns { boolean }
+     */
+    hasSkill(skill: string, arg2: Parameters<this['getSkills']>[0], arg3: Parameters<this['getSkills']>[1], arg4: Parameters<this['getSkills']>[2]): boolean;
+    /**
+     * @param { string } skill
+     * @param { Parameters<this['getStockSkills']>[0] } arg1
+     * @param { Parameters<this['getStockSkills']>[1] } arg2
+     * @param { Parameters<this['getStockSkills']>[2] } arg3
+     * @returns { boolean }
+     */
+    hasStockSkill(skill: string, arg1: Parameters<this['getStockSkills']>[0], arg2: Parameters<this['getStockSkills']>[1], arg3: Parameters<this['getStockSkills']>[2]): boolean;
     isZhu2(): boolean;
     isInitFilter(tag: any): boolean;
-    hasZhuSkill(skill: any, player: any): boolean;
+    /**
+     *
+     * @param {string} skill
+     * @param {Player} [player]
+     */
+    hasZhuSkill(skill: string, player?: Player | undefined): boolean;
     hasGlobalTag(tag: any, arg: any): boolean;
-    hasSkillTag(tag: any, hidden: any, arg: any, globalskill: any): boolean;
+    /**
+     * @param {string} tag
+     * @param {Parameters<this['getSkills']>[0]} hidden
+     * @param {Parameters<SkillAI['skillTagFilter']>[2]} arg
+     * @param {boolean} [globalskill]
+     */
+    hasSkillTag(tag: string, hidden: Parameters<this['getSkills']>[0], arg: [player: import("noname-typings/nonameModules/noname/library/element/player.js").Player, tag: string, arg: any][2], globalskill?: boolean | undefined): boolean;
     hasJudge(name: any): boolean;
     hasFriend(): boolean;
     hasUnknown(num: any): boolean;
     isUnknown(player: any): boolean;
     hasWuxie(info: any): boolean;
-    hasSha(respond: any, noauto: any): true | undefined;
-    hasShan(respond: any): true | undefined;
+    /**
+     *
+     * @param {string|boolean} [respond]
+     * @param {boolean} [noauto]
+     */
+    hasSha(respond?: string | boolean | undefined, noauto?: boolean | undefined): boolean;
+    hasShan(respond: any): boolean;
     mayHaveSha(viewer: any, type: any, ignore: any, rvt: any): number | boolean;
     mayHaveShan(viewer: any, type: any, ignore: any, rvt: any): number | boolean;
     hasCard(name: any, position: any): boolean;
@@ -1119,9 +1281,27 @@ export class Player extends HTMLDivElement {
     $dust(): void;
     $recover(): void;
     $fullscreenpop(str: any, nature: any, avatar: any, broadcast: any): void;
-    $damagepop(num: any, nature: any, font: any, nobroadcast: any): void;
+    /**
+     *
+     * @param { number | string } num
+     * @param { string } [nature]
+     * @param { boolean } [font]
+     * @param { boolean } [nobroadcast]
+     */
+    $damagepop(num: number | string, nature?: string | undefined, font?: boolean | undefined, nobroadcast?: boolean | undefined): void;
     $damage(source: any, ...args: any[]): void;
     $die(): void;
     $dieflip(type: any): void;
     $phaseJudge(card: any): void;
 }
+export type ActionHistory = {
+    useCard: GameEventPromise[];
+    respond: GameEventPromise[];
+    skipped: GameEventPromise[];
+    lose: GameEventPromise[];
+    gain: GameEventPromise[];
+    sourceDamage: GameEventPromise[];
+    damage: GameEventPromise[];
+    custom: GameEventPromise[];
+    useSkill: GameEventPromise[];
+};
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/ui/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/ui/index.d.ts
index df605984f..a51c397cf 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/ui/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/ui/index.d.ts
@@ -129,6 +129,10 @@ export class UI {
      * @type {HTMLDivElement}
      */
     tempnowuxie: HTMLDivElement;
+    /**
+     * @type {HTMLDivElement}
+     */
+    cardPile: HTMLDivElement;
     refresh(node: any): void;
     clear(): void;
     updatec(): void;
diff --git a/noname/game/index.js b/noname/game/index.js
index 297017ea8..16a193d3f 100644
--- a/noname/game/index.js
+++ b/noname/game/index.js
@@ -53,18 +53,19 @@ export class Game {
 	/**
 	 * @type { string }
 	 */
-	// @ts-ignore
 	layout;
 	/**
 	 * @type { Player }
 	 */
-	// @ts-ignore
 	me;
 	/**
 	 * @type { boolean }
 	 */
-	// @ts-ignore
 	chess;
+	/**
+	 * @type { Player }
+	 */
+	zhu;
 	globalEventHandlers = new (class {
 		constructor() {
 			this._handlers = {};
@@ -7486,7 +7487,7 @@ export class Game {
 	}
 	/**
 	 * @param { Player[] } players
-	 * @param { number | number[] | (player: Player) => number } num
+	 * @param { number | number[] | (player: Player) => number } [num]
 	 * @param { { drawDeck: boolean } } [drawDeck]
 	 * @param { boolean } [bottom]
 	 */
diff --git a/noname/library/element/card.js b/noname/library/element/card.js
index 7e91d8be0..d793cb1bf 100644
--- a/noname/library/element/card.js
+++ b/noname/library/element/card.js
@@ -100,6 +100,10 @@ export class Card extends HTMLDivElement {
 	 * @type { any[] }
 	 */
 	_uncheck;
+	/**
+	 * @type { boolean }
+	 */
+	isCard;
 	//执行销毁一张牌的钩子函数
 	selfDestroy(event) {
 		if (this._selfDestroyed) return;
diff --git a/noname/library/element/gameEvent.js b/noname/library/element/gameEvent.js
index 736855ee6..a19280100 100644
--- a/noname/library/element/gameEvent.js
+++ b/noname/library/element/gameEvent.js
@@ -67,37 +67,30 @@ export class GameEvent {
 	/**
 	 * @type { Player }
 	 */
-	// @ts-ignore
 	source;
 	/**
 	 * @type { Player }
 	 */
-	// @ts-ignore
 	player;
 	/**
 	 * @type { Player[] }
 	 */
-	// @ts-ignore
 	players;
 	/**
 	 * @type { Player }
 	 */
-	// @ts-ignore
 	target;
 	/**
 	 * @type { Player[] }
 	 */
-	// @ts-ignore
 	targets;
 	/**
 	 * @type { Card }
 	 */
-	// @ts-ignore
 	card;
 	/**
 	 * @type { Card[] }
 	 */
-	// @ts-ignore
 	cards;
 	/**
 	 * @type { string }
@@ -114,7 +107,6 @@ export class GameEvent {
 	/**
 	 * @type { GameEvent }
 	 */
-	// @ts-ignore
 	_trigger;
 	/**
 	 * @type { Result }
@@ -123,61 +115,79 @@ export class GameEvent {
 	/**
 	 * @type { number }
 	 */
-	// @ts-ignore
 	baseDamage;
 	/**
 	 * @type { Player }
 	 */
-	// @ts-ignore
 	customSource;
 	/**
 	 * @type { number }
 	 */
-	// @ts-ignore
 	extraDamage;
 	/**
 	 * @type { string }
 	 */
-	// @ts-ignore
 	nature;
 	/**
 	 * @type { boolean }
 	 */
-	// @ts-ignore
 	notrigger;
 	/**
 	 * @type { number }
 	 */
-	// @ts-ignore
 	original_num;
 	/**
 	 * @type { boolean }
 	 */
-	// @ts-ignore
 	unreal;
 	/**
 	 * @type { Button[] }
 	 */
-	// @ts-ignore
 	excludeButton;
 	/**
 	 * @type { Result }
 	 */
-	// @ts-ignore
 	result;
 	/**
 	 * @type { GameEventPromise | void | null }
 	 */
-	// @ts-ignore
 	parent;
 	/**
 	 * @type { string }
 	 */
 	name;
 	/**
-	 * @type { Function | void | null }
+	 * @type { (this: GameEventPromise) => any | undefined | void | null }
 	 */
 	filterStop;
+	/**
+	 * @type { Result['cost_data'] }
+	 */
+	cost_data;
+	/**
+	 * @type { boolean }
+	 */
+	responded;
+	/**
+	 * @type { string | undefined }
+	 */
+	judgestr;
+	/**
+	 * @type { boolean }
+	 */
+	judging;
+	/**
+	 * @type { Function | undefined }
+	 */
+	judge2;
+	/**
+	 * @type { Card[] }
+	 */
+	orderingCards;
+	/**
+	 * @type { Function | undefined }
+	 */
+	ai;
 	/**
 	 * @param {keyof this} key
 	 * @param {number} [value]
diff --git a/noname/library/element/player.js b/noname/library/element/player.js
index 8fc371d2b..65ea80540 100644
--- a/noname/library/element/player.js
+++ b/noname/library/element/player.js
@@ -1,3 +1,17 @@
+/**
+ * @typedef { {
+ * useCard: GameEventPromise[], 
+ * respond: GameEventPromise[], 
+ * skipped: GameEventPromise[], 
+ * lose: GameEventPromise[], 
+ * gain: GameEventPromise[],
+ * 	sourceDamage: GameEventPromise[],
+ * 	damage: GameEventPromise[],
+ * 	custom: GameEventPromise[],
+ * 	useSkill: GameEventPromise[],
+ * }} ActionHistory
+ */
+
 import { ai } from "../../ai/index.js";
 import { get } from "../../get/index.js";
 import { game } from "../../game/index.js";
@@ -224,17 +238,7 @@ export class Player extends HTMLDivElement {
 	 */
 	stat;
 	/**
-	 * @type { {
-	 * 	useCard: GameEventPromise[],
-	 * 	respond: GameEventPromise[],
-	 * 	skipped: GameEventPromise[],
-	 * 	lose: GameEventPromise[],
-	 * 	gain: GameEventPromise[],
-	 * 	sourceDamage: GameEventPromise[],
-	 * 	damage: GameEventPromise[],
-	 * 	custom: GameEventPromise[],
-	 * 	useSkill: GameEventPromise[],
-	 * }[] }
+	 * @type { ActionHistory[] }
 	 */
 	actionHistory;
 	/**
@@ -262,7 +266,8 @@ export class Player extends HTMLDivElement {
 	 * 	friend: [],
 	 * 	enemy: [],
 	 * 	neutral: [],
-	 * 	handcards: {
+	 * 	shown?: number,
+	 * 	handcards?: {
 	 * 		global: [],
 	 * 		source: [],
 	 * 		viewed: []
@@ -342,6 +347,18 @@ export class Player extends HTMLDivElement {
 	 * @type { ((player: this) => any)[] }
 	 */
 	_inits;
+	/**
+	 * @type { boolean }
+	 */
+	isZhu;
+	/**
+	 * @type { string }
+	 */
+	identity;
+	/**
+	 * @type { boolean | undefined }
+	 */
+	identityShown;
 	//新函数
 	/**
 	 * 怒气
@@ -1402,7 +1419,7 @@ export class Player extends HTMLDivElement {
 	/**
 	 * 向target发起协力
 	 * @param { Player } target
-	 * @param {*} type
+	 * @param { string } type
 	 * @param {*} reason
 	 */
 	cooperationWith(target, type, reason) {
@@ -2023,6 +2040,7 @@ export class Player extends HTMLDivElement {
 	/**
 	 * @param { string } name
 	 * @param { string } type
+	 * @returns { boolean }
 	 */
 	hasUsableCard(name, type) {
 		if (typeof type !== "string") type = type ? "limit" : "all";
@@ -3698,6 +3716,12 @@ export class Player extends HTMLDivElement {
 		if (num == undefined) return 0;
 		return num;
 	}
+	/**
+	 * @param {*} [unowned] 
+	 * @param {*} [unique] 
+	 * @param {*} [hidden] 
+	 * @returns { string[] }
+	 */
 	getStockSkills(unowned, unique, hidden) {
 		var list = [];
 		if (lib.character[this.name] && (hidden || !this.isUnseen(0))) {
@@ -3842,6 +3866,11 @@ export class Player extends HTMLDivElement {
 	getDiscardableCards(player, arg1, arg2) {
 		return Array.from(this.iterableGetDiscardableCards(player, arg1, arg2));
 	}
+	/**
+	 * @param {Parameters<lib['filter']['canBeGained']>[1]} player 
+	 * @param {Parameters<this['iterableGetCards']>[0]} arg1 
+	 * @param {Parameters<this['iterableGetCards']>[1]} arg2 
+	 */
 	*iterableGetGainableCards(player, arg1, arg2) {
 		for (let card of this.iterableGetCards(arg1, arg2)) {
 			if (lib.filter.canBeGained(card, player, this)) {
@@ -3849,6 +3878,12 @@ export class Player extends HTMLDivElement {
 			}
 		}
 	}
+	/**
+	 * 
+	 * @param {Parameters<this['iterableGetGainableCards']>[0]} player 
+	 * @param {Parameters<this['iterableGetGainableCards']>[1]} [arg1] 
+	 * @param {Parameters<this['iterableGetGainableCards']>[2]} [arg2] 
+	 */
 	getGainableCards(player, arg1, arg2) {
 		return Array.from(this.iterableGetGainableCards(player, arg1, arg2));
 	}
@@ -3860,6 +3895,10 @@ export class Player extends HTMLDivElement {
 		}
 		return list;
 	}
+	/**
+	 * @param { Parameters<typeof this['iterableGetCards']>[0] } [arg1] 
+	 * @param { Parameters<typeof this['iterableGetCards']>[1] } [arg2] 
+	 */
 	countCards(arg1, arg2) {
 		let count = 0;
 		for (let item of this.iterableGetCards(arg1, arg2)) {
@@ -3883,6 +3922,11 @@ export class Player extends HTMLDivElement {
 	countDiscardableCards(player, arg1, arg2) {
 		return this.getDiscardableCards(player, arg1, arg2).length;
 	}
+	/**
+	 * @param {Parameters<this['getGainableCards']>[0]} player 
+	 * @param {Parameters<this['getGainableCards']>[1]} [arg1] 
+	 * @param {Parameters<this['getGainableCards']>[2]} [arg2] 
+	 */
 	countGainableCards(player, arg1, arg2) {
 		return this.getGainableCards(player, arg1, arg2).length;
 	}
@@ -3906,6 +3950,11 @@ export class Player extends HTMLDivElement {
 		skills.sort((a, b) => get.priority(a) - get.priority(b));
 		return skills;
 	}
+	/**
+	 * @param { string | boolean | null } [arg2]
+	 * @param { boolean | null} [arg3]
+	 * @param {boolean} [arg4]
+	 */
 	getSkills(arg2, arg3, arg4) {
 		var skills = this.skills.slice(0);
 		var es = [];
@@ -5781,7 +5830,12 @@ export class Player extends HTMLDivElement {
 			);
 		return this;
 	}
-	gainMultiple(targets, position) {
+	/**
+	 * 
+	 * @param { Player[] } targets 
+	 * @param { string } [position] 
+	 */
+	gainMultiple(targets, position = "h") {
 		var next = game.createEvent("gainMultiple", false);
 		next.setContent("gainMultiple");
 		next.player = this;
@@ -5945,6 +5999,12 @@ export class Player extends HTMLDivElement {
 		next.gaintag = [];
 		return next;
 	}
+	/**
+	 * 
+	 * @param { Card | Card[] } cards 
+	 * @param { Player } target 
+	 * @param { boolean } [visible] 
+	 */
 	give(cards, target, visible) {
 		var next = target.gain(cards, this);
 		next.animate = visible ? "give" : "giveAuto";
@@ -6136,6 +6196,9 @@ export class Player extends HTMLDivElement {
 		next.setContent("doubleDraw");
 		return next;
 	}
+	/**
+	 * @param { number } [num] 
+	 */
 	loseHp(num) {
 		var next = game.createEvent("loseHp");
 		next.num = num;
@@ -6787,6 +6850,12 @@ export class Player extends HTMLDivElement {
 		}
 		if (typeof proceed == "function") proceed();
 	}
+	/**
+	 * @param { string | string[] } name 
+	 * @param { Player | Player[] } [targets] 
+	 * @param { boolean | string } [nature] 
+	 * @param { boolean } [logv] 
+	 */
 	logSkill(name, targets, nature, logv) {
 		if (get.itemtype(targets) == "player") targets = [targets];
 		var nopop = false;
@@ -6980,7 +7049,13 @@ export class Player extends HTMLDivElement {
 			node.classList.add(className);
 		}
 	}
-	popup(name, className, nobroadcast) {
+	/**
+	 * 
+	 * @param { string } name 
+	 * @param { string } className 
+	 * @param { Parameters<this["damagepop"]>[3] } [nobroadcast] 
+	 */
+	popup(name, className = "water", nobroadcast) {
 		var name2 = get.translation(name);
 		if (!name2) return;
 		this.$damagepop(name2, className || "water", true, nobroadcast);
@@ -7403,6 +7478,13 @@ export class Player extends HTMLDivElement {
 			this.classList.remove("linked");
 		}
 	}
+	/**
+	 * @param { string | Card | VCard } card 
+	 * @param { Player } target 
+	 * @param { boolean } [distance] 
+	 * @param { GameEventPromise | boolean } [includecard] 
+	 * @returns { boolean }
+	 */
 	canUse(card, target, distance, includecard) {
 		if (typeof card == "string") card = { name: card, isCard: true };
 		var info = get.info(card);
@@ -8247,6 +8329,18 @@ export class Player extends HTMLDivElement {
 			}
 		});
 	}
+	/**
+	 * @overload
+	 * @param { string } skill 
+	 * @param { SkillTrigger | string } [expire] 
+	 * @param { boolean } [checkConflict] 
+	 */
+	/**
+	 * @overload
+	 * @param { string[] } skill 
+	 * @param { SkillTrigger } [expire] 
+	 * @param { boolean } [checkConflict] 
+	 */
 	addTempSkill(skill, expire, checkConflict) {
 		if (Array.isArray(skill)) {
 			for (var i = 0; i < skill.length; i++) {
@@ -8417,6 +8511,18 @@ export class Player extends HTMLDivElement {
 		}
 		return evts;
 	}
+	/**
+	 * @overload
+	 * @returns { ActionHistory }
+	 */
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @overload
+	 * @param { T } key 
+	 * @param { (event: GameEventPromise) => boolean } [filter]
+	 * @param { GameEventPromise } [last]
+	 * @returns { ActionHistory[T] }
+	 */
 	getHistory(key, filter, last) {
 		if (!key) return this.actionHistory[this.actionHistory.length - 1];
 		if (!filter) return this.actionHistory[this.actionHistory.length - 1][key];
@@ -8432,6 +8538,12 @@ export class Player extends HTMLDivElement {
 			return history.filter(filter);
 		}
 	}
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @param { T } key 
+	 * @param { (event: GameEventPromise) => boolean } filter
+	 * @param { GameEventPromise } [last]
+	 */
 	checkHistory(key, filter, last) {
 		if (!key || !filter) return;
 		else {
@@ -8447,7 +8559,14 @@ export class Player extends HTMLDivElement {
 			}
 		}
 	}
-	hasHistory(key, filter, last) {
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @param { T } key 
+	 * @param { (event: GameEventPromise) => boolean } [filter]
+	 * @param { GameEventPromise } [last]
+	 * @returns { boolean }
+	 */
+	hasHistory(key, filter = lib.filter.all, last) {
 		const history = this.getHistory(key);
 		if (!filter || typeof filter != "function") filter = lib.filter.all;
 		if (last) {
@@ -8459,6 +8578,14 @@ export class Player extends HTMLDivElement {
 		}
 		return history.some(filter);
 	}
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @overload
+	 * @param { T } [key] 
+	 * @param { (event: GameEventPromise) => boolean } [filter]
+	 * @param { GameEventPromise } [last]
+	 * @returns { null | ActionHistory[T] | boolean }
+	 */
 	getLastHistory(key, filter, last) {
 		let history = false;
 		for (let i = this.actionHistory.length - 1; i >= 0; i--) {
@@ -8481,6 +8608,12 @@ export class Player extends HTMLDivElement {
 			return history.filter(filter);
 		}
 	}
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @param { T } key
+	 * @param { (event: GameEventPromise) => boolean } filter
+	 * @param { GameEventPromise } [last]
+	 */
 	checkAllHistory(key, filter, last) {
 		if (!key || !filter) return;
 		this.actionHistory.forEach((value) => {
@@ -8496,6 +8629,13 @@ export class Player extends HTMLDivElement {
 			}
 		});
 	}
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @param { T } [key]
+	 * @param { (event: GameEventPromise) => boolean } [filter]
+	 * @param { GameEventPromise } [last]
+	 * @returns { ActionHistory[T] }
+	 */
 	getAllHistory(key, filter, last) {
 		const history = [];
 		this.actionHistory.forEach((value) => {
@@ -8517,6 +8657,13 @@ export class Player extends HTMLDivElement {
 		}
 		return history;
 	}
+	/**
+	 * @template { keyof ActionHistory } T
+	 * @param { T } key
+	 * @param { (event: GameEventPromise) => boolean } filter
+	 * @param { GameEventPromise } [last]
+	 * @returns { boolean }
+	 */
 	hasAllHistory(key, filter, last) {
 		return this.actionHistory.some((value) => {
 			let history = value[key];
@@ -9096,6 +9243,12 @@ export class Player extends HTMLDivElement {
 		}
 		return false;
 	}
+	/**
+	 * 
+	 * @param { number | Card[] | Card } [add] 
+	 * @param { (card?: Card, player?: Player) => boolean } [filter] 
+	 * @param { boolean } [pure] 
+	 */
 	needsToDiscard(add, filter, pure) {
 		/**
 		 * add: (逻辑上)同时考虑“获得”的这张/些牌
@@ -9124,9 +9277,23 @@ export class Player extends HTMLDivElement {
 	distanceFrom(target, method) {
 		return get.distance(target, this, method);
 	}
+	/**
+	 * @param { string } skill 
+	 * @param { Parameters<this['getSkills']>[0] } arg2 
+	 * @param { Parameters<this['getSkills']>[1] } arg3 
+	 * @param { Parameters<this['getSkills']>[2] } arg4 
+	 * @returns { boolean }
+	 */
 	hasSkill(skill, arg2, arg3, arg4) {
 		return game.expandSkills(this.getSkills(arg2, arg3, arg4)).includes(skill);
 	}
+	/**
+	 * @param { string } skill 
+	 * @param { Parameters<this['getStockSkills']>[0] } arg1 
+	 * @param { Parameters<this['getStockSkills']>[1] } arg2 
+	 * @param { Parameters<this['getStockSkills']>[2] } arg3 
+	 * @returns { boolean }
+	 */
 	hasStockSkill(skill, arg1, arg2, arg3) {
 		return game.expandSkills(this.getStockSkills(arg1, arg2, arg3)).includes(skill);
 	}
@@ -9153,6 +9320,11 @@ export class Player extends HTMLDivElement {
 		}
 		return false;
 	}
+	/**
+	 * 
+	 * @param {string} skill 
+	 * @param {Player} [player] 
+	 */
 	hasZhuSkill(skill, player) {
 		if (!this.hasSkill(skill)) return false;
 		if (player) {
@@ -9187,6 +9359,12 @@ export class Player extends HTMLDivElement {
 		}
 		return false;
 	}
+	/**
+	 * @param {string} tag 
+	 * @param {Parameters<this['getSkills']>[0]} hidden 
+	 * @param {Parameters<SkillAI['skillTagFilter']>[2]} arg 
+	 * @param {boolean} [globalskill] 
+	 */
 	hasSkillTag(tag, hidden, arg, globalskill) {
 		var skills = this.getSkills(hidden);
 		if (globalskill) {
@@ -9281,6 +9459,11 @@ export class Player extends HTMLDivElement {
 		}
 		return false;
 	}
+	/**
+	 * 
+	 * @param {string|boolean} [respond] 
+	 * @param {boolean} [noauto] 
+	 */
 	hasSha(respond, noauto) {
 		if (this.countCards("hs", "sha")) return true;
 		if (this.countCards("hs", "hufu")) return true;
@@ -10848,7 +11031,14 @@ export class Player extends HTMLDivElement {
 			avatar ? 1600 : 1000
 		);
 	}
-	$damagepop(num, nature, font, nobroadcast) {
+	/**
+	 * 
+	 * @param { number | string } num 
+	 * @param { string } [nature] 
+	 * @param { boolean } [font] 
+	 * @param { boolean } [nobroadcast] 
+	 */
+	$damagepop(num, nature = "soil", font, nobroadcast) {
 		if (typeof num == "number" || typeof num == "string") {
 			game.addVideo("damagepop", this, [num, nature, font]);
 			if (nobroadcast !== false)
diff --git a/noname/ui/index.js b/noname/ui/index.js
index 638e0ca9d..cc4a257d7 100644
--- a/noname/ui/index.js
+++ b/noname/ui/index.js
@@ -136,6 +136,10 @@ export class UI {
 	 * @type {HTMLDivElement}
 	 */
 	tempnowuxie;
+	/**
+	 * @type {HTMLDivElement}
+	 */
+	cardPile;
 	refresh(node) {
 		void window.getComputedStyle(node, null).getPropertyValue("opacity");
 	}