Merge pull request #2700 from rebirth-of-I-am/PR-Branch

彭羕【侻失】增加宝宝标记；朱佩兰【痛悼】修复

Author: xizifu

character/sp/skill.js

@@ -1339,7 +1339,7 @@ const skills = {
 					}
 					if (!target?.isIn()) {
 						if (target) {
-							player.unmarkAuto("oldici_effect",target);
+							player.unmarkAuto("oldici_effect", target);
 						}
 						return false;
 					}
@@ -1350,7 +1350,7 @@ const skills = {
 				async content(event, trigger, player) {
 					const target = event.targets[0],
 						str = get.translation(target);
-					player.unmarkAuto("oldici_effect",target);
+					player.unmarkAuto("oldici_effect", target);
 					const bool = await player
 						.chooseToGive(target, "h", "交给" + str + "一张手牌，或受到" + str + "对你造成的1点雷属性伤害")
 						.set("ai", card => {
@@ -5337,9 +5337,7 @@ const skills = {
 				},
 				async content(event, trigger, player) {
 					await player.draw(2);
-					let cards = get
-						.discarded()
-						.filter(c => get.type(c) === "trick");
+					let cards = get.discarded().filter(c => get.type(c) === "trick");
 					if (cards?.length) {
 						const result = await player
 							.chooseButton(["累卵：获得一张普通锦囊牌", cards], true)
@@ -11450,7 +11448,36 @@ const skills = {
 			player.draw();
 			player.addSkill("oltuishi_unlimit");
 		},
+		init(player) {
+			player.addSkill("oltuishi_count");
+			const history = player.getHistory("useCard", evt => evt.finished && get.tag(evt.card, "damage") > 0.5 && !player.hasHistory("sourceDamage", evt2 => evt2.card === evt.card));
+			history.length > 0 && player.addMark("oltuishi_count", history.length, false);
+		},
+		onremove(player) {
+			player.removeSkill("oltuishi_count");
+			player.clearMark("oltuishi_count", false);
+		},
 		subSkill: {
+			count: {
+				charlotte: true,
+				trigger: {
+					player: "useCardAfter",
+					global: ["phaseBefore", "phaseAfter"],
+				},
+				filter(event, player) {
+					if (event.name === "useCard") {
+						return get.tag(event.card, "damage") > 0.5 && !player.hasHistory("sourceDamage", evt2 => evt2.card === event.card);
+					}
+					return player.hasMark("oltuishi_count");
+				},
+				silent: true,
+				content() {
+					const list = trigger.name === "useCard" ? ["addMark", event.name, 1, false] : ["clearMark", event.name, false];
+					player[list[0]](...list.slice(1));
+				},
+				marktext: "失",
+				intro: { content: "本回合已有#张伤害牌未造成过伤害" },
+			},
 			unlimit: {
 				charlotte: true,
 				mod: {
@@ -11501,6 +11528,7 @@ const skills = {
 					}
 				},
 				mark: true,
+				marktext: "侻",
 				intro: { content: "对手牌数小于你的角色使用的下一张牌无距离次数限制" },
 			},
 		},

character/xianding/skill.js

@@ -7347,10 +7347,7 @@ const skills = {
 			}
 			const gainSkills = target.getStockSkills(true, true).filter(i => {
 				const info = get.info(i);
-				if (info && info.zhuSkill && !target.isZhu2()) {
-					return false;
-				}
-				return !info || !info.charlotte;
+				return info && !info.charlotte && (!info.zhuSkill || target.isZhu2());
 			});
 			if (gainSkills.length) {
 				//抽象