Merge pull request #3092 from AstralBarrage/prbranch

新武将；bugfix

Author: xizifu

card/xianxia.js

@@ -510,6 +510,84 @@ game.import("card", function () {
 					},
 				},
 			},
+			liuyedao: {
+				fullskin: true,
+				type: "equip",
+				subtype: "equip1",
+				distance: { attackFrom: -1 },
+				ai: {
+					basic: {
+						equipValue: 3,
+					},
+				},
+				skills: ["liuyedao_skill"],
+			},
+			zj_yexingyi: {
+				fullskin: true,
+				type: "equip",
+				subtype: "equip2",
+				ai: {
+					basic: {
+						equipValue: 5.7,
+					},
+				},
+				skills: ["zj_yexingyi_skill"],
+			},
+			zj_lianjunshengyan: {
+				enable: true,
+				fullskin: true,
+				image: "image/card/lianjunshengyan.png",
+				type: "trick",
+				toself: true,
+				filterTarget: lib.filter.notMe,
+				selectTarget: () => 1,
+				changeTarget(player, targets) {
+					targets.push(player);
+				},
+				modTarget: true,
+				async contentBefore(event, trigger, player) {
+					const evt = event.getParent();
+					if (!evt.lianjunType) {
+						const val = evt.targets.reduce((sum, current) => {
+							sum += get.effect(current, { name: "draw" }, player, player);
+							sum -= get.recoverEffect(current, player, player);
+							return sum;
+						}, 0);
+						const result = await player
+							.chooseControl("摸一张牌", "回复1点体力")
+							.set("prompt", `联军盛宴：选择一项令所有目标执行`)
+							.set("ai", () => (get.event("val") > 0 ? "摸一张牌" : "回复1点体力"))
+							.set("val", val)
+							.forResult();
+						if (result?.control) {
+							player.popup(result.control == "摸一张牌" ? "摸牌" : "回血");
+							evt.lianjunType = result.control == "摸一张牌" ? "draw" : "recover";
+						}
+					}
+				},
+				async content(event, trigger, player) {
+					const evt = event.getParent(),
+						{ target } = event,
+						type = evt.lianjunType;
+					await target[type]();
+				},
+				ai: {
+					basic: {
+						useful: 3,
+						value: 3,
+						order: 5,
+					},
+					result: {
+						target(player, target, card) {
+							return Math.max(get.effect(target, { name: "draw" }, player, target), get.recoverEffect(target, player, target));
+						},
+					},
+					tag: {
+						gain: 1,
+						recover: 1,
+					},
+				},
+			},
 		},
 		skill: {
 			tiejili_skill: {
@@ -796,6 +874,86 @@ game.import("card", function () {
 				},
 				log: false,
 			},
+			liuyedao_skill: {
+				equipSkill: true,
+				trigger: {
+					source: "damageBegin1",
+				},
+				filter(event, player) {
+					if (event.card?.name !== "sha") {
+						return false;
+					}
+					return player.countDiscardableCards(player, "h") > 1;
+				},
+				async cost(event, trigger, player) {
+					event.result = await player
+						.chooseToDiscard(get.prompt2(event.skill), 2, "h")
+						.set("ai", card => {
+							if (get.event("val") <= 0) {
+								return 0;
+							}
+							return 6 - get.value(card);
+						})
+						.set("val", get.damageEffect(trigger.player, trigger.source, player))
+						.set("chooseonly", true)
+						.forResult();
+				},
+				async content(event, trigger, player) {
+					await player.modedDiscard(event.cards);
+					trigger.num++;
+				},
+			},
+			zj_yexingyi_skill: {
+				equipSkill: true,
+				trigger: { target: "shaBegin" },
+				forced: true,
+				priority: 6,
+				audio: true,
+				filter(event, player) {
+					if (player.hasSkillTag("unequip2")) {
+						return false;
+					}
+					if (
+						event.player.hasSkillTag("unequip", false, {
+							name: event.card ? event.card.name : null,
+							target: player,
+							card: event.card,
+						})
+					) {
+						return false;
+					}
+					return event.card.name === "sha" && get.color(event.card) === "red";
+				},
+				async content(event, trigger, player) {
+					trigger.cancel();
+				},
+				ai: {
+					effect: {
+						target(card, player, target) {
+							if (typeof card !== "object" || target.hasSkillTag("unequip2")) {
+								return;
+							}
+							if (
+								player.hasSkillTag("unequip", false, {
+									name: card ? card.name : null,
+									target: target,
+									card: card,
+								}) ||
+								player.hasSkillTag("unequip_ai", false, {
+									name: card ? card.name : null,
+									target: target,
+									card: card,
+								})
+							) {
+								return;
+							}
+							if (card.name === "sha" && get.color(card) === "red") {
+								return "zeroplayertarget";
+							}
+						},
+					},
+				},
+			},
 		},
 		translate: {
 			tiejili: "铁蒺藜骨朵",
@@ -829,6 +987,16 @@ game.import("card", function () {
 			dajunyajing_info: "出牌阶段，对一名角色使用。其以外的所有角色依次选择是否将一张牌当无距离限制的【杀】对其使用。",
 			yushijiesui: "玉石皆碎",
 			yushijiesui_info: "出牌阶段，对一名角色使用。你对目标角色造成1点伤害，然后失去1点体力。",
+			liuyedao: "柳叶刀",
+			liuyedao_info: "你使用【杀】造成伤害时，可以弃置两张手牌令此伤害+1。",
+			liuyedao_skill: "柳叶刀",
+			liuyedao_skill_info: "你使用【杀】造成伤害时，可以弃置两张手牌令此伤害+1。",
+			zj_yexingyi: "夜行衣",
+			zj_yexingyi_info: "锁定技，红色的【杀】对你无效。",
+			zj_yexingyi_skill: "夜行衣",
+			zj_yexingyi_skill_info: "锁定技，红色的【杀】对你无效。",
+			zj_lianjunshengyan: "联军盛宴",
+			zj_lianjunshengyan_info: "出牌阶段，对你和一名其他角色使用。选择一项令所有目标执行：1.摸一张牌；2.回复1点体力。",
 		},
 		list: [
 			["diamond", 6, "suibozhuliu"],
@@ -839,6 +1007,9 @@ game.import("card", function () {
 			["spade", 5, "qingmingjian"],
 			["club", 5, "mengchong"],
 			["heart", 5, "yushijiesui"],
+			["spade", 1, "liuyedao"],
+			["spade", 2, "zj_yexingyi"],
+			["heart", 1, "zj_lianjunshengyan"],
 		],
 	};
 });

character/collab/voices.js

@@ -146,5 +146,5 @@ export default {
 	"#olnengchen2": "为大汉江山鞠躬尽瘁，臣死犹生。",
 	"#olhuojie1": "国虽大，忘战必危，好战必亡。",
 	"#olhuojie2": "这穷兵黩武的罪，让我一人受便可。",
-	"#ol_jsrg_caocao:die": "此征西将军曹操之墓……",
+	"#ol_jsrg_caocao:die": "此征西将军曹侯之墓……",
 };

character/offline/character.js

@@ -175,6 +175,31 @@ const characters = {
 		hp: 3,
 		skills: ["xy_lilu", "xy_yizheng"],
 	},
+	wn_zhuling: {
+		sex: "male",
+		group: "wei",
+		hp: 4,
+		skills: ["wn_zhanyi"],
+	},
+	zj_huangchong: {
+		sex: "male",
+		group: "shu",
+		hp: 3,
+		skills: ["zj_juxian", "zj_lijun"],
+		img: "image/character/std_huangchong.jpg",
+	},
+	zj_dingfeng: {
+		sex: "male",
+		group: "wu",
+		hp: 4,
+		skills: ["zj_duanbing", "zj_fenxun"],
+	},
+	zj_liaohua: {
+		sex: "male",
+		group: "shu",
+		hp: 4,
+		skills: ["zj_dangxian", "zj_fuli"],
+	},
 	zj_zhanghu: {
 		sex: "male",
 		group: "wei",
@@ -394,7 +419,7 @@ const characters = {
 	wn_yangqiú: {
 		sex: "male",
 		group: "qun",
-		hp: 4,
+		hp: 5,
 		skills: ["wn_qifeng"],
 	},
 	pe_jun_liubei: {
@@ -1473,7 +1498,7 @@ const characters = {
 	drag_lvchang: {
 		sex: "male",
 		group: "wei",
-		hp: 3,
+		hp: 4,
 		skills: ["dragjuwu", "dragshouxiang"],
 	},
 	jsp_ganfuren: {

character/offline/characterTitle.js

@@ -266,6 +266,7 @@ export default {
 	wn_zhanghe: "料敌机先",
 	wn_jiaxu: "巧施间策",
 	wn_xuhuang: "乘虚渡江",
+	wn_zhuling: "良将之亚",
 	xy_caocao: "与兵血仇",
 	xy_chengyu: "腹蕴千军",
 	xy_xunyu: "令君劝战",
@@ -282,6 +283,8 @@ export default {
 	zj_zhaotong: "戍边驻阁",
 	zj_zhaoguang: "沓中独断",
 	zj_huangchong: "星陨绵竹",
+	zj_liaohua: "果敢刚直",
+	zj_dingfeng: "寿春解围",
 	zj_zhugezhan: "绵竹之殇",
 	zj_liuyin: "御军定守",
 	zj_huoyi: "三世忠烈",