From ef0c96e135690cc4e9ecc1a8d701286e19bc857d Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Wed, 25 Sep 2019 22:52:38 +0800
Subject: [PATCH] v1.9.93.2(Part 2)

---
 character/extra.js           |  1 +
 character/mobile.js          | 13 ++++---------
 character/shenhua.js         |  7 ++++++-
 character/sp.js              | 11 ++++++-----
 character/xinghuoliaoyuan.js |  7 +++++--
 character/yijiang.js         |  3 ++-
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/character/extra.js b/character/extra.js
index 9554811c4..5932e96e7 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -355,6 +355,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					"step 0"
+					event.forceDie=true;
 					if(typeof event.count!='number'){
 						// event.count=trigger.cards.length-1;
 						event.count=1;
diff --git a/character/mobile.js b/character/mobile.js
index fbfc06e85..47f3f9f68 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -96,8 +96,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					"step 0"
 					player.chooseToCompare(trigger.target);
 					"step 1"
-					if(result.bool&&trigger.target.countGainableCards(player,'he')){
-						player.gainPlayerCard(trigger.target,true,'he');
+					if(result.bool){
+						if(trigger.target.countGainableCards(player,'he')) player.gainPlayerCard(trigger.target,true,'he');
 					}
 					else{
 						var card1=result.player;
@@ -262,11 +262,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					event.current=targets.shift();
 					player.discardPlayerCard(event.current,'hej',true)
 					if(targets.length) event.redo();
-					'step 3'
-					if(player.storage.liezhi){
-						trigger.liezhi=true;
-						player.addSkill('liezhi_disable');
-					}
 				},
 				subSkill:{
 					disable:{
@@ -276,7 +271,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						silent:true,
 						popup:false,
 						charlotte:true,
-						filter:function(event){return !event.liezhi},
+						//filter:function(event){return !event.liezhi},
 						content:function(){player.removeSkill('liezhi_disable')},
 					},
 					damage:{
@@ -284,7 +279,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						forced:true,
 						silent:true,
 						popup:false,
-						content:function(){player.storage.liezhi=true}
+						content:function(){player.addSkill('liezhi_disable')}
 					},
 				},
 			},
diff --git a/character/shenhua.js b/character/shenhua.js
index e18a64803..14c2566b5 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1586,15 +1586,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return event.card.name!='lebu'&&event.card.name!='bingliang';
 						},
 						content:function(){
+							"step 0"
 							player.storage.nzry_shicai.push(get.type(trigger.card,'trick'));
 							for(var i=0;i<trigger.cards.length;i++){
 								if(get.position(trigger.cards[i])=='d'){
+									trigger.cards[i].fix();
 									ui.cardPile.insertBefore(trigger.cards[i],ui.cardPile.firstChild);
-									game.updateRoundNumber();
 									game.log(player,'将',trigger.cards[i],'置于牌堆顶');
 								}
 							};
+							game.updateRoundNumber();
 							player.draw();
+							"step 1"
 							if(event.triggername=='useCard'&&['equip','delay'].contains(get.type(trigger.card))){
 								trigger.cancel();
 								game.broadcastAll(ui.clear);
@@ -3332,6 +3335,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{player:'die'},
 				forced:true,
 				forceDie:true,
+				skillAnimation:true,
+				animationColor:'gray',
 				filter:function(event){
 					return event.source&&event.source.isIn();
 				},
diff --git a/character/sp.js b/character/sp.js
index 50e6ccec0..a3aeaa15e 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -2674,7 +2674,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{global:'damageEnd'},
 				forced:true,
 				filter:function(event,player){
-					return event.player!=player&&event.player.hasSkill('zongkui_mark');
+					return event.player!=player&&event.player.isAlive()&&event.player.hasSkill('zongkui_mark');
 				},
 				content:function(){
 					'step 0'
@@ -3148,9 +3148,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					content:'当你受到伤害后，$受到等量的伤害，当你回复体力后，$回复等量的体力'
 				},
 				nopop:true,
-				trigger:{player:['damageAfter','recoverAfter']},
+				trigger:{player:['damageEnd','recoverEnd']},
 				forced:true,
 				popup:false,
+				priority:15,
 				filter:function(event,player){
 					if(!(player.storage.xianfu2&&player.storage.xianfu2.isIn()&&event.num>0)) return false;
 					if(event.name=='damage') return true;
@@ -3629,7 +3630,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.addTempSkill('weikui2');
 					}
 					else{
-						player.discardPlayerCard(target,'visible',true);
+						player.discardPlayerCard(target,'visible',true,'h');
 					}
 				},
 				ai:{
@@ -5836,10 +5837,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				direct:true,
 				notemp:true,
 				filter:function(event,player){
-					return player.countCards('h')>0;
+					return player.countCards('he')>0;
 				},
 				init:function(player){
-					player.storage.tuifeng=[];
+					if(!player.storage.tuifeng) player.storage.tuifeng=[];
 				},
 				content:function(){
 					'step 0'
diff --git a/character/xinghuoliaoyuan.js b/character/xinghuoliaoyuan.js
index 95bd272b4..76a8be617 100755
--- a/character/xinghuoliaoyuan.js
+++ b/character/xinghuoliaoyuan.js
@@ -573,6 +573,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							player.gain(event.cards[i],'gain2');
 						}
 						else{
+							event.cards[i].fix();
 							ui.cardPile.insertBefore(event.cards[i],ui.cardPile.childNodes[0]);
 						}
 					}
@@ -609,6 +610,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				check:function (){
 					return -1;
 				},
+				delay:0,
 				content:function (){
 					'step 0'
 					player.$throw(cards.length);
@@ -617,6 +619,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var num1=game.players.length;
 					var num2=ui.cardPile.childElementCount;
 					for(var i=0;i<event.cards.length;i++){
+						event.cards[i].fix();
 						var num3=num1*(i+1)-1;
 						if(num3<num2){
 							ui.cardPile.insertBefore(cards[i],ui.cardPile.childNodes[num3]);
@@ -2782,7 +2785,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							return player.canUse(event.cards[0],current);
 						});
 						if(bool){
-							player.chooseUseTarget(event.cards[i],true,false);
+							player.chooseUseTarget(event.cards[0],true,false);
 						}
 						else event.discards.push(event.cards[0]);
 						event.cards.remove(event.cards[0]);
@@ -4015,7 +4018,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			chanyuan:{
-				charlotte:true,
+				//charlotte:true,
 				trigger:{
 					player:["phaseBefore","changeHp"],
 				},
diff --git a/character/yijiang.js b/character/yijiang.js
index 7a55ee0b5..9721864ab 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -1720,7 +1720,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:'phaseUse',
 				filter:function(event,player){
 					if(player.hasSkill('wengua3')) return false;
-					return player.countCards('h')&&game.hasPlayer(function(current){
+					return player.countCards('he')&&game.hasPlayer(function(current){
 						return current.hasSkill('wengua');
 					});
 				},
@@ -3578,6 +3578,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					'step 0'
 					player.showCards(cards);
 					'step 1'
+					cards[0].fix();
 					ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild);
 					game.updateRoundNumber();
 					'step 2'