From 479678013955edf285e92bde8694e8b5657c6f36 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Mon, 15 Apr 2024 18:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E6=88=98=E7=A6=81=E7=94=A8=E4=BB=BB?=
 =?UTF-8?q?=E6=84=8F=E5=8F=98=E6=9B=B4=E5=8A=BF=E5=8A=9B=E7=9A=84=E6=8A=80?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/jsrg.js | 75 +++++++++++++++++++++++++----------------------
 character/old.js  | 11 +++----
 character/sb.js   | 17 ++++++-----
 character/sp.js   |  8 ++---
 character/tw.js   | 21 ++++++-------
 5 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/character/jsrg.js b/character/jsrg.js
index d27c3e246..ce9eeb1cf 100644
--- a/character/jsrg.js
+++ b/character/jsrg.js
@@ -486,17 +486,18 @@ game.import("character", function () {
 				},
 			},
 			//姜维
-			jsrgjinfa: {
-				audio: 2,
-				enable: "phaseUse",
-				usable: 1,
-				filterCard: true,
-				position: "h",
-				discard: false,
-				lose: false,
-				delay: false,
-				check: function () {
-					return 1 + Math.random();
+			jsrgjinfa:{
+				forbid:['guozhan'],
+				audio:2,
+				enable:'phaseUse',
+				usable:1,
+				filterCard:true,
+				position:'h',
+				discard:false,
+				lose:false,
+				delay:false,
+				check:function(){
+					return 1+Math.random();
 				},
 				async content(event, trigger, player) {
 					await player.showCards(event.cards);
@@ -5059,10 +5060,11 @@ game.import("character", function () {
 				},
 			},
 			//许攸
-			jsrglipan: {
-				audio: 2,
-				trigger: {
-					player: "phaseEnd",
+			jsrglipan:{
+				forbid:['guozhan'],
+				audio:2,
+				trigger:{
+					player:'phaseEnd',
 				},
 				direct: true,
 				content: function () {
@@ -5327,11 +5329,12 @@ game.import("character", function () {
 				},
 			},
 			//吕布
-			jsrgwuchang: {
-				audio: 2,
-				trigger: {
-					player: "gainAfter",
-					global: "loseAsyncAfter",
+			jsrgwuchang:{
+				forbid:['guozhan'],
+				audio:2,
+				trigger:{
+					player:'gainAfter',
+					global:'loseAsyncAfter',
 				},
 				forced: true,
 				filter: function (event, player) {
@@ -5474,15 +5477,16 @@ game.import("character", function () {
 				},
 			},
 			//张郃
-			jsrgqiongtu: {
-				audio: 2,
-				enable: "chooseToUse",
-				groupSkill: true,
-				viewAs: {
-					name: "wuxie",
-					suit: "none",
-					number: null,
-					isCard: true,
+			jsrgqiongtu:{
+				//forbid:['guozhan'],
+				audio:2,
+				enable:'chooseToUse',
+				groupSkill:true,
+				viewAs:{
+					name:'wuxie',
+					suit:'none',
+					number:null,
+					isCard:true,
 				},
 				filter: function (event, player) {
 					if (!player.countCards("he", (card) => _status.connectMode || get.type(card) != "basic"))
@@ -6503,12 +6507,13 @@ game.import("character", function () {
 				},
 			},
 			//张辽
-			jsrgzhengbing: {
-				audio: 2,
-				enable: "phaseUse",
-				usable: 3,
-				filter: function (event, player) {
-					return player.group == "qun";
+			jsrgzhengbing:{
+				//forbid:['guozhan'],
+				audio:2,
+				enable:'phaseUse',
+				usable:3,
+				filter:function(event,player){
+					return player.group=='qun';
 				},
 				filterCard: lib.filter.cardRecastable,
 				check: function (card) {
diff --git a/character/old.js b/character/old.js
index 62324c1be..ad8c4d3b9 100755
--- a/character/old.js
+++ b/character/old.js
@@ -226,11 +226,12 @@ game.import("character", function () {
 				},
 			},
 			//魏武帝
-			junkguixin: {
-				init: function () {
-					if (!_status.junkguixin) {
-						_status.junkguixin = [];
-						if (!_status.characterlist) {
+			junkguixin:{
+				forbid:['guozhan'],
+				init:function(){
+					if(!_status.junkguixin){
+						_status.junkguixin=[];
+						if(!_status.characterlist){
 							lib.skill.pingjian.initList();
 						}
 						for (const name of _status.characterlist) {
diff --git a/character/sb.js b/character/sb.js
index b70a1f179..b87636905 100644
--- a/character/sb.js
+++ b/character/sb.js
@@ -7597,14 +7597,15 @@ game.import("character", function () {
 				},
 			},
 			//孙尚香
-			sbjieyin: {
-				trigger: { player: "phaseUseBegin" },
-				forced: true,
-				locked: false,
-				dutySkill: true,
-				group: ["sbjieyin_init", "sbjieyin_fail"],
-				filter: function (event, player) {
-					return game.hasPlayer((current) => current.hasMark("sbjieyin_mark"));
+			sbjieyin:{
+				//forbid:['guozhan'],
+				trigger:{player:'phaseUseBegin'},
+				forced:true,
+				locked:false,
+				dutySkill:true,
+				group:['sbjieyin_init','sbjieyin_fail'],
+				filter:function(event,player){
+					return game.hasPlayer(current=>current.hasMark('sbjieyin_mark'));
 				},
 				content: function () {
 					"step 0";
diff --git a/character/sp.js b/character/sp.js
index be35e8f82..9be19ca15 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -6600,10 +6600,10 @@ game.import("character", function () {
 				},
 			},
 			//OL孟达
-			olgoude: {
-				audio: 2,
-				trigger: {
-					global: "phaseEnd",
+			olgoude:{
+				audio:2,
+				trigger:{
+					global:'phaseEnd',
 				},
 				filter: function (event, player) {
 					var list = [];
diff --git a/character/tw.js b/character/tw.js
index 1331d0b5d..bbd6463c0 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -19977,16 +19977,17 @@ game.import("character", function () {
 					},
 				},
 			},
-			renshe: {
-				audio: 2,
-				trigger: { player: "damageEnd" },
-				direct: true,
-				content: function () {
-					"step 0";
-					var choiceList = [
-						"将势力变更为场上现存的一个其他势力",
-						"令〖外使〗的发动次数+1直到下个出牌阶段结束",
-						"与另一名其他角色各摸一张牌",
+			renshe:{
+				forbid:['guozhan'],
+				audio:2,
+				trigger:{player:'damageEnd'},
+				direct:true,
+				content:function(){
+					'step 0'
+					var choiceList=[
+						'将势力变更为场上现存的一个其他势力',
+						'令〖外使〗的发动次数+1直到下个出牌阶段结束',
+						'与另一名其他角色各摸一张牌',
 					];
 					var controls = ["选项二"];
 					if (