Merge pull request #3109 from AstralBarrage/prbranch

青史翰墨江山如故修改；bugfix

Author: xizifu

card/huodong.js

@@ -694,7 +694,7 @@ game.import("card", function () {
 					if (evt.shenbing == "useCard") {
 						for (let i = 1; i < 6; i++) {
 							if (!target.hasEnabledSlot(i)) {
-								return;
+								continue;
 							}
 							const card = get.cardPile2(function (card) {
 								return get.subtype(card) == "equip" + i && target.canUse(card, target);
@@ -2359,7 +2359,7 @@ game.import("card", function () {
 			liehuo_info: "出牌阶段，对所有其他角色使用，令你和目标暗中选择一张手牌，若有角色与你选择的牌颜色相同，你弃置你选择的牌对这些角色各造成1点火焰伤害。",
 			shenbing: "神兵",
 			shenbing_bg: "兵",
-			shenbing_info: "出牌阶段，对所有角色使用，令目标弃置装备区所有牌或依次使用牌堆不用副类型的装备牌各一张。",
+			shenbing_info: "出牌阶段，对所有角色使用，令目标弃置装备区所有牌或依次使用牌堆不同副类型的装备牌各一张。",
 			jinnao: "金铙",
 			jinnao_skill: "金铙",
 			jinnao_bg: "金",

character/clan/skill.js

@@ -4641,56 +4641,7 @@ const skills = {
 			});
 		},
 		content() {
-			"step 0";
-			var skills = player.getStockSkills(true, true);
-			game.expandSkills(skills);
-			var resetSkills = [];
-			var suffixs = ["used", "round", "block", "blocker"];
-			for (var skill of skills) {
-				var info = get.info(skill);
-				if (info.usable !== undefined) {
-					if (typeof player.getStat("triggerSkill")[skill] == "number" && player.getStat("triggerSkill")[skill] >= 1) {
-						delete player.getStat("triggerSkill")[skill];
-						resetSkills.add(skill);
-					}
-					/*
-					这段逻辑和上面的新逻辑任选一个使用即可
-					if (player.hasSkill("counttrigger") && (player.storage.counttrigger?.[skill] ?? 0) >= 1) {
-						delete player.storage.counttrigger[skill];
-						resetSkills.add(skill);
-					}
-					*/
-					if (typeof player.getStat("skill")[skill] == "number" && player.getStat("skill")[skill] >= 1) {
-						delete player.getStat("skill")[skill];
-						resetSkills.add(skill);
-					}
-				}
-				if (info.round && player.storage[skill + "_roundcount"]) {
-					delete player.storage[skill + "_roundcount"];
-					resetSkills.add(skill);
-				}
-				if (player.storage[`temp_ban_${skill}`]) {
-					delete player.storage[`temp_ban_${skill}`];
-					resetSkills.add(skill);
-				}
-				if (player.awakenedSkills.includes(skill)) {
-					player.restoreSkill(skill);
-					resetSkills.add(skill);
-				}
-				for (var suffix of suffixs) {
-					if (player.hasSkill(skill + "_" + suffix)) {
-						player.removeSkill(skill + "_" + suffix);
-						resetSkills.add(skill);
-					}
-				}
-			}
-			if (resetSkills.length) {
-				var str = "";
-				for (var i of resetSkills) {
-					str += "【" + get.translation(i) + "】、";
-				}
-				game.log(player, "重置了技能", "#g" + str.slice(0, -1));
-			}
+			player.refreshSkill();
 		},
 	},
 	//族吴匡

character/huicui/skill.js

@@ -505,13 +505,20 @@ const skills = {
 	dcmuzhen: {
 		audio: 2,
 		enable: "phaseUse",
+		onChooseToUse(event) {
+			if (game.online) {
+				return;
+			}
+			const count = event.player.getHistory("useSkill", evt => evt.skill == "dcmuzhen" && evt.event.getParent("phaseUse") === event.getParent()).length + 1;
+			event.set("dcmuzhen_count", count);
+		},
 		filter(event, player) {
 			const types = player
 					.getCards("he")
 					.map(card => get.type2(card))
 					.unique(),
-				count = player.getHistory("useSkill", evt => evt.skill == "dcmuzhen" && evt.event.getParent("phaseUse") === event.getParent("phaseUse")).length;
-			return types.length > 0 && types.some(type => !player.getStorage("dcmuzhen_used").includes(type) && player.countCards("he", card => get.type2(card, player) == type) >= count + 1);
+				count = event.dcmuzhen_count;
+			return types.length > 0 && types.some(type => !player.getStorage("dcmuzhen_used").includes(type) && player.countCards("he", card => get.type2(card, player) == type) >= count);
 		},
 		filterTarget: lib.filter.notMe,
 		filterCard(card, player) {
@@ -524,9 +531,8 @@ const skills = {
 			return get.type2(selected[0], player) == type && bool;
 		},
 		selectCard() {
-			const player = get.player(),
-				count = player.getHistory("useSkill", evt => evt.skill == "dcmuzhen" && evt.event.getParent("phaseUse") === get.event().getParent("phaseUse")).length;
-			return count + 1;
+			const count = get.event("dcmuzhen_count");
+			return count;
 		},
 		position: "he",
 		complexCard: true,
@@ -12407,7 +12413,7 @@ const skills = {
 					},
 					cardUsable(card, player, num) {
 						if (card.name == "sha") {
-							return num + player.countMark("suizheng_effect");
+							return num + 2 * player.countMark("suizheng_effect");
 						}
 					},
 				},
@@ -14243,7 +14249,7 @@ const skills = {
 		audio: 2,
 		enable: "phaseUse",
 		filter(event, player) {
-			return player.countMark("weilie_used") <= player.getStorage("fuping").length && player.countCards("he") > 0 && game.hasPlayer(current => current.isDamaged());
+			return player.countMark("weilie_used") <= (player.getStorage("fuping").length + 1) && player.countCards("he") > 0 && game.hasPlayer(current => current.isDamaged());
 		},
 		filterCard: true,
 		position: "he",
@@ -14257,7 +14263,7 @@ const skills = {
 			player.addMark(name + "_used", 1, false);
 			await target.recover();
 			if (target.isDamaged()) {
-				await target.draw();
+				await target.draw(2);
 			}
 		},
 		onremove: true,

character/huicui/translate.js

@@ -88,7 +88,7 @@ const translates = {
 	fuping: "浮萍",
 	fuping_info: "①其他角色对你使用的牌结算结束后，若你未因此技能记录过此牌的名称且你有未废除的装备栏，则你可以废除一个装备栏，记录此牌的名称。②每回合每种牌名限一次。你可以将一张非基本牌当做〖浮萍①〗记录过的基本牌或锦囊牌使用或打出。③若你的所有装备栏均已被废除，则你使用牌无距离限制。",
 	weilie: "炜烈",
-	weilie_info: "每局游戏限X次。出牌阶段，你可以弃置一张牌并选择一名已受伤的角色，令该角色回复1点体力。然后若其体力值小于体力上限，则其摸一张牌（X为你〖浮萍①〗中的记录数+1）。",
+	weilie_info: "每局游戏限X次。出牌阶段，你可以弃置一张牌并选择一名已受伤的角色，令该角色回复1点体力。然后若其体力值小于体力上限，则其摸两张牌（X为你〖浮萍①〗中的记录数+2）。",
 	dc_sunru: "孙茹",
 	xiecui: "撷翠",
 	xiecui_info: "当有角色于回合内第一次因执行牌的效果而造成伤害时，你可以令此伤害+1。若其势力为吴，则该角色获得此伤害牌对应的实体牌，且其本回合的手牌上限+1。",
@@ -209,7 +209,7 @@ const translates = {
 	dcshuangren_info: "出牌阶段开始时，你可以和一名其他角色A进行拼点。若你赢，你选择一名角色B，或选择包含A在内的两名角色A和B（B的势力需与A相同），然后视为对被选择的角色使用一张【杀】（不计入次数限制）；若你没赢，则你本阶段内不能使用【杀】。",
 	zhangxun: "张勋",
 	suizheng: "随征",
-	suizheng_info: "结束阶段，你可以选择一名角色Ａ，获得如下效果直到其下回合结束：①Ａ于下回合出牌阶段内使用【杀】的次数上限+1且无距离限制；②Ａ下回合的出牌阶段结束时，你可以选择一名此阶段内受到过Ａ造成的伤害的角色Ｂ，视为对Ｂ使用一张【杀】。",
+	suizheng_info: "结束阶段，你可以选择一名角色Ａ，获得如下效果直到其下回合结束：①Ａ于下回合出牌阶段内使用【杀】的次数上限+2且无距离限制；②Ａ下回合的出牌阶段结束时，你可以选择一名此阶段内受到过Ａ造成的伤害的角色Ｂ，视为对Ｂ使用一张【杀】。",
 	dc_liuba: "刘巴",
 	dczhubi: "铸币",
 	dczhubi_info: "当有♦牌因弃置而进入弃牌堆后，你可以令系统从牌堆/弃牌堆中检索一张【无中生有】，并将此牌置于牌堆顶。",

character/jsrg/character.js

@@ -24,7 +24,7 @@ const characters = {
 		group: "qun",
 		hp: 4,
 		names: "皇甫|嵩",
-		skills: ["jsrgguanhuo", "jsrgjuxia"],
+		skills: ["jsrgguanhuo", "jsrg_new_juxia"],
 	},
 	jsrg_xushao: {
 		sex: "male",
@@ -36,13 +36,13 @@ const characters = {
 		sex: "female",
 		group: "qun",
 		hp: 3,
-		skills: ["jsrgshichong", "jsrglianzhu"],
+		skills: ["jsrgshichong", "jsrg_new_lianzhu"],
 	},
 	jsrg_qiaoxuan: {
 		sex: "male",
 		group: "qun",
 		hp: 3,
-		skills: ["jsrgjuezhi", "jsrgjizhao"],
+		skills: ["jsrg_new_juezhi", "jsrgjizhao"],
 	},
 	jsrg_yangbiao: {
 		sex: "male",
@@ -57,7 +57,7 @@ const characters = {
 		sex: "male",
 		group: "qun",
 		hp: 3,
-		skills: ["jsrglirang", "jsrgzhengyi"],
+		skills: ["jsrg_new_lirang", "jsrg_new_zhengyi"],
 		dieAudios: ["kongrong"],
 	},
 	jsrg_zhujun: {