新杀谋贾诩评级、分包、技能效果调整

character/rank.js

@@ -138,6 +138,7 @@ window.noname_character_rank = {
 		"xia_yuzhenzi",
 		"dc_simashi",
 		"dc_sb_simayi",
+		"dc_sb_jiaxu",
 		"caofang",
 		"dc_shen_huatuo",
 		"sp_zhenji",
@@ -376,6 +377,7 @@ window.noname_character_rank = {
 		"ol_jianyong",
 		"ol_sb_jiangwei",
 		"dc_sb_zhouyu",
+		"dc_sb_lusu",
 		"dc_lingcao",
 		"jsrg_zhugeliang",
 		"shen_lusu",
@@ -688,7 +690,6 @@ window.noname_character_rank = {
 		"dc_dongzhao",
 		"zhugeruoxue",
 		"zhugemengxue",
-		"dc_sb_lusu",
 		"mb_huban",
 		"jsrg_simayi",
 		"jsrg_zhaoyun",
@@ -2207,9 +2208,11 @@ window.noname_character_rank = {
 			"ol_jianyong",
 			"ol_sb_jiangwei",
 			"dc_sb_zhouyu",
+			"dc_sb_lusu",
 			"xia_shitao",
 			"bailingyun",
 			"dc_sb_simayi",
+			"dc_sb_jiaxu",
 			"caofang",
 			"mb_caomao",
 			"dc_shen_huatuo",
@@ -2710,7 +2713,6 @@ window.noname_character_rank = {
 			"yue_zhoufei",
 			"ol_dingshangwan",
 			"ol_liwan",
-			"dc_sb_lusu",
 			"clan_wangmingshan",
 			"chengji",
 			"mb_sp_guanqiujian",

character/xianding/dynamicTranslate.js

@@ -103,7 +103,7 @@ const dynamicTranslates = {
 		str += "阴，并将这些牌交给另一名其他角色B，然后你与A各摸X张牌（X为A以此法失去的手牌数）；";
 		if (!storage) str += "</span>";
 		if (storage) str += '<span class="bluetext">';
-		str += "阳，令A依次使用这些牌中所有其可以使用的牌。";
+		str += "阳，令A依次使用这些牌中所有其可以使用的牌（无距离限制且不可被响应）。";
 		if (storage) str += "</span>";
 		return str;
 	},

character/xianding/skill.js

@@ -59,12 +59,15 @@ const skills = {
 				if (player.countCards("h") < storage[1]) {
 					yield player.drawTo(storage[1]);
 				} else {
-					yield player.chooseToDiscard("h", true, storage[1] - player.countCards("h"));
+					yield player.chooseToDiscard("h", true, player.countCards("h") - storage[1]);
 				}
 			}
 			if (player.getHp() != storage[2]) {
 				yield player[player.getHp() > storage[2] ? "loseHp" : "recover"](Math.abs(player.getHp() - storage[2]));
 			}
+			if (player.getStat("skill").dcsbfumou) {
+				delete player.getStat("skill").dcsbfumou;
+			}
 		},
 		ai: {
 			//waiting for PZ157
@@ -75,24 +78,24 @@ const skills = {
 		audioname: ["dc_sb_jiaxu_shadow"],
 		enable: "phaseUse",
 		filter(event, player) {
-			return (
+			return game.hasPlayer(target => {
-				game.hasPlayer(target => {
+				return target != player && target.countCards("h");
-					return target != player && target.countCards("h");
+			});
-				}) && game.countPlayer(target => target != player) >= (player.storage.dcsbfumou ? 1 : 2)
-			);
 		},
 		filterTarget(card, player, target) {
 			if (target == player) return false;
 			if (!ui.selected.targets.length) return target.countCards("h");
-			return !player.storage.dcsbfumou;
+			return !player.storage.dcsbfumou && game.countPlayer(target => target != player) > 1;
 		},
 		selectTarget() {
 			const player = get.event("player");
+			if (game.countPlayer(target => target != player) == 1) return [1, 2];
 			return player.storage.dcsbfumou ? [1, 2] : 2;
 		},
 		targetprompt() {
 			const player = get.event("player");
-			return player.storage.dcsbfumou ? "" : ["看牌角色", "得牌角色"][ui.selected.targets.length-1];
+			if (game.countPlayer(target => target != player) == 1) return "";
+			return player.storage.dcsbfumou ? "" : ["看牌角色", "得牌角色"][ui.selected.targets.length - 1];
 		},
 		prompt() {
 			const player = get.event("player");
@@ -105,7 +108,7 @@ const skills = {
 		async content(event, trigger, player) {
 			const storage = player.storage.dcsbfumou,
 				target = event.targets[0],
-				num = Math.ceil(target.countCards("h")/2);
+				num = Math.ceil(target.countCards("h") / 2);
 			player.changeZhuanhuanji("dcsbfumou");
 			let cards = await player
 				.choosePlayerCard("覆谋：选择展示" + get.translation(target) + "的" + get.cnNumber(num) + "张牌", target, "h", num, true)
@@ -114,7 +117,7 @@ const skills = {
 						storage = get.event("storage"),
 						target = get.event().getParent().targets[0];
 					if (!storage) return get.value(card) * -get.attitude(player, target);
-					return target.getUseValue(card) * get.attitude(player, target);
+					return target.getUseValue(card, false) * get.attitude(player, target);
 				})
 				.set("visible", true)
 				.set("storage", storage)
@@ -123,18 +126,25 @@ const skills = {
 			await player.showCards(cards, get.translation(player) + "发动了【覆谋】");
 			if (!storage) {
 				const aim = event.targets[1];
-				cards = cards.filter(card => lib.filter.canBeGained(card, aim, target));
+				if (aim) {
-				if (cards.length) {
+					cards = cards.filter(card => lib.filter.canBeGained(card, aim, target));
-					await aim.gain(cards, target, "give");
+					if (cards.length) {
-					await game.asyncDraw([player, target], cards.length);
+						await aim.gain(cards, target, "give");
+						await game.asyncDraw([player, target], cards.length);
+					} else {
+						aim.popup("杯具");
+						aim.chat("555一张都拿不到");
+					}
 				} else {
-					aim.popup("杯具");
+					player.chat("只是看看，但给不了...");
-					aim.chat("555一张都拿不到~");
 				}
 			} else {
 				for (const card of cards) {
-					if (target.hasUseTarget(card)) {
+					if (target.hasUseTarget(card, false)) {
-						await target.chooseUseTarget(card, true, false);
+						await target.chooseUseTarget(card, true, false, "nodistance").set("oncard", card => {
+							game.log(_status.event.card, "不可被响应");
+							_status.event.directHit.addArray(game.players);
+						});
 					}
 				}
 			}
@@ -144,7 +154,7 @@ const skills = {
 		mark: true,
 		intro: {
 			content(storage) {
-				if (storage) return "转换技，出牌阶段限一次，你可以观看一名其他角色的手牌并展示其一半手牌，令其依次使用这些牌中所有其可以使用的牌。";
+				if (storage) return "转换技，出牌阶段限一次，你可以观看一名其他角色的手牌并展示其一半手牌，令其依次使用这些牌中所有其可以使用的牌（无距离限制且不可被响应）。";
 				return "转换技，出牌阶段限一次，你可以观看一名其他角色A的手牌并展示其一半手牌并将这些牌交给另一名其他角色B，然后你与A各摸X张牌（X为A以此法失去的手牌数）。";
 			},
 		},

character/xianding/sort.js

@@ -13,7 +13,7 @@ const characterSort = {
 	sp2_qifu: ["dc_guansuo", "xin_baosanniang", "dc_zhaoxiang"],
 	sp2_gaoshan: ["wanglang", "liuhui", "zhangjian"],
 	sp2_wumiao: ["wu_zhugeliang", "wu_luxun", "wu_guanyu"],
-	sp2_mouding: ["dc_sb_lusu", "dc_sb_zhouyu", "dc_sb_simayi"],
+	sp2_mouding: ["dc_sb_jiaxu", "dc_sb_lusu", "dc_sb_zhouyu", "dc_sb_simayi"],
 };
 
 const characterSortTranslate = {

character/xianding/translate.js

@@ -455,8 +455,8 @@ const translates = {
 	dc_xiahouba_prefix: "新杀",
 	old_huangfusong: "新杀皇甫嵩",
 	old_huangfusong_prefix: "新杀",
-	dc_sp_machao: "群马超",
+	dc_sp_machao: "新杀SP马超",
-	dc_sp_machao_prefix: "群",
+	dc_sp_machao_prefix: "新杀SP",
 	dc_shixie: "新杀士燮",
 	dc_shixie_prefix: "新杀",
 	dc_guansuo: "新杀关索",
@@ -596,9 +596,9 @@ const translates = {
 	dcsbsushen: "肃身",
 	dcsbsushen_info: "限定技，出牌阶段，你可以记录你当前〖覆谋〗的状态、你的手牌数和你的体力值，然后获得技能〖入世〗。",
 	dcsbrushi: "入世",
-	dcsbrushi_info: "限定技，出牌阶段，你可以将你当前〖覆谋〗的状态、你的手牌数和你的体力值调整为你发动〖肃身〗时的记录。",
+	dcsbrushi_info: "限定技，出牌阶段，你可以将你当前〖覆谋〗的状态、你的手牌数和你的体力值调整为你发动〖肃身〗时的记录，然后重置〖覆谋〗的发动次数。",
 	dcsbfumou: "覆谋",
-	dcsbfumou_info: "转换技，出牌阶段限一次，你可以观看一名其他角色A的手牌并展示其一半手牌：阴，并将这些牌交给另一名其他角色B，然后你与A各摸X张牌（X为A以此法失去的手牌数）；阳，令A依次使用这些牌中所有其可以使用的牌。",
+	dcsbfumou_info: "转换技，出牌阶段限一次，你可以观看一名其他角色A的手牌并展示其一半手牌：阴，并将这些牌交给另一名其他角色B，然后你与A各摸X张牌（X为A以此法失去的手牌数）；阳，令A依次使用这些牌中所有其可以使用的牌（无距离限制且不可被响应）。",
 };
 
 export default translates;