为卡牌添加deadTarget和includeOut属性

character/onlyOL/skill.js

@@ -186,9 +186,15 @@ const skills = {
 				},
 				intro: {
 					markcount(storage, player) {
+						if (!storage) {
+							return "当前暂无记录";
+						}
 						return Object.values(storage).flat().length;
 					},
 					content(storage, player) {
+						if (!storage) {
+							return "当前暂无记录";
+						}
 						const cards = storage["card"],
 							skills = storage["skill"];
 						let str = "";

noname/game/check.js

@@ -135,14 +135,14 @@ export class Check {
 		const player = event.player;
 		const card = get.card();
 		const targets = game.players.slice();
-		if (event.deadTarget || (event.skill && get.info(event.skill)?.deadTarget)) {
+		if (event.deadTarget || (event.skill && get.info(event.skill)?.deadTarget) || (card && get.info(card)?.deadTarget)) {
 			targets.addArray(game.dead);
 		}
 		const isSelectable = (target, event) => {
 			if (game.chess && !event.chessForceAll && player && get.distance(player, target, "pure") > 7) {
 				return false;
 			}
-			if (target.isOut() && !event.includeOut && !(event.skill && get.info(event.skill)?.includeOut)) {
+			if (target.isOut() && !event.includeOut && !(event.skill && get.info(event.skill)?.includeOut) && !(card && get.info(card)?.includeOut)) {
 				return false;
 			}
 			return event.filterTarget(card, player, target);

noname/game/index.js

@@ -7014,7 +7014,8 @@ export class Game extends GameCompatible {
 
 		if (event.isMine() && game.chess && get.config("show_distance") && game.me) {
 			const players = game.players.slice();
-			if (event.deadTarget || (event.skill && get.info(event.skill)?.deadTarget)) {
+			const card = get.card();
+			if (event.deadTarget || (event.skill && get.info(event.skill)?.deadTarget) || (card && get.info(card)?.deadTarget)) {
 				players.addArray(game.dead);
 			}
 			players.forEach(player => {

noname/get/index.js

@@ -4024,7 +4024,7 @@ else if (entry[1] !== void 0) stringifying[key] = JSON.stringify(entry[1]);*/
 	selectableTargets(sort) {
 		var selectable = [];
 		var players = game.players.slice(0);
-		if (_status.event.deadTarget || (_status.event.skill && get.info(_status.event.skill)?.deadTarget)) {
+		if (_status.event.deadTarget || (_status.event.skill && get.info(_status.event.skill)?.deadTarget) || (get.card() && get.info(get.card())?.deadTarget)) {
 			players.addArray(game.dead);
 		}
 		for (var i = 0; i < players.length; i++) {

noname/library/element/content.js

@@ -6361,7 +6361,7 @@ player.removeVirtualEquip(card);
 			event.finish();
 			return;
 		}
-		game.log(player, "对", target, "发起", (event.isDelay ? "延时" : ""), "拼点");
+		game.log(player, "对", target, "发起", event.isDelay ? "延时" : "", "拼点");
 		if (!event.filterCard) {
 			event.filterCard = lib.filter.all;
 		}
@@ -6443,8 +6443,7 @@ player.removeVirtualEquip(card);
 					if (cardsx?.some(card => get.position(card) == "s")) {
 						evt.isDestoryed = true;
 						game.cardsGotoOrdering(cardsx);
-					}
-					else {
+					} else {
 						event.finish();
 					}
 				})
@@ -6453,8 +6452,7 @@ player.removeVirtualEquip(card);
 				});
 			event.untrigger();
 			event.finish();
-		}
-		else {
+		} else {
 			event.trigger("compareCardShowBefore");
 		}
 		"step 6";
@@ -9123,10 +9121,10 @@ player.removeVirtualEquip(card);
 		if (num == 0 && targets.length > 1) {
 			event.sortTarget(true, true);
 		}
-		if (targets[num] && targets[num].isDead()) {
+		if (targets[num] && targets[num].isDead() && !info?.deadTarget) {
 			return;
 		}
-		if (targets[num] && targets[num].isOut()) {
+		if (targets[num] && targets[num].isOut() && !info?.includeOut) {
 			return;
 		}
 		if (targets[num] && targets[num].removed) {

noname/library/element/player.js

@@ -9332,9 +9332,9 @@ export class Player extends HTMLDivElement {
 	 */
 	hasUseTarget(card, distance, includecard) {
 		var player = this;
-		return game.hasPlayer(function (current) {
+		return game.hasPlayer2(function (current) {
 			return player.canUse(card, current, distance, includecard);
-		});
+		}, true);
 	}
 	/**
 	 * 场上是否存在收益为正的目标
@@ -9348,7 +9348,7 @@ export class Player extends HTMLDivElement {
 			card = { name: card, isCard: true };
 		}
 		var player = this;
-		var targets = game.filterPlayer();
+		var targets = game.filterPlayer2(null, null, true);
 		var value = [];
 		var min = 0;
 		var info = get.info(card);
@@ -9410,7 +9410,7 @@ export class Player extends HTMLDivElement {
 			card = { name: card, isCard: true };
 		}
 		var player = this;
-		var targets = game.filterPlayer();
+		var targets = game.filterPlayer2(null, null, true);
 		var value = [];
 		var min = 0;
 		var info = get.info(card);

noname/library/index.js

@@ -1305,7 +1305,7 @@ export class Library {
 						※ 部分功能将会作用于联机模式
 					`,
 					/**
-					 * @param {boolean} bool 
+					 * @param {boolean} bool
 					 */
 					async onclick(bool) {
 						await game.promises.saveConfig("experimental_enable", bool);
@@ -11082,7 +11082,7 @@ export class Library {
 				return player.countUsed(card) < num;
 			}
 		},
-		cardUsable: function (card, player, event) {
+		cardUsable(card, player, event) {
 			card = get.autoViewAs(card);
 			var info = get.info(card);
 			event = event || _status.event;
@@ -11113,9 +11113,9 @@ export class Library {
 				return true;
 			}
 			if (
-				game.hasPlayer(function (current) {
+				game.hasPlayer2(function (current) {
 					return game.checkMod(card, player, current, false, "cardUsableTarget", player);
-				})
+				}, true)
 			) {
 				return true;
 			}
@@ -11183,7 +11183,7 @@ export class Library {
 			}
 			return _status.event._aiexclude.includes(card) == false;
 		},
-		filterCard: function (card, player, event) {
+		filterCard(card, player, event) {
 			var info = get.info(card);
 			//if(info.toself&&!lib.filter.targetEnabled(card,player,player)) return false;
 			if (player == undefined) {
@@ -11214,15 +11214,19 @@ export class Library {
 				return true;
 			}
 			var filterTarget = event && event.filterTarget ? event.filterTarget : lib.filter.filterTarget;
-			return game.hasPlayer(function (current) {
+			return game.hasPlayer2(function (current) {
 				return filterTarget(card, player, current);
-			});
+			}, true);
 		},
-		targetEnabledx: function (card, player, target) {
-			if (!card) {
+		targetEnabledx(card, player, target) {
+			if (!card || !target || target.removed) {
+				return false;
+			}
+			const info = get.info(card);
+			if (!info?.deadTarget && target.isDead()) {
 				return false;
 			}
-			if (!target || !target.isIn()) {
+			if (!info?.includeOut && target.isOut()) {
 				return false;
 			}
 			let event = _status.event,
@@ -11238,27 +11242,29 @@ export class Library {
 					return false;
 				}
 			}
-			var info = get.info(card);
 			if (info.singleCard && info.filterAddedTarget && ui.selected.targets.length) {
 				return Boolean(info.filterAddedTarget(card, player, target, ui.selected.targets[ui.selected.targets.length - 1]));
 			}
 			return lib.filter.targetEnabled.apply(this, arguments);
 		},
-		targetEnabled: function (card, player, target) {
-			if (!card) {
+		targetEnabled(card, player, target) {
+			if (!card || !target || target.removed) {
 				return false;
 			}
-			if (!target || !target.isIn()) {
+			const info = get.info(card);
+			if (!info?.deadTarget && target.isDead()) {
 				return false;
 			}
-			var info = get.info(card);
-			var filter = info.filterTarget;
+			if (!info?.includeOut && target.isOut()) {
+				return false;
+			}
+			const filter = info.filterTarget;
 			if (!info.singleCard || ui.selected.targets.length == 0) {
-				var mod = game.checkMod(card, player, target, "unchanged", "playerEnabled", player);
+				let mod = game.checkMod(card, player, target, "unchanged", "playerEnabled", player);
 				if (mod != "unchanged") {
 					return mod;
 				}
-				var mod = game.checkMod(card, player, target, "unchanged", "targetEnabled", target);
+				mod = game.checkMod(card, player, target, "unchanged", "targetEnabled", target);
 				if (mod != "unchanged") {
 					return mod;
 				}
@@ -11270,11 +11276,15 @@ export class Library {
 				return Boolean(filter(card, player, target));
 			}
 		},
-		targetEnabled2: function (card, player, target) {
-			if (!card) {
+		targetEnabled2(card, player, target) {
+			if (!card || !target || target.removed) {
+				return false;
+			}
+			const info = get.info(card);
+			if (!info?.deadTarget && target.isDead()) {
 				return false;
 			}
-			if (!target || !target.isIn()) {
+			if (!info?.includeOut && target.isOut()) {
 				return false;
 			}
 			if (lib.filter.targetEnabled(card, player, target)) {
@@ -11288,7 +11298,7 @@ export class Library {
 				return false;
 			}
 
-			var filter = get.info(card).modTarget;
+			const filter = get.info(card).modTarget;
 			if (typeof filter == "boolean") {
 				return filter;
 			}
@@ -11297,14 +11307,17 @@ export class Library {
 			}
 			return false;
 		},
-		targetEnabled3: function (card, player, target) {
-			if (!card) {
+		targetEnabled3(card, player, target) {
+			if (!card || !target || target.removed) {
 				return false;
 			}
-			if (!target || !target.isIn()) {
+			const info = get.info(card);
+			if (!info?.deadTarget && target.isDead()) {
+				return false;
+			}
+			if (!info?.includeOut && target.isOut()) {
 				return false;
 			}
-			var info = get.info(card);
 
 			if (info.filterTarget == true) {
 				return true;