diff --git a/character/extra.js b/character/extra.js
index 15d1502d7..1cdb63532 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -517,7 +517,9 @@ character.extra={
 			trigger:{global:'dieAfter'},
 			forced:true,
 			content:function(){
-				player.loseHp(player.hp);
+				if(player.hp<Infinity){
+					player.loseHp(player.hp);
+				}
 				player.removeSkill('wuhun2');
 			}
 		},
diff --git a/character/shenhua.js b/character/shenhua.js
index 7968316fe..f2af18f30 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -166,7 +166,7 @@ character.shenhua={
 			content:function(){
 				"step 0"
 				var fang=player.hp>=2&&player.num('h')<=player.hp+1;
-				player.chooseTarget('是否发动放权？',function(card,player,target){
+				player.chooseTarget('是否发动【放权】？',function(card,player,target){
 					return target!=player;
 				}).ai=function(target){
 					if(!fang) return -1;
@@ -877,7 +877,7 @@ character.shenhua={
 			},
 			content:function(){
 				"step 0"
-				var next=player.chooseToDiscard('he','是否发动悲歌？');
+				var next=player.chooseToDiscard('he','是否发动【悲歌】？');
 				next.ai=ai.get.unuseful2;
 				next.logSkill='beige';
 				"step 1"
@@ -1957,7 +1957,7 @@ character.shenhua={
 						if(player==target&&get.subtype(card)=='equip2'){
 							if(ai.get.equipValue(card)<=8) return 0;
 						}
-						if(target.num('e','2')) return;
+						if(target.get('e','2')) return;
 						if(player.skills.contains('unequip')) return;
 						if(get.tag(card,'respondShan')) return [0.5,0];
 					}
@@ -2039,13 +2039,16 @@ character.shenhua={
 				if(player.storage.niepan) return false;
 			},
 			content:function(){
+				'step 0'
 				player.hp=Math.min(3,player.maxHp);
 				player.discard(player.get('hej'));
 				player.draw(3);
 				player.unmarkSkill('niepan');
-				if(player.classList.contains('linked')) player.link();
-				if(player.classList.contains('turnedover')) player.turnOver();
 				player.storage.niepan=true;
+				'step 1'
+				if(player.classList.contains('linked')) player.link();
+				'step 2'
+				if(player.classList.contains('turnedover')) player.turnOver();
 			},
 			ai:{
 				skillTagFilter:function(player){
@@ -2150,7 +2153,7 @@ character.shenhua={
 			},
 			content:function(){
 				"step 0"
-				player.chooseTarget([1,trigger.num],function(card,player,target){
+				player.chooseTarget('是否发动【节命】？',[1,trigger.num],function(card,player,target){
 					return target.num('h')<Math.min(target.maxHp,5);
 				}).ai=function(target){
 					var att=ai.get.attitude(_status.event.player,target);
@@ -2470,7 +2473,7 @@ character.shenhua={
 			direct:true,
 			content:function(){
 				"step 0";
-				player.chooseTarget('是否发动新雷击？').ai=function(target){
+				player.chooseTarget('是否发动【雷击·新】？').ai=function(target){
 					return ai.get.damageEffect(target,player,player,'thunder');
 				};
 				"step 1"
@@ -2800,7 +2803,7 @@ character.shenhua={
 			direct:true,
 			content:function(){
 				"step 0";
-				player.chooseTarget('是否发动雷击？').ai=function(target){
+				player.chooseTarget('是否发动【雷击】？').ai=function(target){
 					return ai.get.damageEffect(target,player,player);
 				};
 				"step 1"
@@ -3116,7 +3119,7 @@ character.shenhua={
 		hongyan:'红颜',
 		buqu:'不屈',
 		leiji:'雷击',
-		spleiji:'新雷击',
+		spleiji:'雷击·新',
 		guidao:'鬼道',
 		huangtian:'黄天',
 		huangtian2:'黄天',
diff --git a/character/sp.js b/character/sp.js
index 1837d2f80..9ea4e00cc 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -66,6 +66,7 @@ character.sp={
 		yinbing:{
 			trigger:{player:'phaseEnd'},
 			direct:true,
+			audio:2,
 			init:function(player){
 				player.storage.yinbing=[];
 			},
@@ -145,6 +146,7 @@ character.sp={
 				return player.storage.yinbing&&player.storage.yinbing.length>0;
 			},
 			direct:true,
+			audio:2,
 			content:function(){
 				'step 0'
 				player.chooseTarget('是否发动【绝地】？',function(card,player,target){
@@ -293,7 +295,7 @@ character.sp={
 		},
 		mumu:{
 			enable:'phaseUse',
-			// usable:1,
+			usable:1,
 			filterCard:function(card,player,target){
 				return card.name=='sha'||(get.type(card,'trick')=='trick'&&get.color(card)=='black');
 			},
diff --git a/character/swd.js b/character/swd.js
index 306078c62..fcbc3a566 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -851,7 +851,7 @@ character.swd={
 				"step 0"
 				var save=false;
 				if(ai.get.attitude(player,trigger.target)>2){
-					if(player.num('h','shan')||player.num('e','2')||
+					if(player.num('h','shan')||player.get('e','2')||
 					trigger.target.hp==1||player.hp>trigger.target.hp+1){
 						if(!trigger.target.num('h','shan')||trigger.target.num('h')<player.num('h')){
 							save=true;
diff --git a/game/config.js b/game/config.js
index 49408e92d..0a592dd47 100755
--- a/game/config.js
+++ b/game/config.js
@@ -5,7 +5,9 @@ window.config={
 	forbidall:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu',
 	'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan','zhangjiao'],
 	forbidversus:['swd_kangnalishi'],
-	forbidstone:['zhugedan','pal_xuanxiao'],
+	forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','gjqt_bailitusu',
+	'swd_anka','swd_nicole','daqiao','re_daqiao','zhuran','huatuo','swd_tuwei','hs_guldan','wangyi',
+	'swd_guyue','swd_jiangziya','guojia','re_guojia','shen_caocao','swd_qiner','gjqt_aruan'],
 	forbidchess:['hetaihou','swd_kangnalishi'],
 	forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'],
 	forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'],
diff --git a/game/game.js b/game/game.js
index e61265115..37c9d4106 100755
--- a/game/game.js
+++ b/game/game.js
@@ -419,6 +419,42 @@
 							}
 						}
 					},
+					// background_color_music:{
+					// 	name:'背景色',
+					// 	init:'black',
+					// 	item:{
+					// 		blue:'蓝色',
+					// 		black:'黑色',
+					// 	},
+					// 	onclick:function(color){
+					// 		game.saveConfig('background_color_music',color);
+					// 		document.body.dataset.background_color_music=color;
+					// 	}
+					// },
+					// background_color_wood:{
+					// 	name:'背景色',
+					// 	init:'blue',
+					// 	item:{
+					// 		blue:'蓝色',
+					// 		black:'黑色',
+					// 	},
+					// 	onclick:function(color){
+					// 		game.saveConfig('background_color_wood',color);
+					// 		document.body.dataset.background_color_wood=color;
+					// 	}
+					// },
+					// theme_color_music:{
+					// 	name:'主题色',
+					// 	init:'black',
+					// 	item:{
+					// 		blue:'蓝色',
+					// 		black:'黑色',
+					// 	},
+					// 	onclick:function(color){
+					// 		game.saveConfig('theme_color_music',color);
+					// 		document.body.dataset.theme_color_music=color;
+					// 	}
+					// },
 					ui_zoom:{
 						name:'界面缩放',
 						unfrequent:true,
@@ -666,6 +702,20 @@
 							}
 						}
 					},
+					reduce_radius:{
+						name:'减小圆角',
+						init:false,
+						unfrequent:true,
+						onclick:function(bool){
+							game.saveConfig('reduce_radius',bool);
+							if(bool){
+								ui.window.classList.add('reduce_radius');
+							}
+							else{
+								ui.window.classList.remove('reduce_radius');
+							}
+						}
+					},
 					// popup_style:{
 					// 	name:'提示样式',
 					// 	init:'newstyle',
@@ -1019,6 +1069,21 @@
 							ui.arena.dataset.identity_font=font;
 						}
 					},
+					cardtext_font:{
+						name:'卡牌字体',
+						init:'default',
+						unfrequent:true,
+						item:{
+							xinwei:'新魏',
+							huangcao:'黄草',
+							xiaozhuan:'小篆',
+							default:'默认',
+						},
+						onclick:function(font){
+							game.saveConfig('cardtext_font',font);
+							ui.arena.dataset.cardtext_font=font;
+						}
+					},
 					global_font:{
 						name:'界面字体',
 						init:'default',
@@ -1078,6 +1143,24 @@
 							map.hide_card_prompt_basic.hide();
 							map.hide_card_prompt_equip.hide();
 						}
+						// if(config.theme=='woodden'&&config.image_background=='default'){
+						// 	map.background_color_wood.show();
+						// }
+						// else{
+						// 	map.background_color_wood.hide();
+						// }
+						// if(config.theme=='music'&&config.image_background=='default'){
+						// 	map.background_color_music.show();
+						// }
+						// else{
+						// 	map.background_color_music.hide();
+						// }
+						// if(config.theme=='music'){
+						// 	map.theme_color_music.show();
+						// }
+						// else{
+						// 	map.theme_color_music.hide();
+						// }
 					},
 				}
 			},
@@ -1511,7 +1594,7 @@
 							map.player_number.show();
 							map.enhance_zhu.show();
 							map.auto_identity.show();
-							if(config.player_number=='8'){
+							if(config.player_number!='2'){
 								map.double_nei.show();
 							}
 							else{
@@ -2556,7 +2639,7 @@
 			'随从与其他所有角色相互距离基数为1<li>'+
 			'主将杀死对方随从后获得一个额外的行动值并摸两张牌，杀死己方随从无惩罚，随从杀死随从无效果'+
 			'<li>主将可重铸随从牌，但回合内总的重铸次数不能超过3，随从不能重铸任何牌（包括铁索等默认可以重铸的牌）；若重铸的牌为随从牌或法术牌，则摸牌改为从牌库中获得一张法术牌'+
-			'<li>嘲讽：若一方阵营中有嘲讽角色，则同阵营的无嘲讽角色不以能成为杀或决斗的目标'+
+			'<li>嘲讽：若一方阵营中有嘲讽角色，则同阵营的无嘲讽角色不以能成为杀目标'+
 			'<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏，主将死亡后替补登场，替补登场时摸3+X张牌，X为对方存活的随从数，无替补时游戏结束'
 		},
 		setPopped:function(node,func,width,height){
@@ -12461,7 +12544,7 @@
 				}
 			}
 		},
-		asyncDraw:function(players,num){
+		asyncDraw:function(players,num,drawDeck){
 			for(var i=0;i<players.length;i++){
 				var num2=1;
 				if(typeof num=='number'){
@@ -12470,7 +12553,12 @@
 				else if(Array.isArray(num)){
 					num2=num[i];
 				}
-				players[i].draw(num2,false);
+				if(drawDeck&&drawDeck.drawDeck){
+					players[i].draw(num2,false,drawDeck);
+				}
+				else{
+					players[i].draw(num2,false);
+				}
 				players[i].$draw(num2);
 			}
 		},
@@ -13748,14 +13836,27 @@
 				if(lib.config.slim_player){
 					ui.arena.classList.add('slim_player');
 				}
+				if(lib.config.reduce_radius){
+					ui.window.classList.add('reduce_radius');
+				}
 				if(lib.config.layout=='default'&&lib.config.hp_style=='official'){
 					ui.arena.classList.add('hpimage');
 				}
 				if(!lib.config.target_shake){
 					ui.arena.classList.add('no_target_shake');
 				}
+				// var themeentry='background_color_'+lib.config.theme;
+				// if(lib.config[themeentry]){
+				// 	document.body.dataset[themeentry]=lib.config[themeentry];
+				// }
+				// themeentry='theme_color_'+lib.config.theme;
+				// if(lib.config[themeentry]){
+				// 	document.body.dataset[themeentry]=lib.config[themeentry];
+				// }
+
 				ui.arena.dataset.name_font=lib.config.name_font||'xinwei';
 				ui.arena.dataset.identity_font=lib.config.identity_font||'huangcao';
+				ui.arena.dataset.cardtext_font=lib.config.cardtext_font||'default';
 				ui.arena.dataset.global_font=lib.config.global_font||'default';
 				// ui.arena.dataset.font_size=lib.config.font_size||'16';
 				ui.arena.dataset.glow_phase=lib.config.glow_phase;
@@ -16857,6 +16958,7 @@
 				for(var i=0;i<lib.card.list.length;i++){
 					if(lib.card[lib.card.list[i][2]]){
 						if(lib.config.bannedcards.contains(lib.card.list[i][2])) continue;
+						if(game.bannedcards&&game.bannedcards.contains(lib.card.list[i][2])) continue;
 						ui.create.card(ui.cardPile).init(lib.card.list[i]);
 					}
 				}
diff --git a/image/background/xueji_bg.jpg b/image/background/xueji_bg.jpg
new file mode 100755
index 000000000..c9d4b3fb4
Binary files /dev/null and b/image/background/xueji_bg.jpg differ
diff --git a/image/character/stone_anyingzisi.jpg b/image/character/stone_anyingzisi.jpg
new file mode 100644
index 000000000..2c8331d3e
Binary files /dev/null and b/image/character/stone_anyingzisi.jpg differ
diff --git a/image/character/stone_aoshushi.jpg b/image/character/stone_aoshushi.jpg
new file mode 100644
index 000000000..df2e2440b
Binary files /dev/null and b/image/character/stone_aoshushi.jpg differ
diff --git a/image/character/stone_baoweizhe.jpg b/image/character/stone_baoweizhe.jpg
new file mode 100755
index 000000000..cae5111f9
Binary files /dev/null and b/image/character/stone_baoweizhe.jpg differ
diff --git a/image/character/stone_conglinxiaoshou.jpg b/image/character/stone_conglinxiaoshou.jpg
new file mode 100644
index 000000000..8c1cb0615
Binary files /dev/null and b/image/character/stone_conglinxiaoshou.jpg differ
diff --git a/image/character/stone_damoshatuo.jpg b/image/character/stone_damoshatuo.jpg
new file mode 100644
index 000000000..692f572d9
Binary files /dev/null and b/image/character/stone_damoshatuo.jpg differ
diff --git a/image/character/stone_duyanhaidao.jpg b/image/character/stone_duyanhaidao.jpg
new file mode 100644
index 000000000..f2ca38a63
Binary files /dev/null and b/image/character/stone_duyanhaidao.jpg differ
diff --git a/image/character/stone_faqishi.jpg b/image/character/stone_faqishi.jpg
new file mode 100755
index 000000000..46a0c09e9
Binary files /dev/null and b/image/character/stone_faqishi.jpg differ
diff --git a/image/character/stone_fuhuokaijia.jpg b/image/character/stone_fuhuokaijia.jpg
new file mode 100644
index 000000000..ae3c26334
Binary files /dev/null and b/image/character/stone_fuhuokaijia.jpg differ
diff --git a/image/character/stone_gangtiewushi.jpg b/image/character/stone_gangtiewushi.jpg
new file mode 100755
index 000000000..9247d605c
Binary files /dev/null and b/image/character/stone_gangtiewushi.jpg differ
diff --git a/image/character/stone_guangmingquan.jpg b/image/character/stone_guangmingquan.jpg
new file mode 100755
index 000000000..a4605e680
Binary files /dev/null and b/image/character/stone_guangmingquan.jpg differ
diff --git a/image/character/stone_guiqishi.jpg b/image/character/stone_guiqishi.jpg
new file mode 100644
index 000000000..67255486f
Binary files /dev/null and b/image/character/stone_guiqishi.jpg differ
diff --git a/image/character/stone_huangjialeixiang.jpg b/image/character/stone_huangjialeixiang.jpg
new file mode 100644
index 000000000..decbe0fa9
Binary files /dev/null and b/image/character/stone_huangjialeixiang.jpg differ
diff --git a/image/character/stone_huangyeqishi.jpg b/image/character/stone_huangyeqishi.jpg
new file mode 100644
index 000000000..902f3d8b2
Binary files /dev/null and b/image/character/stone_huangyeqishi.jpg differ
diff --git a/image/character/stone_huoli.jpg b/image/character/stone_huoli.jpg
new file mode 100644
index 000000000..e9cc979f2
Binary files /dev/null and b/image/character/stone_huoli.jpg differ
diff --git a/image/character/stone_huoshanxiemu.jpg b/image/character/stone_huoshanxiemu.jpg
new file mode 100755
index 000000000..a98a4701d
Binary files /dev/null and b/image/character/stone_huoshanxiemu.jpg differ
diff --git a/image/character/stone_huoyanweishi.jpg b/image/character/stone_huoyanweishi.jpg
new file mode 100755
index 000000000..2153910c3
Binary files /dev/null and b/image/character/stone_huoyanweishi.jpg differ
diff --git a/image/character/stone_jujishou.jpg b/image/character/stone_jujishou.jpg
new file mode 100755
index 000000000..bd5723b07
Binary files /dev/null and b/image/character/stone_jujishou.jpg differ
diff --git a/image/character/stone_kaodalalong.jpg b/image/character/stone_kaodalalong.jpg
new file mode 100644
index 000000000..1309c8434
Binary files /dev/null and b/image/character/stone_kaodalalong.jpg differ
diff --git a/image/character/stone_kuangyedoushi.jpg b/image/character/stone_kuangyedoushi.jpg
index 2b31b78cb..f7112994c 100644
Binary files a/image/character/stone_kuangyedoushi.jpg and b/image/character/stone_kuangyedoushi.jpg differ
diff --git a/image/character/stone_lifaji.jpg b/image/character/stone_lifaji.jpg
new file mode 100644
index 000000000..3a8eef44b
Binary files /dev/null and b/image/character/stone_lifaji.jpg differ
diff --git a/image/character/stone_lindishuyao.jpg b/image/character/stone_lindishuyao.jpg
new file mode 100755
index 000000000..6cd289ac8
Binary files /dev/null and b/image/character/stone_lindishuyao.jpg differ
diff --git a/image/character/stone_muguangchulong.jpg b/image/character/stone_muguangchulong.jpg
new file mode 100755
index 000000000..4cdd9199b
Binary files /dev/null and b/image/character/stone_muguangchulong.jpg differ
diff --git a/image/character/stone_muyangren.jpg b/image/character/stone_muyangren.jpg
new file mode 100644
index 000000000..8d3b7aa13
Binary files /dev/null and b/image/character/stone_muyangren.jpg differ
diff --git a/image/character/stone_renyaqishi.jpg b/image/character/stone_renyaqishi.jpg
new file mode 100644
index 000000000..26093ede0
Binary files /dev/null and b/image/character/stone_renyaqishi.jpg differ
diff --git a/image/character/stone_senlinlang.jpg b/image/character/stone_senlinlang.jpg
new file mode 100755
index 000000000..468b74a71
Binary files /dev/null and b/image/character/stone_senlinlang.jpg differ
diff --git a/image/character/stone_shachuisaman.jpg b/image/character/stone_shachuisaman.jpg
new file mode 100755
index 000000000..a3f51345b
Binary files /dev/null and b/image/character/stone_shachuisaman.jpg differ
diff --git a/image/character/stone_shalinxingzhe.jpg b/image/character/stone_shalinxingzhe.jpg
new file mode 100755
index 000000000..26beafedc
Binary files /dev/null and b/image/character/stone_shalinxingzhe.jpg differ
diff --git a/image/character/stone_shengdianzhishi.jpg b/image/character/stone_shengdianzhishi.jpg
new file mode 100755
index 000000000..5573ab78f
Binary files /dev/null and b/image/character/stone_shengdianzhishi.jpg differ
diff --git a/image/character/stone_shenmiqishou.jpg b/image/character/stone_shenmiqishou.jpg
new file mode 100644
index 000000000..b7a63707a
Binary files /dev/null and b/image/character/stone_shenmiqishou.jpg differ
diff --git a/image/character/stone_shenshengyongshi.jpg b/image/character/stone_shenshengyongshi.jpg
new file mode 100644
index 000000000..4316f9164
Binary files /dev/null and b/image/character/stone_shenshengyongshi.jpg differ
diff --git a/image/character/stone_shexianjishi.jpg b/image/character/stone_shexianjishi.jpg
new file mode 100644
index 000000000..164b77312
Binary files /dev/null and b/image/character/stone_shexianjishi.jpg differ
diff --git a/image/character/stone_shihualong.jpg b/image/character/stone_shihualong.jpg
new file mode 100644
index 000000000..e570a2d94
Binary files /dev/null and b/image/character/stone_shihualong.jpg differ
diff --git a/image/character/stone_shixiangweishi.jpg b/image/character/stone_shixiangweishi.jpg
new file mode 100644
index 000000000..d2f52d41a
Binary files /dev/null and b/image/character/stone_shixiangweishi.jpg differ
diff --git a/image/character/stone_tujiu.jpg b/image/character/stone_tujiu.jpg
new file mode 100755
index 000000000..da3b4cf50
Binary files /dev/null and b/image/character/stone_tujiu.jpg differ
diff --git a/image/character/stone_tutengshi.jpg b/image/character/stone_tutengshi.jpg
new file mode 100755
index 000000000..72e25abfc
Binary files /dev/null and b/image/character/stone_tutengshi.jpg differ
diff --git a/image/character/stone_wanshiyuansu.jpg b/image/character/stone_wanshiyuansu.jpg
new file mode 100644
index 000000000..0b904825d
Binary files /dev/null and b/image/character/stone_wanshiyuansu.jpg differ
diff --git a/image/character/stone_xiushuihaidao.jpg b/image/character/stone_xiushuihaidao.jpg
new file mode 100644
index 000000000..3fde69e0c
Binary files /dev/null and b/image/character/stone_xiushuihaidao.jpg differ
diff --git a/image/character/stone_xuefanzhanshi.jpg b/image/character/stone_xuefanzhanshi.jpg
new file mode 100644
index 000000000..baa020625
Binary files /dev/null and b/image/character/stone_xuefanzhanshi.jpg differ
diff --git a/image/character/stone_xulingwushi.jpg b/image/character/stone_xulingwushi.jpg
new file mode 100644
index 000000000..eddca229c
Binary files /dev/null and b/image/character/stone_xulingwushi.jpg differ
diff --git a/image/character/stone_xunmashi.jpg b/image/character/stone_xunmashi.jpg
new file mode 100644
index 000000000..4b138eb98
Binary files /dev/null and b/image/character/stone_xunmashi.jpg differ
diff --git a/image/character/stone_xunmenglong.jpg b/image/character/stone_xunmenglong.jpg
new file mode 100644
index 000000000..0f792eade
Binary files /dev/null and b/image/character/stone_xunmenglong.jpg differ
diff --git a/image/character/stone_yanshushi.jpg b/image/character/stone_yanshushi.jpg
new file mode 100755
index 000000000..d6be0bb94
Binary files /dev/null and b/image/character/stone_yanshushi.jpg differ
diff --git a/image/character/stone_zousishangfan.jpg b/image/character/stone_zousishangfan.jpg
new file mode 100644
index 000000000..fc41b26e7
Binary files /dev/null and b/image/character/stone_zousishangfan.jpg differ
diff --git a/layout/default/layout.css b/layout/default/layout.css
index bfb39b1e4..0c1817e46 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -447,6 +447,9 @@ div:not(.handcards)>.card>.info>span,
 	border-radius:6px;
 	transition: opacity 0.3s;
 }
+#window.reduce_radius>.dialog.popped{
+	border-radius:4px;
+}
 #window>.dialog.popped>.bar{
 	display:none !important;
 }
@@ -723,6 +726,10 @@ margin-bottom: 5px;
 	background: rgba(63, 119, 173,1);
 	border: 1px solid rgba(31, 82, 131, 1);
 }
+.hp.actcount>div.overflow:not(.lost){
+	background: rgb(162, 162, 162);
+	border: 1px solid rgb(117, 117, 117);
+}
 .hp.actcount>.lost{
 	background: rgba(63, 119, 173,1);
 	border: 1px solid rgba(31, 82, 131, 1);
@@ -881,7 +888,7 @@ margin-bottom: 5px;
 	animation: dialog_start2 0.3s;
 	-webkit-animation: dialog_start2 0.3s;
 }
-.dialog.removing{top: 100px}
+/*.dialog.removing{top: 100px}*/
 .card.drawing{
 	animation: drawing 1s;
 	animation-fill-mode: forwards;
@@ -920,6 +927,9 @@ margin-bottom: 5px;
     left:10px;
     background-size:cover;
 }
+#window.reduce_radius #me>.fakeme.avatar{
+	border-radius:4px;
+}
 
 .card.removing{transform:scale(0);}
 #me>div>div>.card.removing{margin-left: -52px;margin-right: -52px;}
@@ -1042,6 +1052,9 @@ div:hover>.intro{opacity: 1;}
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
 	border-radius:8px;
 }
+#window.reduce_radius .shadowed{
+	border-radius: 4px;
+}
 .underline,.underlinenode{
 	padding:3px;
 	width:auto;
@@ -1093,6 +1106,18 @@ div:hover>.intro{opacity: 1;}
 #arena[data-identity_font='huangcao'] .player .identity>div{
 	font-family: 'huangcao','xinwei';
 }
+
+
+#arena[data-cardtext_font='xiaozhuan'] .card div:not(.info):not(.background){
+	font-family: 'xiaozhuan';
+}
+#arena[data-cardtext_font='xinwei'] .card div:not(.info):not(.background){
+	font-family: 'xinwei';
+}
+#arena[data-cardtext_font='huangcao'] .card div:not(.info):not(.background){
+	font-family: 'huangcao','xinwei';
+}
+
 .player .identity>div{
 	margin: auto;
 	position: relative;
@@ -1430,6 +1455,11 @@ div:hover>.wunature{
 	border-radius:8px;
 	min-height:240px;
 }
+#window.reduce_radius .dialog.scroll1,
+#window.reduce_radius .dialog.scroll2,
+#window.reduce_radius .dialog.withbg{
+	border-radius:4px;
+}
 
 /*--------动画--------*/
 @keyframes cardeffect{
diff --git a/layout/default/menu.css b/layout/default/menu.css
index 8cfedd471..975dcbb51 100644
--- a/layout/default/menu.css
+++ b/layout/default/menu.css
@@ -428,6 +428,9 @@
 	top:0;
 	position: absolute;
 }
+#window.reduce_radius .menu-buttons>.new_character>.avatar>input{
+	border-radius: 4px;
+}
 .menu-buttons>.new_character>.avatar>.select_avatar{
 	font-family: 'xinwei';
 	font-size: 20px;
@@ -545,11 +548,8 @@
 
 .menubutton{
 	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
-    border-radius:8px;
-    background-image: linear-gradient(rgba(75,75,75,1), rgba(70,70,70,1));
-}
-.menubutton{
     border-radius:4px;
+    background-image: linear-gradient(rgba(75,75,75,1), rgba(70,70,70,1));
 }
 .menubutton.active{
 	background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));
diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css
index d2adebcb9..b2d6ba90d 100644
--- a/layout/mobile/layout.css
+++ b/layout/mobile/layout.css
@@ -25,7 +25,7 @@
     width: calc(5000% / 47);
     left:calc(-150% / 47);
     top:auto;
-    border-radius:0;
+    border-radius:0 !important;
     height:120px;
 }
 #arena:not(.chess) #handcards1{
diff --git a/layout/mode/boss.css b/layout/mode/boss.css
index 6ae3f9793..f470b03c5 100755
--- a/layout/mode/boss.css
+++ b/layout/mode/boss.css
@@ -75,10 +75,6 @@
     top:auto;
     bottom:65px;
     height:calc(100% - 383px);
-    /*min-height: 207px;*/
-    background: rgba(0,0,0,0.2);
-	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
-	border-radius:8px;
     animation: dialog_start2 0.5s;
 	-webkit-animation: dialog_start2 0.5s;
 }
diff --git a/layout/mode/chess.css b/layout/mode/chess.css
index f54bf20b2..2ff6d8409 100755
--- a/layout/mode/chess.css
+++ b/layout/mode/chess.css
@@ -61,6 +61,9 @@
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
 	border-radius:8px;
 }
+#window.reduce_radius>.dialog{
+    border-radius:4px;
+}
 #arena>.dialog.slim:not(.center){
     top:40px;
 }
@@ -139,6 +142,10 @@
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
 	border-radius:8px;
 }
+#window.reduce_radius .player.playergrid,
+#window.reduce_radius .player.obstacle{
+    border-radius:4px;
+}
 .player.playerblank{
     background: none;
 }
diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css
index e51c35b5a..fdc776e7d 100644
--- a/layout/newlayout/global.css
+++ b/layout/newlayout/global.css
@@ -54,7 +54,7 @@
 .player .actcount.hp{
 	top: 18px;
 	left: 15px;
-	width: 130px;
+	width: 120px;
 	bottom: auto;
 	right: auto;
 	text-align: left;
@@ -76,6 +76,9 @@
 .player.fullskin2 .avatar{
 	border-radius:8px 0 0 8px;
 }
+#window.reduce_radius .player.fullskin2 .avatar{
+	border-radius:4px 0 0 4px;
+}
 .player.fullskin2 .avatar2{
 	top:10px;
 	left:auto;
@@ -381,7 +384,6 @@
 .dialog.withbg{
 	background: rgba(0,0,0,0.2);
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
-	border-radius:8px;
 	min-height:240px;
 }
 .dialog>.bar{
diff --git a/mode/boss.js b/mode/boss.js
index ebe6bde3c..7500b0116 100755
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -528,6 +528,7 @@ mode.boss={
 				dialog.classList.add('fixed');
 				ui.window.appendChild(dialog);
 				dialog.classList.add('bosscharacter');
+				dialog.classList.add('withbg');
 				// dialog.add('0/3');
 				dialog.add([list.slice(0,20),'character']);
 				dialog.noopen=true;
@@ -553,6 +554,7 @@ mode.boss={
 					_status.event.dialog=ui.create.dialog('选择参战角色','hidden');
 					ui.window.appendChild(_status.event.dialog);
 					_status.event.dialog.classList.add('bosscharacter');
+					_status.event.dialog.classList.add('withbg');
 					_status.event.dialog.classList.add('fixed');
 					// _status.event.dialog.add('0/3');
 					_status.event.dialog.add([list.slice(0,20),'character']);
@@ -566,6 +568,7 @@ mode.boss={
 				};
 				event.dialogxx=ui.create.characterDialog();
 				event.dialogxx.classList.add('bosscharacter');
+				event.dialogxx.classList.add('withbg');
 				event.dialogxx.classList.add('fixed');
 				ui.create.cheat2=function(){
 					_status.createControl=event.asboss;
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 367690556..90dbf1837 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -869,7 +869,7 @@ mode.guozhan={
 				if(from.identity==toidentity&&toidentity!='ye'){
 					return 4+difficulty;
 				}
-				if(lib.character[from.name1][1]==toidentity){
+				if(from.identity=='unknown'&&lib.character[from.name1][1]==toidentity){
 					if(get.totalPopulation(toidentity)+1<=get.population()/2) return 4+difficulty;
 				}
 				var groups=[];
@@ -902,7 +902,7 @@ mode.guozhan={
 				if(to==game.me) difficulty=(2-get.difficulty())*1.5;
 				if(from==to) return 5+difficulty;
 				if(from.identity==to.identity&&from.identity!='unknown'&&from.identity!='ye') return 5+difficulty;
-				if(lib.character[from.name1][1]==to.identity){
+				if(from.identity=='unknown'&&lib.character[from.name1][1]==to.identity){
 					if(get.totalPopulation(to.identity)+1<=get.population()/2) return 4+difficulty;
 				}
 				var toidentity=to.identity;
diff --git a/mode/identity.js b/mode/identity.js
index ef9ba3088..5d2d0a5b0 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -326,7 +326,7 @@ mode.identity={
 				}
 			}
 			else if(game.me.identity=='nei'){
-				if(get.population('fan')+get.population('zhu')+get.population('zhong')==0){
+				if(game.players.length==1){
 					game.over(true);
 				}
 				else{
@@ -334,7 +334,8 @@ mode.identity={
 				}
 			}
 			else{
-				if(get.population('fan')+get.population('zhong')>0&&game.zhu.classList.contains('dead')){
+				if((get.population('fan')+get.population('zhong')>0||get.population('nei')>1)&&
+					game.zhu.classList.contains('dead')){
 					game.over(true);
 				}
 				else{
@@ -441,9 +442,33 @@ mode.identity={
 				}
 				else{
 					identityList=lib.config.mode_config.identity.identity[game.players.length-2].slice(0);
-					if(get.config('player_number')=='8'&&get.config('double_nei')){
-						identityList.remove('fan');
-						identityList.push('nei');
+					if(get.config('double_nei')){
+						switch(get.config('player_number')){
+							case '8':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+							case '7':
+							identityList.remove('zhong');
+							identityList.push('nei');
+							break;
+							case '6':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+							case '5':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+							case '4':
+							identityList.remove('zhong');
+							identityList.push('nei');
+							break;
+							case '3':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+						}
 					}
 				}
 
@@ -995,7 +1020,7 @@ mode.identity={
 								if(from==to) return 10;
 								if(from.ai.friend.contains(to)) return 5;
 								if(get.population('fan')+get.population('zhong')>0) return 0;
-								return -1;
+								return -5;
 							case 'fan':
 								if(strategy==5) return Math.max(-1,situation);
 								if(strategy==6) return Math.min(0,situation);
diff --git a/mode/stone.js b/mode/stone.js
index c91dc3056..99b0662c0 100755
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -68,6 +68,10 @@ mode.stone={
 				}
 			},
 			drawDeck:function(num,log){
+				if(this.isMin()){
+					this.draw(num,log);
+					return;
+				}
 				if(!num){
 					num=1;
 				}
@@ -90,11 +94,29 @@ mode.stone={
 				else{
 					game.addVideo('updateActCount',this,[used,this.actcount,this.getActCount()]);
 				}
-				for(var i=0;i<10;i++){
-					if(this.actcount>this.node.actcount.childElementCount){
+				var maxcount;
+				if(lib.config.layout=='default'||used=='outphase'||_status.currentPhase!=this){
+					maxcount=this.actcount;
+				}
+				else{
+					if(_status.video){
+						maxcount=this.actcount-(current||0);
+					}
+					else{
+						maxcount=this.actcount-this.getActCount();
+					}
+					if(this.actcount>maxcount){
+						maxcount=this.actcount;
+					}
+					if(maxcount>12){
+						maxcount=12;
+					}
+				}
+				for(var i=0;i<12;i++){
+					if(maxcount>this.node.actcount.childElementCount){
 						ui.create.div(this.node.actcount);
 					}
-					else if(this.actcount<this.node.actcount.childElementCount){
+					else if(maxcount<this.node.actcount.childElementCount){
 						this.node.actcount.lastChild.remove();
 					}
 					else{
@@ -109,18 +131,26 @@ mode.stone={
 					else{
 						count=this.actcount-this.getActCount();
 					}
-					for(var i=0;i<this.actcount;i++){
+					for(var i=0;i<this.node.actcount.childElementCount;i++){
 						if(i<count){
 							this.node.actcount.childNodes[i].classList.remove('lost');
+							if(i>=this.actcount){
+								this.node.actcount.childNodes[i].classList.add('overflow');
+							}
+							else{
+								this.node.actcount.childNodes[i].classList.remove('overflow');
+							}
 						}
 						else{
 							this.node.actcount.childNodes[i].classList.add('lost');
+							this.node.actcount.childNodes[i].classList.remove('overflow');
 						}
 					}
 				}
 			},
-			hasFellowSkill:function(skill){
+			hasFellowSkill:function(skill,exclude){
 				for(var i=0;i<game.players.length;i++){
+					if(exclude&&game.players[i]==this) continue;
 					if(game.players[i].skills.contains(skill)&&
 					game.players[i].side==this.side){
 						return true;
@@ -128,6 +158,17 @@ mode.stone={
 				}
 				return false;
 			},
+			countFellowSkill:function(skill,exclude){
+				var num=0;
+				for(var i=0;i<game.players.length;i++){
+					if(exclude&&game.players[i]==this) continue;
+					if(game.players[i].skills.contains(skill)&&
+					game.players[i].side==this.side){
+						num++;
+					}
+				}
+				return num;
+			},
 			canAddFellow:function(){
 				if(!this.actcharacterlist) return false;
 				if(this.actcharacterlist.length<4) return true;
@@ -397,7 +438,8 @@ mode.stone={
 		}
 	},
 	beastList:['stone_misha','stone_leiouke','stone_huofu',
-		'stone_caoyuanshi','stone_qingwa','stone_mianyang','stone_jiewangzhu',
+		'stone_caoyuanshi','stone_jiewangzhu',
+		'stone_huangjialeixiang','stone_damoshatuo','stone_tujiu','stone_senlinlang',
 		'stone_fennuxiaoji','stone_juxingchanchu','stone_yanjingshe'
 	],
 	cardPack:{
@@ -431,14 +473,26 @@ mode.stone={
 			stone_tuyuansu:['male','qun',5,['chaofeng'],['minskin','stone'],[5,4,'shaman']],
 			stone_huoyuansu:['male','shu',3,['shaman_huoxi'],['minskin','stone'],[4,3,'shaman']],
 			stone_fachao:['male','wei',3,['shaman_tuteng','shaman_fachao'],['minskin','stone'],[3,0,'shaman']],
-			stone_huoshe:['male','shu',3,['shaman_tuteng','shaman_huoshe'],['minskin','stone'],[3,0,'shaman']],
+			stone_huoshe:['male','shu',3,['shaman_tuteng','shaman_huoshe'],['minskin','stone'],[4,0,'shaman']],
+			stone_huoli:['male','wei',3,['shaman_tuteng','shaman_huoli'],['minskin','stone'],[2,0,'shaman']],
+			stone_huoyanweishi:['male','shu',4,['shaman_zhuhuo'],['minskin','stone'],[4,1,'shaman']],
+			stone_tutengshi:['female','wei',2,['shaman_peiyu'],['minskin','stone'],[3,3,'shaman']],
+			stone_shachuisaman:['male','qun',3,['shaman_fengnu'],['minskin','stone'],[4,4,'shaman']],
+			stone_wanshiyuansu:['male','qun',3,['shaman_zoushi'],['minskin','stone'],[3,1,'shaman']],
+			stone_shalinxingzhe:['male','qun',4,['shaman_anhun'],['minskin','stone'],[4,2,'shaman']],
 
 			stone_kuangyedoushi:['male','wu',3,['druid_nuhuo'],['minskin','stone'],[4,2,'druid']],
 			stone_conglinshouwei:['male','wu',3,['druid_huwei'],['minskin','stone'],[4,2,'druid']],
 			stone_baohuzhishu:['male','qun',6,['chaofeng'],['minskin','stone'],[6,4,'druid']],
-			stone_liebao:['male','wei',3,['stone_chongfeng'],['minskin','stone'],[3,3,'druid']],
+			stone_liebao:['male','wei',3,['stone_chongfeng'],['minskin','stone'],[3,2,'druid']],
 			stone_zongxiong:['male','shu',4,['chaofeng'],['minskin','stone'],[4,2,'druid']],
 			stone_baoqishi:['female','wei',2,['druid_chengzhang'],['minskin','stone'],[2,2,'druid']],
+			stone_renyaqishi:['female','wei',1,['druid_renya'],['minskin','stone'],[1,1,'druid']],
+			stone_huangyeqishi:['male','wei',4,['druid_chicheng'],['minskin','stone'],[5,2,'druid']],
+			stone_huoshanxiemu:['male','wei',3,['druid_juhuo','chaofeng'],['minskin','stone'],[5,6,'druid']],
+			stone_conglinxiaoshou:['male','wei',3,['druid_yuehuo'],['minskin','stone'],[4,4,'druid']],
+			stone_lindishuyao:['female','wei',3,['druid_yeyou'],['minskin','stone'],[3,3,'druid']],
+			stone_xunmenglong:['male','wei',2,['druid_qicheng'],['minskin','stone'],[3,3,'druid']],
 
 			stone_caoyuanshi:['male','qun',5,['hunter_nuhou'],['minskin','stone'],[5,2,'hunter']],
 			stone_leiouke:['male','shu',3,['hunter_zhanhuo'],['minskin','stone'],[3,1,'hunter']],
@@ -446,6 +500,12 @@ mode.stone={
 			stone_misha:['male','shu',3,['chaofeng'],['minskin','stone'],[3,3,'hunter']],
 			stone_jiewangzhu:['male','wu',1,['hunter_jiewang'],['minskin','stone'],[1,2,'hunter']],
 			stone_xunshoushi:['male','qun',2,['hunter_xunshou'],['minskin','stone'],[4,3,'hunter']],
+			stone_senlinlang:['male','qun',1,['hunter_qunxi'],['minskin','stone'],[1,1,'hunter']],
+			stone_tujiu:['male','qun',3,['hunter_mishi'],['minskin','stone'],[3,2,'hunter']],
+			stone_muyangren:['male','qun',3,['hunter_muyang'],['minskin','stone'],[4,3,'hunter']],
+			stone_jujishou:['male','qun',2,['hunter_juji'],['minskin','stone'],[2,2,'hunter']],
+			stone_damoshatuo:['male','qun',3,['hunter_dusha'],['minskin','stone'],[3,3,'hunter']],
+			stone_huangjialeixiang:['male','qun',2,['hunter_chuanlin'],['minskin','stone'],[2,3,'hunter']],
 
 			stone_shuiyuansu:['male','wei',4,['mage_bingdong'],['minskin','stone'],[4,2,'mage']],
 			stone_wushixuetu:['female','wu',1,['mage_zhufa'],['minskin','stone'],[1,2,'mage']],
@@ -453,6 +513,12 @@ mode.stone={
 			stone_falifulong:['male','shu',2,['mage_tunfa'],['minskin','stone'],[1,1,'mage']],
 			stone_yingxiongzhihun:['male','wei',1,['mage_minghuo'],['minskin','stone'],[1,2,'mage']],
 			stone_shifazhe:['male','qun',3,['mage_shifa'],['minskin','stone'],[3,3,'mage']],
+			stone_aoshushi:['male','qun',3,['mage_aoshu'],['minskin','stone'],[3,2,'mage']],
+			stone_faqishi:['male','qun',4,['mage_jili'],['minskin','stone'],[4,2,'mage']],
+			stone_fuhuokaijia:['male','qun',3,['mage_gushou'],['minskin','stone'],[3,3,'mage']],
+			stone_kaodalalong:['male','qun',4,['mage_yufa'],['minskin','stone'],[5,4,'mage']],
+			stone_yanshushi:['male','qun',2,['mage_yanshu'],['minskin','stone'],[4,4,'mage']],
+			stone_xulingwushi:['male','qun',2,['mage_pingxu'],['minskin','stone'],[3,3,'mage']],
 
 			stone_hudunren:['male','qun',2,['paladin_hudun'],['minskin','stone'],[2,2,'paladin']],
 			stone_junxuguan:['male','qun',3,['paladin_buji'],['minskin','stone'],[4,1,'paladin']],
@@ -460,6 +526,12 @@ mode.stone={
 			stone_chidunweishi:['male','qun',3,['paladin_chidun'],['minskin','stone'],[3,2,'paladin']],
 			stone_liewangshouwei:['male','qun',5,['paladin_shouwei'],['minskin','stone'],[5,2,'paladin']],
 			stone_longwangpeiou:['female','qun',4,['paladin_zhaohuan'],['minskin','stone'],[5,4,'paladin']],
+			stone_baoweizhe:['male','qun',2,['paladin_baowei'],['minskin','stone'],[2,1,'paladin']],
+			stone_guiqishi:['male','qun',5,['paladin_tuxi'],['minskin','stone'],[5,4,'paladin']],
+			stone_shenmiqishou:['male','qun',4,['paladin_miying'],['minskin','stone'],[5,4,'paladin']],
+			stone_shixiangweishi:['female','qun',3,['paladin_huashi'],['minskin','stone'],[3,3,'paladin']],
+			stone_xuefanzhanshi:['male','qun',3,['paladin_jinghua'],['minskin','stone'],[4,4,'paladin']],
+			stone_xunmashi:['male','qun',3,['paladin_moma'],['minskin','stone'],[3,2,'paladin']],
 
 			stone_lieyanxiaogui:['male','qun',2,['warlock_nonghuo'],['minskin','stone'],[1,4,'warlock']],
 			stone_xiaoguishouling:['male','qun',3,['warlock_zhaogui'],['minskin','stone'],[3,1,'warlock']],
@@ -482,7 +554,13 @@ mode.stone={
 			stone_tegong:['male','qun',2,['rogue_touxi'],['minskin','stone'],[3,3,'rogue']],
 			stone_haidaotoumu:['male','qun',2,['rogue_zhaomu'],['minskin','stone'],[3,2,'rogue']],
 			stone_haidao:['male','qun',1,[],['minskin','stone','stonehidden'],[1,2,'rogue']],
-			stone_cike:['male','qun',1,['rogue_cisha','stone_qianxing'],['minskin','stone'],[2,1,'rogue']],
+			stone_cike:['male','qun',1,['rogue_cisha','stone_qianxing'],['minskin','stone'],[1,1,'rogue']],
+			stone_duyanhaidao:['male','qun',2,['rogue_duxing'],['minskin','stone'],[3,4,'rogue']],
+			stone_gangtiewushi:['male','qun',2,['rogue_shoudao'],['minskin','stone'],[3,2,'rogue']],
+			stone_lifaji:['male','qun',2,['rogue_lifa'],['minskin','stone'],[2,2,'rogue']],
+			stone_shihualong:['male','qun',1,['rogue_fusheng'],['minskin','stone'],[3,2,'rogue']],
+			stone_xiushuihaidao:['male','qun',1,['rogue_jielue'],['minskin','stone'],[1,2,'rogue']],
+			stone_zousishangfan:['male','qun',3,['rogue_jiaoyi'],['minskin','stone'],[4,3,'rogue']],
 
 			stone_beijunmushi:['male','qun',2,['priest_shengliao'],['minskin','stone'],[1,1,'priest']],
 			stone_guanliyuan:['male','qun',2,['priest_faxian'],['minskin','stone'],[2,1,'priest']],
@@ -490,6 +568,12 @@ mode.stone={
 			stone_heianjiaotu:['male','qun',3,['priest_zhufu'],['minskin','stone'],[3,2,'priest']],
 			stone_guangyaozhizi:['male','qun',3,['priest_guangyao'],['minskin','stone'],[5,3,'priest']],
 			stone_longmianjiaoguan:['male','qun',2,['priest_xundao'],['minskin','stone'],[2,2,'priest']],
+			stone_shengdianzhishi:['male','qun',4,['priest_xundao'],['minskin','stone'],[5,4,'priest']],
+			stone_shexianjishi:['male','qun',2,['priest_xundao'],['minskin','stone'],[2,2,'priest']],
+			stone_anyingzisi:['male','qun',3,['priest_xundao'],['minskin','stone'],[4,4,'priest']],
+			stone_guangmingquan:['male','qun',3,['priest_xundao'],['minskin','stone'],[2,0,'priest']],
+			stone_muguangchulong:['male','qun',2,['priest_xundao'],['minskin','stone'],[1,1,'priest']],
+			stone_shenshengyongshi:['male','qun',3,['priest_xundao'],['minskin','stone'],[4,3,'priest']],
 
 			stone_zhongshi:['male','wei',1,['stone_zhongshi1'],['minskin','stone'],[1,2]],
 			stone_zhucangzhe:['male','wei',1,['stone_zhucangzhe1'],['minskin','stone'],[1,2]],
@@ -544,6 +628,7 @@ mode.stone={
 	careerList:['mage','shaman','druid','paladin','rogue','priest','hunter','warrior','warlock'],
 	game:{
 		reserveDead:true,
+		bannedcards:['lebu','guiyoujie'],
 		onWash:function(){
 			if(_status.mode!='deck') return;
 			var list=[];
@@ -2074,8 +2159,9 @@ mode.stone={
 				return target.isMin();
 			},
 			content:function(){
-				target.gainMaxHp();
-				target.recover();
+				target.maxHp++;
+				target.hp++;
+				target.update();
 				player.drawDeck();
 			},
 			ai:{
@@ -2147,7 +2233,7 @@ mode.stone={
 		},
 		spell_kuaisuzhiliao:{
 			type:'stonecard',
-			stoneact:1,
+			stoneact:2,
 			career:'priest',
 			enable:true,
 			fullimage:true,
@@ -2164,6 +2250,7 @@ mode.stone={
 				else{
 					target.recover(2);
 				}
+				// player.addTempSkill('priest_kuaisuzhiliao','phaseAfter');
 			},
 			ai:{
 				order:7,
@@ -2309,8 +2396,9 @@ mode.stone={
 				return target.isMin()&&target.side==player.side;
 			},
 			content:function(){
-				target.gainMaxHp();
-				target.recover();
+				target.maxHp++;
+				target.hp++;
+				target.update();
 				target.draw();
 				target.addSkill('hunter_tanxianmao');
 			},
@@ -2469,8 +2557,9 @@ mode.stone={
 			content:function(){
 				'step 0'
 				if(targets.length){
-					targets[0].gainMaxHp();
-					targets[0].recover();
+					targets[0].maxHp++;
+					targets[0].hp++;
+					target.update();
 					targets[0].draw(3);
 					event.finish();
 				}
@@ -2496,7 +2585,9 @@ mode.stone={
 			type:'stonecard',
 			stoneact:3,
 			career:'druid',
-			enable:true,
+			enable:function(card,player){
+				return player.deckCards&&!player.isMin();
+			},
 			fullimage:true,
 			filterTarget:function(card,player,target){
 				return player==target;
@@ -2699,6 +2790,9 @@ mode.stone={
 				order:1,
 				value:3,
 				useful:3,
+				result:{
+					player:1
+				}
 			}
 		},
 		spell_beici:{
@@ -2985,7 +3079,7 @@ mode.stone={
 			enable:function(event,player){
 				return player.canAddFellow();
 			},
-			stoneact:1,
+			stoneact:2,
 			career:'mage',
 			selectTarget:-1,
 			filterTarget:function(card,player,target){
@@ -3053,10 +3147,7 @@ mode.stone={
 				useful:4,
 				result:{
 					target:function(player,target){
-						if(target.name=='stone_huoshe') return 0;
-						if(target.name=='stone_huoli') return 0;
-						if(target.name=='stone_tuteng1') return 0;
-						if(target.name=='stone_tuteng4') return 0;
+						if(target.skills.contains('shaman_tuteng')) return 0;
 						if(target.hp>1) return target.hp;
 						return 0;
 					}
@@ -3090,7 +3181,7 @@ mode.stone={
 		},
 		spell_xianzuzhaohuan:{
 			type:'stonecard',
-			stoneact:1,
+			stoneact:2,
 			career:'shaman',
 			fullimage:true,
 			enable:true,
@@ -3394,10 +3485,10 @@ mode.stone={
 			selectTarget:-1,
 			content:function(){
 				if(player.hasFellowSkill('priest_hunwu')){
-					target.loseHp(2);
+					target.loseHp(3);
 				}
 				else{
-					target.recover(2);
+					target.recover(3);
 				}
 			},
 			ai:{
@@ -3633,7 +3724,7 @@ mode.stone={
 			stoneact:2,
 			career:'hunter',
 			enable:function(event,player){
-				return player.getEnemy().countFellow()>0;
+				return player.getEnemy().countFellow()>0&&player.canAddFellow();
 			},
 			fullimage:true,
 			filterTarget:function(card,player,target){
@@ -3951,7 +4042,7 @@ mode.stone={
 			fullimage:true,
 			chongzhu:true,
 			enable:function(event,player){
-				return !player.skills.contains('druid_yexingchengzhang');
+				return !player.skills.contains('druid_yexingchengzhang')&&!player.isMin();
 			},
 			stoneact:2,
 			career:'druid',
@@ -4488,6 +4579,14 @@ mode.stone={
 				if(player.canAddFellow()){
 					player.addFellowAuto('stone_xinbing');
 				}
+				'step 2'
+				var equip1=get.cardPile(function(card){
+					return get.subtype(card)=='equip1';
+				});
+				if(!equip1){
+					equip1=game.createCard('qingnang');
+				}
+				player.equip(equip1);
 			},
 			ai:{
 				order:8.5,
@@ -4613,7 +4712,7 @@ mode.stone={
 			multitarget:true,
 			multiline:true,
 			content:function(){
-				game.asyncDraw(targets,3);
+				game.asyncDraw(targets,2);
 			},
 			ai:{
 				order:5,
@@ -5044,8 +5143,9 @@ mode.stone={
 				return target.isMin();
 			},
 			content:function(){
-				target.gainMaxHp(2);
-				target.recover(2);
+				target.maxHp+=2;
+				target.hp+=2;
+				target.update();
 				target.draw(2);
 			},
 			ai:{
@@ -5142,8 +5242,8 @@ mode.stone={
 			},
 			ai:{
 				order:7,
-				value:5,
-				useful:5,
+				value:1,
+				useful:1,
 				result:{
 					target:function(player,target){
 						var ne1=target.num('e'),ne2=player.num('e');
@@ -5175,8 +5275,8 @@ mode.stone={
 			},
 			ai:{
 				order:1,
-				value:5,
-				useful:5,
+				value:1,
+				useful:1,
 				result:{
 					target:function(player,target){
 						if(target.num('he')>=player.num('h')) return -1;
@@ -5187,6 +5287,675 @@ mode.stone={
 		},
 	},
 	skill:{
+		hunter_mishi:{
+			trigger:{global:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return event.player.side==player.side&&event.source!=player;
+			},
+			content:function(){
+				player.draw();
+			}
+		},
+		hunter_muyang:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return player.getLeader().countFellow()>1&&player.getLeader().canAddFellow();
+			},
+			content:function(){
+				var num=player.getLeader().countFellow()-1;
+				var list=[];
+				for(var i in lib.character){
+					if(lib.character[i][4].contains('stone')&&
+					!lib.character[i][4].contains('stonehidden')&&
+					lib.character[i][5]&&lib.character[i][5][0]==num){
+						list.push(i);
+					}
+				}
+				var target=player.getLeader();
+				if(list.length){
+					target.addFellowAuto(list.randomGet());
+				}
+			}
+		},
+		hunter_juji:{
+			unique:true
+		},
+		hunter_dusha:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				'step 0'
+				var list=[];
+				var target=player.getLeader();
+				for(var i=0;i<target.deckCards.length;i++){
+					if(get.type(target.deckCards[i])=='stonecharacter'&&
+					get.info(target.deckCards[i]).stoneact==1){
+						list.push(target.deckCards[i]);
+					}
+				}
+				if(list.length&&target.canAddFellow()){
+					target.useCard(target,list.randomGet(),false).noActCount=true;
+				}
+				'step 1'
+				var list=[];
+				var target=player.getEnemy();
+				for(var i=0;i<target.deckCards.length;i++){
+					if(get.type(target.deckCards[i])=='stonecharacter'&&
+					get.info(target.deckCards[i]).stoneact==1){
+						list.push(target.deckCards[i]);
+					}
+				}
+				if(list.length&&target.canAddFellow()){
+					target.useCard(target,list.randomGet(),false).noActCount=true;
+				}
+			}
+		},
+		hunter_chuanlin:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var list=[];
+				var target=player.getLeader();
+				for(var i=0;i<target.deckCards.length;i++){
+					if(get.type(target.deckCards[i])=='stonecharacter'){
+						list.push(target.deckCards[i]);
+					}
+				}
+				if(list.length){
+					target.gain(target,list.randomGet(),'gain2');
+				}
+			}
+		},
+		hunter_zhanhuo:{
+			global:'hunter_zhanhuo2',
+			ai:{
+				threaten:1.8
+			}
+		},
+		hunter_zhanhuo2:{
+			trigger:{player:'phaseDrawBegin'},
+			forced:true,
+			filter:function(event,player){
+				return player.hasFellowSkill('hunter_zhanhuo',true)&&player.isMin();
+			},
+			content:function(){
+				trigger.num+=player.countFellowSkill('hunter_zhanhuo',true);
+			}
+		},
+
+		rogue_jiaoyi:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				var target=player.getLeader();
+				return target.num('e')>0;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseToDiscard('是否弃置一张装备牌令'+get.translation(player)+'摸三张牌？',
+				'he',function(card){
+					return get.type(card)=='equip';
+				}).ai=function(card){
+					return 7-ai.get.value(card);
+				};
+				"step 1"
+				if(result.bool){
+					player.draw(3);
+				}
+			}
+		},
+		rogue_jielue:{
+			trigger:{global:'equipEnd'},
+			unique:true,
+			forced:true,
+			filter:function(event,player){
+				return event.player.side==player.side&&get.subtype(event.card)=='equip1';
+			},
+			content:function(){
+				player.draw(2);
+			},
+			ai:{
+				threaten:1.3
+			}
+		},
+		rogue_fusheng:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].hp>1){
+						return true;
+					}
+				}
+			},
+			content:function(){
+				var num=1;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].hp>num){
+						num=game.players[i].hp;
+					}
+				}
+				player.hp=num;
+				player.maxHp=num;
+				player.update();
+			}
+		},
+		rogue_lifa:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				'step 0'
+				var target=player.getLeader();
+				if(target.get('e','1')){
+					target=target.getEnemy();
+					player.line(target,'green');
+					target.damage();
+				}
+				else{
+					player.line(target,'green');
+					var equip1=get.cardPile(function(card){
+						return get.subtype(card)=='equip1';
+					});
+					if(!equip1){
+						equip1=game.createCard('qingnang');
+					}
+					target.equip(equip1);
+				}
+			}
+		},
+		rogue_shoudao:{
+			trigger:{global:'phaseEnd'},
+			forced:true,
+			direct:true,
+			filter:function(event,player){
+				return event.player==player.getLeader()&&event.player.countFellow()>1;
+			},
+			content:function(){
+				'step 0'
+				var players=get.players();
+				var targets=[];
+				for(var i=0;i<players.length;i++){
+					if(players[i].side==player.side&&players[i].isMin()&&players[i]!=player){
+						targets.push(players[i]);
+					}
+				}
+				if(targets.length){
+					var target=targets.randomGet();
+					player.logSkill('rogue_shoudao',target);
+					target.maxHp++;
+					target.hp++;
+					target.update();
+					target.draw();
+				}
+			},
+			ai:{
+				threaten:1.8
+			}
+		},
+		rogue_duxing:{
+			trigger:{global:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return event.player.side!=player.side&&!player.skills.contains('stone_qianxing');
+			},
+			content:function(){
+				player.addSkill('stone_qianxing');
+			}
+		},
+
+		paladin_moma:{
+			global:'paladin_moma2',
+			ai:{
+				threaten:1.5
+			}
+		},
+		paladin_moma2:{
+			trigger:{player:'phaseDrawBegin'},
+			forced:true,
+			filter:function(event,player){
+				return player.name=='stone_xinbing'&&player.hasFellowSkill('paladin_moma');
+			},
+			content:function(){
+				trigger.num+=player.countFellowSkill('paladin_moma');
+			}
+		},
+		paladin_jinghua:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&game.players[i].num('h')>1){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&game.players[i].num('h')>1){
+						list.push(game.players[i]);
+					}
+				}
+				list.sort(lib.sort.seat);
+				event.list=list;
+				"step 1"
+				if(event.list.length){
+					var current=event.list.shift();
+					current.damage(2);
+					player.line(current,'green');
+					event.redo();
+				}
+			}
+		},
+		paladin_tuxi:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				var leader=player.getLeader();
+				return leader.hp<leader.maxHp;
+			},
+			content:function(){
+				'step 0'
+				player.line(target,'green');
+				var target=player.getLeader();
+				event.target=target;
+				target.judge(function(card){
+					return get.color(card)=='red'?1:0
+				});
+				'step 1'
+				if(result.color=='red'){
+					event.target.recover();
+				}
+			}
+		},
+		paladin_huashi:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&
+						(game.players[i].hp!=2||game.players[i].maxHp!=2)) return true;
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('化石：令一名随从的体力值及体力上限变为2',function(card,playerx,target){
+					return player!=target&&target.isMin()&&(target.hp!=2||target.maxHp!=2);
+				}).ai=function(target){
+					if(target.hp==2&&target.maxHp>2){
+						return ai.get.attitude(event.chooser,target)*(2-target.maxHp)/100;
+					}
+					return ai.get.attitude(event.chooser,target)*(2-target.hp);
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					result.targets[0].hp=2;
+					result.targets[0].maxHp=2;
+					result.targets[0].update();
+				}
+			}
+		},
+		paladin_baowei:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&
+						game.players[i]!=player&&game.players[i].isMin()) return true;
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('保卫：令一名友方随从获得一点护甲',function(card,playerx,target){
+					return player!=target&&player.side==target.side&&target.isMin();
+				}).ai=function(target){
+					return ai.get.attitude(event.chooser,target);
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					result.targets[0].changeHujia();
+				}
+			}
+		},
+		paladin_miying:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var target=player.getEnemy();
+				var added=[];
+				for(var i=0;i<ui.cardPile.childNodes.length;i++){
+					if(get.type(ui.cardPile.childNodes[i])=='delay'){
+						var name=ui.cardPile.childNodes[i].name;
+						if(!added.contains(name)&&!target.hasJudge(name)){
+							target.addJudge(ui.cardPile.childNodes[i]);
+							added.add(name);
+						}
+					}
+				}
+				if(added.length){
+					player.line(target,'green');
+				}
+			}
+		},
+
+		mage_yufa:{
+			trigger:{global:'useSkillAfter'},
+			forced:true,
+			filter:function(event,player){
+				return event.career&&event.player.side==player.side;
+			},
+			content:function(){
+				trigger.player.actused--;
+				trigger.player.updateActCount();
+			}
+		},
+		mage_pingxu:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				'step 0'
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].stonehidden) continue;
+					if(lib.card[i].type=='stonecard'){
+						list.push(i);
+					}
+				}
+				list=list.randomGets(3);
+				var cards=[];
+				for(var i=0;i<list.length;i++){
+					cards.push(game.createCard(list[i]));
+				}
+				player.getLeader().chooseCardButton(cards,'选择一张法术加入手牌',true);
+				'step 1'
+				player.getLeader().gain(result.links,'draw');
+			}
+		},
+		mage_gushou:{
+			trigger:{global:'damageBegin'},
+            forced:true,
+            filter:function(event,player){
+                if(event.num<=1) return false;
+				return event.player==player.getLeader();
+            },
+            priority:-11,
+            content:function(){
+                trigger.num=1;
+            }
+		},
+		mage_jili:{
+			trigger:{global:'useSkillAfter'},
+			forced:true,
+			filter:function(event,player){
+				return event.career&&event.player.side==player.side;
+			},
+			content:function(){
+				player.draw();
+			}
+		},
+		mage_aoshu:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().gain(game.createCard('spell_aoshuzhihui'),'gain2');
+			}
+		},
+		mage_yanshu:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return player.getLeader().num('e')>0&&player.getEnemy().hasFellow();
+			},
+			content:function(){
+				'step 0'
+				var num=player.getLeader().num('e');
+				var map=[];
+				var targets=player.getEnemy().getFellow();
+				event.targets=targets;
+				for(var i=0;i<targets.length;i++){
+					map.push(0);
+				}
+				for(var i=0;i<num;i++){
+					map[Math.floor(Math.random()*map.length)]++;
+				}
+				event.num=0;
+				event.map=map;
+				'step 1'
+				var targets=event.targets;
+				if(event.num<targets.length){
+					if(event.map[event.num]){
+						player.line(targets[event.num],'fire')
+						targets[event.num].damage(event.map[event.num],'fire');
+					}
+					event.num++;
+					event.redo();
+				}
+			}
+		},
+
+		druid_juhuo:{
+			trigger:{global:'dieAfter'},
+			filter:function(event,player){
+				return event.player.isMin()&&_status.currentPhase==player.getLeader();
+			},
+			unique:true,
+			content:function(){
+				var target=player.getLeader();
+				target.actused--;
+				target.updateActCount();
+				player.line(target,'green');
+			}
+		},
+		druid_yeyou:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				game.asyncDraw([player.getLeader(),player.getEnemy()],1,{drawDeck:1});
+			}
+		},
+		druid_chicheng:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				var target=player.getLeader();
+				return _status.currentPhase==target&&target.countFellow()>1;
+			},
+			content:function(){
+				var target=player.getLeader();
+				var num=target.countFellow();
+				if(num>1){
+					target.actused-=num-1;
+					target.updateActCount();
+				}
+			}
+		},
+		druid_qicheng:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().addSkill('druid_qicheng2');
+			},
+			ai:{
+				threaten:0.8
+			}
+		},
+		druid_qicheng2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player.skills.contains('druid_qicheng');
+			},
+			content:function(){
+				game.delay();
+				var list=[];
+				for(var i in lib.character){
+					if(lib.character[i][4].contains('stone')&&
+					!lib.character[i][4].contains('stonehidden')&&
+					lib.character[i][5]&&lib.character[i][5][0]==1){
+						list.push(i);
+					}
+				}
+				player.addFellowAuto(list.randomGet());
+				player.removeSkill('druid_qicheng2');
+			}
+		},
+		druid_renya:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				'step 0'
+				player.getLeader().chooseControl('冲锋','潜行').ai=function(){
+					if(Math.random()<0.5) return '潜行';
+					return '冲锋';
+				}
+				'step 1'
+				if(result.control=='潜行'){
+					player.maxHp++;
+					player.hp++;
+					player.update();
+					player.addSkill('stone_qianxing');
+				}
+				else{
+					player.draw();
+					player.addSkill('stone_chongfeng');
+					if(player.isTurnedOver()){
+						player.turnOver();
+					}
+				}
+			}
+		},
+		druid_yuehuo:{
+			trigger:{global:'damageBegin'},
+			forced:true,
+			unique:true,
+			filter:function(event){
+				return event.card&&get.type(event.card)=='trick'&&event.notLink();
+			},
+			content:function(){
+				trigger.num++;
+			},
+		},
+
+		shaman_anhun:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return event.player.side==player.side;
+			},
+			content:function(){
+				player.line(player.getLeader(),'green');
+				player.getLeader().drawDeck();
+			}
+		},
+		shaman_zoushi:{
+			trigger:{global:'useCardAfter'},
+			direct:true,
+			unique:true,
+			filter:function(event,player){
+				return get.type(event.card)=='stonecharacter'&&event.player==player.getLeader();
+			},
+			content:function(){
+				if(!player.storage.shaman_zoushi){
+					player.storage.shaman_zoushi=true;
+				}
+				else{
+					var list=[];
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].side!=player.side){
+							list.push(game.players[i]);
+						}
+					}
+					var target=list.randomGet();
+					player.line(target,'green');
+					target.damage();
+					game.delay();
+					player.logSkill('shaman_zoushi');
+				}
+			},
+			ai:{
+				threaten:1.3
+			}
+		},
+		shaman_zhuhuo:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.draw(Math.ceil(Math.random()*3));
+			}
+		},
+		shaman_peiyu:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				var fellows=player.getLeader().getFellow();
+				for(var i=0;i<fellows.length;i++){
+					if(fellows[i].skills.contains('shaman_tuteng')) return true;
+				}
+				return false;
+			},
+			content:function(){
+				var num=0;
+				var fellows=player.getLeader().getFellow();
+				for(var i=0;i<fellows.length;i++){
+					if(fellows[i].skills.contains('shaman_tuteng')) num++;
+				}
+				player.maxHp+=num;
+				player.hp+=num;
+				player.update();
+			}
+		},
+		shaman_huoli:{
+			trigger:{global:'phaseUseBegin'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return event.player.career&&player.side==event.player.side;
+			},
+			content:function(){
+				trigger.player.actused--;
+			},
+			ai:{
+				threaten:1.5
+			}
+		},
+
 		warlock_fushishu:{
 			trigger:{player:'phaseAfter'},
 			forced:true,
@@ -5207,14 +5976,15 @@ mode.stone={
 			forced:true,
 			mark:true,
 			intro:{
-				content:'在你的下一回合开始时，令所有友方随从增加一点体力上限，回复一点体力并摸一张牌'
+				content:'在你的下一回合开始时，令所有友方随从增加一点体力和体力上限并摸一张牌'
 			},
 			content:function(){
 				player.removeSkill('paladin_zhengqianghaosheng');
 				var list=player.getFellow();
 				for(var i=0;i<list.length;i++){
-					list[i].gainMaxHp();
-					list[i].recover();
+					list[i].maxHp++;
+					list[i].hp++;
+					list[i].update();
 				}
 				game.asyncDraw(list);
 			}
@@ -5236,6 +6006,18 @@ mode.stone={
 			}
 		},
 
+		priest_kuaisuzhiliao:{
+			mark:true,
+			intro:{
+				content:'本回合手牌上限-1'
+			},
+			marktext:'治',
+			mod:{
+				maxHandcard:function(player,num){
+					return num-1;
+				}
+			}
+		},
 		priest_anyingxingtai:{
 			intro:{
 				content:function(storage,player){
@@ -5538,6 +6320,9 @@ mode.stone={
 			content:function(){
 				trigger.untrigger();
 				trigger.finish();
+			},
+			ai:{
+				threaten:0.5
 			}
 		},
 		stone_jingxiang:{
@@ -5603,11 +6388,14 @@ mode.stone={
 				}
 				var target=list.randomGet();
 				player.line(target,'green');
-				target.gainMaxHp();
-				target.recover();
+				target.maxHp++;
+				target.hp++;
+				target.update();
 			}
 		},
-		priest_hunwu:{},
+		priest_hunwu:{
+			unique:true,
+		},
 		priest_faxian:{
 			trigger:{source:'fellow'},
 			forced:true,
@@ -6045,8 +6833,9 @@ mode.stone={
 					}
 				}
 				for(var i=0;i<list.length;i++){
-					list[i].gainMaxHp();
-					list[i].recover();
+					list[i].maxHp++;
+					list[i].hp++;
+					list[i].update();
 				}
 				game.asyncDraw(list,2);
 				player.line(list,'green');
@@ -6101,6 +6890,7 @@ mode.stone={
 		mage_tunfa:{
 			trigger:{global:'useCard'},
 			forced:true,
+			unique:true,
 			filter:function(event,player){
 				return get.type(event.card)=='stonecard'&&event.player==player.getLeader();
 			},
@@ -6111,6 +6901,7 @@ mode.stone={
 		mage_lieyan:{
 			trigger:{global:'useCardAfter'},
 			forced:true,
+			unique:true,
 			filter:function(event,player){
 				return get.type(event.card)=='stonecard'&&event.player==player.getLeader();
 			},
@@ -6133,6 +6924,7 @@ mode.stone={
 		mage_zhufa:{
 			trigger:{global:'useCard'},
 			forced:true,
+			unique:true,
 			filter:function(event,player){
 				return get.type(event.card)=='stonecard'&&event.player==player.getLeader();
 			},
@@ -6158,14 +6950,14 @@ mode.stone={
 			filter:function(event,player){
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i].side==player.side&&
-						game.players[i]!=player) return true;
+						game.players[i]!=player&&game.players[i].isMin()) return true;
 				}
 				return false;
 			},
 			content:function(){
 				"step 0"
 				event.chooser=player.getLeader();
-				event.chooser.chooseTarget('驯兽：选择己方一名随从增加一点体力上限，回复一点体力并摸两张牌',function(card,playerx,target){
+				event.chooser.chooseTarget('驯兽：选择己方一名随从增加一点体力和体力上限并摸两张牌',function(card,playerx,target){
 					return player!=target&&player.side==target.side&&target.isMin();
 				}).ai=function(target){
 					return ai.get.attitude(event.chooser,target);
@@ -6174,8 +6966,9 @@ mode.stone={
 				"step 1"
 				if(result.bool){
 					event.chooser.line(result.targets[0]);
-					result.targets[0].gainMaxHp();
-					result.targets[0].recover();
+					result.targets[0].maxHp++;
+					result.targets[0].hp++;
+					result.targets[0].update();
 					result.targets[0].draw(2);
 				}
 			}
@@ -6188,7 +6981,7 @@ mode.stone={
 				player.getLeader().addSkill('hunter_jiewang2');
 			}
 		},
-		hunter_zhanhuo:{
+		hunter_qunxi:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -6381,6 +7174,7 @@ mode.stone={
 		shaman_xueju:{
 			trigger:{global:'useCard'},
 			forced:true,
+			unique:true,
 			filter:function(event,player){
 				return get.type(event.card)=='stonecharacter'&&event.player==player.getLeader();
 			},
@@ -6593,8 +7387,16 @@ mode.stone={
 				return true;
 			},
 			usable:1,
-			selectTarget:-1,
+			prompt:function(event){
+				if(event.player.hasFellowSkill('hunter_juji')) return '造成一点伤害';
+				return '对敌方主将造成一点伤害';
+			},
+			selectTarget:function(){
+				if(_status.event.player.hasFellowSkill('hunter_juji')) return 1;
+				return -1;
+			},
 			filterTarget:function(card,player,target){
+				if(player.hasFellowSkill('hunter_juji')) return target!=player;
 				return target.career&&target.side!=player.side;
 			},
 			content:function(){
@@ -6868,7 +7670,7 @@ mode.stone={
 			mod:{
 				targetEnabled:function(card,player,target){
 					if(target.skills.contains('chaofeng')) return;
-					if(card.name=='sha'||card.name=='juedou'){
+					if(card.name=='sha'){
 						for(var i=0;i<game.players.length;i++){
 							if(game.players[i].side==target.side&&game.players[i].skills.contains('chaofeng')){
 								return false;
@@ -6982,14 +7784,12 @@ mode.stone={
 			}
 		},
 		stone_qianxing:{
-			trigger:{source:'fellow'},
+			trigger:{player:'phaseBegin'},
 			forced:true,
 			unique:true,
 			content:function(){
-				player.addTempSkill('stone_qianxing2',{player:'phaseBegin'});
-			}
-		},
-		stone_qianxing2:{
+				player.removeSkill('stone_qianxing');
+			},
 			mod:{
 				targetEnabled:function(){
 					return false;
@@ -7340,6 +8140,7 @@ mode.stone={
 					player.actcount-=4;
 				}
 				player.updateActCount();
+				player.getEnemy().updateActCount('outphase');
 			}
 		},
 		_actcount2:{
@@ -7347,7 +8148,7 @@ mode.stone={
 			forced:true,
 			popup:false,
 			filter:function(event,player){
-				return !player.isMin()&&!event.noActCount;
+				return !player.isMin()&&!event.noActCount&&_status.currentPhase==player;
 			},
 			content:function(){
 				var stoneact=get.info(trigger.card).stoneact;
@@ -7407,6 +8208,15 @@ mode.stone={
 			popup:false,
 			content:function(){
 				trigger.num--;
+			},
+			ai:{
+				effect:{
+					target:function(card){
+						if(card.name=='bingliang'){
+							return 0.6;
+						}
+					}
+				}
 			}
 		}
 	},
@@ -7433,10 +8243,10 @@ mode.stone={
 		spell_naluzhiguang:'纳鲁之光',
 		spell_naluzhiguang_info:'恢复一点体力值，若目标仍处于受伤状态，则召唤一名圣光护卫',
 		spell_zhiliaozhihuan:'治疗之环',
-		spell_zhiliaozhihuan_info:'令所有随从恢复两点体力值',
+		spell_zhiliaozhihuan_info:'令所有随从回复三点体力',
 
 		spell_zhenyanshu:'真言术',
-		spell_zhenyanshu_info:'令一名随从增加一点体力上限，回复一点体力；从牌库中获得一张牌',
+		spell_zhenyanshu_info:'令一名随从增加一点体力和体力上限；从牌库中获得一张牌',
 		spell_enzeshu:'恩泽术',
 		spell_enzeshu_info:'令一名随从增加三点体力上限并回复三点体力',
 		spell_anyingxingtai:'暗影形态',
@@ -7486,7 +8296,7 @@ mode.stone={
 		spell_tanxianmao:'探险冒',
 		hunter_tanxianmao:'探险冒',
 		hunter_tanxianmao_info:'你死亡时，将一张探险冒置入主将的手牌',
-		spell_tanxianmao_info:'令一名友方随从增加一点体力上限，回复一点体力并摸一张牌，当该随从死亡时，将一张探险冒置入你的手牌',
+		spell_tanxianmao_info:'令一名友方随从增加一点体力和体力上限并摸一张牌，当该随从死亡时，将一张探险冒置入你的手牌',
 		spell_shalumingling:'杀戮命令',
 		spell_shalumingling_info:'造成两点伤害，所有友方随从摸一张牌',
 		spell_zhuizongshu:'追踪术',
@@ -7568,7 +8378,7 @@ mode.stone={
 		spell_fennu:'愤怒',
 		spell_fennu_info:'对一名随从造成两点伤害，或造成一点伤害并从牌库中获得一张牌',
 		spell_heiandiyu:'黑暗低语',
-		spell_heiandiyu_info:'召唤若干个小精灵直到你的随从数达到4；或令一名随从增加一点体力上限，回复一点体力并摸三张牌',
+		spell_heiandiyu_info:'召唤若干个小精灵直到你的随从数达到4；或令一名随从增加一点体力和体力上限并摸三张牌',
 
 		druid_yexingchengzhang:'成长',
 		druid_yexingchengzhang_bg:'长',
@@ -7621,7 +8431,7 @@ mode.stone={
 		spell_fennuzhichui:'愤怒之锤',
 		spell_fennuzhichui_info:'造成一点伤害，从牌库中获得一张牌',
 		spell_zuozhandongyuan:'作战动员',
-		spell_zuozhandongyuan_info:'召唤两个新兵',
+		spell_zuozhandongyuan_info:'召唤两个新兵，随机装备一把武器',
 		spell_liliangzhufu:'力量祝福',
 		spell_liliangzhufu_info:'令一名随从摸两张牌',
 
@@ -7635,8 +8445,8 @@ mode.stone={
 		spell_yongshizhufu_info:'令一名随从的体力值和体力上限翻倍',
 		spell_zhengqianghaosheng:'争强好胜',
 		paladin_zhengqianghaosheng:'争强好胜',
-		paladin_zhengqianghaosheng_info:'在你的下一回合开始时，令所有友方随从增加一点体力上限，回复一点体力并摸一张牌',
-		spell_zhengqianghaosheng_info:'在你的下一回合开始时，令所有友方随从增加一点体力上限，回复一点体力并摸一张牌',
+		paladin_zhengqianghaosheng_info:'在你的下一回合开始时，令所有友方随从增加一点体力和体力上限并摸一张牌',
+		spell_zhengqianghaosheng_info:'在你的下一回合开始时，令所有友方随从增加一点体力和体力上限并摸一张牌',
 		spell_zhihuizhufu:'智慧祝福',
 		paladin_zhihuizhufu:'智慧祝福',
 		spell_zhihuizhufu_info:'选择一名随从，每当其回合开始时，你从牌库中获得一张牌',
@@ -7671,7 +8481,7 @@ mode.stone={
 		spell_yexinglanghun:'野性狼魂',
 		spell_yexinglanghun_info:'召唤两个幽灵狼',
 		spell_shixue:'嗜血',
-		spell_shixue_info:'所有友方随从摸三张牌',
+		spell_shixue_info:'所有友方随从摸两张牌',
 		spell_chazhuangshandian:'叉状闪电',
 		spell_chazhuangshandian_info:'对两个随机敌方随从各造成一点雷电伤害',
 
@@ -7724,6 +8534,22 @@ mode.stone={
 		stone_guanliyuan:'管理员',
 		stone_heianjiaotu:'黑暗教徒',
 
+		stone_shengdianzhishi:'圣殿执事',
+		stone_shexianjishi:'射线技师',
+		stone_anyingzisi:'暗影子嗣',
+		stone_guangmingquan:'光明泉',
+		stone_muguangchulong:'暮光雏龙',
+		stone_shenshengyongshi:'神圣勇士',
+
+		priest_puzhao:'普照',
+		priest_puzhao_info:'你出场时，己方主将可令一名其他友方随从增加两点体力和体力上限',
+		priest_suoxiao:'缩小',
+		priest_suoxiao_info:'你出场时，己方主将可令一名其他随从减少两点体力上限（不能小于1)',
+		priest_shengshui:'圣水',
+		priest_shengshui_info:'在你的回合开始阶段，令一名随机友方随从回复两点体力',
+		priest_muguang:'暮光',
+		priest_muguang_info:'你出场时，若主将手牌中有随从牌，则增加一点体力和体力上限',
+
 		priest_shengliao:'圣疗',
 		priest_shengliao_info:'每当一名随从回复体力，己方主将从牌库中获得一张牌',
 		priest_guangyao:'光耀',
@@ -7733,9 +8559,9 @@ mode.stone={
 		priest_hunwu:'魂舞',
 		priest_hunwu_info:'己方主将的职业技能及法术的治疗效果改为令目标流失等量体力',
 		priest_faxian:'发现',
-		priest_faxian_info:'你出场时，己方主将从3张随机随从牌中选择一张加入手牌',
+		priest_faxian_info:'你出场时，己方主将从三张随机随从牌中选择一张加入手牌',
 		priest_zhufu:'献身',
-		priest_zhufu_info:'你死亡时，令一名随机友方随从增加一点体力上限并回复一点体力',
+		priest_zhufu_info:'你死亡时，令一名随机友方随从增加一点体力和体力上限',
 
 		stone_daomufeizei:'盗墓匪贼',
 		stone_haidao:'海盗',
@@ -7745,6 +8571,26 @@ mode.stone={
 		stone_qiezei:'窃贼',
 		stone_heitieairen:'黑铁矮人',
 
+		stone_duyanhaidao:'独眼海盗',
+		stone_gangtiewushi:'刚铁武师',
+		stone_lifaji:'理发机',
+		stone_shihualong:'石化龙',
+		stone_xiushuihaidao:'锈水海盗',
+		stone_zousishangfan:'走私商贩',
+
+		rogue_duxing:'独行',
+		rogue_duxing_info:'每当敌方主将召唤一名随从，便获得潜行',
+		rogue_shoudao:'授道',
+		rogue_shoudao_info:'在己方主将的回合结束阶段，令一名随机友方随从增加一点体力和体力上限并摸一张牌',
+		rogue_lifa:'理发',
+		rogue_lifa_info:'为己方主将装备一把武器，若已有武器，改为对敌方主将造成一点伤害',
+		rogue_fusheng:'复生',
+		rogue_fusheng_info:'你出场时，体力值和体力上限变为X，X为场上体力最高的随从的体力值',
+		rogue_jielue:'劫掠',
+		rogue_jielue_info:'每当己方主将装备一把武器牌，摸两张牌',
+		rogue_jiaoyi:'交易',
+		rogue_jiaoyi_info:'你出场时，己方主将可以弃置一张装备牌令你摸三张牌',
+
 		rogue_touqie:'偷窃',
 		rogue_touqie_info:'每当你造成一次伤害，己方主将从牌库中获得一张牌',
 		rogue_xunbao:'寻宝',
@@ -7802,6 +8648,27 @@ mode.stone={
 		stone_liewangshouwei:'列王守卫',
 		stone_longwangpeiou:'龙王配偶',
 
+		stone_baoweizhe:'保卫者',
+		stone_guiqishi:'龟骑士',
+		stone_shenmiqishou:'神秘骑手',
+		stone_shixiangweishi:'石像卫士',
+		stone_xuefanzhanshi:'血帆战士',
+		stone_xunmashi:'训马师',
+
+		paladin_baowei:'保卫',
+		paladin_baowei_info:'你出场时，己方主将可令一名其他随从获得一点护甲',
+		paladin_tuxi:'吐息',
+		paladin_tuxi_info:'你出场时，己方主将进行一次判定，若为红色，则回复一点体力',
+		paladin_miying:'秘影',
+		paladin_miying_info:'你出场时，依次将牌堆中的所有不重名的判定牌置入敌方主将的判定区',
+		paladin_huashi:'化石',
+		paladin_huashi_info:'你出场时，己方主将可将一名其他随从的体力值及体力上限变为2',
+		paladin_jinghua:'净化',
+		paladin_jinghua_info:'你出场时，对所有手牌数大于1的随从造成两点伤害',
+		paladin_moma:'秣马',
+		paladin_moma2:'秣马',
+		paladin_moma_info:'所有友方新兵摸牌阶段摸牌数+1',
+
 		paladin_zhaohuan:'召唤',
 		paladin_zhaohuan2:'召唤',
 		paladin_zhaohuan_info:'你出场后，你的主将在使用下一张随从牌时获得一点行动值',
@@ -7810,7 +8677,7 @@ mode.stone={
 		paladin_chidun:'持盾',
 		paladin_chidun_info:'你出场时，己方主将可以弃置对方一名随从的所有牌',
 		paladin_buji:'补给',
-		paladin_buji_info:'你出场时，所有友方新兵增加一点体力上限，回复一点体力并摸两张牌',
+		paladin_buji_info:'你出场时，所有友方新兵增加一点体力和体力上限并摸两张牌',
 		paladin_hudun:'护盾',
 		paladin_hudun_info:'你出场时，获得一点护甲值',
 		paladin_zhaochao:'招潮',
@@ -7823,6 +8690,26 @@ mode.stone={
 		stone_yingxiongzhihun:'英雄之魂',
 		stone_huoyao:'火妖',
 
+		stone_aoshushi:'奥术师',
+		stone_faqishi:'法骑士',
+		stone_fuhuokaijia:'复活铠甲',
+		stone_kaodalalong:'考达拉龙',
+		stone_yanshushi:'炎术士',
+		stone_xulingwushi:'虚灵巫师',
+
+		mage_aoshu:'奥术',
+		mage_aoshu_info:'你出场时，将一张奥术智慧置入主将的手牌',
+		mage_jili:'激励',
+		mage_jili_info:'每当主将使用一次职业技能，摸一张牌',
+		mage_gushou:'固守',
+		mage_gushou_info:'每当己方主将受到多于1伤害时，防止其余伤害',
+		mage_yufa:'驭法',
+		mage_yufa_info:'每当己方主将使用一次职业技能，令其获得一点行动值',
+		mage_yanshu:'炎术',
+		mage_yanshu_info:'你出场时，造成X点火焰伤害，随机分配到敌方随从上，X为己方主将装备区内装备牌的数量',
+		mage_pingxu:'冯虚',
+		mage_pingxu_info:'你出场时，己方主将从三张随机法术牌中选择一张加入手牌',
+
 		mage_shifa:'嗜法',
 		mage_shifa_info:'你出场时，将一张随机法术牌置入双方主将的手牌',
 		mage_minghuo:'冥火',
@@ -7843,14 +8730,35 @@ mode.stone={
 		stone_jiewangzhu:'结网蛛',
 		stone_xunshoushi:'驯兽师',
 
+		stone_senlinlang:'森林狼',
+		stone_tujiu:'秃鹫',
+		stone_muyangren:'牧羊人',
+		stone_jujishou:'狙击手',
+		stone_damoshatuo:'大漠沙驼',
+		stone_huangjialeixiang:'皇家雷象',
+
 		hunter_jiewang:'结网',
-		hunter_jiewang_info:'你死亡时，己方主将获得一张随机随从牌',
+		hunter_jiewang_info:'你死亡时，己方主将获得一张随机野兽牌',
 		hunter_xunshou:'驯兽',
-		hunter_xunshou_info:'你出场时，己方主将可选择一名其他友方随从令其增加一点体力上限，回复一点体力并摸两张牌',
-		hunter_zhanhuo:'战火',
-		hunter_zhanhuo_info:'你出场时，所有友方随从摸一张牌',
+		hunter_xunshou_info:'你出场时，己方主将可选择一名其他友方随从令其增加一点体力和体力上限并摸两张牌',
 		hunter_nuhou:'怒吼',
 		hunter_nuhou_info:'当你死亡时，对所有敌方角色造成一点伤害',
+		hunter_zhanhuo:'战火',
+		hunter_zhanhuo2:'战火',
+		hunter_zhanhuo_info:'其他友方随从摸牌阶段的摸牌数+1',
+
+		hunter_qunxi:'群袭',
+		hunter_qunxi_info:'你出场时，所有友方随从摸一张牌',
+		hunter_mishi:'觅食',
+		hunter_mishi_info:'每当己方主将召唤一个随从，摸一张牌',
+		hunter_dusha:'渡沙',
+		hunter_dusha_info:'你出场时，令双方主将各随机使用一张牌库中的1费随从牌（不计入行动值消耗）',
+		hunter_chuanlin:'穿林',
+		hunter_chuanlin_info:'你出场时，己方主将展示牌库中的一张随机随从牌并获得之',
+		hunter_muyang:'牧羊',
+		hunter_muyang_info:'你出场时，随机召唤一个行动值消耗为X的随从，X为其他友方随从数',
+		hunter_juji:'狙击',
+		hunter_juji_info:'你的职业技能可以指定随从为目标',
 
 		stone_baoqishi:'豹骑士',
 		stone_conglinshouwei:'从林守卫',
@@ -7859,6 +8767,26 @@ mode.stone={
 		stone_liebao:'猎豹',
 		stone_zongxiong:'棕熊',
 
+		stone_renyaqishi:'刃牙骑士',
+		stone_conglinxiaoshou:'丛林枭兽',
+		stone_huangyeqishi:'荒野骑士',
+		stone_xunmenglong:'迅猛龙',
+		stone_lindishuyao:'林地树妖',
+		stone_huoshanxiemu:'火山邪木',
+
+		druid_renya:'刃牙',
+		druid_renya_info:'你出场时，己方主将可以选择一项：令你摸一张牌并将武将牌翻至正面，或令你增加一点体力上限并获得技能潜行',
+		druid_yuehuo:'月火',
+		druid_yuehuo_info:'所有锦囊牌造成的伤害+1',
+		druid_qicheng:'骑乘',
+		druid_qicheng_info:'你死亡时，随机召唤一个行动消耗为1的随从',
+		druid_chicheng:'驰骋',
+		druid_chicheng_info:'你出场时，己方主将获得X点行动值，X为其他友方随从数',
+		druid_yeyou:'夜游',
+		druid_yeyou_info:'双方主将各从牌库中获得一张牌',
+		druid_juhuo:'举火',
+		druid_juhuo_info:'己方主将回合内，每有一名随从死亡，令己方主将获得一点行动值',
+
 		stone_chongfeng:'冲锋',
 		stone_chongfeng_info:'你出场时，立即将武将牌翻至正面',
 		druid_nuhuo:'怒火',
@@ -7877,7 +8805,23 @@ mode.stone={
 		stone_tuyuansu:'土元素',
 		stone_wujiyuansu:'无羁元素',
 		stone_xuejuren:'穴居人',
+		stone_huoli:'活力图腾',
+		stone_tutengshi:'图腾师',
+		stone_shachuisaman:'砂槌萨满',
+		stone_huoyanweishi:'火焰卫士',
+		stone_wanshiyuansu:'顽石元素',
+		stone_shalinxingzhe:'砂鳞行者',
 
+		shaman_anhun:'暗魂',
+		shaman_anhun_info:'每当一名友方随从死亡，令主将从牌库中获得一张牌',
+		shaman_zoushi:'走石',
+		shaman_zoushi_info:'每当己方主将使用一张随从牌，对一名随机敌方角色造成一点伤害',
+		shaman_zhuhuo:'逐火',
+		shaman_zhuhuo_info:'你出场时，摸1~3张牌',
+		shaman_peiyu:'培育',
+		shaman_peiyu_info:'你出场时，增加X点体力和体力上限，X为友方图腾数',
+		shaman_huoli:'活力',
+		shaman_huoli_info:'己方主将出牌阶段开始时，你令其获得一点行动值',
 		shaman_xueju:'穴居',
 		shaman_xueju_info:'每当己主将使用一张随从牌，摸一张牌',
 		shaman_huoxi:'火袭',
@@ -7908,7 +8852,7 @@ mode.stone={
 		_priest_skillx_info:'造成一点伤害',
 		_warrior_skill:'战甲',
 		_warrior_skill_info:'获得一点护甲（不能超过5点）',
-		_warlock_skill:'作法',
+		_warlock_skill:'分流',
 		_warlock_skill_info:'从牌库中获得两张牌',
 		_rogue_skill:'出鞘',
 		_rogue_skill_info:'装备一把武器和一个随机非武器装备',
@@ -8019,9 +8963,9 @@ mode.stone={
 		spell_zhiliaozhichu:'治疗之触',
 		spell_zhiliaozhichu_info:'令目标随从恢复所有体力值并获得嘲讽',
 		chaofeng:'嘲讽',
-		chaofeng_info:'同阵营的无嘲讽角色不以能成为杀或决斗的目标',
+		chaofeng_info:'同阵营的无嘲讽角色不以能成为杀的目标',
 		spell_wangzhezhufu:'王者祝福',
-		spell_wangzhezhufu_info:'令一名随从增加两点体力上限，回复两点体力并摸两张牌',
+		spell_wangzhezhufu_info:'令一名随从增加两点体力和体力上限并摸两张牌',
 		spell_diyulieyan:'地狱烈焰',
 		spell_diyulieyan_info:'所有角色失去一点体力',
 		spell_chenmo:'沉默',
diff --git a/mode/versus.js b/mode/versus.js
index acc23ac38..08a14b75f 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -481,8 +481,13 @@ mode.versus={
 				event.list=[];
 				event.filterChoice=function(name){
 					if(get.config('enable_all')) return false;
-					if(['yuanshu','re_yuanshu','zhangxingcai','hetaiyou','wenpin','yuji','sunluyu',
-					'sp_zhaoyun','sp_diaochan','sp_pangtong','sp_caoren'].contains(name)){
+					if(['yuanshu','re_yuanshu','zhangxingcai','hetaiyou','wenpin','yuji',
+					'xunyu','lusu','guanping','zhangzong','zhoutai','sp_zhangjiao','zhangjiao',
+					'shixie','zhanglu','chenlin','mayunlu','yangxiu','zhugeke','chengyu',
+					'zhangbao','zhangliang','sunhao','wutugu','zhugeguo','liuzan','lingcao',
+					'sunru','lingju','lifeng','hanba','sunluyu','zhuling',
+					'sp_zhaoyun','sp_diaochan','sp_pangtong','sp_caoren','sp_daqiao',
+					'sp_ganning','sp_zhangfei','sp_xiahoudun'].contains(name)){
 						return true;
 					}
 					if(lib.characterPack.refresh[name]) return false;
diff --git a/theme/music/style.css b/theme/music/style.css
index 0c2b3e433..644a25f91 100755
--- a/theme/music/style.css
+++ b/theme/music/style.css
@@ -1,8 +1,13 @@
 html{
 	color: white;
 	text-shadow: black 0 0 2px;
+}
+body{
 	background: url('grid.png'),linear-gradient(#333333, #222222) fixed;
 }
+body[data-background_color_music='blue']{
+	background: url('grid.png'),linear-gradient(#6c7989, #434b55) fixed;
+}
 #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped,
 .player.unseen .equips:not(*:empty),.menu,#splash>div,
 #arena.mobile:not(.chess) .player[data-position='0'] .equips{
@@ -10,6 +15,40 @@ html{
 	background-image: linear-gradient(#4b4b4b, #464646);
 	border-radius: 8px;
 }
+
+#window.reduce_radius #system>div>div,
+#window.reduce_radius #mebg,
+#window.reduce_radius .control,
+#window.reduce_radius .player,
+#window.reduce_radius .card,
+#window.reduce_radius .avatar,
+#window.reduce_radius .avatar2,
+#window.reduce_radius .button,
+#window.reduce_radius #window>.dialog.popped,
+#window.reduce_radius .player.unseen .equips:not(*:empty),
+#window.reduce_radius .menu,#splash>div,
+#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{
+	border-radius: 4px;
+}
+
+body[data-background_color_music='blue'] #system>div>div,
+body[data-background_color_music='blue'] #mebg,
+body[data-background_color_music='blue'] .control,
+body[data-background_color_music='blue'] .player,
+body[data-background_color_music='blue'] .card,
+body[data-background_color_music='blue'] .avatar,
+body[data-background_color_music='blue'] .avatar2,
+body[data-background_color_music='blue'] .button,
+body[data-background_color_music='blue'] #window>.dialog.popped,
+body[data-background_color_music='blue'] .player.unseen .equips:not(*:empty),
+body[data-background_color_music='blue'] .menu,#splash>div,
+body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-position='0'] .equips{
+	background-image: linear-gradient(#6c7989, #434b55);
+}
+
+
+
+
 /*.player.current_action{
 	background-image: linear-gradient(rgba(57, 123, 4,1), rgb(48, 103, 3));
 }*/
diff --git a/theme/simple/style.css b/theme/simple/style.css
index 1f2c667b8..170e161e3 100755
--- a/theme/simple/style.css
+++ b/theme/simple/style.css
@@ -21,6 +21,23 @@ body{
 	background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4));
 	border-radius: 8px;
 }
+
+#window.reduce_radius #system>div>div,
+#window.reduce_radius #mebg,
+#window.reduce_radius .control,
+#window.reduce_radius .player,
+#window.reduce_radius .card,
+#window.reduce_radius .avatar,
+#window.reduce_radius .avatar2,
+#window.reduce_radius .button,
+#window.reduce_radius #window>.dialog.popped,
+#window.reduce_radius .player.unseen .equips:not(*:empty),
+#window.reduce_radius .menu,.menubutton,
+#window.reduce_radius #splash>div,
+#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{
+	border-radius: 4px;
+}
+
 /*.player.current_action{
 	background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));
 }*/
diff --git a/theme/woodden/style.css b/theme/woodden/style.css
index 4a107490e..3ce05a197 100755
--- a/theme/woodden/style.css
+++ b/theme/woodden/style.css
@@ -1,13 +1,35 @@
 html{
 	color: white;
 	text-shadow: black 0 0 2px;
+}
+body{
 	background: url('grid.png'),linear-gradient(#6c7989, #434b55) fixed;
 }
+body[data-background_color_wood='black']{
+	background: url('grid.png'),linear-gradient(#333333, #222222) fixed;
+}
 #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,.dialog>.bar,.menu,#splash>div,
 #arena.mobile:not(.chess) .player[data-position='0'] .equips{
 	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
 	border-radius: 8px;
 }
+
+#window.reduce_radius #system>div>div,
+#window.reduce_radius #mebg,
+#window.reduce_radius .control,
+#window.reduce_radius .player,
+#window.reduce_radius .card,
+#window.reduce_radius .avatar,
+#window.reduce_radius .avatar2,
+#window.reduce_radius .button,
+#window.reduce_radius .dialog>.bar,
+#window.reduce_radius .menu,
+#window.reduce_radius #splash>div,
+#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{
+	border-radius: 4px;
+}
+
+
 .menu.main>.menu-tab>div:not(.active):not(*:hover),
 .menu.main>.menu-tab>.disabled{
 	color: rgba(77, 60, 51,0.5);