diff --git a/character/boss.js b/character/boss.js
index 4b4295cd8..ea2668a12 100644
--- a/character/boss.js
+++ b/character/boss.js
@@ -11,6 +11,7 @@ character.boss={
 		boss_zhouyu:['male','wu',6,['huoshen','boss_honglian','boss_xianyin'],['boss','bossallowed'],'zhu'],
 
 		boss_zhuoguiquxie:['male','qun',0,['boss_bianshen'],['boss','bossallowed'],'shu'],
+		boss_nianshou:['male','qun',Infinity,['boss_nianrui','boss_qixiang','boss_damagecount'],['boss','bossallowed'],'shu'],
 		boss_baiwuchang:['male','qun',9,['boss_baolian','boss_qiangzheng','boss_zuijiu','juece','boss_bianshen4'],['hiddenboss','bossallowed']],
 		boss_heiwuchang:['male','qun',9,['boss_guiji','boss_taiping','boss_suoming','boss_xixing','boss_bianshen4'],['hiddenboss','bossallowed']],
 		boss_luocha:['male','qun',12,['boss_modao','boss_yushou','yizhong','boss_moyany'],['hiddenboss','bossallowed']],
@@ -34,35 +35,564 @@ character.boss={
 		// boss_shuijing:['male','qun',8,[],['boss','bossallowed'],'wei'],
 
 		boss_liedixuande:['male','shu',5,['boss_lingfeng','boss_jizhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-		boss_gongshenyueying:['male','shu',4,[],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-		boss_tianhoukongming:['male','shu',4,[],['jiangeboss','hiddenboss','bossallowed'],'shu'],
-		boss_yuhuoshiyuan:['male','shu',4,[],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+		boss_gongshenyueying:['male','shu',4,['boss_gongshenjg','boss_jingmiao','boss_zhinang'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+		boss_tianhoukongming:['male','shu',4,['boss_biantian','bazhen'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
+		boss_yuhuoshiyuan:['male','shu',4,['boss_yuhuojg','boss_qiwu','boss_tianyujg'],['jiangeboss','hiddenboss','bossallowed'],'shu'],
 		boss_qiaokuijunyi:['male','wei',4,['boss_huodi','boss_jueji'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
 		boss_jiarenzidan:['male','wei',5,['boss_chiying','boss_jingfan'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
 		boss_duanyuzhongda:['male','wei',5,['boss_fanshi','boss_xuanlei','boss_skonghun'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
 		boss_juechenmiaocai:['male','wei',4,['boss_chuanyun','boss_leili','boss_fengxing'],['jiangeboss','hiddenboss','bossallowed'],'wei'],
 
-		boss_baihumech:['male','shu',4,[],['jiangemech','hiddenboss','bossallowed'],'shu'],
-		boss_qinglongmech:['male','shu',4,[],['jiangemech','hiddenboss','bossallowed'],'shu'],
-		boss_xuanwumech:['male','shu',4,[],['jiangemech','hiddenboss','bossallowed'],'shu'],
-		boss_zhuquemech:['male','shu',4,[],['jiangemech','hiddenboss','bossallowed'],'shu'],
-		boss_bianmech:['male','wei',4,[],['jiangemech','hiddenboss','bossallowed'],'wei'],
-		boss_chiwenmech:['male','wei',4,[],['jiangemech','hiddenboss','bossallowed'],'wei'],
-		boss_suannimech:['male','wei',4,[],['jiangemech','hiddenboss','bossallowed'],'wei'],
-		boss_yazimech:['male','wei',4,[],['jiangemech','hiddenboss','bossallowed'],'wei'],
+		boss_jileibaihu:['male','shu',4,['boss_jiguan','boss_zhenwei','boss_benlei'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+		boss_yunpingqinglong:['male','shu',4,['boss_jiguan','boss_mojian'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+		boss_lingjiaxuanwu:['male','shu',5,['boss_jiguan','yizhong','boss_lingyu'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+		boss_chiyuzhuque:['male','shu',5,['boss_jiguan','boss_yuhuojg','boss_tianyun'],['jiangemech','hiddenboss','bossallowed'],'shu'],
+		boss_fudibian:['male','wei',4,['boss_jiguan','boss_didong'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+		boss_tuntianchiwen:['male','wei',5,['boss_jiguan','boss_tanshi','boss_tunshi'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+		boss_shihuosuanni:['male','wei',3,['boss_jiguan','boss_lianyu'],['jiangemech','hiddenboss','bossallowed'],'wei'],
+		boss_lieshiyazi:['male','wei',4,['boss_jiguan','boss_nailuo'],['jiangemech','hiddenboss','bossallowed'],'wei'],
 
 	},
 	skill:{
+		boss_damagecount:{
+			mode:['boss'],
+			global:'boss_damagecount2'
+		},
+		boss_damagecount2:{
+			trigger:{source:'damageEnd'},
+			forced:true,
+			popup:false,
+			silent:true,
+			filter:function(event,player){
+				if(!ui.damageCount) return false;
+				return event.num>0&&player.isFriendOf(game.me)&&event.player.isEnemyOf(game.me);
+			},
+			content:function(){
+				_status.damageCount+=trigger.num;
+				ui.damageCount.innerHTML='伤害: '+_status.damageCount;
+			}
+		},
+		boss_nianrui:{
+			trigger:{player:'phaseDrawBegin'},
+			forced:true,
+			content:function(){
+				trigger.num+=2;
+			},
+			ai:{
+				threaten:1.6
+			}
+		},
+		boss_qixiang:{
+            group:['boss_qixiang1','boss_qixiang2'],
+            ai:{
+                effect:{
+                    target:function(card,player,target,current){
+                        if(card.name=='lebu'&&card.name=='bingliang') return 0.8;
+                    }
+                }
+            }
+        },
+        boss_qixiang1:{
+			trigger:{player:'judge'},
+			forced:true,
+			filter:function(event,player){
+				if(event.card){
+                    if(event.card.viewAs){
+                        return event.card.viewAs=='lebu';
+                    }
+                    else{
+                        return event.card.name=='lebu';
+                    }
+				}
+			},
+			content:function(){
+				player.addTempSkill('boss_qixiang3','judgeAfter');
+			}
+		},
+        boss_qixiang2:{
+			trigger:{player:'judge'},
+			forced:true,
+			filter:function(event,player){
+				if(event.card){
+                    if(event.card.viewAs){
+                        return event.card.viewAs=='bingliang';
+                    }
+                    else{
+                        return event.card.name=='bingliang';
+                    }
+				}
+			},
+			content:function(){
+				player.addTempSkill('boss_qixiang4','judgeAfter');
+			}
+		},
+		boss_qixiang3:{
+			mod:{
+				suit:function(card,suit){
+					if(suit=='diamond') return 'heart';
+				}
+			}
+		},
+		boss_qixiang4:{
+			mod:{
+				suit:function(card,suit){
+					if(suit=='spade') return 'club';
+				}
+			}
+		},
+		boss_lingyu:{
+			trigger:{player:'phaseEnd'},
+			check:function(event,player){
+				if(player.isTurnedOver()) return true;
+				var num=0;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].hp<game.players[i].maxHp&&
+						game.players[i].isFriendOf(player)&&ai.get.recoverEffect(game.players[i])>0){
+						if(game.players[i].hp==1){
+							return true;
+						}
+						num++;
+						if(num>=2) return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				'step 0'
+				player.turnOver();
+				'step 1'
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].hp<game.players[i].maxHp&&game.players[i].isFriendOf(player)){
+						list.push(game.players[i]);
+					}
+				}
+				player.line(list,'green');
+				event.targets=list;
+				'step 2'
+				if(event.targets.length){
+					event.targets.shift().recover();
+					event.redo();
+				}
+			},
+			ai:{
+				threaten:1.5,
+				effect:{
+					target:function(card,player,target){
+						if(card.name=='guiyoujie') return [0,1];
+					}
+				}
+			},
+		},
+		boss_zhenwei:{
+			global:'boss_zhenwei2',
+			ai:{
+				threaten:1.5
+			}
+		},
+		boss_zhenwei2:{
+			mod:{
+				globalTo:function(from,to,distance){
+					if(to.isFriendOf(from)) return;
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].skills.contains('boss_zhenwei')&&
+							game.players[i].isFriendOf(to)&&game.players[i]!=to){
+							return distance+1;
+						}
+					}
+				}
+			}
+		},
+		boss_benlei:{
+			mode:['versus'],
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			filter:function(event,player){
+				if(_status.mode!='jiange') return false;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].type=='mech'&&game.players[i].isEnemyOf(player)){
+						return true;
+					}
+				}
+			},
+			content:function(){
+				var target;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].type=='mech'&&game.players[i].isEnemyOf(player)){
+						target=game.players[i];break;
+					}
+				}
+				if(target){
+					player.line(target,'thunder');
+					target.damage(2,'thunder');
+				}
+			},
+			ai:{
+				threaten:function(player,target){
+					if(_status.mode=='jiange'){
+						for(var i=0;i<game.players.length;i++){
+							if(game.players[i].type=='mech'&&game.players[i].isEnemyOf(target)){
+								return 2;
+							}
+						}
+					}
+					return 1;
+				}
+			}
+		},
+		boss_nailuo:{
+			trigger:{player:'phaseEnd'},
+			check:function(event,player){
+				if(player.isTurnedOver()) return true;
+				var num=0;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isEnemyOf(player)){
+						var es=game.players[i].get('e');
+						for(var j=0;j<es.length;j++){
+							switch(get.subtype(es[j])){
+								case 'equip1':num+=1;break;
+								case 'equip2':num+=2;break;
+								case 'equip3':num+=2;break;
+								case 'equip4':num+=1;break;
+								case 'equip5':num+=1.5;break;
+							}
+						}
+					}
+				}
+				if(_status.mode=='jiange'){
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].isFriendOf(player)&&game.players[i].skills.contains('huodi')){
+							return num>0;
+						}
+					}
+				}
+				return num>=4;
+			},
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isEnemyOf(player)&&game.players[i].num('e')){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				'step 0'
+				player.turnOver();
+				'step 1'
+				event.targets=get.players();
+				'step 2'
+				if(event.targets.length){
+					var current=event.targets.shift();
+					if(current.isEnemyOf(player)){
+						var es=current.get('e');
+						if(es.length){
+							current.discard(es);
+							player.line(current,'green');
+						}
+					}
+					event.redo();
+				}
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target){
+						if(card.name=='guiyoujie') return [0,1];
+					}
+				}
+			},
+		},
+		boss_tanshi:{
+			trigger:{player:'phaseEnd'},
+			forced:true,
+			check:function(){
+				return false;
+			},
+			filter:function(event,player){
+				return player.num('h')>0;
+			},
+			content:function(){
+				player.chooseToDiscard('h',true);
+			}
+		},
+		boss_tunshi:{
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			filter:function(event,player){
+				var nh=player.num('h');
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isEnemyOf(player)&&game.players[i].num('h')>nh){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				'step 0'
+				var targets=[];
+				var nh=player.num('h');
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isEnemyOf(player)&&game.players[i].num('h')>nh){
+						targets.push(game.players[i]);
+					}
+				}
+				targets.sort(lib.sort.seat);
+				event.targets=targets;
+				'step 1'
+				if(event.targets.length){
+					var current=event.targets.shift();
+					current.damage('thunder');
+					player.line(current,'thunder');
+					event.redo();
+				}
+			}
+		},
+		boss_jiguan:{
+			mod:{
+				targetEnabled:function(card,player,target){
+					if(card.name=='lebu'){
+						return false;
+					}
+				}
+			}
+		},
+		boss_gongshenjg:{
+			trigger:{player:'phaseEnd'},
+			mode:['versus'],
+			filter:function(event,player){
+				if(_status.mode!='jiange') return false;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].type=='mech'){
+						if(game.players[i].isEnemyOf(player)) return true;
+						if(game.players[i].hp<game.players[i].maxHp) return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				var enemy;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].type=='mech'){
+						if(game.players[i].isFriendOf(player)){
+							if(game.players[i].hp<game.players[i].maxHp){
+								player.line(game.players[i],'green');
+								game.players[i].recover();
+								return;
+							}
+						}
+						else{
+							enemy=game.players[i];
+						}
+					}
+				}
+				if(enemy){
+					player.line(enemy,'fire');
+					enemy.damage('fire');
+				}
+			},
+		},
+		boss_jingmiao:{
+			trigger:{global:'useCardAfter'},
+            filter:function(event,player){
+                return event.player.isEnemyOf(player)&&event.card.name=='wuxie';
+            },
+			prompt:function(event,player){
+				return '是否对'+get.translation(event.player)+'发动【精妙】？';
+			},
+			check:function(event,player){
+				return ai.get.attitude(player,event.player)<0;
+			},
+            content:function(){
+				player.line(trigger.player,'green');
+				trigger.player.loseHp();
+            },
+            ai:{
+                expose:0.2,
+				threaten:1.3
+            }
+		},
+		boss_zhinang:{
+			trigger:{player:'phaseBegin'},
+            frequent:true,
+            content:function(){
+                "step 0"
+                event.cards=get.cards(3);
+                event.cards2=[];
+                for(var i=0;i<event.cards.length;i++){
+                    var type=get.type(event.cards[i]);
+                    if(type=='trick'||type=='equip'){
+                        event.cards2.push(event.cards[i]);
+                    }
+                }
+                if(!event.isMine()||event.cards2.length==0){
+                    player.showCards(event.cards);
+                }
+                "step 1"
+                if(event.cards2.length==0){
+                    event.finish();
+                }
+                else{
+                    var dialog=ui.create.dialog('将三张牌中的锦囊牌或装备牌交给一己方名角色','hidden');
+                    dialog.add(event.cards);
+                    for(var i=0;i<dialog.buttons.length;i++){
+                        if(event.cards2.contains(dialog.buttons[i].link)){
+                            dialog.buttons[i].style.opacity=1;
+                        }
+                        else{
+                            dialog.buttons[i].style.opacity=0.5;
+                        }
+                    }
+                    var next=player.chooseTarget(true,dialog,function(card,player,target){
+						return target.isFriendOf(player);
+					});
+                    next.ai=function(target){
+                        var att=ai.get.attitude(player,target);
+						if(att>0&&target.num('j','lebu')){
+							return 0.1;
+						}
+                        if(player.num('h')>player.hp){
+                            if(target==player) return Math.max(1,att-2);
+                        }
+                        if(target==player) return att+5;
+                        return att;
+                    }
+                }
+                "step 2"
+                if(result&&result.targets&&result.targets.length){
+                    event.target=result.targets[0];
+                }
+                if(event.cards2.length){
+					player.line(event.target,'green');
+					game.log(event.target,'获得了',event.cards2);
+                    event.target.gain(event.cards2,'gain2');
+                }
+            },
+            ai:{
+                threaten:1.3
+            }
+		},
+		boss_biantian4:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			popup:false,
+			content:function(){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].skills.contains('boss_biantian3')){
+						game.players[i].removeSkill('boss_biantian3');
+						game.players[i].popup('boss_biantian3');
+					}
+					if(game.players[i].skills.contains('boss_biantian2')){
+						game.players[i].removeSkill('boss_biantian2');
+						game.players[i].popup('boss_biantian2');
+					}
+				}
+			}
+		},
+        boss_biantian:{
+            trigger:{player:'phaseBegin'},
+            forced:true,
+            unique:true,
+            group:'boss_biantian4',
+            content:function(){
+                "step 0"
+                for(var i=0;i<game.players.length;i++){
+					if(game.players[i].skills.contains('boss_biantian3')){
+						game.players[i].removeSkill('boss_biantian3');
+						game.players[i].popup('boss_biantian3');
+					}
+					if(game.players[i].skills.contains('boss_biantian2')){
+						game.players[i].removeSkill('boss_biantian2');
+						game.players[i].popup('boss_biantian2');
+					}
+				}
+                player.judge(function(card){
+                    if(get.suit(card)=='spade') return 1;
+					if(get.color(card)=='red') return 0;
+                    return -1;
+                });
+                "step 1"
+				var targets=[];
+                if(result.color=='red'){
+					for(var i=0;i<game.players.length;i++){
+						if(!game.players[i].isFriendOf(player)){
+							game.players[i].addSkill('boss_biantian3');
+							game.players[i].popup('kuangfeng');
+							targets.push(game.players[i]);
+						}
+					}
+					player.logSkill('kuangfeng',targets,'fire');
+                }
+                else if(result.suit=='spade'){
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].isFriendOf(player)){
+							game.players[i].addSkill('boss_biantian2');
+							game.players[i].popup('dawu');
+							targets.push(game.players[i]);
+						}
+					}
+					player.logSkill('dawu',targets,'thunder');
+                }
+            },
+			ai:{
+				threaten:1.6
+			}
+        },
+        boss_biantian2:{
+            trigger:{player:'damageBefore'},
+            filter:function(event){
+                if(event.nature!='thunder') return true;
+                return false;
+            },
+            forced:true,
+			mark:true,
+			marktext:'雾',
+			intro:{
+				content:'已获得大雾标记'
+			},
+            content:function(){
+                trigger.untrigger();
+                trigger.finish();
+            },
+            ai:{
+				nofire:true,
+				nodamage:true,
+                effect:{
+                    target:function(card,player,target,current){
+                        if(get.tag(card,'damage')&&!get.tag(card,'thunderDamage')) return [0,0];
+                    }
+                }
+            }
+        },
+        boss_biantian3:{
+            trigger:{player:'damageBegin'},
+            filter:function(event){
+                if(event.nature=='fire') return true;
+                return false;
+            },
+			mark:true,
+			marktext:'风',
+			intro:{
+				content:'已获得狂风标记'
+			},
+            forced:true,
+            content:function(){
+                trigger.num++;
+            },
+            ai:{
+                effect:{
+                    target:function(card,player,target,current){
+                        if(get.tag(card,'fireDamage')) return 1.5;
+                    }
+                }
+            }
+        },
 		boss_jizhen:{
 			trigger:{player:'phaseEnd'},
 			forced:true,
 			filter:function(event,player){
-				if(player.hp<player.maxHp) return true;
-				if(typeof player.side=='boolean'){
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].side==player.side&&game.players[i].hp<game.players[i].maxHp){
-							return true;
-						}
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isFriendOf(player)&&game.players[i].hp<game.players[i].maxHp){
+						return true;
 					}
 				}
 				return false;
@@ -70,13 +600,8 @@ character.boss={
 			content:function(){
 				var list=[];
 				for(var i=0;i<game.players.length;i++){
-					if(game.players[i].hp<game.players[i].maxHp){
-						if(game.players[i]==player){
-							list.push(game.players[i]);
-						}
-						else if(typeof player.side=='boolean'&&game.players[i].side==player.side){
-							list.push(game.players[i]);
-						}
+					if(game.players[i].isFriendOf(player)&&game.players[i].hp<game.players[i].maxHp){
+						list.push(game.players[i]);
 					}
 				}
 				if(list.length){
@@ -99,10 +624,7 @@ character.boss={
                 "step 1"
                 if(get.color(event.cards[0])!=get.color(event.cards[1])){
                     player.chooseTarget('是否令一名敌方角色失去1点体力？',function(card,player,target){
-						if(typeof player.side=='boolean'){
-							return player.side!=target.side;
-						}
-                        return player!=target;
+						return !target.isFriendOf(player);
                     }).ai=function(target){
                         return -ai.get.attitude(player,target);
                     }
@@ -124,7 +646,7 @@ character.boss={
 		boss_jueji:{
             trigger:{global:'phaseDrawBegin'},
             filter:function(event,player){
-				if(typeof player.side=='boolean'&&player.side==event.player.side){
+				if(event.player.isFriendOf(player)){
 					return false;
 				}
                 return event.num>0&&event.player!=player&&event.player.hp<event.player.maxHp;
@@ -145,23 +667,17 @@ character.boss={
 			trigger:{player:'phaseEnd'},
 			direct:true,
 			filter:function(event,player){
-				if(typeof player.side=='boolean'){
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].side==player.side&&game.players[i].isTurnedOver()){
-							return true;
-						}
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isFriendOf(player)&&game.players[i].isTurnedOver()){
+						return true;
 					}
-					return false;
 				}
-				return player.isTurnedOver();
+				return false;
 			},
 			content:function(){
 				"step 0"
 				player.chooseTarget('是否发动【惑敌】？',function(card,player,target){
-					if(typeof player.side=='boolean'){
-						return player.side!=target.side;
-					}
-					return player!=target;
+					return !target.isFriendOf(player);
 				}).ai=function(target){
 					return -ai.get.attitude(player,target);
 				};
@@ -201,10 +717,8 @@ character.boss={
 			content:function(){
 				"step 0"
 				player.chooseTarget('是否发动【雷厉】？',function(card,player,target){
-					if(player==target) return false;
 					if(target==trigger.player) return false;
-					if(typeof player.side=='boolean') return player.side!=target.side;
-					return true;
+					return target.isEnemyOf(player);
 				}).ai=function(target){
 					return ai.get.damageEffect(target,player,player,'thunder');
 				}
@@ -225,7 +739,7 @@ character.boss={
 			content:function(){
 				"step 0"
 				player.chooseTarget('是否发动【风行】？',function(card,player,target){
-					if(typeof player.side=='boolean'&&player.side==target.side) return false;
+					if(target.isFriendOf(player)) return false;
 					return lib.filter.targetEnabled({name:'sha'},player,target);
 				}).ai=function(target){
 					return ai.get.effect(target,{name:'sha'},player);
@@ -246,8 +760,7 @@ character.boss={
             forced:true,
             filter:function(event,player){
                 for(var i=0;i<game.players.length;i++){
-					if(typeof player.side=='boolean'&&player.side==game.players[i].side) continue;
-                    if(game.players[i]!=player&&game.players[i].num('j')) return true;
+                    if(game.players[i].isEnemyOf(player)&&game.players[i].num('j')) return true;
                 }
                 return false;
             },
@@ -255,8 +768,7 @@ character.boss={
                 "step 0"
                 event.targets=[];
                 for(var i=0;i<game.players.length;i++){
-					if(typeof player.side=='boolean'&&player.side==game.players[i].side) continue;
-                    if(game.players[i]!=player&&game.players[i].num('j')){
+                    if(game.players[i].isEnemyOf(player)&&game.players[i].num('j')){
                         event.targets.push(game.players[i]);
                     }
                 }
@@ -324,10 +836,7 @@ character.boss={
             forced:true,
             filter:function(event,player){
                 if(event.num<=1) return false;
-				if(typeof player.side=='boolean'){
-					return player.side==event.player.side;
-				}
-                return player==event.player;
+				return event.player.isFriendOf(player);
             },
             priority:-11,
             content:function(){
@@ -340,12 +849,11 @@ character.boss={
 		boss_jingfan2:{
 			mod:{
 				globalFrom:function(from,to,distance){
-					if(typeof from.side=='boolean'){
-						for(var i=0;i<game.players.length;i++){
-							if(game.players[i].skills.contains('boss_jingfan')&&
-								game.players[i].side==from.side&&game.players[i]!=from){
-								return distance-1;
-							}
+					if(to.isEnemyOf(from)) return;
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].skills.contains('boss_jingfan')&&
+							game.players[i].isFriendOf(from)&&game.players[i]!=from){
+							return distance-1;
 						}
 					}
 				}
@@ -486,12 +994,15 @@ character.boss={
 			content:function(){
 				var list=[];
 				for(var i=0;i<game.players.length;i++){
-					if(player.canUse('wanjian',game.players[i])){
+					if(player.canUse('wanjian',game.players[i])&&game.players[i].isEnemyOf(player)){
 						list.push(game.players[i]);
 					}
 				}
 				list.sort(lib.sort.seat);
 				player.useCard({name:'wanjian'},list);
+			},
+			ai:{
+				threaten:1.8
 			}
 		},
 		boss_yushou:{
@@ -672,15 +1183,19 @@ character.boss={
 			content:function(){
 				"step 0"
 				event.players=get.players(player);
-				event.players.remove(player);
 				"step 1"
 				if(event.players.length){
 					var current=event.players.shift();
-					player.line(current,'fire');
-					current.damage('fire');
+					if(current.isEnemyOf(player)){
+						player.line(current,'fire');
+						current.damage('fire');
+					}
 					event.redo();
 				}
 			},
+			ai:{
+				threaten:2
+			}
 		},
 		boss_guiji:{
 			trigger:{player:'phaseJudgeBegin'},
@@ -793,7 +1308,7 @@ character.boss={
 			content:function(){
 				"step 0"
 				player.chooseTarget('是否发动【地动】？',function(card,player,target){
-					return player!=target;
+					return target.isEnemyOf(player);
 				}).ai=function(target){
 					var att=ai.get.attitude(player,target);
 					if(target.isTurnedOver()){
@@ -813,6 +1328,9 @@ character.boss={
 					result.targets[0].turnOver();
 				}
 			},
+			ai:{
+				threaten:1.7
+			}
 		},
 		boss_guimei:{
 			mod:{
@@ -1438,6 +1956,66 @@ character.boss={
 				}
 			}
 		},
+		boss_yuhuojg:{
+			trigger:{player:'damageBefore'},
+			filter:function(event){
+				return event.nature=='fire';
+			},
+			forced:true,
+			content:function(){
+				trigger.untrigger();
+				trigger.finish();
+			},
+			ai:{
+				nofire:true,
+				effect:{
+					target:function(card,player,target,current){
+						if(get.tag(card,'fireDamage')) return 0;
+					}
+				}
+			}
+		},
+		boss_tianyun:{
+			trigger:{player:'phaseEnd'},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseTarget('是否发动【天陨】？',function(card,player,target){
+					return target.isEnemyOf(player);
+				}).ai=function(target){
+					if(player.hp<=1) return 0;
+					if(ai.get.attitude(player,target)>-3) return 0;
+					var eff=ai.get.damageEffect(target,player,player,'fire');
+					if(eff>0){
+						return eff+target.num('e')/2;
+					}
+					return 0;
+				}
+				"step 1"
+				if(result.bool){
+					player.logSkill('boss_tianyun',result.targets,'fire');
+					player.loseHp();
+					event.target=result.targets[0];
+				}
+				else{
+					event.finish();
+				}
+				"step 2"
+				if(event.target){
+					event.target.damage(2,'fire');
+				}
+				"step 3"
+				if(event.target){
+					var es=event.target.get('e');
+					if(es.length){
+						event.discard(es);
+					}
+				}
+			},
+			ai:{
+				threaten:2
+			}
+		},
 		boss_tianyu:{
 			audio:true,
 			trigger:{player:'phaseEnd'},
@@ -1467,6 +2045,77 @@ character.boss={
                 }
             }
 		},
+		boss_tianyujg:{
+			audio:true,
+			trigger:{player:'phaseEnd'},
+            forced:true,
+            filter:function(event,player){
+                for(var i=0;i<game.players.length;i++){
+                    if(game.players[i].isEnemyOf(player)&&!game.players[i].isLinked()){
+                        return true;
+                    }
+                }
+                return false;
+            },
+            content:function(){
+                "step 0"
+                event.targets=game.players.slice(0);
+                event.targets.sort(lib.sort.seat);
+                "step 1"
+                if(event.targets.length){
+                    var target=event.targets.shift();
+                    if(!target.isLinked()&&target.isEnemyOf(player)){
+						player.line(target,'green');
+                        target.link();
+                    }
+                    event.redo();
+                }
+            }
+		},
+		boss_qiwu:{
+			trigger:{player:'useCard'},
+			direct:true,
+			filter:function(event,player){
+				if(get.suit(event.card)=='club'){
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i].isFriendOf(player)&&game.players[i].hp<game.players[i].maxHp){
+							return true;
+						}
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				var noneed=(trigger.card.name=='tao'&&trigger.targets[0]==player&&player.hp==player.maxHp-1);
+				player.chooseTarget('是否发动【栖梧】？',function(card,player,target){
+					return target.hp<target.maxHp&&target.isFriendOf(player);
+				}).ai=function(target){
+					var num=ai.get.attitude(player,target);
+					if(num>0){
+						if(noneed&&player==target){
+							num=0.5;
+						}
+						else if(target.hp==1){
+							num+=3;
+						}
+						else if(target.hp==2){
+							num+=1;
+						}
+					}
+					return num;
+				}
+				"step 1"
+				if(result.bool){
+					player.logSkill('qiwu',result.targets);
+					result.targets[0].recover();
+				}
+			},
+			ai:{
+				expose:0.3,
+				threaten:1.5
+			}
+		},
 		boss_jizhi:{
 			audio:2,
 			trigger:{player:'useCard'},
@@ -1770,15 +2419,55 @@ character.boss={
 		boss_duanyuzhongda:'断狱仲达',
 		boss_juechenmiaocai:'绝尘妙才',
 
-		boss_baihumech:'机雷白虎',
-		boss_qinglongmech:'云屏青龙',
-		boss_xuanwumech:'灵甲玄武',
-		boss_zhuquemech:'炽羽朱雀',
-		boss_bianmech:'缚地狴犴',
-		boss_chiwenmech:'吞天螭吻',
-		boss_suannimech:'食火狻猊',
-		boss_yazimech:'裂石睚眦',
+		boss_jileibaihu:'机雷白虎',
+		boss_yunpingqinglong:'云屏青龙',
+		boss_lingjiaxuanwu:'灵甲玄武',
+		boss_chiyuzhuque:'炽羽朱雀',
+		boss_fudibian:'缚地狴犴',
+		boss_tuntianchiwen:'吞天螭吻',
+		boss_shihuosuanni:'食火狻猊',
+		boss_lieshiyazi:'裂石睚眦',
 
+		boss_nianshou:'年兽',
+
+		boss_nianrui:'年瑞',
+		boss_nianrui_info:'锁定技，摸牌阶段，你额外摸两张牌',
+		boss_qixiang:'祺祥',
+		boss_qixiang1:'祺祥',
+		boss_qixiang2:'祺祥',
+		boss_qixiang_info:'乐不思蜀判定时，你的方块判定牌视为红桃；兵粮寸断判定时，你的黑桃判定牌视为草花',
+		boss_jiguan:'机关',
+		boss_jiguan_info:'锁定技，你不能成为【乐不思蜀】的目标',
+		boss_lingyu:'灵愈',
+		boss_lingyu_info:'结束阶段，你可以将自己的武将牌翻面，然后令所有已受伤的己方其他角色回复1点体力',
+		boss_tianyun:'天陨',
+		boss_tianyun_info:'结束阶段，你可以失去1点体力，然后令一名敌方角色受到2点火焰伤害并弃置其装备区里的所有牌',
+		boss_zhenwei:'镇卫',
+		boss_zhenwei_info:'锁定技，对方角色计算与其他己方角色的距离时，始终+1',
+		boss_benlei:'奔雷',
+		boss_benlei_info:'锁定技，准备阶段，对敌方攻城器械造成2点雷电伤害',
+		boss_nailuo:'奈落',
+		boss_nailuo_info:'结束阶段，你可以将你的武将牌翻面，令所有敌方角色弃置装备区内的所有牌',
+		boss_tanshi:'贪食',
+		boss_tanshi_info:'锁定技，结束阶段开始时，你须弃置一张手牌',
+		boss_tunshi:'吞噬',
+		boss_tunshi_info:'锁定技，准备阶段，你对所有手牌数量大于你的敌方角色造成1点伤害',
+		boss_yuhuojg:'浴火',
+		boss_yuhuojg_info:'锁定技，每当你受到火焰伤害时，防止此伤害',
+		boss_qiwu:'栖梧',
+		boss_qiwu_info:'每当你使用一张梅花牌，你可以令一名友方角色回复一点体力',
+		boss_tianyujg:'天狱',
+		boss_tianyujg_info:'锁定技，回合结束阶段，你令所有未横置的敌方角色横置',
+		boss_gongshenjg:'工神',
+		boss_gongshenjg_info:'结束阶段，若已方器械已受伤，你可以为其回复一点体力；否则你可以对敌方器械造成一点火焰伤害',
+		boss_zhinang:'智囊',
+		boss_zhinang_info:'准备阶段，你可以亮出牌堆顶的三张牌，你可以将其中锦囊或装备牌交给一名己方角色，然后将其余牌置入弃牌堆',
+		boss_jingmiao:'精妙',
+		boss_jingmiao_info:'锁定技，每当敌方角色使用的无懈可击生效后，你令其失去1点体力',
+		boss_biantian:'变天',
+		boss_biantian_info:'锁定技，准备阶段，你进行一次判定，若为红色，直到下个回合开始前，令敌方所有角色处于“狂风”状态，若为黑桃，直到下个回合开始前，令己方所有角色处于“大雾”状态',
+        boss_biantian2:'大雾',
+        boss_biantian3:'狂风',
 		boss_lingfeng:'灵锋',
 		boss_lingfeng_info:'摸牌阶段，你可以放弃摸牌，亮出牌堆顶的两张牌，然后获得之，若这些牌的颜色不同，你令一名敌方角色失去1点体力',
 		boss_jizhen:'激阵',
@@ -1810,13 +2499,13 @@ character.boss={
         jizhen_info:'结束阶段，你可以令所至多两名已受伤角色摸一张牌',
 
 		boss_yushou:'驭兽',
-		boss_yushou_info:'出牌阶段开始时，视为你使用了一张[南蛮入侵]',
+		boss_yushou_info:'出牌阶段开始时，你可以对所有敌方角色使用一张南蛮入侵',
 		boss_moyany:'魔炎',
 		boss_moyany_info:'每当你于回合外失去牌时，你可以进行一次判定，若结果为红色，你对一名其他角色造成2点火焰伤害',
 		boss_modao:'魔道',
 		boss_modao_info:'锁定技，准备阶段，你摸两张牌',
 		boss_mojian:'魔箭',
-		boss_mojian_info:'出牌阶段开始时，视为你使用了一张[万箭齐发]',
+		boss_mojian_info:'出牌阶段开始时，你可以对所有敌方角色使用一张万箭齐发',
 		boss_danshu:'丹术',
 		boss_danshu_info:'每当你于回合外失去牌时，你可以进行一次判定，若结果为红色，你回复1点体力',
 
@@ -1838,7 +2527,7 @@ character.boss={
 		boss_guiji:'诡计',
 		boss_guiji_info:'锁定技，准备阶段结束时，若你的判定区内有牌，你随机弃置其中一张牌',
 		boss_lianyu:'炼狱',
-		boss_lianyu_info:'结束阶段，对所有其他角色造成1点火焰伤害',
+		boss_lianyu_info:'结束阶段，你可以对所有敌方角色造成1点火焰伤害',
 
 		boss_guihuo:'鬼火',
 		boss_guihuo_info:'结束阶段，你可以对一名其他角色造成1点火焰伤害',
@@ -1851,7 +2540,7 @@ character.boss={
 		boss_guimei:'鬼魅',
 		boss_guimei_info:'锁定技，你不能成为延时类锦囊的目标',
 		boss_didong:'地动',
-		boss_didong_info:'结束阶段，你可以令一名其他角色将其武将牌翻面',
+		boss_didong_info:'结束阶段，你可以选择一名敌方角色将其武将牌翻面',
 		boss_shanbeng:'山崩',
 		boss_shanbeng_info:'锁定技，当你死亡时，你令所有其他角色弃置其装备区内的所有牌',
 
@@ -1908,8 +2597,8 @@ character.boss={
 		boss_xianyin:'仙音',
 		boss_xianyin_info:'每当你于回合外失去牌，你可以进行一次判定，若为红色，你令一名敌人失去一点体力',
 
-		// boss_yuhuo:'浴火',
-		// boss_yuhuo_info:'觉醒技，在你涅槃后，你获得技能【神威】、【朱羽】',
+		boss_yuhuo:'浴火',
+		boss_yuhuo_info:'觉醒技，在你涅槃后，你获得技能【神威】、【朱羽】',
 		boss_tianyu:'天狱',
 		boss_tianyu_info:'锁定技，回合结束阶段，你解除横置状态，除你之外的所有角色进入横置状态',
 
diff --git a/character/extra.js b/character/extra.js
index 1751fcbb6..15d1502d7 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -1216,6 +1216,7 @@ character.extra={
 		dawu_info:'回合结束阶段，你可以弃掉X枚“星”指定X名角色：直到你的下回合开始，防止他们受到的除雷电伤害外的一切伤害。',
 		kuangfeng:'狂风',
 		kuangfeng2:'狂风',
+		kuangfeng2_bg:'风',
 		// kuangfeng2_info:'已获得狂风标记',
 		kuangfeng3:'狂风',
 		kuangfeng_info:'回合结束阶段，你可以弃掉1枚“星”指定一名角色：直到你的下回合开始，该角色每次受到的火焰伤害+1。',
diff --git a/character/shenhua.js b/character/shenhua.js
index 733623c24..7968316fe 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -525,9 +525,14 @@ character.shenhua={
 			intro:{
 				content:'cards'
 			},
-			mod:{
-				globalFrom:function(from,to,distance){
-					if(from.storage.tuntian) return distance-from.storage.tuntian.length;
+			group:'tuntian_dist',
+			subSkill:{
+				dist:{
+					mod:{
+						globalFrom:function(from,to,distance){
+							if(from.storage.tuntian) return distance-from.storage.tuntian.length;
+						}
+					}
 				}
 			},
 			ai:{
@@ -708,20 +713,19 @@ character.shenhua={
 			forceaudio:true,
 			enable:'phaseUse',
 			filter:function(event,player){
-				if(!game.zhu) return false;
-				if(!game.zhu.isZhu) return false;
-				return (player!=game.zhu&&game.zhu.skills.contains('zhiba')&&
-					player.group=='wu'&&player.num('h')>0&&game.zhu.num('h')>0);
+				var zhu=get.zhu('zhiba');
+				if(!zhu) return false;
+				return (player!=zhu&&player.group=='wu'&&player.num('h')>0&&zhu.num('h')>0);
 			},
 			filterTarget:function(card,player,target){
-				return target==game.zhu;
+				return target.isZhu&&target.get('s').contains('zhiba');
 			},
 			usable:1,
 			content:function(){
 				"step 0"
 				player.chooseToCompare(target,function(card){
 					var player=get.owner(card);
-					if(player!=game.zhu&&ai.get.attitude(player,game.zhu)>0){
+					if(player!=target&&ai.get.attitude(player,target)>0){
 						return -get.number(card);
 					}
 					return get.number(card);
@@ -738,10 +742,10 @@ character.shenhua={
 				},
 				expose:0.2,
 				result:{
-					target:function(player){
+					target:function(player,target){
 						if(player.num('h')<=player.hp) return false;
 						var maxnum=0;
-						var cards2=game.zhu.get('h');
+						var cards2=target.get('h');
 						for(var i=0;i<cards2.length;i++){
 							if(cards2[i].number>maxnum){
 								maxnum=cards2[i].number;
@@ -1432,15 +1436,15 @@ character.shenhua={
 			forceaudio:true,
 			trigger:{player:'judgeEnd'},
 			filter:function(event,player){
-				if(!game.zhu) return false;
-				if(!game.zhu.isZhu) return false;
-				return (player!=game.zhu&&game.zhu.skills.contains('songwei')&&player.group=='wei'&&get.color(event.result.card)=='black');
+				var zhu=get.zhu('songwei');
+				if(!zhu) return false;
+				return (player!=zhu&&player.group=='wei'&&get.color(event.result.card)=='black');
 			},
 			check:function(event,player){
-				return ai.get.attitude(player,game.zhu)>0;
+				return ai.get.attitude(player,get.zhu('songwei'))>0;
 			},
 			content:function(){
-				game.zhu.draw();
+				get.zhu('songwei').draw();
 			}
 		},
 		duanliang:{
@@ -1795,12 +1799,14 @@ character.shenhua={
 			forceaudio:true,
 			trigger:{source:'damageEnd'},
 			filter:function(event,player){
-				if(!game.zhu) return false;
-				if(!game.zhu.isZhu) return false;
-				return (player!=game.zhu&&game.zhu.skills.contains('baonue')&&player.group=='qun')&&game.zhu.hp<game.zhu.maxHp;
+				var zhu=get.zhu('baonue');
+				if(!zhu) return false;
+				return (player!=zhu&&player.group=='qun'&&zhu.hp<zhu.maxHp);
 			},
 			check:function(event,player){
-				return ai.get.attitude(player,game.zhu)>0;
+				var zhu=get.zhu('baonue');
+				if(!zhu) return false;
+				return ai.get.attitude(player,zhu)>0;
 			},
 			content:function(){
 				"step 0"
@@ -1810,7 +1816,10 @@ character.shenhua={
 				})
 				"step 1"
 				if(result.bool){
-					game.zhu.recover();
+					var zhu=get.zhu('baonue');
+					if(zhu){
+						zhu.recover();
+					}
 				}
 			}
 		},
@@ -2912,15 +2921,16 @@ character.shenhua={
 				player.$give(cards,targets[0]);
 			},
 			filter:function(event,player){
-				if(!game.zhu) return false;
-				if(!game.zhu.isZhu) return false;
-				return (player!=game.zhu&&game.zhu.skills.contains('huangtian')&&player.group=='qun')
+				var zhu=get.zhu('huangtian');
+				if(!zhu) return false;
+				return (player!=zhu&&player.group=='qun'&&
+				(player.num('h','shan')+player.num('h','shandian')>0))
 			},
 			filterCard:function(card){
 				return (card.name=='shan'||card.name=='shandian')
 			},
 			filterTarget:function(card,player,target){
-				return target==game.zhu;
+				return target.isZhu&&target.get('s').contains('huangtian');
 			},
 			usable:1,
 			forceaudio:true,
diff --git a/character/sp.js b/character/sp.js
index 20eb8af83..1837d2f80 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -44,6 +44,7 @@ character.sp={
 		// zhuling:['male','wei',4,['zhanyi']],
 		sunluyu:['female','wu',3,['meibu','mumu']],
 		hanba:['female','qun',4,['fentian','zhiri']],
+		zumao:['male','wu',4,['yinbing','juedi']],
 	},
 	perfectPair:{
 		zhugejin:['zhugeke'],
@@ -62,6 +63,133 @@ character.sp={
 		caohong:['caoren'],
 	},
 	skill:{
+		yinbing:{
+			trigger:{player:'phaseEnd'},
+			direct:true,
+			init:function(player){
+				player.storage.yinbing=[];
+			},
+			filter:function(event,player){
+				return player.num('he',{type:'basic'})<player.num('he');
+			},
+			marktext:'兵',
+			content:function(){
+				"step 0"
+				player.chooseCard([1,player.num('he')-player.num('he',{type:'basic'})],'he','是否发动【引兵】？',function(card){
+					return get.type(card)!='basic';
+				}).ai=function(card){
+					return 6-ai.get.value(card);
+				};
+				"step 1"
+				if(result.bool){
+					player.$give(result.cards,player,false);
+					player.logSkill('yinbing');
+					game.log(player,'将',result.cards,'置于武将牌上');
+					player.storage.yinbing=player.storage.yinbing.concat(result.cards);
+					player.lose(result.cards,ui.special);
+					player.markSkill('yinbing');
+					player.syncStorage('yinbing');
+				}
+			},
+			intro:{
+				content:'cards',
+				onunmark:function(storage,player){
+					if(storage&&storage.length){
+						for(var i=0;i<storage.length;i++){
+							ui.discardPile.appendChild(storage[i]);
+						}
+						player.$throw(storage);
+						delete player.storage.yinbing;
+					}
+				}
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target,current){
+						if(card.name=='sha'||card.name=='juedou'){
+							if(current<0) return 1.2;
+						}
+					}
+				},
+				threaten:1.2
+			},
+			subSkill:{
+				discard:{
+					trigger:{player:'damageEnd'},
+					forced:true,
+					filter:function(event,player){
+						return event.card&&player.storage.yinbing.length>0&&
+						(event.card.name=='sha'||event.card.name=='juedou');
+					},
+					content:function(){
+						'step 0'
+						player.chooseCardButton('将一张引兵牌置入弃牌堆',true,player.storage.yinbing);
+						'step 1'
+						var card=result.links[0];
+						player.storage.yinbing.remove(card);
+						ui.discardPile.appendChild(card);
+						player.$throw(card);
+						game.log(player,'将',card,'置入弃牌堆');
+						player.syncStorage('yinbing');
+						if(player.storage.yinbing.length==0){
+							player.unmarkSkill('yinbing');
+						}
+					}
+				}
+			},
+			group:'yinbing_discard'
+		},
+		juedi:{
+			trigger:{player:'phaseBegin'},
+			filter:function(event,player){
+				return player.storage.yinbing&&player.storage.yinbing.length>0;
+			},
+			direct:true,
+			content:function(){
+				'step 0'
+				player.chooseTarget('是否发动【绝地】？',function(card,player,target){
+					return player.hp>=target.hp;
+				}).ai=function(target){
+					if(target==player) return 0.5;
+					var att=ai.get.attitude(player,target);
+					if(att<2) return 0;
+					if(target.hp==1&&att>2){
+						att+=2;
+					}
+					if(player.num('j','lebu')){
+						if(target.hp==target.maxHp) return att-2;
+						return att-1;
+					}
+					if(target.hp==target.maxHp) return 0;
+					if(player.num('h')<player.hp-1){
+						return att-3;
+					}
+					return att-2;
+				}
+				'step 1'
+				if(result.bool){
+					player.logSkill('juedi',result.targets);
+					if(result.targets[0]==player){
+						player.$throw(player.storage.yinbing,1000);
+						player.draw(player.storage.yinbing.length);
+						while(player.storage.yinbing.length){
+							ui.discardPile.appendChild(player.storage.yinbing.shift());
+						}
+						player.syncStorage('yinbing');
+						player.unmarkSkill('yinbing');
+					}
+					else{
+						var target=result.targets[0];
+						game.log(target,'获得了',player.storage.yinbing);
+						target.recover();
+						target.gain(player.storage.yinbing.slice(0),'gain2');
+						player.storage.yinbing.length=0;
+					}
+					player.syncStorage('yinbing');
+					player.unmarkSkill('yinbing');
+				}
+			}
+		},
 		meibu:{
 			trigger:{global:'phaseUseBegin'},
 			filter:function(event,player){
@@ -4124,7 +4252,12 @@ character.sp={
 		sunluyu:'孙鲁育',
 		hanba:'旱魃',
 		panfeng:'潘凤',
+		zumao:'祖茂',
 
+		yinbing:'引兵',
+		yinbing_info:'结束阶段开始时，你可以将至少一张非基本牌置于武将牌上。每当你受到【杀】或【决斗】的伤害后，你将一张“引兵牌”置入弃牌堆。',
+		juedi:'绝地',
+		juedi_info:'准备阶段开始时，若你有“引兵牌”，你可以选择一项：1.将这些牌置入弃牌堆并摸等量的牌；2.令一名体力值不大于你的其他角色回复1点体力并获得这些牌。 ',
 		kuangfu:'狂斧',
 		kuangfu_info:'每当你使用杀造成伤害，可以将对方的一张装备牌移到你的装备区',
 		xintan:'心惔',
diff --git a/character/xianjian.js b/character/xianjian.js
index 50c79c1cf..b3ad543cd 100755
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -1081,7 +1081,7 @@ character.xianjian={
 				}
 				"step 1"
 				if(result.bool){
-					player.logSkill('runxin');
+					player.logSkill('runxin',result.targets);
 					result.targets[0].recover();
 				}
 			},
diff --git a/character/yxs.js b/character/yxs.js
index 2d4d7df2f..03662e2ea 100755
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -374,6 +374,7 @@ character.yxs={
 				return 8-ai.get.value(card);
 			},
 			filterTarget:function(card,player,target){
+				if(target.hp==Infinity) return false;
 				if(target.hp>player.hp) return true;
 				if(target.hp<player.hp&&target.hp<target.maxHp) return true;
 				return false;
@@ -1245,7 +1246,7 @@ character.yxs={
 				if(event.dialog){
 					event.dialog.close();
 				}
-				if(result.control!='cancel'){
+				if(result.control&&result.control.indexOf('2')!=-1){
 					player.logSkill('sheshi');
 					game.log(player,'指定的花色为',result.control);
 					var suit=result.control.slice(0,result.control.length-1);
diff --git a/game/game.js b/game/game.js
index db364409f..0263bb7e1 100755
--- a/game/game.js
+++ b/game/game.js
@@ -24,10 +24,12 @@
 			'牌堆管理',
 			'战棋1v1、对决4v4',
 			'年兽、守卫剑阁',
-			'注1：年兽在挑战模式，守卫剑阁在对决模式菜单中的游戏模式里选',
+			'炉石模式新卡',
+			'修复身份、国战开将过少导致不能游戏的bug',
+			'注1：年兽在挑战模式，守卫剑阁、4v4在对决模式菜单中的游戏模式里选',
 			'注2：此版本去掉了diy捉鬼和剑阁武将包，未来将进入diy武将包',
 			'注3：此版本更改了手气卡代码，若要关闭需重新设置',
-			'注4：安卓版预计一周内更新'
+			'注4：安卓版大约两周后更新'
 		],
 		configprefix:'noname_0.9_',
 		updates:[],
@@ -695,7 +697,7 @@
 					},
 					remember_dialog:{
 						name:'记住对话框位置',
-						init:true,
+						init:false,
 						unfrequent:true,
 					},
 					reset_dialog:{
@@ -1643,6 +1645,22 @@
 							unlimited:'无限',
 						}
 					},
+					continue_game:{
+						name:'显示再战',
+						init:false,
+						onclick:function(bool){
+							game.saveConfig('continue_game',bool,this._link.config.mode);
+							if(get.config('continue_game')){
+								if(!ui.continue_game&&_status.over){
+									ui.continue_game=ui.create.control('再战',game.reloadCurrent);
+								}
+							}
+							else if(ui.continue_game){
+								ui.continue_game.close();
+								delete ui.continue_game;
+							}
+						}
+					},
 					dierestart:{
 						name:'死亡后显示重来',
 						init:true,
@@ -1659,22 +1677,6 @@
 							}
 						}
 					},
-					continue_game:{
-						name:'显示继续游戏',
-						init:false,
-						onclick:function(bool){
-							game.saveConfig('continue_game',bool,this._link.config.mode);
-							if(get.config('continue_game')){
-								if(!ui.continue_game&&_status.over){
-									ui.continue_game=ui.create.control('继续',game.reloadCurrent);
-								}
-							}
-							else if(ui.continue_game){
-								ui.continue_game.close();
-								delete ui.continue_game;
-							}
-						}
-					},
 					revive:{
 						name:'死亡后显示复活',
 						init:false,
@@ -1879,6 +1881,22 @@
 							unlimited:'无限',
 						}
 					},
+					continue_game:{
+						name:'显示再战',
+						init:true,
+						onclick:function(bool){
+							game.saveConfig('continue_game',bool,this._link.config.mode);
+							if(get.config('continue_game')){
+								if(!ui.continue_game&&_status.over){
+									ui.continue_game=ui.create.control('再战',game.reloadCurrent);
+								}
+							}
+							else if(ui.continue_game){
+								ui.continue_game.close();
+								delete ui.continue_game;
+							}
+						}
+					},
 					dierestart:{
 						name:'死亡后显示重来',
 						init:true,
@@ -1895,22 +1913,6 @@
 							}
 						}
 					},
-					continue_game:{
-						name:'显示继续游戏',
-						init:false,
-						onclick:function(bool){
-							game.saveConfig('continue_game',bool,this._link.config.mode);
-							if(get.config('continue_game')){
-								if(!ui.continue_game&&_status.over){
-									ui.continue_game=ui.create.control('继续',game.reloadCurrent);
-								}
-							}
-							else if(ui.continue_game){
-								ui.continue_game.close();
-								delete ui.continue_game;
-							}
-						}
-					},
 					revive:{
 						name:'死亡后显示复活',
 						init:false,
@@ -2513,7 +2515,7 @@
 			'<div style="margin:10px">构筑</div><ul style="margin-top:0"><li>点击右上角的卡组管理构建卡组<li>一套卡组共30张牌，由法术和随从牌构成，每个同名卡牌最多带两张'+
 			'<li>卡组管理器中，随从右上角的x/y表示登场状态为x牌y血'+
 			'<li>游戏开始时，双方摸三张牌并从牌库中获得一张牌，并可选择将手牌置换一次'+
-			'<li>摸牌阶段，主将少摸一张牌，并从卡组中获得一张牌'+
+			'<li>每当主将摸X张牌时，若X至少为2，则其中的X-1张牌从牌堆中获得，1张牌从牌库中获得'+
 			'<li>每名角色使用一套卡组，卡组用完后会重新补满'+
 			'<li>卡组与职业绑定，每个职业有一个专属技能，每回合限用一次，消耗两点行动值</ul>'+
 			'<div style="margin:10px">职业技能</div><ul style="margin-top:0"><li>祭司：召唤一个随机图腾'+
@@ -2525,12 +2527,12 @@
 			'<li>圣骑士：召唤一名士兵'+
 			'<li>猎人：对敌方主将造成一点伤害'+
 			'<li>德鲁伊：视为使用一张不计入出杀次数的杀</ul>'+
-			'<div style="margin:10px">战斗</div><ul style="margin-top:0"><li>游戏流程类似1v1，场上有两名主将进行对抗，主将的体力上限+2'+
-			'<li>主将出牌阶段的出牌数量（行动值）有上限，先手为2，后手为3，装备牌不计入出牌上限<li>游戏每进行一轮，主将的出牌上限+1，超过6时减至2并重新累加'+
+			'<div style="margin:10px">战斗</div><ul style="margin-top:0"><li>游戏流程类似1v1，场上有两名主将进行对抗，主将的体力上限+1'+
+			'<li>主将出牌阶段的出牌数量（行动值）有上限，先手为2，后手为3，装备牌不计入出牌上限<li>游戏每进行一轮，主将的出牌上限+1，超过6时减至3并重新累加'+
 			'<li>使用随从牌可召唤一个随从，随从出场时背面朝上。每一方在场的随从数不能超过4<li>随从于摸牌阶段摸牌基数为1，随从的随从牌均视为闪，装备牌均视为杀<li>'+
 			'随从与其他所有角色相互距离基数为1<li>'+
 			'主将杀死对方随从后获得一个额外的行动值并摸两张牌，杀死己方随从无惩罚，随从杀死随从无效果'+
-			'<li>主将可重铸随从牌，但回合内总的重铸次数不能超过3，随从不能重铸任何牌（包括铁索等默认可以重铸的牌）'+
+			'<li>主将可重铸随从牌，但回合内总的重铸次数不能超过3，随从不能重铸任何牌（包括铁索等默认可以重铸的牌）；若重铸的牌为随从牌或法术牌，则摸牌改为从牌库中获得一张法术牌'+
 			'<li>嘲讽：若一方阵营中有嘲讽角色，则同阵营的无嘲讽角色不以能成为杀或决斗的目标'+
 			'<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏，主将死亡后替补登场，替补登场时摸3+X张牌，X为对方存活的随从数，无替补时游戏结束'
 		},
@@ -4454,6 +4456,9 @@
 						game.playAudio('effect','draw');
 					}
 					if(event.drawDeck){
+						if(event.drawDeck>num){
+							event.drawDeck=num;
+						}
 						num-=event.drawDeck;
 					}
 					if(event.log!=false){
@@ -5319,7 +5324,10 @@
 							this.unmarkSkill('ghujia');
 						}
 					}
-					if(lib.config.layout=='default'&&this.maxHp>14){
+					if(this.maxHp==Infinity){
+						hp.innerHTML='∞';
+					}
+					else if(lib.config.layout=='default'&&this.maxHp>14){
 						hp.innerHTML=this.hp+'/'+this.maxHp;
 						hp.classList.add('text');
 					}
@@ -6361,13 +6369,17 @@
 						else if(typeof arguments[i]=='boolean'){
 							next.animate=arguments[i];
 						}
-						else if(typeof arguments[i]=='object'&&arguments[i].drawDeck){
+						else if(typeof arguments[i]=='object'&&arguments[i].drawDeck!=undefined){
 							next.drawDeck=arguments[i].drawDeck;
 						}
 					}
 					if(next.num==undefined) next.num=1;
 					if(next.num<=0) _status.event.next.remove(next);
 					next.content=lib.element.playerproto.draw;
+					if(lib.config.mode=='stone'&&_status.mode=='deck'&&
+					next.drawDeck==undefined&&!next.player.isMin()&&next.num>1){
+						next.drawDeck=1;
+					}
 					return next;
 				},
 				discard:function(){
@@ -7188,12 +7200,29 @@
 						}
 					},time)
 				},
+				isEnemyOf:function(){
+					return !this.isFriendOf.apply(this,arguments);
+				},
+				isFriendOf:function(player){
+					if(typeof this.side=='boolean'&&typeof player.side=='boolean'){
+						return this.side==player.side;
+					}
+					if(lib.config.mode=='guozhan'){
+						if(this.identity=='unknown'||this.identity=='ye') return false;
+						if(player.identity=='unknown'||player.identity=='ye') return false;
+						return this.identity==player.identity;
+					}
+					return this==player;
+				},
 				isAlive:function(){
 					return this.classList.contains('dead')==false;
 				},
 				isDead:function(){
 					return this.classList.contains('dead');
 				},
+				isDamaged:function(){
+					return this.hp<this.maxHp;
+				},
 				isLinked:function(){
 					return this.classList.contains('linked');
 				},
@@ -9199,7 +9228,26 @@
 				delay:0.5,
 				content:function(){
 					"step 0"
-					player.draw();
+					if(lib.config.mode=='stone'&&_status.mode=='deck'&&
+					!player.isMin()&&get.type(cards[0]).indexOf('stone')==0){
+						var list=[];
+						for(var i=0;i<player.deckCards.length;i++){
+							if(get.type(player.deckCards[i])=='stonecard'){
+								list.push(player.deckCards[i]);
+							}
+						}
+						if(list.length){
+							var choice=list.randomGet();
+							player.deckCards.remove(choice);
+							player.gain(choice,'draw');
+						}
+						else{
+							player.draw({drawDeck:1})
+						}
+					}
+					else{
+						player.draw();
+					}
 					"step 1"
 					for(var i=0;i<cards.length;i++){
 						ui.discardPile.appendChild(cards[i]);
@@ -11228,6 +11276,26 @@
 			}
 			return ui.create.card(ui.special).init([suit,number,name,nature]);
 		},
+		forceOver:function(bool){
+			_status.event.next.length=0;
+			var next=game.createEvent('finish_game');
+			next.bool=bool;
+			next.content=function(){
+				'step 0'
+				while(ui.controls.length){
+					ui.controls[0].close();
+				}
+				while(ui.dialogs.length){
+					ui.dialogs[0].close();
+				}
+				'step 1'
+				game.over(event.bool);
+			};
+			if(_status.paused){
+				game.uncheck();
+				game.resume();
+			}
+		},
 		over:function(result){
 			var i,j,k,num,table,tr,td,dialog;
 			_status.over=true;
@@ -11261,6 +11329,9 @@
 						_status.coin+=10;
 					}
 					_status.coin+=20;
+					if(_status.additionalReward){
+						_status.coin+=_status.additionalReward();
+					}
 					switch(lib.config.mode){
 						case 'identity':{
 							switch(game.me.identity){
@@ -11571,8 +11642,37 @@
 			if(game.controlOver){
 				game.controlOver();return;
 			}
-			if(get.config('continue_game')){
-				ui.continue_game=ui.create.control('继续',game.reloadCurrent);
+			if(lib.config.mode=='boss'){
+				ui.create.control('再战',function(){
+					var pointer=game.boss;
+					var map={boss:game.me==game.boss,links:[]};
+					for(var iwhile=0;iwhile<10;iwhile++){
+						pointer=pointer.nextSeat;
+						if(pointer==game.boss){
+							break;
+						}
+						map.links.push(pointer.name);
+					}
+					game.saveConfig('continue_name_boss',map);
+					localStorage.setItem(lib.configprefix+'directstart',true);
+					game.reload();
+				});
+			}
+			else if(lib.config.mode=='versus'){
+				if(_status.mode=='standard'){
+					ui.create.control('再战',function(){
+						game.saveConfig('continue_name_versus',{
+							friend:_status.friendBackup,
+							enemy:_status.enemyBackup,
+							color:_status.color
+						});
+						localStorage.setItem(lib.configprefix+'directstart',true);
+						game.reload();
+					});
+				}
+			}
+			else if(get.config('continue_game')){
+				ui.continue_game=ui.create.control('再战',game.reloadCurrent);
 			}
 			if(!ui.restart){
 				ui.restart=ui.create.control('restart',game.reload);
@@ -11751,6 +11851,7 @@
 				range=get.select(event.selectButton);
 				if(range[0]!=range[1]||range[0]>1) auto=false;
 				for(i=0;i<dialog.buttons.length;i++){
+					if(dialog.buttons[i].classList.contains('unselectable')) continue;
 					if(event.filterButton(dialog.buttons[i],player)&&lib.filter.buttonIncluded(dialog.buttons[i])){
 						if(ui.selected.buttons.length<range[1]){
 							dialog.buttons[i].classList.add('selectable');
@@ -12458,6 +12559,9 @@
 						}
 					}
 				}
+				if(lib.skill[i].marktext){
+					lib.translate[i+'_bg']=lib.skill[i].marktext;
+				}
 				if(i[0]=='_'){
 					lib.skill.global.add(i);
 				}
@@ -16479,6 +16583,9 @@
 						}
 						if(infoitem[2]>14){
 							node.node.hp.innerHTML=infoitem[2];
+							if(infoitem[2]==Infinity){
+								node.node.hp.innerHTML='∞';
+							}
 							node.node.hp.classList.add('text');
 						}
 						else{
@@ -19458,6 +19565,27 @@
 		},
 	};
 	var get={
+		zhu:function(player,skill){
+			if(typeof player=='string'){
+				skill=player;
+				player=null;
+			}
+			if(lib.config.mode=='identity'){
+				if(skill&&!game.zhu.get('s').contains(skill)) return null;
+				if(game.zhu.isZhu) return game.zhu;
+			}
+			else if(lib.config.mode=='versus'&&_status.mode=='four'){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isZhu){
+						if(skill&&!(game.players[i].get('s').contains(skill))) continue;
+						if(!player||player.side==game.players[i].side){
+							return game.players[i];
+						}
+					}
+				}
+			}
+			return null;
+		},
 		config:function(item){
 			if(!lib.config.mode_config[lib.config.mode]) return;
 			return lib.config.mode_config[lib.config.mode][item];
@@ -21393,7 +21521,7 @@
 						card={name:arguments[i]}
 					}
 				}
-				source.useCard(card,game.me);
+				source.useCard(game.createCard(card.name,card.suit,card.number,card.nature),game.me);
 			},
 			rank:function(){
 		        var list=lib.rank.s.concat(lib.rank.ap).concat(lib.rank.a).concat(lib.rank.am).
@@ -21419,7 +21547,7 @@
 			},
 			gx:function(name,target){
 				target=target||game.me;
-				var fire=false,thunder=false;
+				var nature=null;
 				var suit=null;
 				var suits=['club','spade','diamond','heart'];
 				for(var i=0;i<suits.length;i++){
@@ -21429,52 +21557,28 @@
 						break;
 					}
 				}
+				if(name.indexOf('red')==0){
+					name=name.slice(3);
+					suit=['diamond','heart'].randomGet();
+				}
+				if(name.indexOf('black')==0){
+					name=name.slice(5);
+					suit=['spade','club'].randomGet();
+				}
+
 				if(name=='huosha'){
 					name='sha';
-					fire=true;
+					nature='fire';
 				}
 				else if(name=='leisha'){
 					name='sha';
-					thunder=true;
-				}
-				for(var i=0;i<ui.cardPile.childNodes.length;i++){
-					if(fire&&ui.cardPile.childNodes[i].nature!='fire'){
-						continue;
-					}
-					if(thunder&&ui.cardPile.childNodes[i].nature!='thunder'){
-						continue;
-					}
-					if(suit&&ui.cardPile.childNodes[i].suit!=suit){
-						continue;
-					}
-					if(ui.cardPile.childNodes[i].name==name){
-						var card=ui.cardPile.childNodes[i];
-						target.node.handcards1.appendChild(card);
-						game.check();
-						target.update();
-						ui.updatehl();
-						return;
-					}
-				}
-				for(var i=0;i<ui.discardPile.childNodes.length;i++){
-					if(fire&&ui.cardPile.childNodes[i].nature!='fire'){
-						continue;
-					}
-					if(thunder&&ui.cardPile.childNodes[i].nature!='thunder'){
-						continue;
-					}
-					if(suit&&ui.cardPile.childNodes[i].suit!=suit){
-						continue;
-					}
-					if(ui.discardPile.childNodes[i].name==name){
-						var card=ui.discardPile.childNodes[i];
-						target.node.handcards1.appendChild(card);
-						game.check();
-						target.update();
-						ui.updatehl();
-						return;
-					}
+					nature='thunder';
 				}
+				var card=game.createCard(name,suit,null,nature);
+				target.node.handcards1.appendChild(card);
+				game.check();
+				target.update();
+				ui.updatehl();
 			},
 			ge:function(){
 				cheat.g('zhuge');
diff --git a/image/card/spell_ansezhadan.jpg b/image/card/spell_ansezhadan.jpg
new file mode 100755
index 000000000..5106e2cba
Binary files /dev/null and b/image/card/spell_ansezhadan.jpg differ
diff --git a/image/card/spell_anyingxingtai.jpg b/image/card/spell_anyingxingtai.jpg
new file mode 100755
index 000000000..35b95cd82
Binary files /dev/null and b/image/card/spell_anyingxingtai.jpg differ
diff --git a/image/card/spell_anzhongpohuai.jpg b/image/card/spell_anzhongpohuai.jpg
new file mode 100755
index 000000000..a2daa3ad8
Binary files /dev/null and b/image/card/spell_anzhongpohuai.jpg differ
diff --git a/image/card/spell_aoshufeidan.jpg b/image/card/spell_aoshufeidan.jpg
new file mode 100644
index 000000000..9d67626c0
Binary files /dev/null and b/image/card/spell_aoshufeidan.jpg differ
diff --git a/image/card/spell_beici.jpg b/image/card/spell_beici.jpg
new file mode 100755
index 000000000..c26949959
Binary files /dev/null and b/image/card/spell_beici.jpg differ
diff --git a/image/card/spell_canying.jpg b/image/card/spell_canying.jpg
new file mode 100644
index 000000000..dd0e459a0
Binary files /dev/null and b/image/card/spell_canying.jpg differ
diff --git a/image/card/spell_chirehuoba.jpg b/image/card/spell_chirehuoba.jpg
new file mode 100644
index 000000000..f8af9b4df
Binary files /dev/null and b/image/card/spell_chirehuoba.jpg differ
diff --git a/image/card/spell_chongfeng.jpg b/image/card/spell_chongfeng.jpg
new file mode 100755
index 000000000..aa5612e71
Binary files /dev/null and b/image/card/spell_chongfeng.jpg differ
diff --git a/image/card/spell_conglinzhihun.jpg b/image/card/spell_conglinzhihun.jpg
new file mode 100755
index 000000000..ac936c019
Binary files /dev/null and b/image/card/spell_conglinzhihun.jpg differ
diff --git a/image/card/spell_dubiao.jpg b/image/card/spell_dubiao.jpg
new file mode 100644
index 000000000..3d508e790
Binary files /dev/null and b/image/card/spell_dubiao.jpg differ
diff --git a/image/card/spell_emozhixin.jpg b/image/card/spell_emozhixin.jpg
new file mode 100755
index 000000000..39029a82c
Binary files /dev/null and b/image/card/spell_emozhixin.jpg differ
diff --git a/image/card/spell_enzeshu.jpg b/image/card/spell_enzeshu.jpg
new file mode 100755
index 000000000..c09e2289e
Binary files /dev/null and b/image/card/spell_enzeshu.jpg differ
diff --git a/image/card/spell_fengnu.jpg b/image/card/spell_fengnu.jpg
new file mode 100755
index 000000000..5be8b6025
Binary files /dev/null and b/image/card/spell_fengnu.jpg differ
diff --git a/image/card/spell_fennu.jpg b/image/card/spell_fennu.jpg
new file mode 100755
index 000000000..468a9c10f
Binary files /dev/null and b/image/card/spell_fennu.jpg differ
diff --git a/image/card/spell_fuchoudaji.jpg b/image/card/spell_fuchoudaji.jpg
new file mode 100755
index 000000000..d297d1ec2
Binary files /dev/null and b/image/card/spell_fuchoudaji.jpg differ
diff --git a/image/card/spell_fugen.jpg b/image/card/spell_fugen.jpg
new file mode 100644
index 000000000..d83f39047
Binary files /dev/null and b/image/card/spell_fugen.jpg differ
diff --git a/image/card/spell_fushishu.jpg b/image/card/spell_fushishu.jpg
new file mode 100755
index 000000000..a3ad66964
Binary files /dev/null and b/image/card/spell_fushishu.jpg differ
diff --git a/image/card/spell_hanbingpingzhang.jpg b/image/card/spell_hanbingpingzhang.jpg
new file mode 100644
index 000000000..d23049aae
Binary files /dev/null and b/image/card/spell_hanbingpingzhang.jpg differ
diff --git a/image/card/spell_heiandiyu.jpg b/image/card/spell_heiandiyu.jpg
new file mode 100755
index 000000000..7f8f183ae
Binary files /dev/null and b/image/card/spell_heiandiyu.jpg differ
diff --git a/image/card/spell_heianqiyue.jpg b/image/card/spell_heianqiyue.jpg
new file mode 100755
index 000000000..259a1afca
Binary files /dev/null and b/image/card/spell_heianqiyue.jpg differ
diff --git a/image/card/spell_jingxiang.jpg b/image/card/spell_jingxiang.jpg
new file mode 100755
index 000000000..0899e29ba
Binary files /dev/null and b/image/card/spell_jingxiang.jpg differ
diff --git a/image/card/spell_jinyingduijue.jpg b/image/card/spell_jinyingduijue.jpg
new file mode 100644
index 000000000..9ffc3d8b2
Binary files /dev/null and b/image/card/spell_jinyingduijue.jpg differ
diff --git a/image/card/spell_jipao.jpg b/image/card/spell_jipao.jpg
new file mode 100644
index 000000000..f4934d20d
Binary files /dev/null and b/image/card/spell_jipao.jpg differ
diff --git a/image/card/spell_kongxinshu.jpg b/image/card/spell_kongxinshu.jpg
new file mode 100755
index 000000000..fd29e5780
Binary files /dev/null and b/image/card/spell_kongxinshu.jpg differ
diff --git a/image/card/spell_kuaisuzhiliao.jpg b/image/card/spell_kuaisuzhiliao.jpg
new file mode 100644
index 000000000..349370879
Binary files /dev/null and b/image/card/spell_kuaisuzhiliao.jpg differ
diff --git a/image/card/spell_kuangbao.jpg b/image/card/spell_kuangbao.jpg
new file mode 100755
index 000000000..53b9273bf
Binary files /dev/null and b/image/card/spell_kuangbao.jpg differ
diff --git a/image/card/spell_laojiuhuoba.jpg b/image/card/spell_laojiuhuoba.jpg
new file mode 100644
index 000000000..c137020b1
Binary files /dev/null and b/image/card/spell_laojiuhuoba.jpg differ
diff --git a/image/card/spell_linghunhongxi.jpg b/image/card/spell_linghunhongxi.jpg
new file mode 100644
index 000000000..92790387f
Binary files /dev/null and b/image/card/spell_linghunhongxi.jpg differ
diff --git a/image/card/spell_mengun.jpg b/image/card/spell_mengun.jpg
new file mode 100755
index 000000000..99eea6c0f
Binary files /dev/null and b/image/card/spell_mengun.jpg differ
diff --git a/image/card/spell_piaoqie.jpg b/image/card/spell_piaoqie.jpg
new file mode 100644
index 000000000..99a204311
Binary files /dev/null and b/image/card/spell_piaoqie.jpg differ
diff --git a/image/card/spell_qiangfengsheji.jpg b/image/card/spell_qiangfengsheji.jpg
new file mode 100644
index 000000000..d712081f1
Binary files /dev/null and b/image/card/spell_qiangfengsheji.jpg differ
diff --git a/image/card/spell_rongyanbaolie.jpg b/image/card/spell_rongyanbaolie.jpg
new file mode 100755
index 000000000..c57879d01
Binary files /dev/null and b/image/card/spell_rongyanbaolie.jpg differ
diff --git a/image/card/spell_shalumingling.jpg b/image/card/spell_shalumingling.jpg
new file mode 100755
index 000000000..de54d7a54
Binary files /dev/null and b/image/card/spell_shalumingling.jpg differ
diff --git a/image/card/spell_shenpan.jpg b/image/card/spell_shenpan.jpg
new file mode 100644
index 000000000..f66ce3c59
Binary files /dev/null and b/image/card/spell_shenpan.jpg differ
diff --git a/image/card/spell_shenshengfennu.jpg b/image/card/spell_shenshengfennu.jpg
new file mode 100755
index 000000000..51956d794
Binary files /dev/null and b/image/card/spell_shenshengfennu.jpg differ
diff --git a/image/card/spell_shihuawuqi.jpg b/image/card/spell_shihuawuqi.jpg
new file mode 100755
index 000000000..0d32f0682
Binary files /dev/null and b/image/card/spell_shihuawuqi.jpg differ
diff --git a/image/card/spell_siwangchanrao.jpg b/image/card/spell_siwangchanrao.jpg
new file mode 100755
index 000000000..cfa606a27
Binary files /dev/null and b/image/card/spell_siwangchanrao.jpg differ
diff --git a/image/card/spell_tanxianmao.jpg b/image/card/spell_tanxianmao.jpg
new file mode 100644
index 000000000..0f4b67c0d
Binary files /dev/null and b/image/card/spell_tanxianmao.jpg differ
diff --git a/image/card/spell_tianjiangzhuqun.jpg b/image/card/spell_tianjiangzhuqun.jpg
new file mode 100755
index 000000000..d01935a98
Binary files /dev/null and b/image/card/spell_tianjiangzhuqun.jpg differ
diff --git a/image/card/spell_weijisifu.jpg b/image/card/spell_weijisifu.jpg
new file mode 100644
index 000000000..3239d30c2
Binary files /dev/null and b/image/card/spell_weijisifu.jpg differ
diff --git a/image/card/spell_xianzuzhaohuan.jpg b/image/card/spell_xianzuzhaohuan.jpg
new file mode 100644
index 000000000..8cf45f7d6
Binary files /dev/null and b/image/card/spell_xianzuzhaohuan.jpg differ
diff --git a/image/card/spell_xianzuzhihun.jpg b/image/card/spell_xianzuzhihun.jpg
new file mode 100755
index 000000000..d5036a982
Binary files /dev/null and b/image/card/spell_xianzuzhihun.jpg differ
diff --git a/image/card/spell_xianzuzhishi.jpg b/image/card/spell_xianzuzhishi.jpg
new file mode 100755
index 000000000..43140957b
Binary files /dev/null and b/image/card/spell_xianzuzhishi.jpg differ
diff --git a/image/card/spell_xingchenzhuiluo.jpg b/image/card/spell_xingchenzhuiluo.jpg
new file mode 100644
index 000000000..e3fedfb77
Binary files /dev/null and b/image/card/spell_xingchenzhuiluo.jpg differ
diff --git a/image/card/spell_xinlinghanbao.jpg b/image/card/spell_xinlinghanbao.jpg
new file mode 100755
index 000000000..595c2e987
Binary files /dev/null and b/image/card/spell_xinlinghanbao.jpg differ
diff --git a/image/card/spell_yanbaoshu.jpg b/image/card/spell_yanbaoshu.jpg
new file mode 100644
index 000000000..08b0488fd
Binary files /dev/null and b/image/card/spell_yanbaoshu.jpg differ
diff --git a/image/card/spell_yingyongdaji.jpg b/image/card/spell_yingyongdaji.jpg
new file mode 100755
index 000000000..48c553701
Binary files /dev/null and b/image/card/spell_yingyongdaji.jpg differ
diff --git a/image/card/spell_yongshizhufu.jpg b/image/card/spell_yongshizhufu.jpg
new file mode 100755
index 000000000..8a34b51a8
Binary files /dev/null and b/image/card/spell_yongshizhufu.jpg differ
diff --git a/image/card/spell_zhandounuhuo.jpg b/image/card/spell_zhandounuhuo.jpg
new file mode 100755
index 000000000..53eb5dbc9
Binary files /dev/null and b/image/card/spell_zhandounuhuo.jpg differ
diff --git a/image/card/spell_zhengqianghaosheng.jpg b/image/card/spell_zhengqianghaosheng.jpg
new file mode 100755
index 000000000..0f5e4d97d
Binary files /dev/null and b/image/card/spell_zhengqianghaosheng.jpg differ
diff --git a/image/card/spell_zhenyanshu.jpg b/image/card/spell_zhenyanshu.jpg
new file mode 100755
index 000000000..ae28c2045
Binary files /dev/null and b/image/card/spell_zhenyanshu.jpg differ
diff --git a/image/card/spell_zhihuizhufu.jpg b/image/card/spell_zhihuizhufu.jpg
new file mode 100755
index 000000000..239323ff8
Binary files /dev/null and b/image/card/spell_zhihuizhufu.jpg differ
diff --git a/image/card/spell_zhongnian.jpg b/image/card/spell_zhongnian.jpg
new file mode 100644
index 000000000..5ba613b2b
Binary files /dev/null and b/image/card/spell_zhongnian.jpg differ
diff --git a/image/card/spell_zhuizongshu.jpg b/image/card/spell_zhuizongshu.jpg
new file mode 100755
index 000000000..5b77c13fe
Binary files /dev/null and b/image/card/spell_zhuizongshu.jpg differ
diff --git a/image/card/spell_zhumo.jpg b/image/card/spell_zhumo.jpg
new file mode 100755
index 000000000..3f034d01b
Binary files /dev/null and b/image/card/spell_zhumo.jpg differ
diff --git a/image/card/spell_ziyang.jpg b/image/card/spell_ziyang.jpg
new file mode 100644
index 000000000..a866b406c
Binary files /dev/null and b/image/card/spell_ziyang.jpg differ
diff --git a/image/character/boss_zhuquemech.jpg b/image/character/boss_chiyuzhuque.jpg
similarity index 100%
rename from image/character/boss_zhuquemech.jpg
rename to image/character/boss_chiyuzhuque.jpg
diff --git a/image/character/boss_bianmech.jpg b/image/character/boss_fudibian.jpg
similarity index 100%
rename from image/character/boss_bianmech.jpg
rename to image/character/boss_fudibian.jpg
diff --git a/image/character/boss_baihumech.jpg b/image/character/boss_jileibaihu.jpg
similarity index 100%
rename from image/character/boss_baihumech.jpg
rename to image/character/boss_jileibaihu.jpg
diff --git a/image/character/boss_yazimech.jpg b/image/character/boss_lieshiyazi.jpg
similarity index 100%
rename from image/character/boss_yazimech.jpg
rename to image/character/boss_lieshiyazi.jpg
diff --git a/image/character/boss_xuanwumech.jpg b/image/character/boss_lingjiaxuanwu.jpg
similarity index 100%
rename from image/character/boss_xuanwumech.jpg
rename to image/character/boss_lingjiaxuanwu.jpg
diff --git a/image/character/boss_nianshou.jpg b/image/character/boss_nianshou.jpg
new file mode 100644
index 000000000..d21852d6b
Binary files /dev/null and b/image/character/boss_nianshou.jpg differ
diff --git a/image/character/boss_suannimech.jpg b/image/character/boss_shihuosuanni.jpg
similarity index 100%
rename from image/character/boss_suannimech.jpg
rename to image/character/boss_shihuosuanni.jpg
diff --git a/image/character/boss_chiwenmech.jpg b/image/character/boss_tuntianchiwen.jpg
similarity index 100%
rename from image/character/boss_chiwenmech.jpg
rename to image/character/boss_tuntianchiwen.jpg
diff --git a/image/character/boss_qinglongmech.jpg b/image/character/boss_yunpingqinglong.jpg
similarity index 100%
rename from image/character/boss_qinglongmech.jpg
rename to image/character/boss_yunpingqinglong.jpg
diff --git a/image/character/stone_jingxiang.jpg b/image/character/stone_jingxiang.jpg
new file mode 100755
index 000000000..0899e29ba
Binary files /dev/null and b/image/character/stone_jingxiang.jpg differ
diff --git a/image/character/stone_shurenx.jpg b/image/character/stone_shurenx.jpg
new file mode 100644
index 000000000..4ed14548c
Binary files /dev/null and b/image/character/stone_shurenx.jpg differ
diff --git a/image/character/stone_xiaojingling.jpg b/image/character/stone_xiaojingling.jpg
new file mode 100755
index 000000000..9079cd844
Binary files /dev/null and b/image/character/stone_xiaojingling.jpg differ
diff --git a/image/character/stone_zhumo.jpg b/image/character/stone_zhumo.jpg
new file mode 100755
index 000000000..3f034d01b
Binary files /dev/null and b/image/character/stone_zhumo.jpg differ
diff --git a/image/character/zumao.jpg b/image/character/zumao.jpg
new file mode 100644
index 000000000..96f084e4b
Binary files /dev/null and b/image/character/zumao.jpg differ
diff --git a/mode/boss.js b/mode/boss.js
index 7073450dd..ebe6bde3c 100755
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -156,6 +156,9 @@ mode.boss={
 						player.node.hp.classList.add('text');
 						player.node.hp.dataset.condition='';
 						player.node.hp.innerHTML=info[2];
+						if(info[2]==Infinity){
+							player.node.hp.innerHTML='∞';
+						}
 						player.setIdentity(player.name);
 						player.node.identity.dataset.color=info[5];
 						bosslistlinks[cfg]=player;
@@ -204,14 +207,19 @@ mode.boss={
 					bosslist.show();
 				},200);
 				game.me=ui.create.player();
-				game.chooseCharacter(function(target){
-					if(event.current){
-						event.current.classList.remove('highlight');
-					}
-					event.current=target;
-					game.save('current',target.name);
-					target.classList.add('highlight');
-				});
+				if(lib.config.continue_name_boss){
+					event.noslide=true;
+				}
+				else{
+					game.chooseCharacter(function(target){
+						if(event.current){
+							event.current.classList.remove('highlight');
+						}
+						event.current=target;
+						game.save('current',target.name);
+						target.classList.add('highlight');
+					});
+				}
 				if(lib.storage.test){
 					event.current.classList.remove('highlight');
 					if(event.current.nextSibling&&event.current.nextSibling.classList.contains('player')){
@@ -239,14 +247,20 @@ mode.boss={
 				var boss=ui.create.player().init(event.current.name);
 				game.boss=boss;
 				boss.side=true;
-				boss.classList.add('bossplayer');
-				boss.classList.add('highlight');
-				boss.animate('bossing');
-				boss.node.hp.animate('start');
-				boss.style.left=(rect.left-ui.arena.offsetLeft)+'px';
-				boss.style.top=(rect.top-ui.arena.offsetTop)+'px';
+				if(!event.noslide){
+					// boss.classList.add('bossplayer');
+					// boss.classList.add('highlight');
+					boss.animate('bossing');
+					boss.node.hp.animate('start');
+					boss.style.left=(rect.left-ui.arena.offsetLeft)+'px';
+					boss.style.top=(rect.top-ui.arena.offsetTop)+'px';
+				}
 				boss.setIdentity('zhu');
 				boss.identity='zhu';
+				if(lib.config.continue_name_boss){
+					result=lib.config.continue_name_boss;
+					game.saveConfig('continue_name_boss');
+				}
 				for(var i=0;i<result.links.length;i++){
 					var player=ui.create.player(ui.arena).init(result.links[i]).animate('start');
 					player.setIdentity('cai');
@@ -380,7 +394,9 @@ mode.boss={
 				_status.videoInited=true,
 				info.boss=(game.me==game.boss);
 				game.addVideo('init',null,info);
-
+				if(game.bossinfo.init){
+					game.bossinfo.init();
+				}
 				"step 4"
 				event.trigger('gameStart');
 				game.gameDraw(game.boss);
@@ -650,6 +666,53 @@ mode.boss={
 				if(player==game.boss&&game.boss.name!='boss_yecha'&&game.boss.name!='boss_luocha'){
 					return false;
 				}
+			},
+			init:function(){
+				_status.additionalReward=function(){
+					return 500;
+				}
+			}
+		},
+		boss_nianshou:{
+			chongzheng:99,
+			init:function(){
+				game.boss.node.action.classList.add('freecolor');
+				game.boss.node.action.style.opacity=1;
+				game.boss.node.action.style.letterSpacing='4px';
+				game.boss.node.action.style.marginRight=0;
+				game.boss.node.action.style.fontFamily='huangcao';
+				game.boss.node.action.innerHTML='';
+				_status.additionalReward=function(){
+					return Math.round(Math.pow(_status.damageCount,2.4))*2;
+				}
+				var time=360;
+				var interval=setInterval(function(){
+					if(_status.over){
+						clearInterval(interval);
+						return;
+					}
+					var sec=time%60;
+					if(sec<10){
+						sec='0'+sec;
+					}
+					game.boss.node.action.innerHTML=Math.floor(time/60)+':'+sec;
+					if(time<=0){
+						delete _status.additionalReward;
+						if(typeof _status.coin=='number'){
+							if(game.me==game.boss){
+								_status.coin+=Math.round(Math.pow(_status.damageCount,2.4));
+							}
+							else{
+								_status.coin+=Math.round(Math.pow(_status.damageCount,1.8));
+							}
+						}
+						game.forceOver(true);
+						clearInterval(interval);
+					}
+					time--;
+				},1000);
+				_status.damageCount=0;
+				ui.damageCount=ui.create.system('伤害: 0',null,true);
 			}
 		},
 		boss_zhangjiao:{
diff --git a/mode/chess.js b/mode/chess.js
index e99a0f1de..1eb1e6b5f 100755
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -656,25 +656,6 @@ mode.chess={
 			}
 		},
 		playerproto:{
-			finishGame:function(){
-				'step 0'
-				while(ui.controls.length){
-					ui.controls[0].close();
-				}
-				while(ui.dialogs.length){
-					ui.dialogs[0].close();
-				}
-				'step 1'
-				if(_status.friendDied<_status.enemyDied){
-					game.over(true);
-				}
-				else if(_status.friendDied>_status.enemyDied){
-					game.over(false);
-				}
-				else{
-					game.over();
-				}
-			},
 			replaceChessPlayer:function(){
 				'step 0'
 				if(get.config('additional_player')){
@@ -2141,15 +2122,14 @@ mode.chess={
 					finishGameBr.classList.add('finish_game');
 					ui.finishGame=ui.create.system('结束游戏',function(){
 						ui.finishGame.remove();
-						var next=game.createEvent('finish_game');
-						next.content=lib.element.playerproto.finishGame;
-						if(_status.paused){
-							if(_status.event.next.length>1){
-								_status.event.next.length=0;
-								_status.event.next.push(next);
-							}
-							game.uncheck();
-							game.resume();
+						if(_status.friendDied<_status.enemyDied){
+							game.forceOver(true);
+						}
+						else if(_status.friendDied>_status.enemyDied){
+							game.forceOver(false);
+						}
+						else{
+							game.forceOver();
 						}
 					});
 					ui.finishGame.classList.add('finish_game');
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 5b023b23b..d1f713a64 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -210,11 +210,18 @@ mode.guozhan={
 			var next=game.createEvent('chooseCharacter',false);
 			next.showConfig=true;
 			next.addPlayer=true;
-			next.ai=function(player,list){
+			next.ai=function(player,list,back){
 				for(var i=0;i<list.length-1;i++){
 					for(var j=i+1;j<list.length;j++){
 						if(lib.character[list[i]][1]==lib.character[list[j]][1]){
 							player.init(list[i],list[j],false);
+							if(back){
+								list.remove(player.name1);
+								list.remove(player.name2);
+								for(var i=0;i<list.length;i++){
+									back.push(list[i]);
+								}
+							}
 							return;
 						}
 					}
@@ -412,7 +419,7 @@ mode.guozhan={
 				event.list.remove(game.me.name2);
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i]!=game.me){
-						event.ai(game.players[i],event.list.splice(0,parseInt(get.config('choice_num'))))
+						event.ai(game.players[i],event.list.splice(0,parseInt(get.config('choice_num'))),event.list);
 					}
 				}
 				for(var i=0;i<game.players.length;i++){
diff --git a/mode/identity.js b/mode/identity.js
index db7302810..7e9cc1b5f 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -348,7 +348,7 @@ mode.identity={
 			next.removePlayer=function(){
 				return game.players.randomGet(game.me,game.zhu);
 			};
-			next.ai=function(player,list,list2){
+			next.ai=function(player,list,list2,back){
 				if(_status.event.zhongmode){
 					if(get.config('double_character')){
 						player.init(list[0],list[1]);
@@ -410,6 +410,13 @@ mode.identity={
 						player.init(list[0]);
 					}
 				}
+				if(back){
+					list.remove(player.name);
+					list.remove(player.name2);
+					for(var i=0;i<list.length;i++){
+						back.push(list[i]);
+					}
+				}
 			}
 			next.content=function(){
 				"step 0"
@@ -720,8 +727,7 @@ mode.identity={
 				}
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i]!=game.zhu&&game.players[i]!=game.me){
-						event.ai(game.players[i],
-							event.list.splice(0,get.config('choice_'+game.players[i].identity)))
+						event.ai(game.players[i],event.list.splice(0,get.config('choice_'+game.players[i].identity)),null,event.list)
 					}
 				}
 			}
diff --git a/mode/stone.js b/mode/stone.js
index c0fd3a24c..c91dc3056 100755
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -10,10 +10,7 @@ mode.stone={
 			},
 			chongzhu:true,
 			textShadow:'black 0 0 2px',
-			filterTarget:function(card,player,target){
-				return player==target;
-			},
-			selectTarget:-1,
+			notarget:true,
 			content:function(){
 				"step 0"
 				var name=card.name.slice(0,card.name.indexOf('_stonecharacter'));
@@ -50,7 +47,7 @@ mode.stone={
 				order:8.5,
 				useful:[5.5,1],
 				result:{
-					target:1
+					player:1
 				}
 			}
 		},
@@ -174,6 +171,24 @@ mode.stone={
 				}
 				return false;
 			},
+			getFellow:function(enemy){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()){
+						if(enemy){
+							if(game.players[i].side!=this.side){
+								list.push(game.players[i]);
+							}
+						}
+						else{
+							if(game.players[i].side==this.side){
+								list.push(game.players[i]);
+							}
+						}
+					}
+				}
+				return list;
+			},
 			countFellow:function(){
 				if(!this.actcharacterlist) return 0;
 				var num=0;
@@ -195,10 +210,13 @@ mode.stone={
 				fellow.dataset.position=i+4+(this==game.me?0:4);
 				return this;
 			},
-			addFellowAuto:function(name){
+			addFellowAuto:function(name,delay){
 				var next=game.createEvent('addFellowAuto');
 				next.player=this;
 				next.fellowName=name;
+				if(typeof delay=='boolean'){
+					next.delay=delay;
+				}
 				next.content=function(){
 					"step 0"
 					if(!player.canAddFellow()){
@@ -228,7 +246,7 @@ mode.stone={
 						fellow.draw(num,false);
 					}
 					player.updateActCount();
-					if(fellow.skills.contains('shaman_tuteng')){
+					if(fellow.skills.contains('shaman_tuteng')||event.delay===false){
 						fellow.noPhaseDelay=true;
 					}
 					// player.line(fellow,'green');
@@ -363,12 +381,7 @@ mode.stone={
 					}
 				}
 				if(source&&source.side!=this.side&&!source.isMin()){
-					if(_status.mode=='deck'){
-						source.draw(2,{drawDeck:1});
-					}
-					else{
-						source.draw(2);
-					}
+					source.draw(2);
 					if(source.getActCount()>0){
 						source.actused--;
 					}
@@ -383,6 +396,10 @@ mode.stone={
 			}
 		}
 	},
+	beastList:['stone_misha','stone_leiouke','stone_huofu',
+		'stone_caoyuanshi','stone_qingwa','stone_mianyang','stone_jiewangzhu',
+		'stone_fennuxiaoji','stone_juxingchanchu','stone_yanjingshe'
+	],
 	cardPack:{
 		mode_stone:[
 			'spell_xiaoshi','spell_chenmo','spell_morizaihuo','spell_shengerpingdeng','spell_jingshenkongzhi','spell_anyingkuangluan',
@@ -395,7 +412,16 @@ mode.stone={
 			'spell_xishengqiyue','spell_zuzhou','spell_xiaoguibaopo','spell_emozhinu','spell_anyinglieyan','spell_liliangdaijia',
 			'spell_shenshengxinxing','spell_shengguangzhadan','spell_maizang','spell_xinlingshijie','spell_naluzhiguang','spell_zhiliaozhihuan',
 			'spell_nuxi','spell_dunpaimengji','spell_zhansha','spell_nuhuozhongshao','spell_xuanfengzhan','spell_juemingluandou',
-			'spell_lierenyinji','spell_kuaisusheji','spell_guanmenfanggou','spell_zhaohuanchongwu','spell_zidanshangtang','spell_duochongsheji'
+			'spell_lierenyinji','spell_kuaisusheji','spell_guanmenfanggou','spell_zhaohuanchongwu','spell_zidanshangtang','spell_duochongsheji',
+			'spell_xianzuzhihun','spell_xianzuzhaohuan','spell_fengnu','spell_shihuawuqi','spell_xianzuzhishi','spell_rongyanbaolie',
+			'spell_laojiuhuoba','spell_chirehuoba','spell_aoshufeidan','spell_canying','spell_yanbaoshu','spell_hanbingpingzhang','spell_jingxiang',
+			'spell_mengun','spell_jipao','spell_beici','spell_weijisifu','spell_anzhongpohuai','spell_piaoqie',
+			'spell_conglinzhihun','spell_heiandiyu','spell_fugen','spell_xingchenzhuiluo','spell_fengnu','spell_ziyang',
+			'spell_shalumingling','spell_tianjiangzhuqun','spell_tanxianmao','spell_dubiao','spell_qiangfengsheji','spell_zhuizongshu',
+			'spell_zhenyanshu','spell_enzeshu','spell_anyingxingtai','spell_kuaisuzhiliao','spell_kongxinshu','spell_xinlinghanbao',
+			'spell_jinyingduijue','spell_zhihuizhufu','spell_shenshengfennu','spell_yongshizhufu','spell_shenpan','spell_zhengqianghaosheng',
+			'spell_zhongnian','spell_fuchoudaji','spell_yingyongdaji','spell_zhandounuhuo','spell_chongfeng','spell_kuangbao',
+			'spell_linghunhongxi','spell_siwangchanrao','spell_emozhixin','spell_fushishu','spell_ansezhadan','spell_heianqiyue'
 		]
 	},
 	characterPack:{
@@ -497,7 +523,11 @@ mode.stone={
 
 			stone_shumiao:['none','wu',1,[],['minskin','stone','stonehidden'],[1,1]],
 			stone_shuren:['none','wu',2,['stone_chongfeng','stone_zibao'],['minskin','stone','stonehidden'],[2,2]],
+			stone_shurenx:['none','wu',2,[],['minskin','stone','stonehidden'],[2,2]],
 			stone_youlinglang:['none','qun',2,['chaofeng'],['minskin','stone','stonehidden'],[2,2]],
+			stone_xiaojingling:['none','qun',1,['xuying'],['minskin','stone','stonehidden'],[1,1]],
+			stone_zhumo:['none','qun',2,[],['minskin','stone','stonehidden'],[2,2]],
+			stone_jingxiang:['none','qun',2,['stone_jingxiang','chaofeng'],['minskin','stone','stonehidden'],[2,0]],
 			stone_shengguanghuwei:['female','qun',2,['priest_shengguang'],['minskin','stone','stonehidden'],[1,1]],
 			stone_liegou:['none','qun',1,['stone_chongfeng'],['minskin','stone','stonehidden'],[1,2]],
 			stone_mianyang:['none','qun',1,['mage_mianyang'],['minskin','stone','stonehidden'],[1,0]],
@@ -527,14 +557,6 @@ mode.stone={
 				list.shift().remove();
 			}
 		},
-		modPhaseDraw:function(player,num){
-			if(_status.mode=='deck'&&!player.isMin()){
-				player.draw(num,{drawDeck:1});
-			}
-			else{
-				player.draw(num);
-			}
-		},
 		getVideoName:function(){
 			var str=get.translation(game.me.name);
 			if(game.me.name2){
@@ -618,6 +640,7 @@ mode.stone={
 				lib.spells=[];
 				var spells=lib.cardPack.mode_stone;
 				for(var i=0;i<spells.length;i++){
+					if(lib.card[spells[i]].stonehidden) continue;
 					if(lib.card[spells[i]].career){
 						list4[lib.card[spells[i]].career].push(spells[i]);
 					}
@@ -786,6 +809,7 @@ mode.stone={
 								game.save('deckList',lib.storage.deckList);
 								listContainer.style.transform='';
 								deckContainer.classList.remove('shown');
+								updateCardDialog();
 							}
 							e.stopPropagation();
 						});
@@ -1333,6 +1357,7 @@ mode.stone={
 				_status.enemylist=event.list.slice(0,result.links.length);
 				_status.double_character=get.config('double_character');
 				"step 2"
+				event.choosingDeck=true;
 				if(_status.mode=='deck'){
 					_status.deck=[];
 					if(!_status.auto){
@@ -1349,6 +1374,7 @@ mode.stone={
 						var buttons=ui.create.div('.buttons',event.dialog.content);
 						var currentNode=null;
 						var clickButton=function(click){
+							if(!event.choosingDeck) return;
 							if(click!==false){
 								_status.deck.push(this.name);
 							}
@@ -1374,6 +1400,7 @@ mode.stone={
 								currentNode.classList.add('shown');
 							}
 							else{
+								event.choosingDeck=false;
 								event.dialog.close();
 								ui.auto.show();
 								game.resume();
@@ -1437,18 +1464,19 @@ mode.stone={
 				else{
 					career=name.slice(7);
 				}
-				deck=[];
-				for(var i=0;i<lib.careerMinions[career].length;i++){
-					deck.push(lib.careerMinions[career][i]);
-					deck.push(lib.careerMinions[career][i]);
-				}
-				deck=deck.concat(lib.minions.randomGets(18-lib.careerMinions[career].length*2-lib.careerSpells[career].length)).
-				concat(lib.careerSpells[career]).concat(lib.spells.randomGets(12-lib.careerSpells[career].length));
+				deck=lib.careerMinions[career].randomGets(6).concat(lib.careerMinions[career].randomGets(6)).
+				concat(lib.minions.randomGets(6)).concat(lib.spells.randomGets(4)).
+				concat(lib.careerSpells[career].randomGets(4)).concat(lib.careerSpells[career].randomGets(4));
 			}
 			else{
 				career=lib.storage.deckList[name].career;
 				deck=lib.storage.deckList[name].deck.slice(0);
 			}
+			deck.sort(function(a,b){
+				if(a>b) return 1;
+				if(a==b) return 0;
+				return -1;
+			});
 			player.deck=name;
 			player.career=career;
 			if(!player.node.career){
@@ -1473,6 +1501,1718 @@ mode.stone={
 		}
 	},
 	card:{
+		spell_siwangchanrao:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'warlock',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				target.damage();
+				'step 1'
+				if(target.isDead()){
+					player.drawDeck();
+				}
+			},
+			ai:{
+				order:2,
+				value:5,
+				useful:5,
+				result:{
+					target:-1
+				},
+				tag:{
+					damage:1,
+				}
+			}
+		},
+		spell_ansezhadan:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'warlock',
+			filterTarget:true,
+			content:function(){
+				'step 0'
+				target.damage(2);
+				'step 1'
+				var hs=player.get('h');
+				if(hs.length){
+					player.discard(hs.randomGet());
+				}
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2
+				}
+			}
+		},
+		spell_emozhixin:{
+			type:'stonecard',
+			stoneact:4,
+			career:'warlock',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				if(target.side!=player.side){
+					target.damage(4);
+				}
+				else{
+					target.draw(4);
+				}
+			},
+			ai:{
+				order:4,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(target.side!=player.side){
+							return -3;
+						}
+						else{
+							return 2;
+						}
+					}
+				}
+			}
+		},
+		spell_heianqiyue:{
+			type:'stonecard',
+			stoneact:3,
+			career:'warlock',
+			enable:true,
+			fullimage:true,
+			notarget:true,
+			content:function(){
+				'step 0'
+				var fellows=player.getEnemy().getFellow();
+				if(fellows.length){
+					fellows.randomGet().die();
+				}
+				'step 1'
+				var fellows=player.getEnemy().getFellow();
+				if(fellows.length){
+					fellows.randomGet().die();
+				}
+				'step 2'
+				var hs=player.get('h');
+				if(hs.length){
+					player.discard(hs.randomGets(2));
+				}
+			},
+			ai:{
+				order:7,
+				value:3,
+				useful:3,
+				result:{
+					player:function(player){
+						if(player.getEnemy().countFellow()>=2) return 1;
+						return 0;
+					}
+				}
+			}
+		},
+		spell_linghunhongxi:{
+			type:'stonecard',
+			stoneact:5,
+			career:'warlock',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				target.die({source:player});
+				'step 1'
+				player.recover(2);
+			},
+			ai:{
+				order:7.5,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
+				}
+			}
+		},
+		spell_fushishu:{
+			type:'stonecard',
+			stoneact:2,
+			career:'warlock',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&!target.skills.contains('warlock_fushishu');
+			},
+			content:function(){
+				target.addSkill('warlock_fushishu');
+			},
+			ai:{
+				order:7.5,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
+				}
+			}
+		},
+
+		spell_fuchoudaji:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'warrior',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			selectTarget:-1,
+			content:function(){
+				if(player.hp<=2){
+					target.damage(3);
+				}
+				else{
+					target.damage();
+				}
+			},
+			ai:{
+				order:8.9,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_yingyongdaji:{
+			type:'stonecard',
+			stoneact:2,
+			career:'warrior',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.side!=player.side;
+			},
+			content:function(){
+				'step 0'
+				player.damage(2,target);
+				'step 1'
+				target.damage(2);
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(player.hujia>=2) return -1.5;
+						if(player.hujia==1){
+							if(player.hp>3) return -1.5;
+							return 0;
+						}
+						return 0;
+					}
+				},
+				tag:{
+					damage:1,
+				}
+			}
+		},
+		spell_zhandounuhuo:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&game.players[i].isDamaged()) return true;
+				}
+				return false;
+			},
+			stoneact:1,
+			career:'warrior',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				var num=0;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&game.players[i].isDamaged()){
+						num++;
+					}
+				}
+				if(num){
+					player.drawDeck(num);
+				}
+			},
+			ai:{
+				order:0.5,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_kuangbao:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'warrior',
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.isDamaged();
+			},
+			content:function(){
+				target.draw(4);
+			},
+			ai:{
+				order:6,
+				value:3,
+				useful:3,
+				result:{
+					target:1
+				},
+			}
+		},
+		spell_chongfeng:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'warrior',
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.isTurnedOver();
+			},
+			content:function(){
+				'step 0'
+				target.draw(3);
+				'step 1'
+				if(target.isTurnedOver()){
+					target.turnOver();
+				}
+			},
+			ai:{
+				order:6,
+				value:3,
+				useful:3,
+				result:{
+					target:function(player,target){
+						if(target.isTurnedOver()) return 2;
+						return 1;
+					}
+				},
+			}
+		},
+		spell_zhongnian:{
+			type:'stonecard',
+			stoneact:3,
+			career:'warrior',
+			enable:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&game.players[i].isDamaged()) return true;
+				}
+				return false;
+			},
+			fullimage:true,
+			filterTarget:true,
+			content:function(){
+				var num=0;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&game.players[i].isDamaged()){
+						num++;
+					}
+				}
+				if(num){
+					target.damage(Math.min(3,num));
+				}
+			},
+			ai:{
+				order:7.2,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						var num=0;
+						for(var i=0;i<game.players.length;i++){
+							if(game.players[i].side==player.side&&game.players[i].isDamaged()){
+								num++;
+								if(num>=2) return -1.5;
+							}
+						}
+						return 0;
+					},
+					tag:{
+						damage:1
+					}
+				}
+			}
+		},
+
+		spell_jinyingduijue:{
+			type:'stonecard',
+			stoneact:4,
+			career:'paladin',
+			enable:function(card,player){
+				var n1=player.countFellow();
+				var n2=player.getEnemy().countFellow();
+				return n1>0&&n2>0&&n1+n2>2;
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			selectTarget:-1,
+			multitarget:true,
+			multiline:true,
+			content:function(){
+				var maxf=[],maxe=[];
+				for(var i=0;i<targets.length;i++){
+					if(targets[i].side==player.side){
+						if(!maxf.length||targets[i].hp==maxf[0].hp){
+							maxf.push(targets[i]);
+						}
+						else if(targets[i].hp>maxf[0].hp){
+							maxf.length=0;
+							maxf.push(targets[i]);
+						}
+					}
+					else{
+						if(!maxe.length||targets[i].hp==maxe[0].hp){
+							maxe.push(targets[i]);
+						}
+						else if(targets[i].hp>maxe[0].hp){
+							maxe.length=0;
+							maxe.push(targets[i]);
+						}
+					}
+				}
+				if(maxf.length){
+					targets.remove(maxf.randomGet());
+				}
+				if(maxe.length){
+					targets.remove(maxe.randomGet());
+				}
+				targets.sort(lib.sort.seat);
+				for(var i=0;i<targets.length;i++){
+					targets[i].die()._triggered=null;
+				}
+				ui.clear();
+			},
+			ai:{
+				order:9,
+				value:2,
+				useful:2,
+				result:{
+					player:function(player,target){
+						return player.getEnemy().countFellow()-player.countFellow();
+					}
+				}
+			}
+		},
+		spell_zhihuizhufu:{
+			type:'stonecard',
+			stoneact:1,
+			career:'paladin',
+			enable:function(card,player){
+				return !player.isMin();
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&!target.skills.contains('paladin_zhihuizhufu');
+			},
+			content:function(){
+				target.addSkill('paladin_zhihuizhufu');
+				target.storage.paladin_zhihuizhufu=player;
+			},
+			ai:{
+				order:2,
+				value:5,
+				useful:5,
+				result:{
+					player:function(player,target){
+						return target.hp;
+					}
+				}
+			}
+		},
+		spell_shenshengfennu:{
+			type:'stonecard',
+			stoneact:5,
+			career:'paladin',
+			enable:true,
+			fullimage:true,
+			filterTarget:true,
+			content:function(){
+				'step 0'
+				event.card=player.getDeckCards()[0];
+				player.gain(event.card,'gain2');
+				game.log(player,'获得了',event.card);
+				'step 1'
+				var num=lib.card[event.card.name].stoneact;
+				if(num&&typeof num=='number'){
+					target.damage(num);
+				}
+			},
+			ai:{
+				order:6,
+				value:2,
+				useful:2,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2
+				}
+			}
+		},
+		spell_yongshizhufu:{
+			type:'stonecard',
+			stoneact:3,
+			career:'paladin',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.hp*=2;
+				target.maxHp*=2;
+				target.update();
+			},
+			ai:{
+				order:4,
+				value:2,
+				useful:2,
+				result:{
+					target:function(player,target){
+						return Math.max(0,target.hp-1);
+					}
+				}
+			}
+		},
+		spell_shenpan:{
+			type:'stonecard',
+			stoneact:2,
+			career:'paladin',
+			enable:function(card,player){
+				return player.getEnemy().countFellow()>=3;
+			},
+			fullimage:true,
+			notarget:true,
+			content:function(){
+				var target=player.getEnemy().getFellow().randomGet();
+				player.line(target);
+				target.die({source:player});
+			},
+			ai:{
+				order:9,
+				value:4,
+				useful:4,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_zhengqianghaosheng:{
+			type:'stonecard',
+			stoneact:2,
+			career:'paladin',
+			enable:function(card,player){
+				return !player.skills.contains('paladin_zhengqianghaosheng');
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				player.addSkill('paladin_zhengqianghaosheng');
+			},
+			ai:{
+				order:3,
+				value:4,
+				useful:4,
+				result:{
+					player:function(player){
+						if(player.countFellow()>=2) return 1;
+						return 0;
+					}
+				}
+			}
+		},
+
+		spell_zhenyanshu:{
+			type:'stonecard',
+			stoneact:1,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.gainMaxHp();
+				target.recover();
+				player.drawDeck();
+			},
+			ai:{
+				order:7,
+				value:3,
+				useful:3,
+				result:{
+					target:function(player,target){
+						return Math.max(1,10-target.hp);
+					}
+				}
+			}
+		},
+		spell_enzeshu:{
+			type:'stonecard',
+			stoneact:3,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.gainMaxHp(3);
+				target.recover(3);
+			},
+			ai:{
+				order:5,
+				value:3,
+				useful:3,
+				result:{
+					target:function(player,target){
+						return Math.max(1,10-target.hp);
+					}
+				}
+			}
+		},
+		spell_anyingxingtai:{
+			type:'stonecard',
+			stoneact:2,
+			career:'priest',
+			chongzhu:true,
+			enable:function(event,player){
+				if(player.career!='priest') return false;
+				return !player.storage.anyingxingtai||player.storage.anyingxingtai<2;
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				if(typeof player.storage.anyingxingtai!='number'){
+					player.storage.anyingxingtai=1;
+				}
+				else if(player.storage.anyingxingtai<2){
+					player.storage.anyingxingtai=2;
+				}
+				player.markSkill('priest_anyingxingtai');
+			},
+			ai:{
+				order:6.1,
+				value:3,
+				useful:3,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_kuaisuzhiliao:{
+			type:'stonecard',
+			stoneact:1,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				if(player.hasFellowSkill('priest_hunwu')){
+					return true;
+				}
+				return target.hp<target.maxHp;
+			},
+			content:function(){
+				if(player.hasFellowSkill('priest_hunwu')){
+					target.loseHp(2);
+				}
+				else{
+					target.recover(2);
+				}
+			},
+			ai:{
+				order:7,
+				value:7,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(player.hasFellowSkill('priest_hunwu')){
+							return -2
+						}
+						return ai.get.recoverEffect(target,player,target);
+					}
+				}
+			}
+		},
+		spell_kongxinshu:{
+			type:'stonecard',
+			stoneact:3,
+			career:'priest',
+			enable:function(card,player){
+				return player.canAddFellow();
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			selectTarget:-1,
+			content:function(){
+				if(!player.canAddFellow()) return;
+				var deck=player.getEnemy().deckCards;
+				if(deck){
+					var list=[];
+					for(var i=0;i<deck.length;i++){
+						if(get.type(deck[i])=='stonecharacter'){
+							list.push(deck[i].name);
+						}
+					}
+					if(list.length){
+						var name=list.randomGet();
+						player.addFellowAuto(name.slice(0,name.indexOf('_stonecharacter')));
+					}
+				}
+			},
+			ai:{
+				order:3,
+				value:2,
+				useful:2,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_xinlinghanbao:{
+			type:'stonecard',
+			stoneact:2,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage(2);
+			},
+			ai:{
+				order:6,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2
+				}
+			}
+		},
+
+		spell_shalumingling:{
+			type:'stonecard',
+			stoneact:3,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			filterTarget:true,
+			content:function(){
+				'step 0'
+				target.damage(2);
+				'step 1'
+				var friends=player.getFellow();
+				if(friends.length){
+					game.asyncDraw(friends);
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:-2,
+				},
+				tag:{
+					damage:2
+				}
+			}
+		},
+		spell_dubiao:{
+			type:'stonecard',
+			stoneact:0,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			notarget:true,
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side!=player.side){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					var target=list.randomGet();
+					target.damage();
+					player.line(target);
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_tanxianmao:{
+			type:'stonecard',
+			stoneact:2,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side==player.side;
+			},
+			content:function(){
+				target.gainMaxHp();
+				target.recover();
+				target.draw();
+				target.addSkill('hunter_tanxianmao');
+			},
+			ai:{
+				order:2,
+				value:2,
+				useful:2,
+				result:{
+					target:function(player,target){
+						return Math.max(1,10-target.hp);
+					}
+				}
+			}
+		},
+		spell_zhuizongshu:{
+			type:'stonecard',
+			stoneact:1,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				player.chooseCardButton('选择一张加入手牌',player.getDeckCards(3),true);
+				'step 1'
+				player.gain(result.links,'draw');
+			},
+			ai:{
+				order:2,
+				value:3,
+				useful:3,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_qiangfengsheji:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'hunter',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side&&target.isMin();
+			},
+			selectTarget:[1,2],
+			content:function(){
+				'step 0'
+				target.damage();
+				'step 1'
+				if(target.isAlive()){
+					var hs=target.get('h');
+					if(hs.length){
+						target.discard(hs.randomGet());
+					}
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(target.num('h')) return -2;
+						return -1.5;
+					}
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_tianjiangzhuqun:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			stoneact:3,
+			career:'hunter',
+			notarget:true,
+			content:function(){
+				'step 0'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_jiewangzhu');
+				}
+				'step 1'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_jiewangzhu');
+				}
+				'step 2'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_jiewangzhu');
+				}
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+
+		spell_conglinzhihun:{
+			type:'stonecard',
+			stoneact:3,
+			career:'druid',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return player.side==target.side&&target.isMin()&&!target.skills.contains('druid_conglinzhihun');
+			},
+			selectTarget:-1,
+			content:function(){
+				target.addSkill('druid_conglinzhihun');
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					player:function(player){
+						var num=0;
+						for(var i=0;i<game.players.length;i++){
+							if(game.players[i].isMin()&&game.players[i].side==player.side&&
+							!game.players[i].skill.contains('druid_conglinzhihun')){
+								num++;
+								if(num>=2) return 1;
+							}
+						}
+						return 0;
+					}
+				}
+			}
+		},
+		spell_heiandiyu:{
+			fullimage:true,
+			type:'stonecard',
+			enable:true,
+			stoneact:4,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			multitarget:true,
+			targetprompt:['增加体力并摸牌'],
+			selectTarget:[0,1],
+			notarget:true,
+			content:function(){
+				'step 0'
+				if(targets.length){
+					targets[0].gainMaxHp();
+					targets[0].recover();
+					targets[0].draw(3);
+					event.finish();
+				}
+				else{
+					event.num=0;
+				}
+				'step 1'
+				if(player.canAddFellow()&&event.num++<10){
+					player.addFellowAuto('stone_xiaojingling');
+					event.redo();
+				}
+			},
+			ai:{
+				order:5,
+				result:{
+					target:function(player,target){
+						return Math.max(1,target.hp-target.num('h'));
+					},
+				}
+			}
+		},
+		spell_ziyang:{
+			type:'stonecard',
+			stoneact:3,
+			career:'druid',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				if(player.skills.contains('druid_ziyang')){
+					player.drawDeck(3);
+					event.finish();
+				}
+				else{
+					player.chooseControl('获得行动值','摸牌').ai=function(){
+						if(player.num('h')<=1) return '摸牌';
+						return '获得行动值';
+					};
+				}
+				'step 1'
+				if(result.control=='摸牌'){
+					player.drawDeck(3);
+				}
+				else{
+					player.addSkill('druid_ziyang');
+				}
+			},
+			ai:{
+				order:1,
+				value:4,
+				useful:4,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_xingchenzhuiluo:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:6,
+			career:'druid',
+			targetprompt:['造成四点伤害'],
+			multitarget:true,
+			filterTarget:function(card,player,target){
+				return target.side!=player.side;
+			},
+			selectTarget:[0,1],
+			notarget:true,
+			content:function(){
+				'step 0'
+				if(targets.length){
+					targets[0].damage(4);
+					event.finish();
+				}
+				else{
+					var list=player.getFellow(true);
+					if(list.length){
+						list.sort(lib.sort.seat);
+						event.list=list;
+						player.line(list);
+					}
+					else{
+						event.finish();
+					}
+				}
+				'step 1'
+				if(event.list.length){
+					event.list.shift().damage(2);
+					event.redo();
+				}
+			},
+			ai:{
+				order:7,
+				useful:5,
+				value:5,
+				result:{
+					target:function(player,target){
+						if(target==player.getEnemy()) return -2;
+						return -1;
+					}
+				},
+				tag:{
+					damage:2
+				}
+			}
+		},
+		spell_fennu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				player.chooseControl('两点','一点').prompt='造成两点伤害，或造成一点伤害并从牌库中获得一张牌';
+				'step 1'
+				if(result.control=='一点'){
+					target.damage();
+				}
+				else{
+					target.damage(2);
+					event.finish();
+				}
+				'step 2'
+				player.drawDeck();
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1
+				},
+				tag:{
+					damage:2,
+				}
+			}
+		},
+		spell_fugen:{
+			type:'stonecard',
+			stoneact:2,
+			career:'druid',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				target.die();
+				'step 1'
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].stonehidden) continue;
+					if(lib.card[i].type=='stonecharacter'){
+						list.push(i);
+					}
+				}
+				player.getEnemy().gain(game.createCard(list.randomGet()),'draw');
+			},
+			ai:{
+				order:8.8,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
+				}
+			}
+		},
+
+		spell_mengun:{
+			type:'stonecard',
+			stoneact:2,
+			career:'rogue',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side!=player.side;
+			},
+			content:function(){
+				'step 0'
+				target.die();
+				event.name=target.name;
+				'step 1'
+				player.getEnemy().gain(game.createCard(event.name+'_stonecharacter'),'gain2');
+			},
+			ai:{
+				order:8.8,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
+				}
+			}
+		},
+		spell_jipao:{
+			type:'stonecard',
+			stoneact:3,
+			career:'rogue',
+			enable:function(card,player){
+				return !player.isMin();
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				if(!player.isMin()){
+					player.drawDeck(4);
+				}
+			},
+			ai:{
+				order:1,
+				value:3,
+				useful:3,
+			}
+		},
+		spell_beici:{
+			type:'stonecard',
+			stoneact:0,
+			career:'rogue',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.hp==target.maxHp;
+			},
+			content:function(){
+				target.loseHp();
+			},
+			ai:{
+				order:9,
+				result:{
+					target:-1
+				},
+				value:6,
+				useful:6,
+			}
+		},
+		spell_weijisifu:{
+			type:'stonecard',
+			stoneact:2,
+			career:'rogue',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			selectTarget:-1,
+			content:function(){
+				if(target.deckCards){
+					var cards=[];
+					for(var i=0;i<3;i++){
+						cards.push(game.createCard('spell_zhumo'));
+					}
+					player.$give(cards,target);
+					for(var i=0;i<cards.length;i++){
+						target.deckCards.push(cards[i]);
+					}
+					lib.skill.global.add('rogue_zhumo');
+				}
+			},
+			ai:{
+				order:6,
+				value:5,
+				useful:5,
+				result:{
+					target:-1
+				}
+			}
+		},
+		spell_zhumo:{
+			type:'stonecard',
+			stoneact:0,
+			enable:false,
+			fullimage:true,
+			stonehidden:true
+		},
+		spell_anzhongpohuai:{
+			type:'stonecard',
+			stoneact:3,
+			career:'rogue',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				var list=target.getFellow();
+				if(list.length){
+					list.randomGet().die({source:player});
+				}
+				'step 1'
+				var es=target.get('e');
+				if(es.length){
+					target.discard(es.randomGet());
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(target.hasFellow()) return -1;
+						return 0;
+					}
+				}
+			}
+		},
+		spell_piaoqie:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'rogue',
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			selectTarget:-1,
+			content:function(){
+				var cards=player.getEnemy().deckCards.randomGets(2);
+				var list=[];
+				for(var i=0;i<cards.length;i++){
+					list.push(game.createCard(cards[i].name,cards[i].suit,cards[i].number,cards[i].nature));
+				}
+				if(list.length){
+					player.gain(list,'draw');
+				}
+			},
+			ai:{
+				order:0.5,
+				result:{
+					player:1
+				}
+			}
+		},
+
+		spell_canying:{
+			type:'stonecard',
+			stoneact:1,
+			career:'mage',
+			enable:function(event,player){
+				return player.hasFellow();
+			},
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side==player.side;
+			},
+			selectTarget:-1,
+			multitarget:true,
+			multiline:true,
+			fullimage:true,
+			content:function(){
+				var cards=[];
+				for(var i=0;i<targets.length;i++){
+						if(lib.card[targets[i].name+'_stonecharacter']){
+							cards.push(game.createCard(targets[i].name+'_stonecharacter'));
+						}
+				}
+				player.gain(cards,'gain2');
+			},
+			ai:{
+				order:2,
+				value:5,
+				useful:5,
+			}
+		},
+		spell_laojiuhuoba:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'mage',
+			filterTarget:true,
+			content:function(){
+				target.damage('fire');
+				if(player.deckCards){
+					player.deckCards.push(game.createCard('spell_chirehuoba'));
+				}
+			},
+			ai:{
+				order:7,
+				value:4,
+				useful:4,
+				result:{
+					target:-1
+				},
+				tag:{
+					damage:1,
+					natureDamage:1,
+					fireDamage:1,
+				}
+			}
+		},
+		spell_chirehuoba:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'mage',
+			stonehidden:true,
+			filterTarget:true,
+			content:function(){
+				target.damage(2,'fire');
+			},
+			ai:{
+				order:7,
+				value:6,
+				useful:6,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2,
+					natureDamage:2,
+					fireDamage:2,
+				}
+			}
+		},
+		spell_hanbingpingzhang:{
+			type:'stonecard',
+			stoneact:2,
+			career:'mage',
+			enable:true,
+			fullimage:true,
+			filterTarget:true,
+			content:function(){
+				if(target.maxHp<2){
+					target.maxHp=2;
+				}
+				if(target.hp<2){
+					target.hp=2;
+					target.update();
+				}
+				target.addSkill('mage_hanbingpingzhang');
+			},
+			ai:{
+				order:1,
+				value:3,
+				useful:3,
+				result:{
+					target:function(player,target){
+						if(target.hp<=2) return 3-target.hp;
+						return 0;
+					}
+				}
+			}
+		},
+		spell_aoshufeidan:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.getEnemy().countFellow()>0;
+			},
+			stoneact:2,
+			career:'mage',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side&&target.isMin();
+			},
+			selectTarget:-1,
+			multitarget:true,
+			multiline:true,
+			content:function(){
+				'step 0'
+				var map=[];
+				for(var i=0;i<targets.length;i++){
+					map.push(0);
+				}
+				for(var i=0;i<3;i++){
+					map[Math.floor(Math.random()*map.length)]++;
+				}
+				event.num=0;
+				event.map=map;
+				'step 1'
+				if(event.num<targets.length){
+					if(event.map[event.num]){
+						targets[event.num].damage(event.map[event.num]);
+					}
+					event.num++;
+					event.redo();
+				}
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+				}
+			}
+		},
+		spell_jingxiang:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			stoneact:1,
+			career:'mage',
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			content:function(){
+				'step 0'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_jingxiang',false);
+				}
+				'step 1'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_jingxiang',false);
+				}
+			},
+			ai:{
+				order:4,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_yanbaoshu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:6,
+			career:'mage',
+			filterTarget:true,
+			content:function(){
+				target.damage(4,'fire');
+			},
+			ai:{
+				order:8,
+				value:4,
+				useful:4,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2,
+					natureDamage:2,
+					fireDamage:2,
+				}
+			}
+		},
+
+		spell_fengnu:{
+			type:'stonecard',
+			stoneact:2,
+			career:'shaman',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&!target.skills.contains('shaman_fengnu');
+			},
+			content:function(){
+				target.addSkill('shaman_fengnu');
+			},
+			ai:{
+				order:4,
+				value:4,
+				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.hp>1) return target.hp;
+						return 0;
+					}
+				}
+			}
+		},
+		spell_shihuawuqi:{
+			type:'stonecard',
+			stoneact:1,
+			career:'shaman',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&!target.skills.contains('shaman_shihuawuqi');
+			},
+			content:function(){
+				target.addSkill('shaman_shihuawuqi');
+			},
+			ai:{
+				order:4,
+				value:4,
+				useful:4,
+				result:{
+					target:function(player,target){
+						if(target.isTurnedOver()) return 0;
+						if(target.isMin()) return target.hp;
+						return 1.1;
+					}
+				}
+			}
+		},
+		spell_xianzuzhaohuan:{
+			type:'stonecard',
+			stoneact:1,
+			career:'shaman',
+			fullimage:true,
+			enable:true,
+			filterTarget:function(card,player,target){
+				return !target.isMin();
+			},
+			multitarget:true,
+			multiline:true,
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				var hs=targets[0].get('h',function(card){
+					return get.type(card)=='stonecharacter';
+				});
+				if(hs.length&&targets[0].canAddFellow()){
+					targets[0].useCard(targets[0],hs.randomGet(),false).noActCount=true;
+				}
+				'step 1'
+				var hs=targets[1].get('h',function(card){
+					return get.type(card)=='stonecharacter';
+				});
+				if(hs.length&&targets[1].canAddFellow()){
+					targets[1].useCard(targets[1],hs.randomGet(),false).noActCount=true;
+				}
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					player:function(player){
+						var hs=player.get('h',function(card){
+							return get.type(card)=='stonecharacter';
+						});
+						if(hs.length==0) return 0;
+						var enemy=player.getEnemy();
+						if(enemy.num('h')<=1) return 1;
+						var num=0;
+						for(var i=0;i<hs.length;i++){
+							num+=get.info(hs[i]).stoneact;
+						}
+						if(num/hs.length>=3) return 1;
+						return 0;
+					}
+				}
+			}
+		},
+		spell_xianzuzhihun:{
+			type:'stonecard',
+			stoneact:2,
+			career:'shaman',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&!target.skills.contains('shaman_xianzuzhihun');
+			},
+			content:function(){
+				target.addSkill('shaman_xianzuzhihun');
+			},
+			ai:{
+				order:5,
+				value:4,
+				useful:4,
+				result:{
+					target:function(player,target){
+						if(lib.card[target.name+'_stonecharacter']){
+							return lib.card[target.name+'_stonecharacter'].stoneact-1;
+						}
+						return 0;
+					}
+				}
+			}
+		},
+		spell_xianzuzhishi:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:0,
+			career:'shaman',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				player.drawDeck(2);
+				player.addTempSkill('shaman_xianzuzhishi','phaseAfter');
+			},
+			ai:{
+				order:10,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_rongyanbaolie:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'shaman',
+			filterTarget:true,
+			content:function(){
+				'step 0'
+				target.damage(3,'fire');
+				'step 1'
+				player.loseHp();
+			},
+			ai:{
+				order:8,
+				value:6,
+				useful:5,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2,
+					natureDamage:2,
+					fireDamage:2,
+				}
+			}
+		},
+
 		spell_shenshengxinxing:{
 			type:'stonecard',
 			stoneact:5,
@@ -1554,7 +3294,9 @@ mode.stone={
 				'step 0'
 				target.die();
 				'step 1'
-				player.gain(game.createCard(target.name+'_stonecharacter'),'gain2');
+				if(player.deckCards){
+					player.deckCards.push(game.createCard(target.name+'_stonecharacter'));
+				}
 			},
 			ai:{
 				order:7,
@@ -1621,7 +3363,7 @@ mode.stone={
 			},
 			ai:{
 				order:7,
-				value:5,
+				value:7,
 				useful:5,
 				result:{
 					player:function(player,target){
@@ -1739,7 +3481,9 @@ mode.stone={
 				value:5,
 				useful:5,
 				result:{
-					target:-2
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
 				}
 			}
 		},
@@ -1886,7 +3630,7 @@ mode.stone={
 		},
 		spell_guanmenfanggou:{
 			type:'stonecard',
-			stoneact:3,
+			stoneact:2,
 			career:'hunter',
 			enable:function(event,player){
 				return player.getEnemy().countFellow()>0;
@@ -1927,10 +3671,7 @@ mode.stone={
 			},
 			selectTarget:-1,
 			content:function(){
-				var list=['stone_misha','stone_leiouke','stone_huofu',
-				'stone_caoyuanshi','stone_qingwa','stone_mianyang','stone_jiewangzhu',
-				'stone_fennuxiaoji','stone_juxingchanchu','stone_yanjingshe'];
-				player.addFellowAuto(list.randomGet());
+				player.addFellowAuto(lib.beastList.randomGet());
 			},
 			ai:{
 				order:6,
@@ -1978,10 +3719,7 @@ mode.stone={
 			},
 			stoneact:4,
 			career:'hunter',
-			filterTarget:function(card,player,target){
-				return player==target;
-			},
-			selectTarget:-1,
+			notarget:true,
 			content:function(){
 				'step 0'
 				var list=[];
@@ -2384,6 +4122,8 @@ mode.stone={
 			filterTarget:true,
 			selectTarget:[0,1],
 			notarget:true,
+			multitarget:true,
+			targetprompt:['造成一点伤害'],
 			content:function(){
 				'step 0'
 				if(targets.length){
@@ -2554,7 +4294,7 @@ mode.stone={
 			type:'stonecard',
 			fullimage:true,
 			enable:true,
-			stoneact:3,
+			stoneact:4,
 			career:'rogue',
 			filterTarget:function(card,player,target){
 				return target.isMin();
@@ -2567,7 +4307,9 @@ mode.stone={
 				value:5,
 				useful:5,
 				result:{
-					target:-100
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
 				},
 			}
 		},
@@ -2736,10 +4478,7 @@ mode.stone={
 			},
 			stoneact:3,
 			career:'paladin',
-			selectTarget:-1,
-			filterTarget:function(card,player,target){
-				return player==target;
-			},
+			notarget:true,
 			content:function(){
 				'step 0'
 				if(player.canAddFellow()){
@@ -2751,7 +4490,7 @@ mode.stone={
 				}
 			},
 			ai:{
-				order:9,
+				order:8.5,
 				value:5,
 				useful:5,
 				result:{
@@ -2874,7 +4613,7 @@ mode.stone={
 			multitarget:true,
 			multiline:true,
 			content:function(){
-				game.asyncDraw(targets,2);
+				game.asyncDraw(targets,3);
 			},
 			ai:{
 				order:5,
@@ -2896,10 +4635,7 @@ mode.stone={
 			},
 			stoneact:4,
 			career:'shaman',
-			selectTarget:-1,
-			filterTarget:function(card,player,target){
-				return player==target;
-			},
+			notarget:true,
 			content:function(){
 				'step 0'
 				if(player.canAddFellow()){
@@ -2932,10 +4668,7 @@ mode.stone={
 			},
 			stoneact:2,
 			career:'shaman',
-			filterTarget:function(card,player,target){
-				return player==target;
-			},
-			selectTarget:-1,
+			notarget:true,
 			content:function(){
 				'step 0'
 				var list=[];
@@ -2998,11 +4731,11 @@ mode.stone={
 			type:'stonecard',
 			fullimage:true,
 			enable:true,
-			stoneact:3,
+			stoneact:4,
 			career:'mage',
 			filterTarget:true,
 			content:function(){
-				target.damage(2,'fire');
+				target.damage(3,'fire');
 			},
 			ai:{
 				order:8,
@@ -3454,6 +5187,273 @@ mode.stone={
 		},
 	},
 	skill:{
+		warlock_fushishu:{
+			trigger:{player:'phaseAfter'},
+			forced:true,
+			mark:true,
+			intro:{
+				content:'下个回合结束后死亡'
+			},
+			content:function(){
+				player.die();
+			},
+			ai:{
+				threaten:0.1
+			}
+		},
+
+		paladin_zhengqianghaosheng:{
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			mark:true,
+			intro:{
+				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();
+				}
+				game.asyncDraw(list);
+			}
+		},
+		paladin_zhihuizhufu:{
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			mark:true,
+			intro:{
+				content:function(storage){
+					return '回合开始阶段，'+get.translation(storage)+'从牌库中获得一张牌';
+				}
+			},
+			filter:function(event,player){
+				return game.players.contains(player.storage.paladin_zhihuizhufu);
+			},
+			content:function(){
+				player.storage.paladin_zhihuizhufu.drawDeck();
+			}
+		},
+
+		priest_anyingxingtai:{
+			intro:{
+				content:function(storage,player){
+					return '职业技能改为造成'+get.cnNumber(player.storage.anyingxingtai)+'点伤害';
+				}
+			}
+		},
+		hunter_tanxianmao:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			mark:true,
+			marktext:'冒',
+			intro:{
+				content:'你死亡时，将一张探险冒置入主将的手牌'
+			},
+			content:function(){
+				player.getLeader().addSkill('hunter_tanxianmao2');
+			}
+		},
+		hunter_tanxianmao2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player.skills.contains('hunter_tanxianmao');
+			},
+			content:function(){
+				player.gain(game.createCard('spell_tanxianmao'),'gain2');
+				player.removeSkill('hunter_tanxianmao2');
+			}
+		},
+		rogue_zhumo:{
+			trigger:{player:'discardAfter'},
+			filter:function(event,player){
+				for(var i=0;i<event.cards.length;i++){
+					if(get.position(event.cards[i])=='d'){
+						if(event.cards[i].name=='spell_zhumo') return true;
+					}
+				}
+				return false;
+			},
+			forced:true,
+			popup:false,
+			content:function(){
+				'step 0'
+				event.num=0;
+				for(var i=0;i<trigger.cards.length;i++){
+					if(get.position(trigger.cards[i])=='d'){
+						if(trigger.cards[i].name=='spell_zhumo') event.num++;
+					}
+				}
+				event.target=player.getEnemy();
+				"step 1"
+				if(event.num--&&event.target.canAddFellow()){
+					event.target.addFellowAuto('stone_zhumo');
+					event.redo();
+				}
+			},
+		},
+
+		druid_conglinzhihun:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			mark:true,
+			intro:{
+				content:'你死亡后，召唤一个树人'
+			},
+			content:function(){
+				player.getLeader().addSkill('druid_conglinzhihun2');
+			},
+			ai:{
+				threaten:0.8
+			}
+		},
+		druid_conglinzhihun2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player.skills.contains('druid_conglinzhihun');
+			},
+			content:function(){
+				game.delay();
+				player.addFellowAuto('stone_shurenx');
+				player.removeSkill('druid_conglinzhihun2');
+			}
+		},
+		shaman_xianzuzhishi:{
+			mark:true,
+			intro:{
+				content:'本回合手牌上限-1'
+			},
+			marktext:'祖',
+			mod:{
+				maxHandcard:function(player,num){
+					return num-1;
+				}
+			}
+		},
+		shaman_xianzuzhihun:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			mark:true,
+			intro:{
+				content:'你死亡后，召唤一个自身的复制'
+			},
+			marktext:'魂',
+			content:function(){
+				var target=player.getLeader()
+				target.addSkill('shaman_xianzuzhihun2');
+				target.storage.shaman_xianzuzhihun=player.name;
+			},
+			ai:{
+				threaten:0.5
+			}
+		},
+		shaman_xianzuzhihun2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				if(!player.storage.shaman_xianzuzhihun) return false;
+				return event.player.skills.contains('shaman_xianzuzhihun');
+			},
+			content:function(){
+				game.delay();
+				player.addFellowAuto(player.storage.shaman_xianzuzhihun);
+				player.removeSkill('shaman_xianzuzhihun2');
+				delete player.storage.shaman_xianzuzhihun;
+			}
+		},
+
+		shaman_fengnu:{
+			unique:true,
+			trigger:{player:'phaseAfter'},
+			forced:true,
+			mark:true,
+			intro:{
+				content:'结合结束后，你获得一个额外的回合'
+			},
+			filter:function(event,player){
+				return event.parent.name!='shaman_fengnu';
+			},
+			content:function(){
+				player.phase();
+			},
+			ai:{
+				order:-10,
+				result:{
+					target:2
+				},
+				threaten:1.5
+			}
+		},
+		shaman_shihuawuqi:{
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			content:function(){
+				player.draw(3);
+			},
+			mark:true,
+			intro:{
+				content:'回合开始阶段，摸三张牌'
+			},
+			group:'shaman_shihuawuqi2'
+		},
+		shaman_shihuawuqi2:{
+			trigger:{global:'phaseBegin'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player==player.getLeader();
+			},
+			content:function(){
+				player.removeSkill('shaman_shihuawuqi');
+			}
+		},
+		mage_hanbingpingzhang:{
+			trigger:{player:['damageBegin','loseHpBegin']},
+			forced:true,
+			unique:true,
+			priority:-55,
+			mark:true,
+			filter:function(event,player){
+				return player.hp-event.num<2;
+			},
+			content:function(){
+				trigger.num=player.hp-2;
+			},
+			intro:{
+				content:'体力值不能降至2以内'
+			},
+			marktext:'屏',
+			ai:{
+				effect:{
+					target:function(card,player,target){
+						if(get.tag(card,'damage')||get.tag(card,'loseHp')){
+							if(target.hp<=2) return 0;
+						}
+					}
+				}
+			},
+			group:'mage_hanbingpingzhang2'
+		},
+		mage_hanbingpingzhang2:{
+			trigger:{global:'phaseBegin'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player==player.getLeader();
+			},
+			content:function(){
+				player.removeSkill('mage_hanbingpingzhang');
+			}
+		},
 		spell_modaoyou:{
 			intro:{
 				content:function(storage){
@@ -3469,14 +5469,7 @@ mode.stone={
 				return event.player.skills.contains('hunter_jiewang');
 			},
 			content:function(){
-				var list=[];
-				for(var i in lib.card){
-					if(lib.card[i].stonehidden) continue;
-					if(lib.card[i].type=='stonecharacter'){
-						list.push(i);
-					}
-				}
-				player.gain(game.createCard(list.randomGet()),'draw');
+				player.gain(game.createCard(lib.beastList.randomGet()+'_stonecharacter'),'draw');
 				player.removeSkill('hunter_jiewang2');
 			}
 		},
@@ -3547,6 +5540,16 @@ mode.stone={
 				trigger.finish();
 			}
 		},
+		stone_jingxiang:{
+			trigger:{player:'phaseDrawBefore'},
+			forced:true,
+			unique:true,
+			popup:false,
+			content:function(){
+				trigger.untrigger();
+				trigger.finish();
+			}
+		},
 		mage_mianyang:{
 			mod:{
 				cardEnabled:function(card){
@@ -3744,7 +5747,7 @@ mode.stone={
 				return event.player.skills.contains('rogue_xunbao');
 			},
 			content:function(){
-				player.gain(game.createCard('spell_sijidaifa'),'draw2');
+				player.gain(game.createCard('spell_sijidaifa'),'gain2');
 				player.removeSkill('rogue_xunbao2');
 			}
 		},
@@ -4328,6 +6331,19 @@ mode.stone={
 				player.removeSkill('druid_yexingchengzhang');
 			}
 		},
+		druid_ziyang:{
+			trigger:{player:'phaseUseBegin'},
+			forced:true,
+			mark:true,
+			intro:{
+				content:'下个出牌阶段开始时获得四点额外行动值',
+			},
+			content:function(){
+				player.actused-=4;
+				player.updateActCount();
+				player.removeSkill('druid_ziyang');
+			}
+		},
 		druid_chengzhang:{
 			trigger:{source:'fellow'},
 			forced:true,
@@ -4458,6 +6474,7 @@ mode.stone={
 			filter:function(event,player){
 				if(player.career!='priest') return false;
 				if(player.getActCount()+2>player.actcount) return false;
+				if(player.storage.anyingxingtai) return false;
 				return true;
 			},
 			usable:1,
@@ -4492,6 +6509,34 @@ mode.stone={
 				}
 			}
 		},
+		_priest_skillx:{
+			enable:'phaseUse',
+			filter:function(event,player){
+				if(player.career!='priest') return false;
+				if(player.getActCount()+2>player.actcount) return false;
+				if(!player.storage.anyingxingtai) return false;
+				return true;
+			},
+			usable:1,
+			prompt:function(event,player){
+				return '造成'+get.cnNumber(_status.event.player.storage.anyingxingtai)+'点伤害';
+			},
+			filterTarget:true,
+			content:function(){
+				player.actused+=2;
+				player.updateActCount();
+				event.parent.career='priest';
+				target.damage(player.storage.anyingxingtai);
+			},
+			ai:{
+				order:2,
+				result:{
+					target:function(player,target){
+						return ai.get.damageEffect(target,player,target);
+					}
+				}
+			}
+		},
 		_mage_skill:{
 			enable:'phaseUse',
 			filter:function(event,player){
@@ -5302,7 +7347,7 @@ mode.stone={
 			forced:true,
 			popup:false,
 			filter:function(event,player){
-				return !player.isMin();
+				return !player.isMin()&&!event.noActCount;
 			},
 			content:function(){
 				var stoneact=get.info(trigger.card).stoneact;
@@ -5382,7 +7427,7 @@ mode.stone={
 		spell_shengguangzhadan:'圣光炸弹',
 		spell_shengguangzhadan_info:'对所有随从造成等同于其手牌数的伤害',
 		spell_maizang:'埋葬',
-		spell_maizang_info:'令一名敌方随从死亡，并将一张与该随从同名的随从牌置于你的手牌',
+		spell_maizang_info:'令一名敌方随从死亡，并将一张与该随从同名的随从洗入你的牌库',
 		spell_xinlingshijie:'心灵视界',
 		spell_xinlingshijie_info:'将一张敌方主将手牌的复制置于你的手牌',
 		spell_naluzhiguang:'纳鲁之光',
@@ -5390,6 +7435,20 @@ mode.stone={
 		spell_zhiliaozhihuan:'治疗之环',
 		spell_zhiliaozhihuan_info:'令所有随从恢复两点体力值',
 
+		spell_zhenyanshu:'真言术',
+		spell_zhenyanshu_info:'令一名随从增加一点体力上限，回复一点体力；从牌库中获得一张牌',
+		spell_enzeshu:'恩泽术',
+		spell_enzeshu_info:'令一名随从增加三点体力上限并回复三点体力',
+		spell_anyingxingtai:'暗影形态',
+		priest_anyingxingtai:'暗影形态',
+		spell_anyingxingtai_info:'你的职业技能改为造成一点伤害，若已进入暗影形态，则改为造成两点伤害',
+		spell_kuaisuzhiliao:'快速治疗',
+		spell_kuaisuzhiliao_info:'回复两点体力',
+		spell_xinlinghanbao:'心灵撼爆',
+		spell_xinlinghanbao_info:'对敌方主将造成两点伤害',
+		spell_kongxinshu:'控心术',
+		spell_kongxinshu_info:'复制敌方牌库中的一张随从，将其置入战场',
+
 		stone_shengguanghuwei:'圣光护卫',
 		priest_shengguang:'圣光',
 		priest_shengguang_info:'每当一名随从获得治疗，摸一张牌',
@@ -5405,7 +7464,35 @@ mode.stone={
 		spell_xuanfengzhan:'旋风斩',
 		spell_xuanfengzhan_info:'对所有随从造成一点伤害',
 		spell_juemingluandou:'绝命乱半',
-		spell_juemingluandou_info:'随机保留一名随从，然后令所有其他随从死亡',
+		spell_juemingluandou_info:'随机保留一名随从，然后令所有其他随从死亡（无法触发死亡技能）',
+
+		spell_zhongnian:'重碾',
+		spell_zhongnian_info:'造成X点伤害，X为已受伤的友方角色数且不超过3',
+		spell_zhandounuhuo:'战斗怒火',
+		spell_zhandounuhuo_info:'从牌库中获得X张牌，X为已受伤的友方角色数',
+		spell_chongfeng:'冲锋',
+		spell_chongfeng_info:'令一名武将牌背面朝上的友方随从摸三张牌，然后将武将牌翻至正面',
+		spell_fuchoudaji:'复仇打击',
+		spell_fuchoudaji_info:'对所有随从造成一点伤害，若你的体力值不大于2，改为造成三点伤害',
+		spell_kuangbao:'狂暴',
+		spell_kuangbao_info:'令一名已受伤的友方随从摸四张牌',
+		spell_yingyongdaji:'英勇打击',
+		spell_yingyongdaji_info:'令一名敌方角色对你造成两点伤害，然后对其造成两点伤害',
+
+		spell_dubiao:'毒镖',
+		spell_dubiao_info:'对一名随机敌方角色造成一点伤害',
+		spell_qiangfengsheji:'强风射击',
+		spell_qiangfengsheji_info:'对两名敌方随从各造成一点伤害，并弃置其一张手牌',
+		spell_tanxianmao:'探险冒',
+		hunter_tanxianmao:'探险冒',
+		hunter_tanxianmao_info:'你死亡时，将一张探险冒置入主将的手牌',
+		spell_tanxianmao_info:'令一名友方随从增加一点体力上限，回复一点体力并摸一张牌，当该随从死亡时，将一张探险冒置入你的手牌',
+		spell_shalumingling:'杀戮命令',
+		spell_shalumingling_info:'造成两点伤害，所有友方随从摸一张牌',
+		spell_zhuizongshu:'追踪术',
+		spell_zhuizongshu_info:'从牌库中随机选择三张牌，获得其中的一张',
+		spell_tianjiangzhuqun:'天降蛛群',
+		spell_tianjiangzhuqun_info:'召唤三只结网蛛',
 
 		spell_lierenyinji:'猎人印记',
 		spell_lierenyinji_info:'将一名随从的体力上限降至1',
@@ -5438,6 +7525,21 @@ mode.stone={
 		spell_emozhinu:'恶魔之怒',
 		spell_emozhinu_info:'对所有随从造成一点伤害',
 
+		spell_emozhixin:'恶魔之心',
+		spell_emozhixin_info:'对一名敌方随从造成四点伤害，或令一名友方随从摸四张牌',
+		spell_ansezhadan:'暗色炸弹',
+		spell_ansezhadan_info:'造成两点伤害，随机弃置一张手牌',
+		spell_fushishu:'腐蚀术',
+		warlock_fushishu:'腐蚀',
+		warlock_fushishu_info:'下个回合结束后死亡',
+		spell_fushishu_info:'令一名敌方随从于其下个回合结束后死亡',
+		spell_heianqiyue:'黑暗契约',
+		spell_heianqiyue_info:'随机令两名敌方随从死亡，随机弃置两张手牌',
+		spell_linghunhongxi:'灵魂虹吸',
+		spell_linghunhongxi_info:'杀死一名随从，回复两点体力',
+		spell_siwangchanrao:'死亡缠绕',
+		spell_siwangchanrao_info:'对一名随从造成一点伤害；若该随从死亡，从牌库中获得一张牌',
+
 		spell_wuyashenxiang:'乌鸦神像',
 		spell_wuyashenxiang_info:'从三张法术牌或随从牌中选择一张加入手牌',
 		spell_huotigenxu:'活体根须',
@@ -5447,18 +7549,37 @@ mode.stone={
 		spell_yexingchengzhang:'野性成长',
 		spell_yexingchengzhang_info:'下个出牌阶段开始时获得三点额外行动值',
 		spell_ziranzhili:'自然之力',
-		spell_ziranzhili_info:'召唤三个树人，树人在其回合结束后死亡',
+		spell_ziranzhili_info:'召唤三个自爆树人',
 		spell_yemanpaoxiao:'野蛮咆哮',
 		spell_yemanpaoxiao_bg:'咆',
 		spell_yemanpaoxiao2:'咆哮',
 		spell_yemanpaoxiao_info:'所有友方角色造成的伤害+1，直到你的下个回合开始',
 
+		spell_conglinzhihun:'丛林之魂',
+		druid_conglinzhihun:'树魂',
+		druid_conglinzhihun_info:'你死亡后召唤一个树人',
+		spell_conglinzhihun_info:'令所有友方随从获得技能树魂（你死亡后召唤一个树人）',
+		spell_ziyang:'滋养',
+		spell_ziyang_info:'下个出牌开始阶段获得四点额外行动值，或从牌库中获得三张牌',
+		spell_fugen:'腐根',
+		spell_fugen_info:'令一名随从死亡，将一张随机随从置入对手的手牌',
+		spell_xingchenzhuiluo:'星辰坠落',
+		spell_xingchenzhuiluo_info:'对一名敌方角色造成四点伤害，或对所有敌方随从造成两点伤害',
+		spell_fennu:'愤怒',
+		spell_fennu_info:'对一名随从造成两点伤害，或造成一点伤害并从牌库中获得一张牌',
+		spell_heiandiyu:'黑暗低语',
+		spell_heiandiyu_info:'召唤若干个小精灵直到你的随从数达到4；或令一名随从增加一点体力上限，回复一点体力并摸三张牌',
+
 		druid_yexingchengzhang:'成长',
 		druid_yexingchengzhang_bg:'长',
 		druid_yexingchengzhang_info:'下个出牌阶段开始时获得三点额外行动值',
+		druid_ziyang:'滋养',
+		druid_ziyang_bg:'养',
+		druid_ziyang_info:'下个出牌阶段开始时获得四点额外行动值',
 
 		stone_shumiao:'树苗',
-		stone_shuren:'树人',
+		stone_shuren:'自爆树人',
+		stone_shurenx:'树人',
 		stone_zibao:'自爆',
 		stone_zibao_info:'结合结束后立即死亡',
 
@@ -5475,6 +7596,22 @@ mode.stone={
 		spell_modaoyou:'磨刀油',
 		spell_modaoyou_info:'令你下一次剑刃乱舞造成的伤害+1，并与一名随机友方随从各摸两张牌',
 
+		spell_mengun:'闷棍',
+		spell_mengun_info:'令一名敌方随从死亡，将一张该随从的复制置入对手的手牌',
+		spell_anzhongpohuai:'暗中破坏',
+		spell_anzhongpohuai_info:'随机杀死一名敌方随从，随机弃置敌方的一张装备牌',
+		spell_beici:'背刺',
+		spell_beici_info:'令一名未受伤的随从流失一点体力',
+		spell_weijisifu:'危机四伏',
+		spell_zhumo:'蛛魔',
+		stone_zhumo:'蛛魔',
+		spell_zhumo_info:'每当该牌被弃置，为你的对手召唤一只蛛魔',
+		spell_weijisifu_info:'将三张蛛魔牌洗入对手的牌库；每当一名角色弃置蛛魔牌，为其对手召唤一只蛛魔',
+		spell_piaoqie:'剽窃',
+		spell_piaoqie_info:'复制两张对手牌库中的牌加入你的手牌',
+		spell_jipao:'疾跑',
+		spell_jipao_info:'从牌库中获得四张牌',
+
 		spell_fengxian:'奉献',
 		spell_fengxian_info:'对所有敌方角色造成一点伤害',
 		spell_fuchouzhinu:'复仇之怒',
@@ -5488,6 +7625,43 @@ mode.stone={
 		spell_liliangzhufu:'力量祝福',
 		spell_liliangzhufu_info:'令一名随从摸两张牌',
 
+		spell_jinyingduijue:'精英对决',
+		spell_jinyingduijue_info:'双方各保留体力值最高的一名随从，然后令其他随从死亡（无法触发死亡技能）',
+		spell_shenpan:'审判',
+		spell_shenpan_info:'若你的对手有至少三名随从，则随机杀死一名敌方随从',
+		spell_shenshengfennu:'神圣愤怒',
+		spell_shenshengfennu_info:'从牌库中获得一张牌，并造成等同于其行动值消耗的伤害',
+		spell_yongshizhufu:'勇士祝福',
+		spell_yongshizhufu_info:'令一名随从的体力值和体力上限翻倍',
+		spell_zhengqianghaosheng:'争强好胜',
+		paladin_zhengqianghaosheng:'争强好胜',
+		paladin_zhengqianghaosheng_info:'在你的下一回合开始时，令所有友方随从增加一点体力上限，回复一点体力并摸一张牌',
+		spell_zhengqianghaosheng_info:'在你的下一回合开始时，令所有友方随从增加一点体力上限，回复一点体力并摸一张牌',
+		spell_zhihuizhufu:'智慧祝福',
+		paladin_zhihuizhufu:'智慧祝福',
+		spell_zhihuizhufu_info:'选择一名随从，每当其回合开始时，你从牌库中获得一张牌',
+
+		spell_fengnu:'风怒',
+		shaman_fengnu:'风怒',
+		shaman_fengnu_info:'回合结束后，你获得一个额外回合',
+		spell_fengnu_info:'令一名随从获得技能风怒（回合结束后，你获得一个额外回合）',
+		spell_rongyanbaolie:'熔岩爆裂',
+		spell_rongyanbaolie_info:'造成三点火焰伤害，流失一点体力',
+		spell_shihuawuqi:'石化武器',
+		shaman_shihuawuqi:'充能',
+		shaman_shihuawuqi_info:'回合开始阶段，你摸三张牌',
+		spell_shihuawuqi_info:'令一名友方随从获得技能充能（回合开始阶段，你摸三张牌），直到你的下一回合开始',
+		spell_xianzuzhaohuan:'先祖召唤',
+		spell_xianzuzhaohuan_info:'双方各将手牌中的一张随机随从牌置入战场',
+		spell_xianzuzhihun:'先祖之魂',
+		shaman_xianzuzhihun:'转生',
+		shaman_xianzuzhihun_info:'你死亡后，召唤一个自身的复制',
+		spell_xianzuzhihun_info:'令一名随从获得技能转生（你死亡后，召唤一个自身的复制）',
+		spell_xianzuzhishi:'先祖知识',
+		shaman_xianzuzhishi:'先祖知识',
+		shaman_xianzuzhishi_info:'本回合手牌上限-1',
+		spell_xianzuzhishi_info:'从牌库中获得两张牌，本回合手牌上限-1（多次使用不叠加）',
+
 		spell_lianhuanbaolie:'连环爆裂',
 		spell_lianhuanbaolie_info:'造成1〜2点雷电伤害',
 		spell_shandianfengbao:'闪电风暴',
@@ -5497,15 +7671,34 @@ mode.stone={
 		spell_yexinglanghun:'野性狼魂',
 		spell_yexinglanghun_info:'召唤两个幽灵狼',
 		spell_shixue:'嗜血',
-		spell_shixue_info:'所有友方随从摸两张牌',
+		spell_shixue_info:'所有友方随从摸三张牌',
 		spell_chazhuangshandian:'叉状闪电',
 		spell_chazhuangshandian_info:'对两个随机敌方随从各造成一点雷电伤害',
 
 		stone_qingwa:'青蛙',
 		stone_youlinglang:'幽灵狼',
+		stone_jingxiang:'镜像',
+		stone_jingxiang_info:'锁定技，你跳过摸牌阶段',
 		shaman_qingwa:'青蛙',
 		shaman_qingwa_info:'锁定技，你跳过摸牌阶段',
+		stone_xiaojingling:'小精灵',
 
+		spell_laojiuhuoba:'老旧火把',
+		spell_laojiuhuoba_info:'造成一点伤害，将一张炽热火把置入你的牌库',
+		spell_chirehuoba:'炽热火把',
+		spell_chirehuoba_info:'造成两点火焰伤害',
+		spell_canying:'残影',
+		spell_canying_info:'复制你的所有随从，并将其置入你的手牌',
+		spell_yanbaoshu:'炎爆术',
+		spell_yanbaoshu_info:'造成四点火焰伤害',
+		spell_jingxiang:'镜像',
+		spell_jingxiang_info:'召唤两个具有嘲讽且摸牌阶段不摸牌的随从',
+		spell_aoshufeidan:'奥术飞弹',
+		spell_aoshufeidan_info:'造成3点伤害，随从分配到所有敌方随从上',
+		spell_hanbingpingzhang:'寒冰屏障',
+		mage_hanbingpingzhang:'寒冰屏障',
+		mage_hanbingpingzhang_info:'体力值不能降到2以内',
+		spell_hanbingpingzhang_info:'令一名角色的体力值不能降到2以内，直到你的下一回合开始',
 
 		spell_hanbingjian:'寒冰箭',
 		spell_hanbingjian_info:'对一个随从造成两点伤害，然后将其翻面',
@@ -5518,7 +7711,7 @@ mode.stone={
 		spell_bianxingshu:'变形术',
 		spell_bianxingshu_info:'将一个随从变成一只绵羊',
 		spell_huoqiushu:'火球术',
-		spell_huoqiushu_info:'造成两点火焰伤害',
+		spell_huoqiushu_info:'造成三点火焰伤害',
 
 		stone_mianyang:'绵羊',
 		mage_mianyang:'绵羊',
@@ -5711,6 +7904,8 @@ mode.stone={
 		_mage_skill_info:'对一名随从造成一点火焰伤害',
 		_priest_skill:'治疗',
 		_priest_skill_info:'回复一点体力',
+		_priest_skillx:'心刺',
+		_priest_skillx_info:'造成一点伤害',
 		_warrior_skill:'战甲',
 		_warrior_skill_info:'获得一点护甲（不能超过5点）',
 		_warlock_skill:'作法',
@@ -5833,7 +8028,7 @@ mode.stone={
 		spell_chenmo_info:'弃置一名随从的所有牌，并令其体力上限减至1',
 		spell_zhiliaoshui:'治疗水',
 		spell_zhiliaoshui_info:'出牌阶段对自己使用，恢复两点体力值；或于濒死阶段对一名角色使用，令目标恢复一点体力',
-		spell_yanmie:'黑暗契约',
+		spell_yanmie:'极恶之咒',
 		spell_yanmie_info:'交换你与敌方主将的装备区，并摸若干张牌直到你的手牌数与敌方主将相等',
 		spell_xiaoshi:'消失',
 		spell_xiaoshi_info:'令敌方主将将所有装备区内的牌收入手牌，并弃置其若干张手牌，直到其手牌数与你相等',
diff --git a/mode/versus.js b/mode/versus.js
index 07f5d76a4..acc23ac38 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -298,6 +298,16 @@ mode.versus={
 					weiboss:[],shuboss:[],
 				}
 				event.list=list;
+				if(lib.characterPack.boss){
+					for(var i in lib.characterPack.boss){
+						if(!lib.character[i]&&lib.characterPack.boss[i][4]){
+							if(lib.characterPack.boss[i][4].contains('jiangeboss')||
+							lib.characterPack.boss[i][4].contains('jiangemech')){
+								lib.character[i]=lib.characterPack.boss[i];
+							}
+						}
+					}
+				}
 				for(var i in lib.character){
 					if(lib.character[i][4]){
 						if(lib.character[i][4].contains('jiangeboss')){
@@ -596,6 +606,15 @@ mode.versus={
 			next.showConfig=true;
 			next.content=function(){
 				"step 0"
+				if(lib.config.continue_name_versus){
+					_status.friend=lib.config.continue_name_versus.friend;
+					_status.enemy=lib.config.continue_name_versus.enemy;
+					_status.color=lib.config.continue_name_versus.color;
+					game.additionaldead=[];
+					event.goto(1);
+					game.saveConfig('continue_name_versus');
+					return;
+				}
 				event.check=function(){
 					this.dialog.classList.add('fullwidth');
 					this.dialog.classList.add('fullheight');
@@ -907,6 +926,9 @@ mode.versus={
 				};
 				game.pause();
 				"step 1"
+				_status.friendBackup=_status.friend.slice(0);
+				_status.enemyBackup=_status.enemy.slice(0);
+
 				_status.friendDied=[];
 				_status.enemyDied=[];
 				_status.totalCount=_status.friend.length;