diff --git a/character/hearth.js b/character/hearth.js
index 495a9c562..248756f81 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -3322,7 +3322,7 @@ character.hearth={
 			trigger:{player:'useCard'},
 			direct:true,
 			filter:function(event){
-				return get.type(event.card,'trick')=='trick';
+				return get.type(event.card,'trick')=='trick'&&event.cards[0]&&event.cards[0]==event.card;
 			},
 			content:function(){
 				"step 0"
@@ -6224,7 +6224,7 @@ character.hearth={
 		malymowang_info:'锁定技，你的锦囊牌在每回合中造成的首次伤害+1；出牌阶段开始时，你从3张随机锦囊中选择一张加入手牌',
 		malymowang_info_alter:'锁定技，你的锦囊牌在每回合中造成的首次伤害+1；出牌阶段开始时，随机获得一张普通锦牌牌',
 		lingzhou:'灵咒',
-		lingzhou_info:'每当你使用一张锦囊牌，可令一名角色摸一张牌或回复一点体力',
+		lingzhou_info:'每当你使用一张非转化的锦囊牌，可令一名角色摸一张牌或回复一点体力',
 		mieshi:'灭世',
 		mieshi_info:'锁定技，结束阶段，你流失一点体力，并对一名随机的其他角色造成一点火焰伤害',
 		xshixin:'蚀心',
diff --git a/character/shenhua.js b/character/shenhua.js
index 4891c19a5..c36fb0ea9 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -42,6 +42,8 @@ character.shenhua={
 	perfectPair:{
 		yuanshao:['yanwen'],
 		menghuo:['zhurong'],
+		sp_zhugeliang:['pangtong'],
+		sunce:['zhouyu','taishici','daqiao']
 	},
 	characterIntro:{
 		huangzhong:'字汉升，今河南南阳人。汉末三国时期蜀汉名将。本为刘表部下中郎将，后归刘备，并助刘备攻益州刘璋，在定军山一战中阵斩曹操部下名将夏侯渊。备称汉中王后改封后将军，赐关内侯。',
diff --git a/character/sp.js b/character/sp.js
index e08a11936..350c96295 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -161,6 +161,7 @@ character.sp={
 		zhangliang:'东汉末年黄巾起义首领之一，张角的三弟。中平元年（184）随兄起义，号称“人公将军”。遭到朝廷所派左中郎将皇甫嵩进攻时，他率军在广宗（今河北威县）进行反击。后因警戒疏忽，遭到汉军夜袭，兵败身亡。',
 	},
 	perfectPair:{
+		yuejin:['re_lidian'],
 		zhugejin:['zhugeke'],
 		guanyinping:['guanyu'],
 		zhangxingcai:['liushan'],
@@ -179,7 +180,6 @@ character.sp={
 		cuiyan:['caocao'],
 		guansuo:['guanyu'],
 		mateng:['machao','madai','mayunlu'],
-		madai:['mayunlu'],
 		chengpu:['zhouyu'],
 		hanba:['swd_muyun'],
 		dongbai:['dongzhuo']
diff --git a/character/standard.js b/character/standard.js
index 8f9d562db..3c15fb93b 100644
--- a/character/standard.js
+++ b/character/standard.js
@@ -61,13 +61,15 @@ character.standard={
 		zhenji:['caopi'],
 		caocao:['xuzhu','dianwei'],
 		huangzhong:['weiyan'],
-		zhugeliang:['huangyueying','pangtong'],
+		zhugeliang:['huangyueying'],
 		liubei:['guanyu','zhangfei','ganfuren'],
 		zhaoyun:['liushan'],
 		daqiao:['xiaoqiao'],
 		zhouyu:['huanggai','xiaoqiao'],
 		sunquan:['zhoutai'],
-		lvbu:['diaochan']
+		lvbu:['diaochan'],
+		machao:['madai','mayunlu'],
+		zhangliao:['zangba']
 	},
 	skill:{
 		hujia:{
@@ -1696,7 +1698,7 @@ character.standard={
 		mashu_info:'锁定技，你的进攻距离+1',
 		feiying_info:'锁定技，你的防御距离+1',
 		tieji_info:'当你使用一张[杀]时，可进行一次判定，若为红色则此[杀]不可闪避',
-		jizhi_info:'每当你使用或打出一张普通锦囊牌，可以摸一张牌',
+		jizhi_info:'每当你使用或打出一张非转化的普通锦囊牌，可以摸一张牌',
 		qicai_info:'锁定技，你使用的锦囊牌无距离限制',
 		zhiheng_info:'出牌阶段，你可以弃置任意张牌并摸等量的牌，每阶段限1次',
 		jiuyuan_info:'主公技，锁定技，濒死阶段，吴势力角色对你使用的[桃]额外回复一点体力',
diff --git a/mode/guozhan.js b/mode/guozhan.js
index a7110e925..6014157be 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1911,6 +1911,7 @@ mode.guozhan={
 					event.list.push(i);
 				}
 				_status.characterlist=event.list.slice(0);
+				_status.yeidentity=[];
 				if(_status.brawl&&_status.brawl.chooseCharacterFilter){
 					event.list=_status.brawl.chooseCharacterFilter(event.list);
 				}
@@ -2115,6 +2116,7 @@ mode.guozhan={
 					list=get.charactersOL();
 				}
 				_status.characterlist=list.slice(0);
+				_status.yeidentity=[];
 				event.list=list.slice(0);
 				var list2=[];
 				var num;
@@ -2568,6 +2570,21 @@ mode.guozhan={
 			},
 			dieAfter:function(source){
 				this.showCharacter(2);
+				if(get.is.jun(this.name1)){
+					var yelist=[];
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].identity==this.identity){
+							yelist.push(game.players[i]);
+						}
+					}
+					game.broadcastAll(function(list){
+						for(var i=0;i<list.length;i++){
+							list[i].identity='ye';
+							list[i].setIdentity();
+						}
+					},yelist);
+					_status.yeidentity.add(this.identity);
+				}
 				if(source&&source.identity!='unknown'){
 					if(this.identity=='ye') source.draw(1);
 					else if(this.identity!=source.identity) source.draw(get.population(this.identity)+1);
@@ -2735,7 +2752,7 @@ mode.guozhan={
 				game.addVideo('showCharacter',this,num);
 				if(this.identity=='unknown'){
 					this.group=lib.character[this.name1][1];
-					if(get.is.jun(this.name1)){
+					if(get.is.jun(this.name1)&&this.isAlive()){
 						this.identity=this.group;
 						var yelist=[];
 						for(var i=0;i<game.players.length;i++){
@@ -2750,8 +2767,12 @@ mode.guozhan={
 							}
 						},yelist,this.group);
 					}
-					else if(get.totalPopulation(this.group)+1>get.population()/2) this.identity='ye';
-					else this.identity=this.group;
+					else if(_status.yeidentity.contains(this.group)||get.totalPopulation(this.group)+1>get.population()/2){
+						this.identity='ye';
+					}
+					else{
+						this.identity=this.group;
+					}
 					this.setIdentity(this.identity);
 					this.ai.shown=1;
 					this.node.identity.classList.remove('guessing');
@@ -2842,7 +2863,8 @@ mode.guozhan={
 				var name1=this.name1;
 				var name2=this.name2;
 				if(lib.character[name1][1]!=lib.character[name2][1]) return false;
-				var list=['re','diy','sp','jsp','shen','jg','xin'];
+				if(get.is.jun(this.name1)) return true;
+				var list=['re','diy','sp','jsp','shen','jg','xin','old','gz'];
 				for(var i=0;i<list.length;i++){
 					if(name1.indexOf(list[i]+'_')==0){
 						name1=name1.slice(list[i].length+1);
@@ -3082,7 +3104,6 @@ mode.guozhan={
 					return Math.min(0,Math.random()-0.3)+difficulty;
 				}
 				return Math.min(0,Math.random()-0.5)+difficulty;
-
 			},
 		}
 	},