diff --git a/audio/skill/jianshu1.mp3 b/audio/skill/jianshu1.mp3
new file mode 100644
index 000000000..ec2e588bb
Binary files /dev/null and b/audio/skill/jianshu1.mp3 differ
diff --git a/audio/skill/jianshu2.mp3 b/audio/skill/jianshu2.mp3
new file mode 100644
index 000000000..3534e3817
Binary files /dev/null and b/audio/skill/jianshu2.mp3 differ
diff --git a/audio/skill/yongdi1.mp3 b/audio/skill/yongdi1.mp3
new file mode 100644
index 000000000..ec65ed57c
Binary files /dev/null and b/audio/skill/yongdi1.mp3 differ
diff --git a/audio/skill/yongdi2.mp3 b/audio/skill/yongdi2.mp3
new file mode 100644
index 000000000..891bd2207
Binary files /dev/null and b/audio/skill/yongdi2.mp3 differ
diff --git a/character/diy.js b/character/diy.js
index 4c38b8e41..c57206995 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -98,7 +98,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			diy:{
 				diy_tieba:["diy_wenyang","ns_zuoci","ns_lvzhi","ns_wangyun","ns_nanhua","ns_nanhua_left","ns_nanhua_right","ns_huamulan","ns_huangzu","ns_jinke","ns_yanliang","ns_wenchou","ns_caocao","ns_caocaosp","ns_zhugeliang","ns_wangyue","ns_yuji","ns_xinxianying","ns_guanlu","ns_simazhao","ns_sunjian","ns_duangui","ns_zhangbao","ns_masu","ns_zhangxiu","ns_lvmeng","ns_shenpei","ns_yujisp","ns_yangyi","ns_liuzhang","ns_xinnanhua","ns_zhangwei"],
 				diy_default:["diy_feishi","diy_liuyan","diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","diy_liufu","diy_xizhenxihong","diy_liuzan","diy_zaozhirenjun","diy_yangyi","diy_tianyu"],
-				diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa"],
+				diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa","key_kengo"],
 			},
 		},
 		characterIntro:{
diff --git a/character/refresh.js b/character/refresh.js
index df5d3d2d4..eb5555e03 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -2600,7 +2600,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(event.dialog) event.dialog.close();
 						if(event.control) event.control.close();
 						var top=[];
-						var judges=player.node.judges.childNodes;
+						var judges=player.getCards('j');
 						var stopped=false;
 						if(!player.hasWuxie()){
 							for(var i=0;i<judges.length;i++){
@@ -5448,7 +5448,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			rejinjiu3:'禁酒',
 			ol_xiahouyuan:'界夏侯渊',
 			shebian:'设变',
-			shebian_info:'当你的武将牌翻面后，你可以移动场上的一张牌。',
+			shebian_info:'当你的武将牌翻面后，你可以移动场上的一张装备牌。',
 			cangzhuo:'藏拙',
 			cangzhuo_info:'弃牌阶段开始时，若你本回合内没有使用过锦囊牌，则你的锦囊牌不计入手牌上限。',
 			
diff --git a/character/shenhua.js b/character/shenhua.js
index 20e5251ae..98ff8acea 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -6390,10 +6390,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				ai:{
 					save:true,
+					mingzhi:true,
 					skillTagFilter:function(player){
 						if(player.hp>0) return false;
-						},
 					},
+				},
 				intro:{
 					content:'cards',
 					onunmark:function(storage,player){
diff --git a/character/sp.js b/character/sp.js
index 40ee7dae7..f2b77e2be 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -1164,10 +1164,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			//花鬘
+			manyi:{audio:2},
 			hmmanyi:{
 				trigger:{target:'useCardToBefore'},
 				forced:true,
-				audio:2,
+				audio:'manyi',
 				filter:function(event,player){
 					return event.card.name=='nanman';
 				},
@@ -8352,7 +8353,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					list.push('cancel2');
 					if(list.length){
 						player.chooseControl(list).set('prompt',get.prompt2('xinzhengnan')).set('ai',function(){
-							if(list.contains('new_rewusheng')) return 1;
+							if(list.contains('xindangxian')) return 'xindangxian';
 							return 0;
 						});
 					}
diff --git a/character/standard.js b/character/standard.js
index f566b1777..34f1bcfcb 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -1175,7 +1175,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(event.dialog) event.dialog.close();
 						if(event.control) event.control.close();
 						var top=[];
-						var judges=player.node.judges.childNodes;
+						var judges=player.getCards('j');
 						var stopped=false;
 						if(!player.hasWuxie()){
 							for(var i=0;i<judges.length;i++){
diff --git a/character/yijiang.js b/character/yijiang.js
index 9be03701b..04e4f158a 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -3482,12 +3482,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						popup:false,
 						audio:false,
 						content:function(){
+							"step 0"
 							if(player.storage.xinsidi4.isAlive()&&!player.getHistory('useCard',function(evt){
 								return evt.card.name=='sha';
 							}).length&&player.storage.xinsidi4.canUse({name:'sha',isCard:true},player,false)){
 								player.storage.xinsidi4.logSkill('xinsidi',player);
 								player.storage.xinsidi4.useCard({name:'sha',isCard:true},player);
 							}
+							"step 1"
 							delete player.storage.xinsidi2;
 							delete player.storage.xinsidi3;
 							delete player.storage.xinsidi4;
diff --git a/game/asset.js b/game/asset.js
index 8f7d1798d..e2f7169ae 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -2383,6 +2383,10 @@ window.noname_asset_list=[
 	'audio/skill/shebian2.mp3',
 	'audio/skill/shensu1_ol_xiahouyuan1.mp3',
 	'audio/skill/shensu1_ol_xiahouyuan2.mp3',
+	'audio/skill/jianshu1.mp3',
+	'audio/skill/jianshu2.mp3',
+	'audio/skill/yongdi1.mp3',
+	'audio/skill/yongdi2.mp3',
 	
 	'font/huangcao.ttf',
 	'font/shousha.ttf',
diff --git a/game/game.js b/game/game.js
index 8000e2281..4f95e5843 100644
--- a/game/game.js
+++ b/game/game.js
@@ -20958,7 +20958,7 @@
 					}
 					var range=get.subtype(name);
 					if(this.isDisabled(range)) return false;
-					if(['equip3','equip4'].contains(range)&&!this.isEmpty(6)) return false;
+					if(['equip3','equip4'].contains(range)&&!this.isDisabled(6)) return false;
 					if(!replace&&!this.isEmpty(range)) return false;
 					return true;
 				},
diff --git a/game/update.js b/game/update.js
index 6e9cf0d94..fcb77b36e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,6 @@
 window.noname_update={
-	version:'1.9.98.5',
-	update:'1.9.98.4.5',
+	version:'1.9.98.5.1',
+	update:'1.9.98.5',
 	changeLog:[
 		'The final...「My Song」...',
 	],
@@ -8,7 +8,7 @@ window.noname_update={
 		//'card/extra.js',
 		//'card/huanlekapai.js',
 		//'card/sp.js',
-		'card/standard.js',
+		//'card/standard.js',
 		//'card/swd.js',
 		//'card/mtg.js',
 		//'card/guozhan.js',
@@ -22,14 +22,14 @@ window.noname_update={
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		'character/mobile.js',
+		//'character/mobile.js',
 		//'character/mtg.js',
-		'character/old.js',
+		//'character/old.js',
 		'character/refresh.js',
 		'character/shenhua.js',
 		'character/sp.js',
 		//'character/tw.js',
-		//'character/standard.js',
+		'character/standard.js',
 		//'character/swd.js',
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
diff --git a/mode/guozhan.js b/mode/guozhan.js
index b96a1a6d1..fa6470da7 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -457,7 +457,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						var list=[
 							'sha','tao','jiu',
 							'taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman',
-							'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi'
+							'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi','yiyi'
 						];
 						var list2=[];
 						for(var i=0;i<list.length;i++){
@@ -2609,7 +2609,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				skillAnimation:true,
 				animationColor:'wood',
 				audio:"hunshang",
-				derivation:["reyingzi","gzyinghun"],
+				derivation:["baka_yingzi","baka_yinghun"],
 				viceSkill:true,
 				init:function (player){
 					if(player.checkViceSkill('baka_hunshang')&&!player.viceChanged){
@@ -4176,7 +4176,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					dialog:function(){
 						var list=[
 							'taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman',
-							'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi',
+							'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi','yiyi',
 						];
 						for(var i=0;i<list.length;i++){
 							list[i]=['锦囊','',list[i]];
@@ -4736,7 +4736,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						return {
 							filterCard:function(){return false},
 							selectCard:-1,
-							viewAs:{name:'sha'},
+							viewAs:{name:'sha',cards:links},
 							cards:links,
 							onuse:function(result,player){
 								result.cards=lib.skill[result.skill].cards;
@@ -8508,7 +8508,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				var toidentity=to.identity;
 				if(toidentity=='unknown'){
 					toidentity=lib.character[to.name1][1];
-					if(get.population(toidentity)>=get.population()-2){
+					if(!to.wontYe()){
 						toidentity='ye';
 					}
 				}
diff --git a/mode/identity.js b/mode/identity.js
index c813b13c8..9e902f0e5 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -2733,7 +2733,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				intro:{
 					content:'准备阶段开始时，可以观看牌堆顶的三张牌，然后将这些牌以任意顺序置于牌堆顶或牌堆底'
 				},
-				trigger:{player:'phaseBegin'},
+				trigger:{player:'phaseZhunbeiBegin'},
 				silent:true,
 				content:function(){
 					"step 0"
@@ -2748,7 +2748,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						if(event.dialog) event.dialog.close();
 						if(event.control) event.control.close();
 						var top=[];
-						var judges=player.node.judges.childNodes;
+						var judges=player.getCards('j');
 						var stopped=false;
 						if(!player.countCards('h','wuxie')){
 							for(var i=0;i<judges.length;i++){