手杀笮融，bugfix

card/kaiheiji.js

@@ -440,6 +440,9 @@ game.import("card", function () {
 				},
 				async content(event, trigger, player) {
 					const { target } = event;
+					if (!target.isDead()) {
+						return;
+					}
 					await target.reviveEvent();
 					await target.draw(3);
 				},
@@ -998,8 +1001,16 @@ game.import("card", function () {
 				filterTarget: true,
 				reverseOrder: true,
 				async content(event, trigger, player) {
-					const target = event.target,
-						cardname = "shandian";
+					//摩斯码全责
+					const target = event.target;
+					target
+						.when("damageBefore")
+						.filter(evt => evt.getParent(event.name) == event && evt.card?.name == "shandian")
+						.step(async (evt, trigger, player) => {
+							trigger.card = event.card;
+						});
+					await target.executeDelayCardEffect("shandian");
+					/*	cardname = "shandian";
 					const VCard = ui.create.card();
 					VCard._destroy = true;
 					VCard.expired = true;
@@ -1012,7 +1023,7 @@ game.import("card", function () {
 					VCard.delete();
 					if (result.bool == false) {
 						await target.damage(3, "thunder", "nosource");
-					}
+					}*/
 				},
 				ai: {
 					wuxie(target, card, player, viewer, status) {
@@ -1192,6 +1203,19 @@ game.import("card", function () {
 				async content(event, trigger, player) {
 					await player.gainPlayerCard(trigger.target, "he", true);
 				},
+				ai: {
+					effect: {
+						player_use(card, player, target) {
+							if (!target || target.countCards("h") || !target.countCards("e")) {
+								return;
+							}
+							const filter = card => get.type(card) == "equip" && get.info(card)?.toself === false;
+							if (filter(card) && target.getCards("e").every(cardx => filter(cardx))) {
+								return "zeroplayertarget";
+							}
+						},
+					},
+				},
 			},
 			youfu_skill: {
 				popup: false,
@@ -1225,13 +1249,18 @@ game.import("card", function () {
 						event.result = { bool: bool, targets: targets };
 					} else {
 						event.result = await player
-							.chooseTarget(get.prompt(event.skill), "令任意名【有福同享】的目标角色也成为" + get.translation(trigger.card) + "的目标", (card, player, target) => {
-								const trigger = get.event().getTrigger();
-								if (!player.getStorage("youfu_skill").includes(target)) {
-									return false;
-								}
-								return !trigger.targets.includes(target) && lib.filter.targetEnabled2(trigger.card, player, target);
-							})
+							.chooseTarget(
+								get.prompt(event.skill),
+								"令任意名【有福同享】的目标角色也成为" + get.translation(trigger.card) + "的目标",
+								(card, player, target) => {
+									const trigger = get.event().getTrigger();
+									if (!player.getStorage("youfu_skill").includes(target)) {
+										return false;
+									}
+									return !trigger.targets.includes(target) && lib.filter.targetEnabled2(trigger.card, player, target);
+								},
+								[1, targets.length]
+							)
 							.set("ai", target => {
 								const player = get.player(),
 									trigger = get.event().getTrigger();

character/huicui/skill.js

@@ -1977,7 +1977,7 @@ const skills = {
 			}
 			await player.showCards(cards, get.translation(player) + "发动了【乘烟】");
 			const card = cards[0];
-			if (card.name == "sha" || (get.type(card) == "trick" && get.info(card).filterTarget)) {
+			if (card.name == "sha" || (get.type(card, false) == "trick" && get.info(card, false).filterTarget)) {
 				player.addTempSkill("dcchengyan_effect");
 				player.markAuto("dcchengyan_effect", [[trigger.card, card, target]]);
 			} else {
@@ -4556,7 +4556,7 @@ const skills = {
 			return card.hasGaintag("eternal_dcqiqin_tag") && lib.filter.cardDiscardable(card, player);
 		},
 		filterTarget: (card, player, target) => {
-			return target != player && target.countCards("he");
+			return target != player && target.countCards("hej");
 		},
 		position: "h",
 		check: card => {
@@ -18413,21 +18413,23 @@ const skills = {
 			}
 		},
 		group: "xuxie_add",
-	},
-	xuxie_add: {
-		audio: "xuxie",
-		trigger: { player: "phaseUseEnd" },
-		forced: true,
-		locked: false,
-		sourceSkill: "xuxie",
-		filter(event, player) {
-			return game.hasPlayer(function (current) {
-				return current.maxHp > player.maxHp;
-			});
-		},
-		content() {
-			player.gainMaxHp();
-			player.chooseDrawRecover(2, true);
+		subSkill: {
+			add: {
+				audio: "xuxie",
+				trigger: { player: "phaseUseEnd" },
+				forced: true,
+				locked: false,
+				filter(event, player) {
+					return game.hasPlayer(function (current) {
+						return current.maxHp > player.maxHp;
+					});
+				},
+				content() {
+					player.gainMaxHp();
+					player.chooseDrawRecover(2, true);
+				},
+
+			},
 		},
 	},
 	//新潘凤

character/mobile/character.js

@@ -1,4 +1,10 @@
 const characters = {
+	mb_zerong: {
+		sex: "male",
+		hp: 4,
+		group: "qun",
+		skills: ["mbfutu", "mbjingtu", "mbjiebian"],
+	},
 	pot_lusu: {
 		sex: "male",
 		hp: 3,

character/mobile/dynamicTranslate.js

@@ -1,6 +1,14 @@
 import { lib, game, ui, get, ai, _status } from "../../noname.js";
 
 const dynamicTranslates = {
+	mbfozong(player) {
+		const list = player.getStorage("mbfozong");
+		if (!list?.length) {
+			return lib.translate["mbfozong"];
+		}
+		const colors = list?.map(i => get.translation(i))?.join("和");
+		return `锁定技，你的${colors}手牌不计入手牌上限，造成的伤害值和恢复值+1。`;
+	},
 	potkuanggu(player) {
         if (player.getStorage("potkuanggu", 0)) {
 			return lib.translate["potkuanggu_pot_weiyan_achieve_info"];