From 7de210fb7e6cc0f3a74d3322097ec992d156028c Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Sat, 18 Jan 2020 13:32:04 +0800
Subject: [PATCH] v1.9.97.2.1

---
 card/guozhan.js | 28 +++++++++-------------------
 card/sp.js      |  1 +
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/card/guozhan.js b/card/guozhan.js
index 6a387aa6b..28bedb4d6 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -1077,7 +1077,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			g_taipingyaoshu:{},
 			yuxi_skill:{
 				equipSkill:true,
-				trigger:{player:'phaseDrawBegin2'},
+				trigger:{player:'phaseDrawBegin'},
 				forced:true,
 				filter:function(event,player){
 					return !player.isUnseen();
@@ -1127,10 +1127,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			},
 			g_chiling1:{
 				mode:['guozhan'],
-				trigger:{player:'discardAfter'},
+				trigger:{
+					player:'loseEnd',
+					global:'cardsDiscardEnd',
+				},
 				filter:function(event,player){
+					var evt=event.getParent().relatedEvent;
+					if(evt&&evt.name=='useCard') return false;
 					for(var i=0;i<event.cards.length;i++){
-						if(event.cards[i].name=='chiling'&&get.position(event.cards[i])=='d'){
+						if(event.cards[i].name=='chiling'&&get.position(event.cards[i],true)=='d'){
 							return true;
 						}
 					}
@@ -1153,22 +1158,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}
 				},
 			},
-			g_chiling2:{
-				mode:['guozhan'],
-				trigger:{player:'judgeAfter'},
-				forced:true,
-				popup:false,
-				filter:function(event,player){
-					if(get.position(event.result.card)!='d') return false;
-					return event.result.card.name=='chiling';
-				},
-				content:function(){
-					_status.chiling=true;
-					game.cardsGotoSpecial(trigger.result.card);
-					game.log(trigger.result.card,'已被移出游戏');
-					player.popup('敕令');
-				}
-			},
+			g_chiling2:{},
 			g_chiling3:{
 				mode:['guozhan'],
 				trigger:{player:'phaseAfter'},
diff --git a/card/sp.js b/card/sp.js
index a4c54e013..50df1a5b7 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -7,6 +7,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			jinchan:{
 				audio:true,
 				fullskin:true,
+				wuxieable:true,
 				type:'trick',
 				notarget:true,
 				global:['g_jinchan','g_jinchan2'],