From 87706237b2389fe81dc2fea0c70ee223329c2c21 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Mon, 16 Dec 2019 22:41:32 +0800
Subject: [PATCH] v1.9.96.4.1

---
 character/shenhua.js  | 4 ++--
 character/standard.js | 2 ++
 character/yijiang.js  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/character/shenhua.js b/character/shenhua.js
index db020b228..e263c3810 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1551,7 +1551,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							target:'useCardToTargeted',				
 						},
 						filter:function (event,player,name){
-							if(!event.nzry_shicai) return false;
+							if(!event.nzry_shicai&&!event.getParent().nzry_shicai) return false;
 							if(name=='useCardToTargeted'&&('equip'!=get.type(event.card)||event.player!=player)) return false;
 							if(name=='useCardAfter'&&['equip','delay'].contains(get.type(event.card))) return false;
 							return event.cards.filterInD().length>0;
@@ -3237,7 +3237,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				group:["guzheng_count"],
 				subSkill:{
 					count:{
-						trigger:{global:['dloseEnd','cardsDiscardAfter']},
+						trigger:{global:['loseEnd','cardsDiscardAfter']},
 						forced:true,
 						silent:true,
 						popup:false,
diff --git a/character/standard.js b/character/standard.js
index 85a2a92b7..43a91d03f 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -719,6 +719,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						next.set('source',player);
 						next.set('jijiang',true);
 						next.set('skillwarn','替'+get.translation(player)+'打出一张杀');
+						next.noOrdering=true;
 						next.autochoose=lib.filter.autoRespondSha;
 					}
 					else{
@@ -786,6 +787,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						next.set('target',target);
 						next.set('jijiang',true);
 						next.set('skillwarn','替'+get.translation(player)+'打出一张杀');
+						next.noOrdering=true;
 						next.autochoose=lib.filter.autoRespondSha;
 					}
 					else{
diff --git a/character/yijiang.js b/character/yijiang.js
index d10983e0f..5bf12a992 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -6356,6 +6356,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						});
 						next.set('sourcex',player);
 						next.set('jijiang',true);
+						next.noOrdering=true;
 						next.autochoose=lib.filter.autoRespondSha;
 					}
 					else{
@@ -6434,6 +6435,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						next.set('source',player);
 						next.set('target',target);
 						next.set('jijiang',true);
+						next.noOrdering=true;
 						next.autochoose=lib.filter.autoRespondSha;
 					}
 					else{