From b117662756d4ae2edfc3fda9af9ed8e43c4cecf9 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Sat, 4 May 2024 15:02:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E9=99=84?=
 =?UTF-8?q?=E4=B9=89=E3=80=91=E6=B2=A1=E6=9C=89=E5=8F=AF=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8D=A1=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/ddd/skill.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/character/ddd/skill.js b/character/ddd/skill.js
index e0da3ae21..7f0afff6a 100644
--- a/character/ddd/skill.js
+++ b/character/ddd/skill.js
@@ -4930,7 +4930,10 @@ const skills = {
 		content() {
 			"step 0";
 			trigger.source.chooseCard("是否响应" + get.translation(player) + "的【附义】？", "弃置两张牌，令其获得其武将牌上的一个技能", "he", 2, lib.filter.cardDiscardable).set("ai", () => {
-				if (get.attitude(_status.event.player, _status.event.getParent().player) <= 2) return 0;
+				let zhu = _status.event.getParent().player;
+				if (!zhu.getStockSkills(true, true).some(skill => {
+					return !zhu.hasSkill(skill, null, false, false);
+				}) || get.attitude(_status.event.player, zhu) <= 2) return 0;
 				return 6 - get.value(card);
 			});
 			"step 1";
@@ -4941,6 +4944,7 @@ const skills = {
 					return !player.hasSkill(skill, null, false, false);
 				});
 				if (skills.length == 1) event._result = { control: skills[0] };
+				else if (!skills.length) event.finish();
 				else
 					trigger.source
 						.chooseControl(skills)

From 541a2aecee39d15ecee56f2f23e25399f5622d4f Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Sat, 4 May 2024 17:44:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mode/guozhan.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/guozhan.js b/mode/guozhan.js
index 9c1cd194b..4c34de0bb 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -8723,6 +8723,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			gzyimie: {
 				audio: "yimie",
 				inherit: "yimie",
+				mainSkill: true,
 				init: function (player) {
 					if (player.checkMainSkill("gzyimie")) {
 						player.removeMaxHp(2);
@@ -20769,6 +20770,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 						player.removeMaxHp();
 					}
 				},
+				viceSkill: true,
 				group: ["hunshang_yingzi", "hunshang_yinghun"],
 			},
 			reyingzi_sunce: { audio: 2 },