diff --git a/card/standard.js b/card/standard.js
index 87fc64b8c..d80039327 100755
--- a/card/standard.js
+++ b/card/standard.js
@@ -1424,7 +1424,7 @@ card.standard={
 					else event.state=true;
 					event.goto(1);
 				}
-				else if(event.current.next==event.end){
+				else if(event.current.next==event.end||event.end.isDead()){
 					if(event.state==false){
 						trigger.untrigger();
 						trigger.finish();
@@ -1518,7 +1518,7 @@ card.standard={
 					else event.state=true;
 					event.goto(1);
 				}
-				else if(event.current.next==event.end){
+				else if(event.current.next==event.end||event.end.isDead()){
 					if(event.state==false){
 						trigger.untrigger();
 						trigger.cancelled=true;
diff --git a/character/boss.js b/character/boss.js
index b7803575d..b5b05871b 100644
--- a/character/boss.js
+++ b/character/boss.js
@@ -10,6 +10,19 @@ character.boss={
 		boss_pangtong:['male','shu',4,['boss_tianyu','qiwu','niepan','boss_yuhuo'],['boss','bossallowed'],'zhu'],
 		boss_zhaoyun:['male','shu',1,['boss_juejing','longhun','zhanjiang'],['boss','bossallowed'],'qun'],
 		boss_zhouyu:['male','wu',6,['huoshen','boss_honglian','boss_xianyin'],['boss','bossallowed'],'zhu'],
+
+		boss_zhuoguiquxie:['male','qun',0,['boss_bianshen'],['boss','bossallowed']],
+		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']],
+		boss_yecha:['male','qun',11,['boss_modao','boss_mojian','bazhen','boss_danshu'],['hiddenboss','bossallowed']],
+		boss_niutou:['male','qun',7,['boss_baolian','niepan','boss_manjia','boss_xiaoshou','boss_bianshen3'],['hiddenboss','bossallowed']],
+		boss_mamian:['male','qun',6,['boss_guiji','fankui','boss_lianyu','juece','boss_bianshen3'],['hiddenboss','bossallowed']],
+		boss_chi:['male','qun',5,['boss_guimei','boss_didong','boss_shanbeng','boss_bianshen2'],['hiddenboss','bossallowed']],
+		boss_mo:['female','qun',5,['boss_guimei','enyuan','boss_beiming','boss_bianshen2'],['hiddenboss','bossallowed']],
+		boss_wang:['male','qun',5,['boss_guimei','boss_luolei','huilei','boss_bianshen2'],['hiddenboss','bossallowed']],
+		boss_liang:['female','qun',5,['boss_guimei','boss_guihuo','boss_minbao','boss_bianshen2'],['hiddenboss','bossallowed']],
+
 		boss_lvbu1:['male','qun',8,['mashu','wushuang','boss_baonu'],['boss','bossallowed'],'wei'],
 		boss_lvbu2:['male','qun',4,['mashu','wushuang','swd_xiuluo','shenwei','shenji'],['hiddenboss','bossallowed'],'qun'],
 		boss_caiwenji:['female','qun',4,['beige','boss_hujia','boss_guihan'],['boss','bossallowed'],'wei'],
@@ -20,8 +33,490 @@ character.boss={
 		boss_huatuo:['male','qun',6,['chulao','mazui','boss_shengshou','guizhen','wuqin'],['boss','bossallowed'],'wu'],
 		boss_dongzhuo:['male','qun',20,['jiuchi','boss_qiangzheng','boss_baolin'],['boss','bossallowed'],'shu'],
 		// boss_shuijing:['male','qun',8,[],['boss','bossallowed'],'wei'],
+
 	},
 	skill:{
+		boss_bianshen2:{
+			mode:['boss'],
+			global:'boss_bianshen2x'
+		},
+		boss_bianshen2x:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			priority:-10,
+			filter:function(event){
+				if(lib.config.mode!='boss') return false;
+				return event.player==game.boss&&event.player.skills.contains('boss_bianshen2');
+			},
+			content:function(){
+				'step 0'
+				game.delay();
+				'step 1'
+				game.changeBoss(['boss_niutou','boss_mamian'].randomGet());
+			}
+		},
+		boss_bianshen3:{
+			mode:['boss'],
+			global:'boss_bianshen3x'
+		},
+		boss_bianshen3x:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			priority:-10,
+			filter:function(event){
+				if(lib.config.mode!='boss') return false;
+				return event.player==game.boss&&event.player.skills.contains('boss_bianshen3');
+			},
+			content:function(){
+				'step 0'
+				game.delay();
+				'step 1'
+				game.changeBoss(['boss_baiwuchang','boss_heiwuchang'].randomGet());
+			}
+		},
+		boss_bianshen4:{
+			mode:['boss'],
+			global:'boss_bianshen4x'
+		},
+		boss_bianshen4x:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			priority:-10,
+			filter:function(event){
+				if(lib.config.mode!='boss') return false;
+				return event.player==game.boss&&event.player.skills.contains('boss_bianshen4');
+			},
+			content:function(){
+				'step 0'
+				game.delay();
+				'step 1'
+				game.changeBoss(['boss_yecha','boss_luocha'].randomGet());
+			}
+		},
+		boss_moyany:{
+			trigger:{player:'loseEnd'},
+			frequent:true,
+			unique:true,
+			filter:function(event,player){
+				return _status.currentPhase!=player;
+			},
+			content:function(){
+				"step 0"
+				player.judge(function(card){
+					return get.color(card)=='red'?1:0;
+				});
+				"step 1"
+				if(result.bool){
+					player.chooseTarget(true,'选择一个目标对其造成两点火焰伤害',function(card,player,target){
+						return player!=target;
+					}).ai=function(target){
+						return ai.get.damageEffect(target,player,player,'fire');
+					}
+				}
+				else{
+					event.finish();
+				}
+				"step 2"
+				if(result.targets.length){
+					player.line(result.targets,'fire');
+					result.targets[0].damage(2,'fire');
+				}
+			},
+			ai:{
+				effect:{
+					target:function(card){
+						if(get.tag(card,'loseCard')){
+							return [0.5,1];
+						}
+					}
+				}
+			}
+		},
+		boss_danshu:{
+			trigger:{player:'loseEnd'},
+			frequent:true,
+			unique:true,
+			filter:function(event,player){
+				return _status.currentPhase!=player&&player.hp<player.maxHp;
+			},
+			content:function(){
+				"step 0"
+				player.judge(function(card){
+					return get.color(card)=='red'?1:0;
+				});
+				"step 1"
+				if(result.color=='red'){
+					player.recover();
+				}
+			},
+			ai:{
+				effect:{
+					target:function(card){
+						if(get.tag(card,'loseCard')){
+							return [0.5,1];
+						}
+					}
+				}
+			}
+		},
+		boss_modao:{
+			trigger:{player:'phaseBegin'},
+			forced:true,
+			content:function(){
+				player.draw(2);
+			}
+		},
+		boss_mojian:{
+			trigger:{player:'phaseUseBegin'},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(player.canUse('wanjian',game.players[i])){
+						list.push(game.players[i]);
+					}
+				}
+				list.sort(lib.sort.seat);
+				player.useCard({name:'wanjian'},list);
+			}
+		},
+		boss_yushou:{
+			trigger:{player:'phaseUseBegin'},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(player.canUse('nanman',game.players[i])){
+						list.push(game.players[i]);
+					}
+				}
+				list.sort(lib.sort.seat);
+				player.useCard({name:'nanman'},list);
+			}
+		},
+		boss_zuijiu:{
+			trigger:{source:'damageBegin'},
+			filter:function(event){
+				return event.card&&(event.card.name=='sha'||event.card.name=='juedou')&&
+				event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
+			},
+			forced:true,
+			content:function(){
+				trigger.num++;
+			}
+		},
+		boss_xixing:{
+			trigger:{player:'phaseBegin'},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseTarget('是否发动【吸星】？',function(card,player,target){
+					return player!=target&&target.isLinked();
+				}).ai=function(target){
+					return ai.get.damageEffect(target,player,player,'thunder');
+				}
+				"step 1"
+				if(result.bool){
+					player.logSkill('boss_xixing',result.targets);
+					result.targets[0].damage('thunder');
+					player.recover();
+				}
+			},
+		},
+		boss_suoming:{
+			trigger:{player:'phaseEnd'},
+            direct:true,
+            filter:function(event,player){
+                for(var i=0;i<game.players.length;i++){
+                    if(!game.players[i].isLinked()&&player!=game.players[i]){
+                        return true;
+                    }
+                }
+            },
+            content:function(){
+                "step 0"
+                var num=0;
+                for(var i=0;i<game.players.length;i++){
+                    if(!game.players[i].isLinked()&&player!=game.players[i]){
+                        num++;
+                    }
+                }
+                player.chooseTarget('是否发动【索命】？',[1,num],function(card,player,target){
+                    return !target.isLinked()&&player!=target;
+                }).ai=function(target){
+                    return -ai.get.attitude(player,target);
+                }
+                "step 1"
+                if(result.bool){
+                    player.logSkill('boss_suoming',result.targets);
+                    event.targets=result.targets;
+                    event.num=0;
+                }
+                else{
+                    event.finish();
+                }
+                "step 2"
+                if(event.num<event.targets.length){
+                    event.targets[event.num].link();
+                    event.num++;
+                    event.redo();
+                }
+            },
+		},
+		boss_taiping:{
+			trigger:{player:'phaseDrawBegin'},
+			forced:true,
+			content:function(){
+				trigger.num+=2;
+			}
+		},
+		boss_baolian:{
+			trigger:{player:'phaseEnd'},
+			forced:true,
+			content:function(){
+				player.draw(2);
+			}
+		},
+		boss_xiaoshou:{
+			trigger:{player:'phaseEnd'},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseTarget('是否发动【枭首】？',function(card,player,target){
+					return player!=target&&target.hp>=player.hp;
+				}).ai=function(target){
+					return ai.get.damageEffect(target,player,player,'fire');
+				}
+				"step 1"
+				if(result.bool){
+					player.logSkill('boss_xiaoshou',result.targets);
+					result.targets[0].damage('fire',3);
+				}
+			},
+		},
+		boss_manjia:{
+			group:['boss_manjia1','boss_manjia2']
+		},
+        boss_manjia1:{
+			trigger:{target:'useCardToBefore'},
+			forced:true,
+			priority:6,
+			filter:function(event,player){
+                if(player.get('e','2')) return false;
+				if(event.player.num('s','unequip')) return false;
+				if(event.card.name=='nanman') return true;
+				if(event.card.name=='wanjian') return true;
+				if(event.card.name=='sha'&&!event.card.nature) return true;
+			},
+			content:function(){
+				trigger.untrigger();
+				trigger.finish();
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target,current){
+                        if(target.get('e','2')) return;
+						if(player.num('s','unequip')) return;
+						if(card.name=='nanman'||card.name=='wanjian') return 0;
+						if(card.name=='sha'){
+    						var equip1=player.get('e','1');
+    						if(equip1&&equip1.name=='zhuque') return 2;
+    						if(equip1&&equip1.name=='qinggang') return 1;
+							if(!card.nature) return 0;
+						}
+					}
+				}
+			}
+		},
+		boss_manjia2:{
+			trigger:{player:'damageBegin'},
+			filter:function(event,player){
+                if(player.get('e','2')) return false;
+				if(event.nature=='fire') return true;
+			},
+			forced:true,
+            check:function(){
+                return false;
+            },
+			content:function(){
+				trigger.num++;
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target,current){
+                        if(target.get('e','2')) return;
+						if(card.name=='sha'){
+							if(card.nature=='fire'||player.skills.contains('zhuque_skill')) return 2;
+						}
+						if(get.tag(card,'fireDamage')&&current<0) return 2;
+					}
+				}
+			}
+		},
+		boss_lianyu:{
+			trigger:{player:'phaseEnd'},
+			unique:true,
+			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');
+					event.redo();
+				}
+			},
+		},
+		boss_guiji:{
+			trigger:{player:'phaseJudgeBegin'},
+            forced:true,
+            content:function(){
+                player.discard(player.get('j').randomGet());
+            },
+            filter:function(event ,player){
+                return player.num('j')>0;
+            },
+            ai:{
+                effect:{
+                    target:function(card,player,target,current){
+                        if(get.type(card)=='delay'&&target.num('j')==0) return 0.1;
+                    }
+                }
+            }
+		},
+		boss_minbao:{
+			global:'boss_minbao2'
+		},
+		boss_minbao2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			filter:function(event,player){
+				return event.player.skills.contains('boss_minbao')&&event.player.isDead();
+			},
+			content:function(){
+				trigger.player.line(player,'fire');
+				player.damage('nosource','fire').animate=false;
+				player.$damage(trigger.player);
+				if(lib.config.animation&&!lib.config.low_performance){
+					player.$fire();
+				}
+			}
+		},
+		boss_guihuo:{
+			trigger:{player:'phaseEnd'},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseTarget('是否发动【鬼火】？',function(card,player,target){
+					return player!=target;
+				}).ai=function(target){
+					return ai.get.damageEffect(target,player,player,'fire');
+				}
+				"step 1"
+				if(result.bool){
+					player.logSkill('boss_guihuo',result.targets);
+					result.targets[0].damage('fire');
+				}
+			},
+		},
+		boss_luolei:{
+			trigger:{player:'phaseBegin'},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseTarget('是否发动【落雷】？',function(card,player,target){
+					return player!=target;
+				}).ai=function(target){
+					return ai.get.damageEffect(target,player,player,'thunder');
+				}
+				"step 1"
+				if(result.bool){
+					player.logSkill('boss_luolei',result.targets);
+					result.targets[0].damage('thunder');
+				}
+			},
+		},
+		boss_beiming:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			filter:function(event){
+				return event.source!=undefined;
+			},
+			content:function(){
+				trigger.source.discard(trigger.source.get('h'));
+			},
+			ai:{
+				threaten:0.7
+			}
+		},
+		boss_shanbeng:{
+			global:'boss_shanbeng2',
+			trigger:{player:'dieBegin'},
+			forced:true,
+			content:function(){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].num('e')){
+						player.line(game.players[i],'green');
+					}
+				}
+				game.delay();
+			}
+		},
+		boss_shanbeng2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			filter:function(event,player){
+				return player.num('e')>0&&event.player.skills.contains('boss_shanbeng')&&event.player.isDead();
+			},
+			content:function(){
+				player.discard(player.get('e'));
+			}
+		},
+		boss_didong:{
+			trigger:{player:'phaseEnd'},
+			direct:true,
+			content:function(){
+				"step 0"
+				player.chooseTarget('是否发动【地动】？',function(card,player,target){
+					return player!=target;
+				}).ai=function(target){
+					var att=ai.get.attitude(player,target);
+					if(target.isTurnedOver()){
+						if(att>0){
+							return att+5;
+						}
+						return -1;
+					}
+					if(player.isTurnedOver()){
+						return 5-att;
+					}
+					return -att;
+				};
+				"step 1"
+				if(result.bool){
+					player.logSkill('boss_didong',result.targets);
+					result.targets[0].turnOver();
+				}
+			},
+		},
+		boss_guimei:{
+			mod:{
+				targetEnabled:function(card,player,target){
+					if(get.type(card)=='delay'){
+						return false;
+					}
+				}
+			}
+		},
+		boss_bianshen:{
+			trigger:{global:'gameStart'},
+			forced:true,
+			popup:false,
+			content:function(){
+				player.init(['boss_chi','boss_mo','boss_wang','boss_liang'].randomGet());
+				game.addVideo('reinit2',player,player.name);
+			}
+		},
 		zhanjiang:{
 			trigger:{player:'phaseBegin'},
 			filter:function(event,player){
@@ -413,6 +908,7 @@ character.boss={
 				player.chooseCardTarget({
 					position:'he',
 					filterTarget:function(card,player,target){
+						if(!lib.character[target.name]) return false;
 						return player!=target&&!target.storage.boss_hujia;
 					},
 					filterCard:true,
@@ -535,6 +1031,7 @@ character.boss={
 				}
 				"step 2"
 				if(result.targets.length){
+					player.line(result.targets);
 					result.targets[0].loseHp();
 				}
 			},
@@ -867,6 +1364,73 @@ character.boss={
 		},
 	},
 	translate:{
+		boss_chi:'魑',
+		boss_mo:'魅',
+		boss_wang:'魍',
+		boss_liang:'魉',
+		boss_niutou:'牛头',
+		boss_mamian:'马面',
+		boss_baiwuchang:'白无常',
+		boss_heiwuchang:'黑无常',
+		boss_luocha:'罗刹',
+		boss_yecha:'夜叉',
+
+		boss_yushou:'驭兽',
+		boss_yushou_info:'出牌阶段开始时，视为你使用了一张[南蛮入侵]',
+		boss_moyany:'魔炎',
+		boss_moyany_info:'每当你于回合外失去牌时，你可以进行一次判定，若结果为红色，你对一名其他角色造成2点火焰伤害',
+		boss_modao:'魔道',
+		boss_modao_info:'锁定技，准备阶段，你摸两张牌',
+		boss_mojian:'魔箭',
+		boss_mojian_info:'出牌阶段开始时，视为你使用了一张[万箭齐发]',
+		boss_danshu:'丹术',
+		boss_danshu_info:'每当你于回合外失去牌时，你可以进行一次判定，若结果为红色，你回复1点体力',
+
+		boss_zuijiu:'醉酒',
+		boss_zuijiu_info:'锁定技，你的【杀】额外造成1点伤害',
+		boss_taiping:'太平',
+		boss_taiping_info:'锁定技，摸牌阶段摸牌时，你的摸牌数量+2',
+		boss_suoming:'索命',
+		boss_suoming_info:'结束阶段，将任意名未被横置的其他角色的武将牌横置',
+		boss_xixing:'吸星',
+		boss_xixing_info:'准备阶段，对任意一名横置的其他角色造成1点雷电伤害，然后回复1点体力',
+
+		boss_baolian:'暴敛',
+		boss_baolian_info:'锁定技，结束阶段，你摸两张牌',
+		boss_manjia:'蛮甲',
+		boss_manjia_info:'锁定技，若你的装备区内没有防具牌，则你视为装备了[藤甲]',
+		boss_xiaoshou:'枭首',
+		boss_xiaoshou_info:'结束阶段，对体力不小于你的一名其他角色造成3点伤害',
+		boss_guiji:'诡计',
+		boss_guiji_info:'锁定技，准备阶段结束时，若你的判定区内有牌，你随机弃置其中一张牌',
+		boss_lianyu:'炼狱',
+		boss_lianyu_info:'结束阶段，对所有其他角色造成1点火焰伤害',
+
+		boss_guihuo:'鬼火',
+		boss_guihuo_info:'结束阶段，对一名其他角色造成1点火焰伤害',
+		boss_minbao:'冥爆',
+		boss_minbao_info:'锁定技，当你死亡时，对场上所有其他角色造成1点火焰伤害',
+		boss_luolei:'落雷',
+		boss_luolei_info:'准备阶段，对一名其他角色造成1点雷电伤害',
+		boss_beiming:'悲鸣',
+		boss_beiming_info:'锁定技，当你死亡时，你令杀死你的角色弃置所有手牌',
+		boss_guimei:'鬼魅',
+		boss_guimei_info:'锁定技，你不能成为延时类锦囊的目标',
+		boss_didong:'地动',
+		boss_didong_info:'结束阶段，令一名其他角色将其武将牌翻面',
+		boss_shanbeng:'山崩',
+		boss_shanbeng_info:'锁定技，当你死亡时，你令所有其他角色弃置其装备区内的所有牌',
+
+		boss_zhuoguiquxie:'捉鬼驱邪',
+		boss_bianshen:'变身',
+		boss_bianshen_info:'游戏开始时，你随机变身为魑、魅、魍、魉中的一个',
+		boss_bianshen2:'变身',
+		boss_bianshen2_info:'你死亡后随机变身为牛头、马面中的一个',
+		boss_bianshen3:'变身',
+		boss_bianshen3_info:'你死亡后随机变身为白无常、黑无常中的一个',
+		boss_bianshen4:'变身',
+		boss_bianshen4_info:'你死亡后随机变身为罗刹、夜叉中的一个',
+
 		zhanjiang:'斩将',
 		zhanjiang_info:'准备阶段开始时，如果其他角色的装备区内有【青釭剑】，你可以获得之',
 
diff --git a/character/hearth.js b/character/hearth.js
index 1058992a8..971518468 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -245,7 +245,9 @@ character.hearth={
 		},
 		fushi:{
 			enable:'phaseUse',
-			filterTarget:true,
+			filterTarget:function(card,player,target){
+				return target.hp<target.maxHp;
+			},
 			content:function(){
 				'step 0'
 				target.loseMaxHp(true);
@@ -692,7 +694,9 @@ character.hearth={
 				trigger.player.line(player,'thunder');
 				player.damage('nosource','thunder').animate=false;
 				player.$damage(trigger.player);
-				player.$thunder();
+				if(lib.config.animation&&!lib.config.low_performance){
+					player.$thunder();
+				}
 			}
 		},
 		huanwu:{
diff --git a/character/rank.js b/character/rank.js
index af1933a85..701e20283 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -99,6 +99,7 @@ window.characterRank={
         'hs_tgolem',
     ],
     am:[
+        'lifeng',
         'zhugeguo',
         'sp_caiwenji',
         'yxs_yingzheng',
diff --git a/character/refresh.js b/character/refresh.js
index 855419347..1b4893577 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -1016,6 +1016,7 @@ character.refresh={
 			}
 		},
 		qianxin:{
+			skillAnimation:true,
 			audio:2,
 			unique:true,
 			trigger:{source:'damageAfter'},
@@ -1030,7 +1031,6 @@ character.refresh={
 			}
 		},
 		jianyan:{
-			skillAnimation:true,
 			audio:2,
 			enable:'phaseUse',
 			usable:1,
diff --git a/character/standard.js b/character/standard.js
index 82c8c9255..5c1791403 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -1516,7 +1516,7 @@ character.standard={
 		luoshen_info:'回合开始阶段，你可以进行一定判定，若为黑色则可以继续判定，直到出现红色。然后你获得所有黑色的判定牌',
 		qingguo_info:'你可以将一张黑色手牌当[闪]使用或打出',
 		rende_info:'出牌阶段，你可以将任意手牌送给其他角色，若送出的手牌不少于两张，你回复一点体力',
-		jijiang_info:'蜀势力角色可以帮你使用或打出[杀]',
+		jijiang_info:'主公技，蜀势力角色可以帮你使用或打出[杀]',
 		wusheng_info:'你可以将一张红色牌当[杀]使用',
 		paoxiao_info:'出牌阶段，你使用[杀]无数量限制',
 		guanxing_info:'回合开始阶段，你可以观看牌堆顶的x张牌，并将其以任意顺序置于牌堆项或牌堆底，x为存活角色个数且不超过5',
@@ -1528,7 +1528,7 @@ character.standard={
 		jizhi_info:'每当你使用或打出一张非延时锦囊，可以摸一张牌',
 		qicai_info:'锁定技，你使用的锦囊牌无距离限制',
 		zhiheng_info:'出牌阶段，你可以弃置任意张牌并摸等量的牌，每阶段限1次',
-		jiuyuan_info:'锁定技，濒死阶段，吴势力角色对你使用的[桃]额外回复一点体力',
+		jiuyuan_info:'主公技，锁定技，濒死阶段，吴势力角色对你使用的[桃]额外回复一点体力',
 		qixi_info:'你可以将一张黑色牌当[过河拆桥]使用',
 		keji_info:'若你在出牌阶段没有使用[杀]，则可跳过弃牌阶段',
 		kurou_info:'出牌阶段，你可以流失一点体力并摸两张牌',
diff --git a/character/swd.js b/character/swd.js
index 006645ab9..62a9eacf2 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -4083,6 +4083,7 @@ character.swd={
 				}
 			},
 			intro:{
+				nocount:true,
 				onunmark:function(content,player){
 					player.storage.yishan.length=0;
 				},
@@ -7302,7 +7303,6 @@ character.swd={
 				};
 				"step 1"
 				if(result.bool){
-					player.discard(result.cards);
 					player.logSkill('huanling',result.targets);
 					player.turnOver();
 					result.targets[0].turnOver();
diff --git a/character/woods.js b/character/woods.js
index ae17ec3b1..36e920f69 100755
--- a/character/woods.js
+++ b/character/woods.js
@@ -770,7 +770,7 @@ character.woods={
 		lieren_info:'你每使用【杀】造成一次伤害，可与受到该伤害的角色拼点；若你赢，你获得对方的一张牌。',
 		xingshang_info:'你可以立即获得死亡角色的所有牌。',
 		fangzhu_info:'你每受到一次伤害，可令除你以外的任一角色补X张牌，X为你已损失的体力值，然后该角色将其武将牌翻面。',
-		songwei_info:'其他魏势力的角色的判定牌结果为♠或♣且失效后，可以让你摸一张牌。',
+		songwei_info:'主公技，其他魏势力的角色的判定牌结果为♠或♣且失效后，可以让你摸一张牌。',
 		duanliang_info:'出牌阶段，你可以将你的任意一张♠或♣的基本牌或装备牌当【兵粮寸断】使用；你可以对与你距离2以内的角色使用【兵粮寸断】。',
 		haoshi_info:'摸牌阶段，你可以额外摸两张牌，若此时你的手牌数多于五张，你必须将一半(向下取整)的手牌交给场上除你外手牌数最少的一名角色。',
 		dimeng_info:'出牌阶段，你可以选择其他两名角色，你弃掉等同于这两名角色手牌数量之差的牌，然后交换他们的手牌，每回合限一次。',
@@ -778,7 +778,7 @@ character.woods={
 		jiuchi_info:'你可将你的任意一张♠手牌当【酒】使用。',
 		roulin_info:'你对女性角色、女性角色对你使用【杀】时，都需连续使用两张【闪】才能抵消。',
 		benghuai_info:'回合结束阶段，若你的体力不是全场最少的(或之一)，你须减1点体力或体力上限。',
-		baonue_info:'其他群雄角色每造成一次伤害，可进行一次判定，若为♠，你回复1点体力。',
+		baonue_info:'主公技，其他群雄角色每造成一次伤害，可进行一次判定，若为♠，你回复1点体力。',
 		luanwu_info:'出牌阶段，可令除你外的所有角色依次对与其距离最近的另一名角色使用一张【杀】，无法如此做者失去1点体力。',
 		wansha_info:'在你的回合，除你以外，只有处于濒死状态的角色才能使用【桃】。',
 		weimu_info:'你不能成为♠或♣锦囊的目标。',
diff --git a/character/xianjian.js b/character/xianjian.js
index d10375e12..20b891a7d 100755
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -816,14 +816,14 @@ character.xianjian={
 			direct:true,
 			content:function(){
 				"step 0"
-				player.discardPlayerCard(trigger.player,'he','是否发动【破云】',[1,2]);
+				player.discardPlayerCard(trigger.player,'he','是否发动【破云】',[1,2]).logSkill=['poyun',trigger.player];
 				"step 1"
 				if(result.bool){
 					player.storage.xuanning--;
 					if(!player.storage.xuanning){
 						player.unmarkSkill('xuanning');
 					}
-					player.logSkill('poyun',trigger.player);
+					player.syncStorage('xuanning');
 				}
 			},
 			ai:{
diff --git a/character/yijiang.js b/character/yijiang.js
index cc7faf89a..13e1050d6 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -2315,6 +2315,7 @@ character.yijiang={
 				return false;
 			},
 			content:function(){
+				player.line(trigger.damage,'green');
 				trigger.player.damage();
 			},
 			ai:{
diff --git a/character/yxs.js b/character/yxs.js
index defcc48bd..1711e18c2 100755
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -2029,7 +2029,9 @@ character.yxs={
 			check:function(card){
 				return 6-ai.get.value(card);
 			},
-			filterCard:true,
+			filterCard:function(card){
+				return !lib.card[card.name].image;
+			},
 			discard:false,
 			lose:false,
 			prepare:function(cards,player,targets){
diff --git a/game/game.js b/game/game.js
index 7603e310e..06963565f 100755
--- a/game/game.js
+++ b/game/game.js
@@ -16,13 +16,10 @@
 		dieClose:[]
 	};
 	var lib={
-		version:1.74,
+		version:1.75,
 		changeLog:[
-			'界面问题修正',
-			'限制结算速度选项（较卡时建议开启）',
-			'引用配音方法调整',
-			'觉醒技、限定技特效',
-			'烟花、下雪等特效（需在选项－玩法中开启富甲天下）'
+			'挑战模式修复，增加捉鬼驱邪',
+			'完善炉石模式'
 		],
 		configprefix:'noname_0.9_',
 		updates:[],
@@ -2401,13 +2398,13 @@
 			'<li>卡组与职业绑定，每个职业有一个专属技能，每回合限用一次，消耗两点行动值</ul>'+
 			'<div style="margin:10px">职业技能</div><ul style="margin-top:0"><li>祭司：召唤一个随机图腾'+
 			'<li>法师：对一名随从造成一点火焰伤害'+
-			'<li>医生：回复一点体力'+
-			'<li>战士：获得一点护甲，摸一张牌'+
+			'<li>牧师：回复一点体力'+
+			'<li>战士：获得一点护甲'+
 			'<li>术士：牌库中摸两张牌'+
-			'<li>装备一把武器和一个随机非武器装备'+
-			'<li>谋士：召唤一名士兵'+
+			'<li>潜行者：装备一把武器和一个随机非武器装备'+
+			'<li>圣骑士：召唤一名士兵'+
 			'<li>猎人：对敌方主将造成一点伤害'+
-			'<li>蛮人：视为使用一张不计入出杀次数的杀</ul>'+
+			'<li>德鲁伊：视为使用一张不计入出杀次数的杀</ul>'+
 			'<div style="margin:10px">战斗</div><ul style="margin-top:0"><li>游戏流程类似1v1，场上有两名主将进行对抗'+
 			'<li>主将出牌阶段的出牌数量（行动值）有上限，先手为2，后手为3，装备牌不计入出牌上限<li>游戏每进行一轮，主将的出牌上限+1，超过6时减至2并重新累加'+
 			'<li>使用随从牌可召唤一个随从，随从出场时背面朝上。每一方在场的随从数不能超过4<li>随从于摸牌阶段摸牌基数为1，随从的随从牌均视为闪，装备牌均视为杀<li>'+
@@ -3765,6 +3762,14 @@
 					event.dialog.close();
 					"step 2"
 					if(event.result.bool&&event.result.buttons){
+						if(event.logSkill){
+							if(typeof event.logSkill=='string'){
+								player.logSkill(event.logSkill);
+							}
+							else if(Array.isArray(event.logSkill)){
+								player.logSkill.apply(player,event.logSkill);
+							}
+						}
 						var cards=[];
 						for(var i=0;i<event.result.buttons.length;i++){
 							cards.push(event.result.buttons[i].link);
@@ -5265,7 +5270,7 @@
 				updateMarks:function(){
 					for(var i in this.marks){
 						if(i=='ghujia'||(!this.marks[i].querySelector('.image')&&lib.skill[i]&&
-							lib.skill[i].intro&&this.storage[i])){
+							lib.skill[i].intro&&!lib.skill[i].intro.nocount&&this.storage[i])){
 							this.marks[i].classList.add('overflowmark')
 							var num;
 							if(i=='ghujia'){
@@ -6207,7 +6212,7 @@
 						}
 					}
 					if(next.num==undefined) next.num=1;
-					if(next.num==0) _status.event.next.remove(next);
+					if(next.num<=0) _status.event.next.remove(next);
 					next.content=lib.element.playerproto.draw;
 					return next;
 				},
@@ -7288,18 +7293,19 @@
 						return node;
 					}
 					else{
+						var node;
 						if(card==undefined||card.length==0) return;
 						if(false){
 							var left=-52+(Math.random()<0.5?1:-1)*Math.random()*100;
 							var top=-52+(Math.random()<0.5?1:-1)*Math.random()*80;
 
-							var node=this.$throwxy2(card,
+							node=this.$throwxy2(card,
 								'calc(50% '+(left>0?'+':'-')+' '+Math.abs(left)+'px)',
 								'calc(50% '+(top>0?'+':'-')+' '+Math.abs(top)+'px)'
 							);
 						}
 						else{
-							var node=this.$throwordered(card.copy('thrown'));
+							node=this.$throwordered(card.copy('thrown'));
 						}
 						if(time!=undefined){
 							node.fixed=true;
@@ -8121,6 +8127,9 @@
 						if(card[3]) this.node.background.setBackground(bg+'_'+card[3],'card');
 						else this.node.background.setBackground(bg,'card');
 					}
+					else if(lib.card[card[2]].fullimage){
+						this.setBackground('card/'+bg);
+					}
 					else if(lib.card[card[2]].image=='card'){
 						if(card[3]) this.setBackground(bg+'_'+card[3],'card');
 						else this.setBackground(bg,'card');
@@ -8140,13 +8149,23 @@
 					if(lib.card[card[2]].color){
 						this.style.color=lib.card[card[2]].color;
 					}
+					else if(lib.card[card[2]].fullimage){
+						this.style.color='white';
+					}
 					if(lib.card[card[2]].textShadow){
 						this.style.textShadow=lib.card[card[2]].textShadow;
 					}
+					else if(lib.card[card[2]].fullimage){
+						this.style.textShadow='black 0 0 2px';
+					}
 					if(lib.card[card[2]].opacity){
 						this.node.info.style.opacity=lib.card[card[2]].opacity;
 						this.node.name.style.opacity=lib.card[card[2]].opacity;
 					}
+					else if(lib.card[card[2]].fullimage){
+						this.node.info.style.opacity=1;
+						this.node.name.style.opacity=1;
+					}
 					if(lib.card[card[2]].modinfo){
 						this.node.info.innerHTML=lib.card[card[2]].modinfo;
 					}
@@ -8592,8 +8611,9 @@
 						else ui.dialogs[i].hide();
 					}
 					ui.dialog=this;
+					var translate;
 					if(lib.config.remember_dialog&&lib.config.dialog_transform&&!this.classList.contains('fixed')){
-						var translate=lib.config.dialog_transform;
+						translate=lib.config.dialog_transform;
 						this._dragtransform=translate;
 						this.style.transform='translate('+translate[0]+'px,'+translate[1]+'px) scale(0.8)';
 					}
@@ -8872,7 +8892,7 @@
 			ghujia:{
 				intro:{
 					content:function(content,player){
-						return '已有'+get.cnNumber(player.hujia)+'点护甲值<p>每点护甲可以抵挡一点伤害</p>';
+						return '已有'+get.cnNumber(player.hujia)+'点护甲值';
 					}
 				}
 			},
@@ -8994,7 +9014,7 @@
 					if(lib.config.tao_enemy&&event.dying.side!=player.side&&lib.config.mode!='identity'&&lib.config.mode!='guozhan'){
 						event._result={bool:false}
 					}
-					else if(player.hasSkillTag('save',true)||player.num('h','tao')||
+					else if(player.hasSkillTag('save',true)||player.num('h','tao')||player.num('h','spell_zhiliaoshui')||
 					(player==event.dying&&(player.num('h','jiu')||player.num('h','hufu')||player.num('h','tianxianjiu')))){
 						player.chooseToUse({
 							filterCard:function(card,player){
@@ -9563,9 +9583,7 @@
 						}
 						game.singleHandcard=true;
 						ui.arena.classList.add('single-handcard');
-						ui.fakeme=ui.create.div('.player.controlfakeme');
-						ui.fakeme.line=lib.element.player.line;
-						ui.fakemebg=ui.create.div('.avatar',ui.fakeme).hide();
+						ui.fakeme=ui.create.div('.fakeme.avatar',ui.me);
 					}
 					ui.arena.style.display='';
 					ui.refresh(ui.arena);
@@ -9575,11 +9593,7 @@
 					if(!players.boss){
 						game.singleHandcard=true;
 						ui.arena.classList.add('single-handcard');
-						ui.fakeme=ui.create.div('.player.controlfakeme');
-						ui.fakeme.dataset.position=0;
-						ui.fakeme.line=lib.element.player.line;
-						ui.fakemebg=ui.create.div('.avatar',ui.fakeme).hide();
-						ui.refresh(ui.fakemebg);
+						ui.fakeme=ui.create.div('.fakeme.avatar',ui.me);
 					}
 					ui.arena.dataset.number=8;
 				}
@@ -9634,14 +9648,12 @@
 
 				if(lib.config.mode=='versus'){
 					if(players.bool){
-						ui.fakemebg.show();
 						game.onSwapControl();
 					}
 				}
 				else if(lib.config.mode=='boss'){
 					if(!players.boss){
 						game.onSwapControl();
-						ui.fakemebg.show();
 					}
 					ui.arena.style.display='';
 					ui.refresh(ui.arena);
@@ -9773,6 +9785,21 @@
 					console.log(content);
 				}
 			},
+			bossSwap:function(player,name){
+				player.delete();
+				var boss=ui.create.player().init(name);
+				boss.dataset.position=player.dataset.position;
+				game.playerMap[player.dataset.position]=boss;
+				if(game.me==player){
+					game.me=boss;
+				}
+				game.players.push(boss);
+				game.arrangePlayers();
+				game.boss=boss;
+				ui.arena.appendChild(boss.animate('zoominanim'));
+				boss.setIdentity('zhu');
+				boss.identity='zhu';
+			},
 			stoneSwap:function(info){
 				var player=ui.create.player();
 				player.classList.add('noidentity');
@@ -9816,6 +9843,14 @@
 					console.log(source);
 				}
 			},
+			reinit2:function(source,name){
+				if(source&&name){
+					source.init(name);
+				}
+				else{
+					console.log(source);
+				}
+			},
 			skill:function(player,content){
 				if(typeof content=='string'){
 					lib.skill[content].video(player);
@@ -11323,6 +11358,10 @@
 			if(!ui.restart){
 				ui.restart=ui.create.control('restart',game.reload);
 			}
+			if(ui.tempnowuxie){
+				ui.tempnowuxie.close();
+				delete ui.tempnowuxie;
+			}
 
 			if(ui.revive){
 				ui.revive.close();
@@ -12087,7 +12126,7 @@
 					};
 					if(card.ai.basic.useful==undefined) card.ai.basic.useful=2;
 					if(card.subtype=='equip3'){
-						if(card.ai.basic.equipValue==undefined) card.ai.basic.equipValue=6;
+						if(card.ai.basic.equipValue==undefined) card.ai.basic.equipValue=7;
 					}
 					else if(card.subtype=='equip4'){
 						if(card.ai.basic.equipValue==undefined) card.ai.basic.equipValue=5;
@@ -12394,9 +12433,9 @@
 			game.arrangePlayers();
 			return player;
 		},
-		addFellow:function(position,character){
+		addFellow:function(position,character,animation){
 			game.addVideo('addFellow',null,[position,character]);
-			var player=ui.create.player(ui.arena).animate('start');
+			var player=ui.create.player(ui.arena).animate(animation||'start');
 			player.dataset.position=position||game.players.length+game.dead.length;
 			if(character) player.init(character);
 			game.players.push(player);game.arrangePlayers();
@@ -12806,10 +12845,11 @@
 				else{
 					for(var i in lib.character){
 						if(lib.character[i][4].contains('minskin')) continue;
-						if(lib.character[i][4].contains('boss')&&!
-						lib.character[i][4].contains('bossallowed')) continue;
-						if(lib.character[i][4].contains('hiddenboss')&&!
-						lib.character[i][4].contains('bossallowed')) continue;
+						if(lib.character[i][4].contains('boss')||lib.character[i][4].contains('hiddenboss')){
+							if(lib.config.mode=='boss') continue;
+							if(!lib.character[i][4].contains('bossallowed')) continue;
+						}
+
 						if(lib.character[i][4].contains('stonehidden')) continue;
 						if(lib.config.banned.contains(i)) continue;
 						if(filter&&filter(i)) continue;
@@ -12924,8 +12964,16 @@
 						seperate=seperate(list);
 						dialog.seperate=[];
 						for(var i in seperate){
-							dialog.seperate.push(dialog.add(i));
-							dialog.add([seperate[i],'vcard'],noclick);
+							var link='';
+							var linkcontent=seperate[i];
+							if(i.indexOf('_link:')!=-1){
+								link=i.slice(i.indexOf('_link:')+6);
+								i=i.slice(0,i.indexOf('_link:'));
+							}
+							var nodesep=dialog.add(i);
+							nodesep.link=link;
+							dialog.seperate.push(nodesep);
+							dialog.add([linkcontent,'vcard'],noclick);
 						}
 					}
 					else{
@@ -13728,6 +13776,7 @@
 	                        var map={};
 	                        if(info.config){
 	                            var hiddenNodes=[];
+								var config=lib.config.mode_config[mode]||{};
 	                            for(var j in info.config){
 	                                if(j==='update'){
 	                                    continue;
@@ -13735,7 +13784,6 @@
 	                                var cfg=copyObj(info.config[j]);
 									cfg._name=j;
 									cfg.mode=mode;
-									var config=lib.config.mode_config[mode]||{};
 	                                if(!config.hasOwnProperty(j)){
 										game.saveConfig(j,cfg.init,mode);
 	                                }
@@ -13959,13 +14007,13 @@
 	                                });
 									page.style.paddingBottom='10px';
 								}
+								var config=lib.config;
 	                            for(var j in info.config){
 	                                if(j==='update'){
 	                                    continue;
 	                                }
 	                                var cfg=copyObj(info.config[j]);
 									cfg._name=j;
-									var config=lib.config;
 	                                if(!config.hasOwnProperty(j)){
 										if(cfg.type!='autoskill'&&cfg.type!='banskill'){
 											game.saveConfig(j,cfg.init);
@@ -16754,17 +16802,18 @@
 						clearTimeout(ui.roundmenu._resetTimeout);
 						delete ui.roundmenu._resetTimeout;
 					}
+					var translate;
 					if(ui.roundmenu._dragorigin&&ui.roundmenu._dragtransform&&ui.roundmenu._dragtouches){
 						var dx=ui.roundmenu._dragtouches.clientX-ui.roundmenu._dragorigin.clientX;
 						var dy=ui.roundmenu._dragtouches.clientY-ui.roundmenu._dragorigin.clientY;
 						if(dx*dx+dy*dy<1000){
 							ui.click.roundmenu();
 							ui.roundmenu._dragtransform=ui.roundmenu._dragorigintransform;
-							var translate=ui.roundmenu._dragtransform;
+							translate=ui.roundmenu._dragtransform;
 							ui.roundmenu.style.transform='translate('+translate[0]+'px,'+translate[1]+'px)';
 						}
 						else{
-							var translate=ui.roundmenu._dragtransform;
+							translate=ui.roundmenu._dragtransform;
 							translate[0]+=dx;
 							translate[1]+=dy;
 							ui.click.checkroundtranslate();
@@ -16780,10 +16829,11 @@
 				}
 				else if(_status.draggingtouchdialog){
 					delete _status._swipeorigin;
+					var translate;
 					if(_status.draggingtouchdialog._dragorigin&&_status.draggingtouchdialog._dragtransform&&_status.draggingtouchdialog._dragtouches){
 						var dx=_status.draggingtouchdialog._dragtouches.clientX-_status.draggingtouchdialog._dragorigin.clientX;
 						var dy=_status.draggingtouchdialog._dragtouches.clientY-_status.draggingtouchdialog._dragorigin.clientY;
-						var translate=_status.draggingtouchdialog._dragtransform;
+						translate=_status.draggingtouchdialog._dragtransform;
 						translate[0]+=dx;
 						translate[1]+=dy;
 						ui.click.checkdialogtranslate(null,_status.draggingtouchdialog);
@@ -17176,8 +17226,9 @@
 				if(window.inSplash) return;
 				if(_status.draggingdialog){
 					var ddialog=_status.draggingdialog;
+					var translate;
 					if(ddialog._dragorigin&&ddialog._dragtransform){
-						var translate=ddialog._dragtransform;
+						translate=ddialog._dragtransform;
 						translate[0]+=e.x-ddialog._dragorigin.x;
 						translate[1]+=e.y-ddialog._dragorigin.y;
 						ui.click.checkdialogtranslate(null,ddialog);
@@ -17187,13 +17238,14 @@
 					delete _status.draggingdialog;
 				}
 				if(_status.draggingroundmenu){
+					var translate;
 					if(ui.roundmenu._dragorigin&&ui.roundmenu._dragtransform){
 						var dx=e.x-ui.roundmenu._dragorigin.x;
 						var dy=e.y-ui.roundmenu._dragorigin.y;
 						if(dx*dx+dy*dy<25){
 							ui.click.roundmenu();
 						}
-						var translate=ui.roundmenu._dragtransform;
+						translate=ui.roundmenu._dragtransform;
 						translate[0]+=dx;
 						translate[1]+=dy;
 						ui.click.checkroundtranslate();
@@ -19087,6 +19139,7 @@
 			var card=false;
 			if(typeof num!='number') num=1;
 			if(num==0) {card=true;num=1;}
+			if(num<0) num=1;
 			while(num--){
 				if(ui.cardPile.hasChildNodes()==false){
 					if(_status.maxShuffle!=undefined){
@@ -19520,8 +19573,9 @@
 			return num;
 		},
 		tag:function(item,tag,item2){
+			var result;
 			if(get.info(item)&&get.info(item).ai&&get.info(item).ai.tag){
-				var result=get.info(item).ai.tag[tag];
+				result=get.info(item).ai.tag[tag];
 			}
 			if(typeof result=='function') return result(item,item2);
 			return result;
@@ -19980,6 +20034,9 @@
 							uiintro.add('<div class="text center">攻击范围：1</div>');
 						}
 					}
+					else if(lib.card[name]&&lib.card[name].addinfomenu){
+						uiintro.add('<div class="text center">'+lib.card[name].addinfomenu+'</div>');
+					}
 					if(lib.translate[name+'_info'].length<=100){
 						uiintro.add('<div class="text center">'+lib.translate[name+'_info']+'</div>');
 					}
diff --git a/image/card/dianhaishenzhu.png b/image/card/dianhaishenzhu.png
deleted file mode 100755
index 1f11bc076..000000000
Binary files a/image/card/dianhaishenzhu.png and /dev/null differ
diff --git a/image/card/emofengdi.png b/image/card/emofengdi.png
deleted file mode 100755
index 3b3bad925..000000000
Binary files a/image/card/emofengdi.png and /dev/null differ
diff --git a/image/card/fengraozhijiao.png b/image/card/fengraozhijiao.png
deleted file mode 100755
index 38d7bf6f5..000000000
Binary files a/image/card/fengraozhijiao.png and /dev/null differ
diff --git a/image/card/jintiao.png b/image/card/jintiao.png
deleted file mode 100755
index 66b6b651f..000000000
Binary files a/image/card/jintiao.png and /dev/null differ
diff --git a/image/card/konghunshi.png b/image/card/konghunshi.png
deleted file mode 100755
index efbca385a..000000000
Binary files a/image/card/konghunshi.png and /dev/null differ
diff --git a/image/card/leader_hard.jpg b/image/card/leader_hard.jpg
index 3722a7936..48cac6dc7 100644
Binary files a/image/card/leader_hard.jpg and b/image/card/leader_hard.jpg differ
diff --git a/image/card/liumangxingzhen.png b/image/card/liumangxingzhen.png
deleted file mode 100755
index 1783c986b..000000000
Binary files a/image/card/liumangxingzhen.png and /dev/null differ
diff --git a/image/card/mengjing_mengye.png b/image/card/mengjing_mengye.png
deleted file mode 100644
index 54817c522..000000000
Binary files a/image/card/mengjing_mengye.png and /dev/null differ
diff --git a/image/card/miefafu.png b/image/card/miefafu.png
deleted file mode 100755
index 96fba66a9..000000000
Binary files a/image/card/miefafu.png and /dev/null differ
diff --git a/image/card/mindieyi.png b/image/card/mindieyi.png
deleted file mode 100755
index 925f591a9..000000000
Binary files a/image/card/mindieyi.png and /dev/null differ
diff --git a/image/card/sanghunzhao.png b/image/card/sanghunzhao.png
deleted file mode 100755
index a70f83ff4..000000000
Binary files a/image/card/sanghunzhao.png and /dev/null differ
diff --git a/image/card/shengerpingdeng.png b/image/card/shengerpingdeng.png
deleted file mode 100755
index 6a3792cd5..000000000
Binary files a/image/card/shengerpingdeng.png and /dev/null differ
diff --git a/image/card/spell_anyingkuangluan.jpg b/image/card/spell_anyingkuangluan.jpg
new file mode 100644
index 000000000..ebd57289c
Binary files /dev/null and b/image/card/spell_anyingkuangluan.jpg differ
diff --git a/image/card/spell_anyinglieyan.jpg b/image/card/spell_anyinglieyan.jpg
new file mode 100755
index 000000000..443500339
Binary files /dev/null and b/image/card/spell_anyinglieyan.jpg differ
diff --git a/image/card/spell_aoshuzhihui.jpg b/image/card/spell_aoshuzhihui.jpg
new file mode 100755
index 000000000..311dc9809
Binary files /dev/null and b/image/card/spell_aoshuzhihui.jpg differ
diff --git a/image/card/spell_baofengxue.jpg b/image/card/spell_baofengxue.jpg
new file mode 100755
index 000000000..e4950b070
Binary files /dev/null and b/image/card/spell_baofengxue.jpg differ
diff --git a/image/card/spell_bianxingshu.jpg b/image/card/spell_bianxingshu.jpg
new file mode 100755
index 000000000..32a64449b
Binary files /dev/null and b/image/card/spell_bianxingshu.jpg differ
diff --git a/image/card/spell_bingdong.jpg b/image/card/spell_bingdong.jpg
new file mode 100755
index 000000000..e22b70075
Binary files /dev/null and b/image/card/spell_bingdong.jpg differ
diff --git a/image/card/spell_binghuan.jpg b/image/card/spell_binghuan.jpg
new file mode 100644
index 000000000..35496088a
Binary files /dev/null and b/image/card/spell_binghuan.jpg differ
diff --git a/image/card/spell_chazhuangshandian.jpg b/image/card/spell_chazhuangshandian.jpg
new file mode 100755
index 000000000..bec2294b1
Binary files /dev/null and b/image/card/spell_chazhuangshandian.jpg differ
diff --git a/image/card/spell_chenmo.jpg b/image/card/spell_chenmo.jpg
new file mode 100755
index 000000000..fad76eaa6
Binary files /dev/null and b/image/card/spell_chenmo.jpg differ
diff --git a/image/card/spell_cigu.jpg b/image/card/spell_cigu.jpg
new file mode 100755
index 000000000..82e9d109c
Binary files /dev/null and b/image/card/spell_cigu.jpg differ
diff --git a/image/card/spell_cisha.jpg b/image/card/spell_cisha.jpg
new file mode 100755
index 000000000..05287905d
Binary files /dev/null and b/image/card/spell_cisha.jpg differ
diff --git a/image/card/spell_daoshan.jpg b/image/card/spell_daoshan.jpg
new file mode 100755
index 000000000..1cd5434bf
Binary files /dev/null and b/image/card/spell_daoshan.jpg differ
diff --git a/image/card/spell_diyulieyan.jpg b/image/card/spell_diyulieyan.jpg
new file mode 100755
index 000000000..24a9ec236
Binary files /dev/null and b/image/card/spell_diyulieyan.jpg differ
diff --git a/image/card/spell_dunpaimengji.jpg b/image/card/spell_dunpaimengji.jpg
new file mode 100755
index 000000000..d02d9c6ce
Binary files /dev/null and b/image/card/spell_dunpaimengji.jpg differ
diff --git a/image/card/spell_duochongsheji.jpg b/image/card/spell_duochongsheji.jpg
new file mode 100755
index 000000000..5ca794819
Binary files /dev/null and b/image/card/spell_duochongsheji.jpg differ
diff --git a/image/card/spell_emozhinu.jpg b/image/card/spell_emozhinu.jpg
new file mode 100755
index 000000000..9881dd329
Binary files /dev/null and b/image/card/spell_emozhinu.jpg differ
diff --git a/image/card/spell_fengxian.jpg b/image/card/spell_fengxian.jpg
new file mode 100755
index 000000000..0f95c7741
Binary files /dev/null and b/image/card/spell_fengxian.jpg differ
diff --git a/image/card/spell_fennuzhichui.jpg b/image/card/spell_fennuzhichui.jpg
new file mode 100755
index 000000000..ddb218408
Binary files /dev/null and b/image/card/spell_fennuzhichui.jpg differ
diff --git a/image/card/spell_fuchouzhinu.jpg b/image/card/spell_fuchouzhinu.jpg
new file mode 100755
index 000000000..06a43ba11
Binary files /dev/null and b/image/card/spell_fuchouzhinu.jpg differ
diff --git a/image/card/spell_guanmenfanggou.jpg b/image/card/spell_guanmenfanggou.jpg
new file mode 100755
index 000000000..d929778cc
Binary files /dev/null and b/image/card/spell_guanmenfanggou.jpg differ
diff --git a/image/card/spell_hanbingjian.jpg b/image/card/spell_hanbingjian.jpg
new file mode 100755
index 000000000..7de4e0a02
Binary files /dev/null and b/image/card/spell_hanbingjian.jpg differ
diff --git a/image/card/spell_hengsao.jpg b/image/card/spell_hengsao.jpg
new file mode 100644
index 000000000..33fd89ee3
Binary files /dev/null and b/image/card/spell_hengsao.jpg differ
diff --git a/image/card/spell_huoqiushu.jpg b/image/card/spell_huoqiushu.jpg
new file mode 100755
index 000000000..10704ab33
Binary files /dev/null and b/image/card/spell_huoqiushu.jpg differ
diff --git a/image/card/spell_huotigenxu.jpg b/image/card/spell_huotigenxu.jpg
new file mode 100644
index 000000000..f9ea8ac6b
Binary files /dev/null and b/image/card/spell_huotigenxu.jpg differ
diff --git a/image/card/spell_jianrenluanwu.jpg b/image/card/spell_jianrenluanwu.jpg
new file mode 100755
index 000000000..423d314ce
Binary files /dev/null and b/image/card/spell_jianrenluanwu.jpg differ
diff --git a/image/card/spell_jingshenkongzhi.jpg b/image/card/spell_jingshenkongzhi.jpg
new file mode 100644
index 000000000..5aca2fc95
Binary files /dev/null and b/image/card/spell_jingshenkongzhi.jpg differ
diff --git a/image/card/spell_juemingluandou.jpg b/image/card/spell_juemingluandou.jpg
new file mode 100755
index 000000000..ea8b09ef7
Binary files /dev/null and b/image/card/spell_juemingluandou.jpg differ
diff --git a/image/card/spell_kuaisusheji.jpg b/image/card/spell_kuaisusheji.jpg
new file mode 100755
index 000000000..3e795ffac
Binary files /dev/null and b/image/card/spell_kuaisusheji.jpg differ
diff --git a/image/card/spell_lianhuanbaolie.jpg b/image/card/spell_lianhuanbaolie.jpg
new file mode 100755
index 000000000..52d758382
Binary files /dev/null and b/image/card/spell_lianhuanbaolie.jpg differ
diff --git a/image/card/spell_lierenyinji.jpg b/image/card/spell_lierenyinji.jpg
new file mode 100644
index 000000000..06394e85d
Binary files /dev/null and b/image/card/spell_lierenyinji.jpg differ
diff --git a/image/card/spell_lieyanfengbao.jpg b/image/card/spell_lieyanfengbao.jpg
new file mode 100755
index 000000000..801bb31e0
Binary files /dev/null and b/image/card/spell_lieyanfengbao.jpg differ
diff --git a/image/card/spell_liliangdaijia.jpg b/image/card/spell_liliangdaijia.jpg
new file mode 100755
index 000000000..dfe03cd91
Binary files /dev/null and b/image/card/spell_liliangdaijia.jpg differ
diff --git a/image/card/spell_liliangzhufu.jpg b/image/card/spell_liliangzhufu.jpg
new file mode 100644
index 000000000..f5fe96216
Binary files /dev/null and b/image/card/spell_liliangzhufu.jpg differ
diff --git a/image/card/spell_maizang.jpg b/image/card/spell_maizang.jpg
new file mode 100644
index 000000000..985fe361b
Binary files /dev/null and b/image/card/spell_maizang.jpg differ
diff --git a/image/card/spell_modaoyou.jpg b/image/card/spell_modaoyou.jpg
new file mode 100644
index 000000000..88a84557a
Binary files /dev/null and b/image/card/spell_modaoyou.jpg differ
diff --git a/image/card/spell_morizaihuo.jpg b/image/card/spell_morizaihuo.jpg
new file mode 100644
index 000000000..7225592f5
Binary files /dev/null and b/image/card/spell_morizaihuo.jpg differ
diff --git a/image/card/spell_naluzhiguang.jpg b/image/card/spell_naluzhiguang.jpg
new file mode 100755
index 000000000..94d04a083
Binary files /dev/null and b/image/card/spell_naluzhiguang.jpg differ
diff --git a/image/card/spell_niuquxukong.jpg b/image/card/spell_niuquxukong.jpg
new file mode 100644
index 000000000..4b18406e2
Binary files /dev/null and b/image/card/spell_niuquxukong.jpg differ
diff --git a/image/card/spell_nuhuozhongshao.jpg b/image/card/spell_nuhuozhongshao.jpg
new file mode 100755
index 000000000..8b28c5026
Binary files /dev/null and b/image/card/spell_nuhuozhongshao.jpg differ
diff --git a/image/card/spell_nuxi.jpg b/image/card/spell_nuxi.jpg
new file mode 100644
index 000000000..50ce72d82
Binary files /dev/null and b/image/card/spell_nuxi.jpg differ
diff --git a/image/card/spell_sanghunzhao.jpg b/image/card/spell_sanghunzhao.jpg
new file mode 100644
index 000000000..85f1c728a
Binary files /dev/null and b/image/card/spell_sanghunzhao.jpg differ
diff --git a/image/card/spell_shandianfengbao.jpg b/image/card/spell_shandianfengbao.jpg
new file mode 100644
index 000000000..d227fe52b
Binary files /dev/null and b/image/card/spell_shandianfengbao.jpg differ
diff --git a/image/card/spell_shengerpingdeng.jpg b/image/card/spell_shengerpingdeng.jpg
new file mode 100644
index 000000000..c27de061f
Binary files /dev/null and b/image/card/spell_shengerpingdeng.jpg differ
diff --git a/image/card/spell_shengguangzhadan.jpg b/image/card/spell_shengguangzhadan.jpg
new file mode 100644
index 000000000..9a527a5ea
Binary files /dev/null and b/image/card/spell_shengguangzhadan.jpg differ
diff --git a/image/card/spell_shengliaoshu.jpg b/image/card/spell_shengliaoshu.jpg
new file mode 100755
index 000000000..b430c7160
Binary files /dev/null and b/image/card/spell_shengliaoshu.jpg differ
diff --git a/image/card/spell_shenshengxinxing.jpg b/image/card/spell_shenshengxinxing.jpg
new file mode 100644
index 000000000..f24a3a39b
Binary files /dev/null and b/image/card/spell_shenshengxinxing.jpg differ
diff --git a/image/card/spell_shixue.jpg b/image/card/spell_shixue.jpg
new file mode 100755
index 000000000..8ce73e517
Binary files /dev/null and b/image/card/spell_shixue.jpg differ
diff --git a/image/card/spell_sijidaifa.jpg b/image/card/spell_sijidaifa.jpg
new file mode 100755
index 000000000..6522193ab
Binary files /dev/null and b/image/card/spell_sijidaifa.jpg differ
diff --git a/image/card/spell_wangzhezhufu.jpg b/image/card/spell_wangzhezhufu.jpg
new file mode 100644
index 000000000..a6e9bd424
Binary files /dev/null and b/image/card/spell_wangzhezhufu.jpg differ
diff --git a/image/card/spell_wuyashenxiang.jpg b/image/card/spell_wuyashenxiang.jpg
new file mode 100644
index 000000000..5cf6f2cdf
Binary files /dev/null and b/image/card/spell_wuyashenxiang.jpg differ
diff --git a/image/card/spell_xianzuzhiliao.jpg b/image/card/spell_xianzuzhiliao.jpg
new file mode 100644
index 000000000..15543c5e4
Binary files /dev/null and b/image/card/spell_xianzuzhiliao.jpg differ
diff --git a/image/card/spell_xiaoguibaopo.jpg b/image/card/spell_xiaoguibaopo.jpg
new file mode 100755
index 000000000..ddd203f6d
Binary files /dev/null and b/image/card/spell_xiaoguibaopo.jpg differ
diff --git a/image/card/spell_xiaoshi.jpg b/image/card/spell_xiaoshi.jpg
new file mode 100755
index 000000000..695df42b3
Binary files /dev/null and b/image/card/spell_xiaoshi.jpg differ
diff --git a/image/card/spell_xinlingshijie.jpg b/image/card/spell_xinlingshijie.jpg
new file mode 100644
index 000000000..fe66322f1
Binary files /dev/null and b/image/card/spell_xinlingshijie.jpg differ
diff --git a/image/card/spell_xishengqiyue.jpg b/image/card/spell_xishengqiyue.jpg
new file mode 100644
index 000000000..1ab8f0402
Binary files /dev/null and b/image/card/spell_xishengqiyue.jpg differ
diff --git a/image/card/spell_xuanfengzhan.jpg b/image/card/spell_xuanfengzhan.jpg
new file mode 100755
index 000000000..03b77e278
Binary files /dev/null and b/image/card/spell_xuanfengzhan.jpg differ
diff --git a/image/card/spell_yanmie.jpg b/image/card/spell_yanmie.jpg
new file mode 100644
index 000000000..ccf5c079d
Binary files /dev/null and b/image/card/spell_yanmie.jpg differ
diff --git a/image/card/spell_yaoshu.jpg b/image/card/spell_yaoshu.jpg
new file mode 100755
index 000000000..280c38ccc
Binary files /dev/null and b/image/card/spell_yaoshu.jpg differ
diff --git a/image/card/spell_yemanpaoxiao.jpg b/image/card/spell_yemanpaoxiao.jpg
new file mode 100755
index 000000000..7bd54591e
Binary files /dev/null and b/image/card/spell_yemanpaoxiao.jpg differ
diff --git a/image/card/spell_yexingchengzhang.jpg b/image/card/spell_yexingchengzhang.jpg
new file mode 100755
index 000000000..0cacccd02
Binary files /dev/null and b/image/card/spell_yexingchengzhang.jpg differ
diff --git a/image/card/spell_yexinglanghun.jpg b/image/card/spell_yexinglanghun.jpg
new file mode 100755
index 000000000..6fb2a1185
Binary files /dev/null and b/image/card/spell_yexinglanghun.jpg differ
diff --git a/image/card/spell_zhansha.jpg b/image/card/spell_zhansha.jpg
new file mode 100755
index 000000000..228fdaa39
Binary files /dev/null and b/image/card/spell_zhansha.jpg differ
diff --git a/image/card/spell_zhaohuanchongwu.jpg b/image/card/spell_zhaohuanchongwu.jpg
new file mode 100755
index 000000000..36a547204
Binary files /dev/null and b/image/card/spell_zhaohuanchongwu.jpg differ
diff --git a/image/card/spell_zhiliaoshui.jpg b/image/card/spell_zhiliaoshui.jpg
new file mode 100644
index 000000000..fb030a24f
Binary files /dev/null and b/image/card/spell_zhiliaoshui.jpg differ
diff --git a/image/card/spell_zhiliaozhichu.jpg b/image/card/spell_zhiliaozhichu.jpg
new file mode 100644
index 000000000..6235a8fd1
Binary files /dev/null and b/image/card/spell_zhiliaozhichu.jpg differ
diff --git a/image/card/spell_zhiliaozhihuan.jpg b/image/card/spell_zhiliaozhihuan.jpg
new file mode 100755
index 000000000..7d3c51729
Binary files /dev/null and b/image/card/spell_zhiliaozhihuan.jpg differ
diff --git a/image/card/spell_zidanshangtang.jpg b/image/card/spell_zidanshangtang.jpg
new file mode 100755
index 000000000..050448d43
Binary files /dev/null and b/image/card/spell_zidanshangtang.jpg differ
diff --git a/image/card/spell_ziranzhili.jpg b/image/card/spell_ziranzhili.jpg
new file mode 100755
index 000000000..4014e6bdd
Binary files /dev/null and b/image/card/spell_ziranzhili.jpg differ
diff --git a/image/card/spell_zuozhandongyuan.jpg b/image/card/spell_zuozhandongyuan.jpg
new file mode 100644
index 000000000..6bfa298d3
Binary files /dev/null and b/image/card/spell_zuozhandongyuan.jpg differ
diff --git a/image/card/spell_zuzhou.jpg b/image/card/spell_zuzhou.jpg
new file mode 100644
index 000000000..0308df64b
Binary files /dev/null and b/image/card/spell_zuzhou.jpg differ
diff --git a/image/card/yesushengxue.png b/image/card/yesushengxue.png
deleted file mode 100755
index a02317cf4..000000000
Binary files a/image/card/yesushengxue.png and /dev/null differ
diff --git a/image/card/zhaohunfan.png b/image/card/zhaohunfan.png
deleted file mode 100755
index c78b64cbf..000000000
Binary files a/image/card/zhaohunfan.png and /dev/null differ
diff --git a/image/character/boss_baiwuchang.jpg b/image/character/boss_baiwuchang.jpg
new file mode 100644
index 000000000..3fe674dfa
Binary files /dev/null and b/image/character/boss_baiwuchang.jpg differ
diff --git a/image/character/boss_chi.jpg b/image/character/boss_chi.jpg
new file mode 100644
index 000000000..8c9f40c0f
Binary files /dev/null and b/image/character/boss_chi.jpg differ
diff --git a/image/character/boss_heiwuchang.jpg b/image/character/boss_heiwuchang.jpg
new file mode 100644
index 000000000..7b1b9d98d
Binary files /dev/null and b/image/character/boss_heiwuchang.jpg differ
diff --git a/image/character/boss_liang.jpg b/image/character/boss_liang.jpg
new file mode 100644
index 000000000..6512448f5
Binary files /dev/null and b/image/character/boss_liang.jpg differ
diff --git a/image/character/boss_luocha.jpg b/image/character/boss_luocha.jpg
new file mode 100644
index 000000000..7b35a9c15
Binary files /dev/null and b/image/character/boss_luocha.jpg differ
diff --git a/image/character/boss_mamian.jpg b/image/character/boss_mamian.jpg
new file mode 100644
index 000000000..13a333071
Binary files /dev/null and b/image/character/boss_mamian.jpg differ
diff --git a/image/character/boss_mo.jpg b/image/character/boss_mo.jpg
new file mode 100644
index 000000000..192903e5a
Binary files /dev/null and b/image/character/boss_mo.jpg differ
diff --git a/image/character/boss_niutou.jpg b/image/character/boss_niutou.jpg
new file mode 100644
index 000000000..52d6c2786
Binary files /dev/null and b/image/character/boss_niutou.jpg differ
diff --git a/image/character/boss_wang.jpg b/image/character/boss_wang.jpg
new file mode 100644
index 000000000..6b21c7803
Binary files /dev/null and b/image/character/boss_wang.jpg differ
diff --git a/image/character/boss_yecha.jpg b/image/character/boss_yecha.jpg
new file mode 100644
index 000000000..19efe0c85
Binary files /dev/null and b/image/character/boss_yecha.jpg differ
diff --git a/image/character/boss_zhuoguiquxie.jpg b/image/character/boss_zhuoguiquxie.jpg
new file mode 100644
index 000000000..52d6c2786
Binary files /dev/null and b/image/character/boss_zhuoguiquxie.jpg differ
diff --git a/image/character/leader_caocao.jpg b/image/character/leader_caocao.jpg
index 7f321b38a..f466cf1e7 100644
Binary files a/image/character/leader_caocao.jpg and b/image/character/leader_caocao.jpg differ
diff --git a/image/character/luocha.jpg b/image/character/luocha.jpg
deleted file mode 100644
index f030600a5..000000000
Binary files a/image/character/luocha.jpg and /dev/null differ
diff --git a/image/character/stone_aihaozhihun.jpg b/image/character/stone_aihaozhihun.jpg
new file mode 100755
index 000000000..7127d4ede
Binary files /dev/null and b/image/character/stone_aihaozhihun.jpg differ
diff --git a/image/character/stone_aomishouwei.jpg b/image/character/stone_aomishouwei.jpg
new file mode 100755
index 000000000..d2f6afa04
Binary files /dev/null and b/image/character/stone_aomishouwei.jpg differ
diff --git a/image/character/stone_banxian.jpg b/image/character/stone_banxian.jpg
deleted file mode 100644
index 6ac8ab649..000000000
Binary files a/image/character/stone_banxian.jpg and /dev/null differ
diff --git a/image/character/stone_baohuzhishu.jpg b/image/character/stone_baohuzhishu.jpg
new file mode 100644
index 000000000..25ef68aa6
Binary files /dev/null and b/image/character/stone_baohuzhishu.jpg differ
diff --git a/image/character/stone_baoqishi.jpg b/image/character/stone_baoqishi.jpg
new file mode 100644
index 000000000..4a438fd46
Binary files /dev/null and b/image/character/stone_baoqishi.jpg differ
diff --git a/image/character/stone_beijunmushi.jpg b/image/character/stone_beijunmushi.jpg
new file mode 100755
index 000000000..404ef75f8
Binary files /dev/null and b/image/character/stone_beijunmushi.jpg differ
diff --git a/image/character/stone_caoyuanshi.jpg b/image/character/stone_caoyuanshi.jpg
new file mode 100644
index 000000000..0bd510e8d
Binary files /dev/null and b/image/character/stone_caoyuanshi.jpg differ
diff --git a/image/character/stone_chidunshinv.jpg b/image/character/stone_chidunshinv.jpg
new file mode 100755
index 000000000..fa8341f99
Binary files /dev/null and b/image/character/stone_chidunshinv.jpg differ
diff --git a/image/character/stone_chidunweishi.jpg b/image/character/stone_chidunweishi.jpg
new file mode 100644
index 000000000..c8902f694
Binary files /dev/null and b/image/character/stone_chidunweishi.jpg differ
diff --git a/image/character/stone_chilundashi.jpg b/image/character/stone_chilundashi.jpg
new file mode 100644
index 000000000..4e98ade7e
Binary files /dev/null and b/image/character/stone_chilundashi.jpg differ
diff --git a/image/character/stone_cike.jpg b/image/character/stone_cike.jpg
new file mode 100644
index 000000000..a1cc01c87
Binary files /dev/null and b/image/character/stone_cike.jpg differ
diff --git a/image/character/stone_conglinshouwei.jpg b/image/character/stone_conglinshouwei.jpg
new file mode 100644
index 000000000..b880971ca
Binary files /dev/null and b/image/character/stone_conglinshouwei.jpg differ
diff --git a/image/character/stone_daogu.jpg b/image/character/stone_daogu.jpg
deleted file mode 100644
index aeb16bff7..000000000
Binary files a/image/character/stone_daogu.jpg and /dev/null differ
diff --git a/image/character/stone_daomufeizei.jpg b/image/character/stone_daomufeizei.jpg
new file mode 100644
index 000000000..954ed4581
Binary files /dev/null and b/image/character/stone_daomufeizei.jpg differ
diff --git a/image/character/stone_daoshi.jpg b/image/character/stone_daoshi.jpg
deleted file mode 100644
index 54ef8ae90..000000000
Binary files a/image/character/stone_daoshi.jpg and /dev/null differ
diff --git a/image/character/stone_dijieshicong.jpg b/image/character/stone_dijieshicong.jpg
new file mode 100755
index 000000000..bdd65f517
Binary files /dev/null and b/image/character/stone_dijieshicong.jpg differ
diff --git a/image/character/stone_diyuhuo.jpg b/image/character/stone_diyuhuo.jpg
new file mode 100644
index 000000000..1f50fd059
Binary files /dev/null and b/image/character/stone_diyuhuo.jpg differ
diff --git a/image/character/stone_fachao.jpg b/image/character/stone_fachao.jpg
new file mode 100644
index 000000000..5bfbacd35
Binary files /dev/null and b/image/character/stone_fachao.jpg differ
diff --git a/image/character/stone_falifulong.jpg b/image/character/stone_falifulong.jpg
new file mode 100644
index 000000000..c71f0fce6
Binary files /dev/null and b/image/character/stone_falifulong.jpg differ
diff --git a/image/character/stone_famingjia.jpg b/image/character/stone_famingjia.jpg
new file mode 100755
index 000000000..cde2f35d3
Binary files /dev/null and b/image/character/stone_famingjia.jpg differ
diff --git a/image/character/stone_fatiaozhuru.jpg b/image/character/stone_fatiaozhuru.jpg
new file mode 100755
index 000000000..5d58e4cf1
Binary files /dev/null and b/image/character/stone_fatiaozhuru.jpg differ
diff --git a/image/character/stone_feipin.jpg b/image/character/stone_feipin.jpg
deleted file mode 100644
index 33ca71dc1..000000000
Binary files a/image/character/stone_feipin.jpg and /dev/null differ
diff --git a/image/character/stone_fennuxiaoji.jpg b/image/character/stone_fennuxiaoji.jpg
new file mode 100755
index 000000000..2c3003e50
Binary files /dev/null and b/image/character/stone_fennuxiaoji.jpg differ
diff --git a/image/character/stone_genv.jpg b/image/character/stone_genv.jpg
deleted file mode 100644
index bd399962c..000000000
Binary files a/image/character/stone_genv.jpg and /dev/null differ
diff --git a/image/character/stone_gongzhu.jpg b/image/character/stone_gongzhu.jpg
deleted file mode 100644
index 30f6b7257..000000000
Binary files a/image/character/stone_gongzhu.jpg and /dev/null differ
diff --git a/image/character/stone_guangyaozhizi.jpg b/image/character/stone_guangyaozhizi.jpg
new file mode 100755
index 000000000..05cb57f3d
Binary files /dev/null and b/image/character/stone_guangyaozhizi.jpg differ
diff --git a/image/character/stone_guanliyuan.jpg b/image/character/stone_guanliyuan.jpg
new file mode 100644
index 000000000..0ba3cbc1b
Binary files /dev/null and b/image/character/stone_guanliyuan.jpg differ
diff --git a/image/character/stone_haidao.jpg b/image/character/stone_haidao.jpg
new file mode 100644
index 000000000..e8ef0e104
Binary files /dev/null and b/image/character/stone_haidao.jpg differ
diff --git a/image/character/stone_haidaotoumu.jpg b/image/character/stone_haidaotoumu.jpg
new file mode 100755
index 000000000..d64413fa8
Binary files /dev/null and b/image/character/stone_haidaotoumu.jpg differ
diff --git a/image/character/stone_hanguangzhizhe.jpg b/image/character/stone_hanguangzhizhe.jpg
new file mode 100755
index 000000000..381d7d78a
Binary files /dev/null and b/image/character/stone_hanguangzhizhe.jpg differ
diff --git a/image/character/stone_heianjiaotu.jpg b/image/character/stone_heianjiaotu.jpg
new file mode 100755
index 000000000..5d2086aff
Binary files /dev/null and b/image/character/stone_heianjiaotu.jpg differ
diff --git a/image/character/stone_heitieairen.jpg b/image/character/stone_heitieairen.jpg
new file mode 100755
index 000000000..5530a6cce
Binary files /dev/null and b/image/character/stone_heitieairen.jpg differ
diff --git a/image/character/stone_huanghou.jpg b/image/character/stone_huanghou.jpg
deleted file mode 100644
index 56cf3f87b..000000000
Binary files a/image/character/stone_huanghou.jpg and /dev/null differ
diff --git a/image/character/stone_hudunren.jpg b/image/character/stone_hudunren.jpg
new file mode 100644
index 000000000..352b59c2b
Binary files /dev/null and b/image/character/stone_hudunren.jpg differ
diff --git a/image/character/stone_huofu.jpg b/image/character/stone_huofu.jpg
new file mode 100644
index 000000000..17ee7fe57
Binary files /dev/null and b/image/character/stone_huofu.jpg differ
diff --git a/image/character/stone_huoqiangshou.jpg b/image/character/stone_huoqiangshou.jpg
new file mode 100755
index 000000000..7cc1f7c34
Binary files /dev/null and b/image/character/stone_huoqiangshou.jpg differ
diff --git a/image/character/stone_huoshe.jpg b/image/character/stone_huoshe.jpg
new file mode 100644
index 000000000..d53b84e13
Binary files /dev/null and b/image/character/stone_huoshe.jpg differ
diff --git a/image/character/stone_huoyao.jpg b/image/character/stone_huoyao.jpg
new file mode 100755
index 000000000..1eb0f8b3d
Binary files /dev/null and b/image/character/stone_huoyao.jpg differ
diff --git a/image/character/stone_huoyuansu.jpg b/image/character/stone_huoyuansu.jpg
new file mode 100644
index 000000000..081954aa8
Binary files /dev/null and b/image/character/stone_huoyuansu.jpg differ
diff --git a/image/character/stone_jiangong.jpg b/image/character/stone_jiangong.jpg
new file mode 100644
index 000000000..fcdd7bcac
Binary files /dev/null and b/image/character/stone_jiangong.jpg differ
diff --git a/image/character/stone_jiewangzhu.jpg b/image/character/stone_jiewangzhu.jpg
new file mode 100644
index 000000000..07b0411f7
Binary files /dev/null and b/image/character/stone_jiewangzhu.jpg differ
diff --git a/image/character/stone_junxuguan.jpg b/image/character/stone_junxuguan.jpg
new file mode 100755
index 000000000..4723e6b6c
Binary files /dev/null and b/image/character/stone_junxuguan.jpg differ
diff --git a/image/character/stone_juxingchanchu.jpg b/image/character/stone_juxingchanchu.jpg
new file mode 100644
index 000000000..1384b689b
Binary files /dev/null and b/image/character/stone_juxingchanchu.jpg differ
diff --git a/image/character/stone_kongjuzhanma.jpg b/image/character/stone_kongjuzhanma.jpg
new file mode 100755
index 000000000..25a635a1b
Binary files /dev/null and b/image/character/stone_kongjuzhanma.jpg differ
diff --git a/image/character/stone_kuangyedoushi.jpg b/image/character/stone_kuangyedoushi.jpg
new file mode 100644
index 000000000..2b31b78cb
Binary files /dev/null and b/image/character/stone_kuangyedoushi.jpg differ
diff --git a/image/character/stone_kuangzhanshi.jpg b/image/character/stone_kuangzhanshi.jpg
new file mode 100644
index 000000000..3d829b025
Binary files /dev/null and b/image/character/stone_kuangzhanshi.jpg differ
diff --git a/image/character/stone_kutongsiseng.jpg b/image/character/stone_kutongsiseng.jpg
new file mode 100644
index 000000000..d3fd55b7c
Binary files /dev/null and b/image/character/stone_kutongsiseng.jpg differ
diff --git a/image/character/stone_langren.jpg b/image/character/stone_langren.jpg
new file mode 100755
index 000000000..f8ba182cb
Binary files /dev/null and b/image/character/stone_langren.jpg differ
diff --git a/image/character/stone_lansaizhanshi.jpg b/image/character/stone_lansaizhanshi.jpg
new file mode 100644
index 000000000..cd28e2790
Binary files /dev/null and b/image/character/stone_lansaizhanshi.jpg differ
diff --git a/image/character/stone_leiouke.jpg b/image/character/stone_leiouke.jpg
new file mode 100644
index 000000000..d50392822
Binary files /dev/null and b/image/character/stone_leiouke.jpg differ
diff --git a/image/character/stone_liebao.jpg b/image/character/stone_liebao.jpg
new file mode 100644
index 000000000..17a46512a
Binary files /dev/null and b/image/character/stone_liebao.jpg differ
diff --git a/image/character/stone_liegou.jpg b/image/character/stone_liegou.jpg
new file mode 100755
index 000000000..d929778cc
Binary files /dev/null and b/image/character/stone_liegou.jpg differ
diff --git a/image/character/stone_liewangshouwei.jpg b/image/character/stone_liewangshouwei.jpg
new file mode 100644
index 000000000..9fef25f9b
Binary files /dev/null and b/image/character/stone_liewangshouwei.jpg differ
diff --git a/image/character/stone_lieyanxiaogui.jpg b/image/character/stone_lieyanxiaogui.jpg
new file mode 100755
index 000000000..54cfffe78
Binary files /dev/null and b/image/character/stone_lieyanxiaogui.jpg differ
diff --git a/image/character/stone_linghunjisi.jpg b/image/character/stone_linghunjisi.jpg
new file mode 100755
index 000000000..df7f4d834
Binary files /dev/null and b/image/character/stone_linghunjisi.jpg differ
diff --git a/image/character/stone_longmianjiaoguan.jpg b/image/character/stone_longmianjiaoguan.jpg
new file mode 100644
index 000000000..713080218
Binary files /dev/null and b/image/character/stone_longmianjiaoguan.jpg differ
diff --git a/image/character/stone_longwangpeiou.jpg b/image/character/stone_longwangpeiou.jpg
new file mode 100755
index 000000000..3af76c4a8
Binary files /dev/null and b/image/character/stone_longwangpeiou.jpg differ
diff --git a/image/character/stone_mafengzhuru.jpg b/image/character/stone_mafengzhuru.jpg
new file mode 100755
index 000000000..c503954bf
Binary files /dev/null and b/image/character/stone_mafengzhuru.jpg differ
diff --git a/image/character/stone_mianyang.jpg b/image/character/stone_mianyang.jpg
new file mode 100755
index 000000000..0ce511e05
Binary files /dev/null and b/image/character/stone_mianyang.jpg differ
diff --git a/image/character/stone_mingguangjisi.jpg b/image/character/stone_mingguangjisi.jpg
new file mode 100755
index 000000000..c23f8af25
Binary files /dev/null and b/image/character/stone_mingguangjisi.jpg differ
diff --git a/image/character/stone_misha.jpg b/image/character/stone_misha.jpg
new file mode 100644
index 000000000..38266b2fc
Binary files /dev/null and b/image/character/stone_misha.jpg differ
diff --git a/image/character/stone_morishouwei.jpg b/image/character/stone_morishouwei.jpg
new file mode 100644
index 000000000..18be2873c
Binary files /dev/null and b/image/character/stone_morishouwei.jpg differ
diff --git a/image/character/stone_nianqingjisi.jpg b/image/character/stone_nianqingjisi.jpg
new file mode 100755
index 000000000..81c2a8d84
Binary files /dev/null and b/image/character/stone_nianqingjisi.jpg differ
diff --git a/image/character/stone_qiezei.jpg b/image/character/stone_qiezei.jpg
new file mode 100755
index 000000000..8925f6b02
Binary files /dev/null and b/image/character/stone_qiezei.jpg differ
diff --git a/image/character/stone_qingwa.jpg b/image/character/stone_qingwa.jpg
new file mode 100755
index 000000000..2a38115f3
Binary files /dev/null and b/image/character/stone_qingwa.jpg differ
diff --git a/image/character/stone_qunbing.jpg b/image/character/stone_qunbing.jpg
deleted file mode 100644
index b27111e17..000000000
Binary files a/image/character/stone_qunbing.jpg and /dev/null differ
diff --git a/image/character/stone_qunguan.jpg b/image/character/stone_qunguan.jpg
deleted file mode 100644
index dd312f678..000000000
Binary files a/image/character/stone_qunguan.jpg and /dev/null differ
diff --git a/image/character/stone_qunjiang.jpg b/image/character/stone_qunjiang.jpg
deleted file mode 100644
index 1447a8330..000000000
Binary files a/image/character/stone_qunjiang.jpg and /dev/null differ
diff --git a/image/character/stone_sanxian.jpg b/image/character/stone_sanxian.jpg
deleted file mode 100644
index b69e78b57..000000000
Binary files a/image/character/stone_sanxian.jpg and /dev/null differ
diff --git a/image/character/stone_shengguanghuwei.jpg b/image/character/stone_shengguanghuwei.jpg
new file mode 100755
index 000000000..dc7268b9a
Binary files /dev/null and b/image/character/stone_shengguanghuwei.jpg differ
diff --git a/image/character/stone_shifazhe.jpg b/image/character/stone_shifazhe.jpg
new file mode 100755
index 000000000..ed6211db1
Binary files /dev/null and b/image/character/stone_shifazhe.jpg differ
diff --git a/image/character/stone_shishigui.jpg b/image/character/stone_shishigui.jpg
new file mode 100755
index 000000000..27ff2067a
Binary files /dev/null and b/image/character/stone_shishigui.jpg differ
diff --git a/image/character/stone_shubing.jpg b/image/character/stone_shubing.jpg
deleted file mode 100644
index 58261aa29..000000000
Binary files a/image/character/stone_shubing.jpg and /dev/null differ
diff --git a/image/character/stone_shuguan.jpg b/image/character/stone_shuguan.jpg
deleted file mode 100644
index 66ce81797..000000000
Binary files a/image/character/stone_shuguan.jpg and /dev/null differ
diff --git a/image/character/stone_shuiyuansu.jpg b/image/character/stone_shuiyuansu.jpg
new file mode 100644
index 000000000..e639c08f4
Binary files /dev/null and b/image/character/stone_shuiyuansu.jpg differ
diff --git a/image/character/stone_shujiang.jpg b/image/character/stone_shujiang.jpg
deleted file mode 100644
index 4f8ec0a72..000000000
Binary files a/image/character/stone_shujiang.jpg and /dev/null differ
diff --git a/image/character/stone_shumiao.jpg b/image/character/stone_shumiao.jpg
new file mode 100644
index 000000000..0fab5edd6
Binary files /dev/null and b/image/character/stone_shumiao.jpg differ
diff --git a/image/character/stone_shuren.jpg b/image/character/stone_shuren.jpg
new file mode 100644
index 000000000..4ed14548c
Binary files /dev/null and b/image/character/stone_shuren.jpg differ
diff --git a/image/character/stone_tegong.jpg b/image/character/stone_tegong.jpg
new file mode 100644
index 000000000..cf4976cff
Binary files /dev/null and b/image/character/stone_tegong.jpg differ
diff --git a/image/character/stone_tutengyongshi.jpg b/image/character/stone_tutengyongshi.jpg
new file mode 100644
index 000000000..f2d55f4be
Binary files /dev/null and b/image/character/stone_tutengyongshi.jpg differ
diff --git a/image/character/stone_tuyuansu.jpg b/image/character/stone_tuyuansu.jpg
new file mode 100644
index 000000000..71b6eee3f
Binary files /dev/null and b/image/character/stone_tuyuansu.jpg differ
diff --git a/image/character/stone_weibing.jpg b/image/character/stone_weibing.jpg
deleted file mode 100644
index 6be1f55da..000000000
Binary files a/image/character/stone_weibing.jpg and /dev/null differ
diff --git a/image/character/stone_weiguan.jpg b/image/character/stone_weiguan.jpg
deleted file mode 100644
index 0a6b0819c..000000000
Binary files a/image/character/stone_weiguan.jpg and /dev/null differ
diff --git a/image/character/stone_weijiang.jpg b/image/character/stone_weijiang.jpg
deleted file mode 100644
index b1a9367a0..000000000
Binary files a/image/character/stone_weijiang.jpg and /dev/null differ
diff --git a/image/character/stone_wubing.jpg b/image/character/stone_wubing.jpg
deleted file mode 100644
index 985d63afb..000000000
Binary files a/image/character/stone_wubing.jpg and /dev/null differ
diff --git a/image/character/stone_wuguan.jpg b/image/character/stone_wuguan.jpg
deleted file mode 100644
index 18502deb7..000000000
Binary files a/image/character/stone_wuguan.jpg and /dev/null differ
diff --git a/image/character/stone_wujiang.jpg b/image/character/stone_wujiang.jpg
deleted file mode 100644
index 0dac53f16..000000000
Binary files a/image/character/stone_wujiang.jpg and /dev/null differ
diff --git a/image/character/stone_wujiyuansu.jpg b/image/character/stone_wujiyuansu.jpg
new file mode 100644
index 000000000..cbca40f6d
Binary files /dev/null and b/image/character/stone_wujiyuansu.jpg differ
diff --git a/image/character/stone_wunv.jpg b/image/character/stone_wunv.jpg
deleted file mode 100644
index 65ddbf6eb..000000000
Binary files a/image/character/stone_wunv.jpg and /dev/null differ
diff --git a/image/character/stone_wushixuetu.jpg b/image/character/stone_wushixuetu.jpg
new file mode 100644
index 000000000..f1866ca14
Binary files /dev/null and b/image/character/stone_wushixuetu.jpg differ
diff --git a/image/character/stone_wuyi.jpg b/image/character/stone_wuyi.jpg
new file mode 100755
index 000000000..9bc99544d
Binary files /dev/null and b/image/character/stone_wuyi.jpg differ
diff --git a/image/character/stone_xiaogui.jpg b/image/character/stone_xiaogui.jpg
new file mode 100755
index 000000000..78561ff66
Binary files /dev/null and b/image/character/stone_xiaogui.jpg differ
diff --git a/image/character/stone_xiaoguishouling.jpg b/image/character/stone_xiaoguishouling.jpg
new file mode 100755
index 000000000..c954bee30
Binary files /dev/null and b/image/character/stone_xiaoguishouling.jpg differ
diff --git a/image/character/stone_xuejuren.jpg b/image/character/stone_xuejuren.jpg
new file mode 100644
index 000000000..b35cbd863
Binary files /dev/null and b/image/character/stone_xuejuren.jpg differ
diff --git a/image/character/stone_xukongxingzhe.jpg b/image/character/stone_xukongxingzhe.jpg
new file mode 100644
index 000000000..0f53e04cd
Binary files /dev/null and b/image/character/stone_xukongxingzhe.jpg differ
diff --git a/image/character/stone_xunshoushi.jpg b/image/character/stone_xunshoushi.jpg
new file mode 100644
index 000000000..337174632
Binary files /dev/null and b/image/character/stone_xunshoushi.jpg differ
diff --git a/image/character/stone_yanjingshe.jpg b/image/character/stone_yanjingshe.jpg
new file mode 100755
index 000000000..061ff6920
Binary files /dev/null and b/image/character/stone_yanjingshe.jpg differ
diff --git a/image/character/stone_yaosaishouwei.jpg b/image/character/stone_yaosaishouwei.jpg
new file mode 100755
index 000000000..c6e679c57
Binary files /dev/null and b/image/character/stone_yaosaishouwei.jpg differ
diff --git a/image/character/stone_yiji.jpg b/image/character/stone_yiji.jpg
deleted file mode 100644
index 912fcb789..000000000
Binary files a/image/character/stone_yiji.jpg and /dev/null differ
diff --git a/image/character/stone_yingxiongzhihun.jpg b/image/character/stone_yingxiongzhihun.jpg
new file mode 100644
index 000000000..a16cde5ed
Binary files /dev/null and b/image/character/stone_yingxiongzhihun.jpg differ
diff --git a/image/character/stone_yinshi.jpg b/image/character/stone_yinshi.jpg
deleted file mode 100644
index 74b8e3129..000000000
Binary files a/image/character/stone_yinshi.jpg and /dev/null differ
diff --git a/image/character/stone_yisheng.jpg b/image/character/stone_yisheng.jpg
deleted file mode 100644
index 561d14d05..000000000
Binary files a/image/character/stone_yisheng.jpg and /dev/null differ
diff --git a/image/character/stone_youlinglang.jpg b/image/character/stone_youlinglang.jpg
new file mode 100644
index 000000000..08e91a3ae
Binary files /dev/null and b/image/character/stone_youlinglang.jpg differ
diff --git a/image/character/stone_yuanguanying.jpg b/image/character/stone_yuanguanying.jpg
new file mode 100644
index 000000000..57db652aa
Binary files /dev/null and b/image/character/stone_yuanguanying.jpg differ
diff --git a/image/character/stone_yuanhou.jpg b/image/character/stone_yuanhou.jpg
new file mode 100644
index 000000000..0e1a6ac91
Binary files /dev/null and b/image/character/stone_yuanhou.jpg differ
diff --git a/image/character/stone_yurenqishi.jpg b/image/character/stone_yurenqishi.jpg
new file mode 100755
index 000000000..891ceef95
Binary files /dev/null and b/image/character/stone_yurenqishi.jpg differ
diff --git a/image/character/stone_zhihuiguan.jpg b/image/character/stone_zhihuiguan.jpg
new file mode 100755
index 000000000..fcd6cc248
Binary files /dev/null and b/image/character/stone_zhihuiguan.jpg differ
diff --git a/image/character/stone_zhiyuzhe.jpg b/image/character/stone_zhiyuzhe.jpg
new file mode 100644
index 000000000..7ca72d6f0
Binary files /dev/null and b/image/character/stone_zhiyuzhe.jpg differ
diff --git a/image/character/stone_zhongshi.jpg b/image/character/stone_zhongshi.jpg
new file mode 100755
index 000000000..d0f419dae
Binary files /dev/null and b/image/character/stone_zhongshi.jpg differ
diff --git a/image/character/stone_zhucangzhe.jpg b/image/character/stone_zhucangzhe.jpg
new file mode 100755
index 000000000..029da9b88
Binary files /dev/null and b/image/character/stone_zhucangzhe.jpg differ
diff --git a/image/character/stone_zhujiashi.jpg b/image/character/stone_zhujiashi.jpg
new file mode 100644
index 000000000..412b3959f
Binary files /dev/null and b/image/character/stone_zhujiashi.jpg differ
diff --git a/image/character/stone_zongxiong.jpg b/image/character/stone_zongxiong.jpg
new file mode 100644
index 000000000..e58727a7e
Binary files /dev/null and b/image/character/stone_zongxiong.jpg differ
diff --git a/image/character/yecha.jpg b/image/character/yecha.jpg
deleted file mode 100644
index ca401703d..000000000
Binary files a/image/character/yecha.jpg and /dev/null differ
diff --git a/layout/default/layout.css b/layout/default/layout.css
index d90b6f81a..e9f23b408 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -137,7 +137,7 @@ table{table-layout: fixed;}
 #arena[data-font_size='20']{
 	font-size:20px;
 }*/
-#arena{width:90%;height: 90%;top: calc(5% + 10px);left: 5%;z-index: 0}
+#arena{width:90%;height: 90%;top: calc(5% + 10px);left: 5%;}
 #arena.right:not(.noleft){left:240px;opacity: 0.6;}
 #arena.left:not(.noleft){left:calc(10% - 240px);opacity: 0.6;}
 #arena.top{top:-100%;}
@@ -299,6 +299,7 @@ body>.background{z-index:-5}
 	filter:blur(6px) !important;
 	-webkit-filter:blur(6px) !important;
 }
+.zoominanim{-webkit-animation:zoomin 0.5s;}
 .zoomin{transform: scale(1.05) !important;}
 .zoomout{transform: scale(0.95) !important;}
 .zoomin2{transform: scale(2) !important;}
@@ -514,6 +515,7 @@ margin-bottom: 5px;
 	letter-spacing:3px;
 }
 .button.nodisplay{display: none;}
+.dialog .content>.nodisplay{display: none;}
 .button.character>.intro{top:71px;left:0;}
 .button.character>.identity{top:-6px;left:72px;}
 /*--------确认--------*/
diff --git a/layout/mode/boss.css b/layout/mode/boss.css
index e10dba444..6ae3f9793 100755
--- a/layout/mode/boss.css
+++ b/layout/mode/boss.css
@@ -75,6 +75,7 @@
     top:auto;
     bottom:65px;
     height:calc(100% - 383px);
+    /*min-height: 207px;*/
     background: rgba(0,0,0,0.2);
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
 	border-radius:8px;
diff --git a/manifest.json b/manifest.json
index a0d283474..ac4db81fb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "noname",
-  "xwalk_version": "1.7.4",
+  "xwalk_version": "1.7.5",
   "start_url": "index.html",
   "icons": [
     {
diff --git a/mode/boss.js b/mode/boss.js
index ca83b8c06..5391e6f7f 100755
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -6,6 +6,9 @@ mode.boss={
 				if(this!=game.boss){
 					this.storage.boss_chongzheng=0;
 				}
+				if(game.bossinfo.checkResult&&game.bossinfo.checkResult()===false){
+					return;
+				}
 				if(this==game.boss||game.players.length==1){
 					game.checkResult();
 				}
@@ -14,6 +17,32 @@ mode.boss={
 	},
 	game:{
 		reserveDead:true,
+		changeBoss:function(name){
+			if(game.additionaldead){
+				game.additionaldead.push(game.boss);
+			}
+			else{
+				game.additionaldead=[game.boss];
+			}
+			game.boss.delete();
+			game.dead.remove(game.boss);
+			var boss=ui.create.player().init(name);
+			game.addVideo('bossSwap',game.boss,boss.name);
+			if(game.me==game.boss){
+				boss.dataset.position=0;
+				game.swapControl(boss);
+			}
+			else{
+				boss.dataset.position=7;
+			}
+			game.players.push(boss.animate('zoominanim'));
+			game.arrangePlayers();
+			game.boss=boss;
+			ui.arena.appendChild(boss);
+			boss.directgain(get.cards(4));
+			boss.setIdentity('zhu');
+			boss.identity='zhu';
+		},
 		checkResult:function(){
 			if(game.boss==game.me){
 				game.over(game.boss.isAlive());
@@ -360,6 +389,9 @@ mode.boss={
 					}
 				}
 				else{
+					if(player.identity=='zhu'&&game.boss!=player){
+						player=game.boss;
+					}
 					player.phase();
 				}
 				"step 1"
@@ -441,7 +473,7 @@ mode.boss={
 				dialog.classList.add('fixed');
 				ui.window.appendChild(dialog);
 				dialog.classList.add('bosscharacter');
-				dialog.add('0/3');
+				// dialog.add('0/3');
 				dialog.add([list.slice(0,20),'character']);
 				dialog.noopen=true;
 
@@ -449,11 +481,11 @@ mode.boss={
 				next._triggered=null;
 				next.custom.replace.target=event.customreplacetarget;
 				next.selectButton=[3,3];
-				next.custom.add.button=function(){
-					if(ui.cheat2&&ui.cheat2.backup) return;
-					_status.event.dialog.content.childNodes[1].innerHTML=
-					ui.selected.buttons.length+'/3';
-				};
+				// next.custom.add.button=function(){
+				// 	if(ui.cheat2&&ui.cheat2.backup) return;
+				// 	_status.event.dialog.content.childNodes[1].innerHTML=
+				// 	ui.selected.buttons.length+'/3';
+				// };
 				event.changeDialog=function(){
 					if(ui.cheat2&&ui.cheat2.dialog==_status.event.dialog){
 						return;
@@ -467,7 +499,7 @@ mode.boss={
 					ui.window.appendChild(_status.event.dialog);
 					_status.event.dialog.classList.add('bosscharacter');
 					_status.event.dialog.classList.add('fixed');
-					_status.event.dialog.add('0/3');
+					// _status.event.dialog.add('0/3');
 					_status.event.dialog.add([list.slice(0,20),'character']);
 					game.uncheck();
 					game.check();
@@ -573,6 +605,14 @@ mode.boss={
 		},
 	},
 	boss:{
+		boss_zhuoguiquxie:{
+			chongzheng:99,
+			checkResult:function(){
+				if(game.boss.name!='boss_yecha'&&game.boss.name!='boss_luocha'){
+					return false;
+				}
+			}
+		},
 		boss_zhangjiao:{
 			// loopType:2,
 		},
@@ -607,7 +647,6 @@ mode.boss={
 		},
 	},
 	skill:{
-
 		_bossswap:{
 			trigger:{player:['phaseBegin','chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin',
 			'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin',
diff --git a/mode/stone.js b/mode/stone.js
index 92a106f5a..9025891b3 100755
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -1,6 +1,59 @@
 'use strict';
 mode.stone={
 	element:{
+		stonecharacter:{
+			type:'stonecharacter',
+			color:'white',
+			opacity:1,
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			chongzhu:true,
+			textShadow:'black 0 0 2px',
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				"step 0"
+				var name=card.name.slice(0,card.name.indexOf('_stonecharacter'));
+				var added=false;
+				var i;
+				for(i=0;i<player.actcharacterlist.length;i++){
+					if(player.actcharacterlist[i]===null){
+						added=true;
+						break;
+					}
+				}
+				var pos=i+4;
+				if(player!=game.me){
+					pos+=4;
+				}
+				var fellow=game.addFellow(pos,name);
+				fellow.side=player.side;
+				fellow.classList.add('turnedover');
+				player.actcharacterlist[i]=fellow;
+				fellow.$gain2(card);
+				event.source=fellow;
+				var num=lib.character[name][5][1];
+				if(num){
+					fellow.draw(num,false);
+				}
+				player.updateActCount();
+				if(fellow.skills.contains('shaman_tuteng')){
+					fellow.noPhaseDelay=true;
+				}
+				"step 1"
+				event.trigger('fellow');
+			},
+			ai:{
+				order:8.5,
+				useful:[5.5,1],
+				result:{
+					target:1
+				}
+			}
+		},
 		player:{
 			init:function(player){
 				if(!player.isMin()||player.forcemin){
@@ -53,6 +106,15 @@ mode.stone={
 					}
 				}
 			},
+			hasFellowSkill:function(skill){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].skills.contains(skill)&&
+					game.players[i].side==this.side){
+						return true;
+					}
+				}
+				return false;
+			},
 			canAddFellow:function(){
 				if(!this.actcharacterlist) return false;
 				if(this.actcharacterlist.length<4) return true;
@@ -117,6 +179,48 @@ mode.stone={
 				fellow.dataset.position=i+4+(this==game.me?0:4);
 				return this;
 			},
+			addFellowAuto:function(name){
+				var next=game.createEvent('addFellowAuto');
+				next.player=this;
+				next.fellowName=name;
+				next.content=function(){
+					"step 0"
+					if(!player.canAddFellow()){
+						event.finish();
+						return;
+					}
+					var name=event.fellowName;
+					var added=false;
+					var i;
+					for(i=0;i<player.actcharacterlist.length;i++){
+						if(player.actcharacterlist[i]===null){
+							added=true;
+							break;
+						}
+					}
+					var pos=i+4;
+					if(player!=game.me){
+						pos+=4;
+					}
+					var fellow=game.addFellow(pos,name,'zoominanim');
+					fellow.side=player.side;
+					fellow.classList.add('turnedover');
+					player.actcharacterlist[i]=fellow;
+					event.source=fellow;
+					var num=lib.character[name][5][1];
+					if(num){
+						fellow.draw(num,false);
+					}
+					player.updateActCount();
+					if(fellow.skills.contains('shaman_tuteng')){
+						fellow.noPhaseDelay=true;
+					}
+					// player.line(fellow,'green');
+					"step 1"
+					event.trigger('fellow');
+					event.result=event.source;
+				}
+			},
 			removeFellow:function(fellow){
 				if(!this.actcharacterlist) return this;
 				var index=this.actcharacterlist.indexOf(fellow);
@@ -170,7 +274,6 @@ mode.stone={
 								player.draw(2,false);
 								var nd=game.enemy.countFellow();
 								if(nd){
-									console.log(nd);
 									player.directgain(player.getDeckCards(nd));
 								}
 							}
@@ -244,41 +347,123 @@ mode.stone={
 	},
 	cardPack:{
 		mode_stone:[
-			'zhaohunfan','jintiao','liumangxingzhen','shengerpingdeng','emofengdi','konghunshi',
-			'mindieyi','miefafu','dianhaishenzhu','yesushengxue','sanghunzhao','fengraozhijiao'
+			'spell_xiaoshi','spell_chenmo','spell_morizaihuo','spell_shengerpingdeng','spell_jingshenkongzhi','spell_anyingkuangluan',
+			'spell_binghuan','spell_yanmie','spell_zhiliaozhichu','spell_wangzhezhufu','spell_diyulieyan','spell_zhiliaoshui',
+			'spell_hanbingjian','spell_huoqiushu','spell_bianxingshu','spell_aoshuzhihui','spell_baofengxue','spell_lieyanfengbao',
+			'spell_shandianfengbao','spell_chazhuangshandian','spell_yaoshu','spell_shixue','spell_lianhuanbaolie','spell_yexinglanghun',
+			'spell_fuchouzhinu','spell_liliangzhufu','spell_fennuzhichui','spell_fengxian','spell_zuozhandongyuan','spell_shengliaoshu',
+			'spell_cigu','spell_modaoyou','spell_jianrenluanwu','spell_daoshan','spell_cisha','spell_sijidaifa',
+			'spell_huotigenxu','spell_wuyashenxiang','spell_ziranzhili','spell_yemanpaoxiao','spell_hengsao','spell_yexingchengzhang',
+			'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'
 		]
 	},
 	characterPack:{
 		mode_stone:{
-			stone_weibing:['male','wei',2,['stone_weibing'],['minskin','stone'],[1,0]],
-			stone_weiguan:['male','wei',1,['stone_weiguan'],['minskin','stone'],[1,2]],
-			stone_weijiang:['male','wei',3,['stone_weijiang'],['minskin','stone'],[3,0]],
+			stone_tutengyongshi:['male','wei',4,['shaman_jili'],['minskin','stone'],[4,2,'shaman']],
+			stone_xuejuren:['male','wei',2,['shaman_xueju'],['minskin','stone'],[1,1,'shaman']],
+			stone_tuyuansu:['male','qun',5,['chaofeng'],['minskin','stone'],[5,4,'shaman']],
+			stone_huoyuansu:['male','shu',3,['shaman_huoxi'],['minskin','stone'],[4,3,'shaman']],
+			stone_fachao:['male','wei',3,['shaman_tuteng','shaman_fachao'],['minskin','stone'],[3,0,'shaman']],
+			stone_huoshe:['male','shu',3,['shaman_tuteng','shaman_huoshe'],['minskin','stone'],[3,0,'shaman']],
 
-			stone_shubing:['male','shu',2,['stone_shubing'],['minskin','stone'],[1,0]],
-			stone_shuguan:['male','shu',1,['stone_shuguan'],['minskin','stone'],[1,2]],
-			stone_shujiang:['male','shu',3,['stone_shujiang'],['minskin','stone'],[3,0]],
+			stone_kuangyedoushi:['male','wu',3,['druid_nuhuo'],['minskin','stone'],[4,2,'druid']],
+			stone_conglinshouwei:['male','wu',3,['druid_huwei'],['minskin','stone'],[4,2,'druid']],
+			stone_baohuzhishu:['male','qun',6,['chaofeng'],['minskin','stone'],[6,4,'druid']],
+			stone_liebao:['male','wei',3,['stone_jixing'],['minskin','stone'],[3,3,'druid']],
+			stone_zongxiong:['male','shu',4,['chaofeng'],['minskin','stone'],[4,2,'druid']],
+			stone_baoqishi:['female','wei',2,['druid_chengzhang'],['minskin','stone'],[2,2,'druid']],
 
-			stone_wubing:['male','wu',2,['stone_wubing'],['minskin','stone'],[1,0]],
-			stone_wuguan:['male','wu',1,['stone_wuguan'],['minskin','stone'],[1,2]],
-			stone_wujiang:['male','wu',3,['stone_wujiang'],['minskin','stone'],[3,0]],
+			stone_caoyuanshi:['male','qun',5,['hunter_nuhou'],['minskin','stone'],[5,2,'hunter']],
+			stone_leiouke:['male','shu',3,['hunter_zhanhuo'],['minskin','stone'],[3,1,'hunter']],
+			stone_huofu:['male','qun',2,['stone_jixing'],['minskin','stone'],[3,4,'hunter']],
+			stone_misha:['male','shu',3,['chaofeng'],['minskin','stone'],[3,3,'hunter']],
+			stone_jiewangzhu:['male','wu',1,['hunter_jiewang'],['minskin','stone'],[1,2,'hunter']],
+			stone_xunshoushi:['male','qun',2,['hunter_xunshou'],['minskin','stone'],[4,3,'hunter']],
 
-			stone_qunbing:['male','qun',2,['stone_qunbing'],['minskin','stone'],[1,0]],
-			stone_qunguan:['male','qun',1,['stone_qunguan'],['minskin','stone'],[1,2]],
-			stone_qunjiang:['male','qun',3,['stone_qunjiang'],['minskin','stone'],[3,0]],
+			stone_shuiyuansu:['male','wei',4,['mage_bingdong'],['minskin','stone'],[4,2,'mage']],
+			stone_wushixuetu:['female','wu',1,['mage_zhufa'],['minskin','stone'],[1,2,'mage']],
+			stone_huoyao:['male','shu',3,['mage_lieyan'],['minskin','stone'],[3,1,'mage']],
+			stone_falifulong:['male','shu',2,['mage_tunfa'],['minskin','stone'],[1,1,'mage']],
+			stone_yingxiongzhihun:['male','wei',1,['mage_minghuo'],['minskin','stone'],[1,2,'mage']],
+			stone_shifazhe:['male','qun',3,['mage_shifa'],['minskin','stone'],[3,3,'mage']],
 
-			stone_daoshi:['male','qun',1,['stone_daoshi'],['minskin','stone'],[1,2]],
-			stone_sanxian:['male','qun',2,['stone_sanxian'],['minskin','stone'],[2,0]],
-			stone_yisheng:['male','qun',1,['jijiu'],['minskin','stone'],[2,2]],
-			stone_yinshi:['male','qun',1,['stone_yinshi'],['minskin','stone'],[1,2]],
-			stone_banxian:['male','qun',3,['stone_banxian'],['minskin','stone'],[3,0]],
+			stone_hudunren:['male','qun',2,['paladin_hudun'],['minskin','stone'],[2,2,'paladin']],
+			stone_junxuguan:['male','qun',3,['paladin_buji'],['minskin','stone'],[4,1,'paladin']],
+			stone_yurenqishi:['male','qun',2,['paladin_zhaochao'],['minskin','stone'],[4,2,'paladin']],
+			stone_chidunweishi:['male','qun',3,['paladin_chidun'],['minskin','stone'],[3,2,'paladin']],
+			stone_liewangshouwei:['male','qun',5,['paladin_shouwei'],['minskin','stone'],[5,2,'paladin']],
+			stone_longwangpeiou:['female','qun',4,['paladin_zhaohuan'],['minskin','stone'],[5,4,'paladin']],
 
-			stone_daogu:['female','qun',1,['stone_daogu'],['minskin','stone'],[1,2]],
-			stone_gongzhu:['female','wu',1,['shushen'],['minskin','stone'],[2,2]],
-			stone_genv:['female','wei',1,['jieyin'],['minskin','stone'],[1,2]],
-			stone_wunv:['female','qun',1,['biyue'],['minskin','stone'],[3,2]],
-			stone_huanghou:['female','qun',2,['stone_huanghou'],['minskin','stone'],[3,1]],
-			stone_feipin:['female','qun',1,['guixiu'],['minskin','stone'],[1,2]],
-			stone_yiji:['female','qun',1,['stone_yiji'],['minskin','stone'],[2,2]],
+			stone_lieyanxiaogui:['male','qun',2,['warlock_nonghuo'],['minskin','stone'],[1,4,'warlock']],
+			stone_xiaoguishouling:['male','qun',3,['warlock_zhaogui'],['minskin','stone'],[3,1,'warlock']],
+			stone_xiaogui:['male','qun',1,[],['minskin','stone','stonehidden'],[1,1]],
+			stone_kongjuzhanma:['male','qun',1,['warlock_yongsheng'],['minskin','stone'],[3,1,'warlock']],
+			stone_morishouwei:['male','qun',4,['warlock_zaihuo'],['minskin','stone'],[4,4,'warlock']],
+			stone_xukongxingzhe:['male','qun',2,['chaofeng'],['minskin','stone'],[1,1,'warlock']],
+			stone_diyuhuo:['male','qun',4,['warlock_yuhuo'],['minskin','stone'],[5,4,'warlock']],
+
+			stone_zhihuiguan:['female','qun',2,['warrior_tongling'],['minskin','stone'],[2,1,'warrior']],
+			stone_kuangzhanshi:['male','qun',3,['warrior_baoluan'],['minskin','stone'],[3,0,'warrior']],
+			stone_zhujiashi:['male','qun',2,['warrior_zhujia'],['minskin','stone'],[2,1,'warrior']],
+			stone_jiangong:['male','qun',2,['warrior_jiangong'],['minskin','stone'],[2,1,'warrior']],
+			stone_chidunshinv:['female','qun',4,['warrior_tidun'],['minskin','stone'],[5,4,'warrior']],
+			stone_yuanhou:['male','qun',4,['chaofeng'],['minskin','stone'],[4,2,'warrior']],
+
+			stone_daomufeizei:['male','qun',3,['rogue_xunbao'],['minskin','stone'],[4,3,'rogue']],
+			stone_qiezei:['male','qun',2,['rogue_touqie'],['minskin','stone'],[2,2,'rogue']],
+			stone_heitieairen:['male','qun',2,['rogue_qiancang'],['minskin','stone'],[4,3,'rogue']],
+			stone_tegong:['male','qun',2,['rogue_touxi'],['minskin','stone'],[3,3,'rogue']],
+			stone_haidaotoumu:['male','qun',2,['rogue_zhaomu'],['minskin','stone'],[3,2,'rogue']],
+			stone_haidao:['male','qun',1,[],['minskin','stone','stonehidden'],[1,2,'rogue']],
+			stone_cike:['male','qun',1,['rogue_cisha','stone_qianxing'],['minskin','stone'],[2,1,'rogue']],
+
+			stone_beijunmushi:['male','qun',2,['priest_shengliao'],['minskin','stone'],[1,1,'priest']],
+			stone_guanliyuan:['male','qun',2,['priest_faxian'],['minskin','stone'],[2,1,'priest']],
+			stone_linghunjisi:['male','qun',4,['priest_hunwu'],['minskin','stone'],[4,2,'priest']],
+			stone_heianjiaotu:['male','qun',3,['priest_zhufu'],['minskin','stone'],[3,2,'priest']],
+			stone_guangyaozhizi:['male','qun',3,['priest_guangyao'],['minskin','stone'],[5,3,'priest']],
+			stone_longmianjiaoguan:['male','qun',2,['priest_xundao'],['minskin','stone'],[2,2,'priest']],
+
+			stone_zhongshi:['male','wei',1,['stone_zhongshi1'],['minskin','stone'],[1,2]],
+			stone_zhucangzhe:['male','wei',1,['stone_zhucangzhe1'],['minskin','stone'],[1,2]],
+			stone_huoqiangshou:['male','wei',3,['stone_huoqiangshou1'],['minskin','stone'],[3,1]],
+
+			stone_lansaizhanshi:['male','shu',1,['stone_jixing'],['minskin','stone'],[1,2]],
+			stone_kutongsiseng:['male','shu',1,['stone_kutongsiseng1'],['minskin','stone'],[1,2]],
+			stone_yuanguanying:['male','shu',3,['stone_yuanguanying1'],['minskin','stone'],[3,1]],
+
+			stone_dijieshicong:['male','wu',2,['stone_dijieshicong1'],['minskin','stone'],[1,1]],
+			stone_yaosaishouwei:['male','wu',1,['stone_yaosaishouwei1'],['minskin','stone'],[1,2]],
+			stone_famingjia:['male','wu',3,['stone_famingjia1'],['minskin','stone'],[3,1]],
+
+			stone_chilundashi:['male','qun',2,['stone_chilundashi1'],['minskin','stone'],[1,1]],
+			stone_hanguangzhizhe:['male','qun',2,['stone_hanguangzhizhe1'],['minskin','stone'],[2,2]],
+			stone_aihaozhihun:['male','qun',3,['stone_aihaozhihun1'],['minskin','stone'],[3,1]],
+
+			stone_fennuxiaoji:['male','qun',1,['stone_fennuxiaoji1'],['minskin','stone'],[1,1]],
+			stone_juxingchanchu:['male','qun',2,['stone_juxingchanchu1'],['minskin','stone'],[2,1]],
+			stone_wuyi:['male','qun',1,['jijiu'],['minskin','stone'],[2,2]],
+			stone_langren:['male','qun',1,['stone_qianxing'],['minskin','stone'],[1,2]],
+			stone_shishigui:['male','qun',2,['stone_shishigui1'],['minskin','stone'],[2,1]],
+
+			stone_fatiaozhuru:['female','qun',1,['stone_fatiaozhuru1'],['minskin','stone'],[1,1]],
+			stone_mingguangjisi:['female','wu',2,['shushen'],['minskin','stone'],[2,1]],
+			stone_nianqingjisi:['female','wei',2,['stone_zhufu'],['minskin','stone'],[2,1]],
+			stone_aomishouwei:['female','qun',1,['biyue'],['minskin','stone'],[2,2]],
+			stone_yanjingshe:['female','qun',2,['stone_yanjingshe1'],['minskin','stone'],[3,2]],
+			stone_zhiyuzhe:['female','qun',3,['stone_zhiyu'],['minskin','stone'],[3,1]],
+			stone_mafengzhuru:['female','qun',1,['stone_mafengzhuru1'],['minskin','stone'],[1,2]],
+
+			stone_shumiao:['none','wu',1,[],['minskin','stone','stonehidden'],[1,2]],
+			stone_shuren:['none','wu',2,['stone_jixing','stone_zibao'],['minskin','stone','stonehidden'],[2,2]],
+			stone_youlinglang:['none','qun',2,['chaofeng'],['minskin','stone','stonehidden'],[2,2]],
+			stone_shengguanghuwei:['female','qun',2,['priest_shengguang'],['minskin','stone','stonehidden'],[1,1]],
+			stone_liegou:['none','qun',1,['stone_jixing'],['minskin','stone','stonehidden'],[1,2]],
+			stone_mianyang:['none','qun',1,['mage_mianyang'],['minskin','stone','stonehidden'],[1,0]],
+			stone_qingwa:['none','wu',1,['shaman_qingwa'],['minskin','stone','stonehidden'],[1,0]],
 
 			stone_tuteng1:['none','qun',2,['shaman_tuteng','chaofeng'],['minskin','stone','stonehidden'],[2,0]],
 			stone_tuteng2:['none','qun',2,['shaman_tuteng','shaman_zhuore'],['minskin','stone','stonehidden'],[2,0]],
@@ -291,6 +476,19 @@ mode.stone={
 	careerList:['mage','shaman','druid','paladin','rogue','priest','hunter','warrior','warlock'],
 	game:{
 		reserveDead:true,
+		onWash:function(){
+			if(_status.mode!='deck') return;
+			var list=[];
+			for(var i=0;i<ui.discardPile.childElementCount;i++){
+				var type=get.type(ui.discardPile.childNodes[i]);
+				if(type=='stonecard'||type=='stonecharacter'){
+					list.push(ui.discardPile.childNodes[i]);
+				}
+			}
+			while(list.length){
+				list.shift().remove();
+			}
+		},
 		modPhaseDraw:function(player,num){
 			if(_status.mode=='deck'&&!player.isMin()){
 				if(num>1){
@@ -347,35 +545,58 @@ mode.stone={
 			}
 		},
 		initStone:function(){
-			var list=[],list2=[];
+			var list=[],list2=[],list3={},list4={};
+			for(var i=0;i<lib.careerList.length;i++){
+				list3[lib.careerList[i]]=[];
+				list4[lib.careerList[i]]=[];
+			}
 			var i,j,name;
 			for(var i in lib.characterPack.mode_stone){
 				lib.character[i]=lib.characterPack.mode_stone[i];
 				lib.character[i][3].add('stonesha');
 				lib.character[i][3].add('stoneshan');
 				lib.character[i][3].add('stonedraw');
-				if(lib.character[i][4].contains('stonehidden')) continue;
 				name=i+'_stonecharacter';
-				if(lib.character[i][5][0]<3){
-					list.push(name);
-				}
-				else{
-					list2.push(name);
-				}
 				lib.card[name]={
 					image:'character/'+i,
 					stoneact:lib.character[i][5][0],
 					career:lib.character[i][5][2]||null
 				};
-				for(j in lib.card.stonecharacter){
-					lib.card[name][j]=lib.card.stonecharacter[j];
+				for(j in lib.element.stonecharacter){
+					lib.card[name][j]=lib.element.stonecharacter[j];
 				}
 				lib.translate[name]=get.translation(i);
 				lib.translate[name+'_info']=get.skillintro(i);
+				if(lib.character[i][4].contains('stonehidden')){
+					lib.card[name].stonehidden=true;
+					continue;
+				}
+				if(!lib.character[i][5][2]){
+					if(lib.character[i][5][0]<3){
+						list.push(name);
+					}
+					else{
+						list2.push(name);
+					}
+				}
+				else{
+					list3[lib.character[i][5][2]].push(name);
+				}
 			}
 			if(_status.mode=='deck'){
-				lib.spells=lib.cardPack.mode_stone.slice(0);
+				lib.spells=[];
+				var spells=lib.cardPack.mode_stone;
+				for(var i=0;i<spells.length;i++){
+					if(lib.card[spells[i]].career){
+						list4[lib.card[spells[i]].career].push(spells[i]);
+					}
+					else{
+						lib.spells.push(spells[i]);
+					}
+				}
+				lib.careerSpells=list4;
 				lib.minions=list.concat(list2);
+				lib.careerMinions=list3;
 				if(!lib.storage.deckList){
 					lib.storage.deckList={};
 				}
@@ -393,24 +614,24 @@ mode.stone={
 					for(i=0;i<list.length;i++){
 						lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),list[i]]);
 					}
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'shengerpingdeng']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'konghunshi']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'emofengdi']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'mindieyi']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'miefafu']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'sanghunzhao']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'sanghunzhao']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'jintiao']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'zhaohunfan']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'fengraozhijiao']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_shengerpingdeng']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_anyingkuangluan']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_jingshenkongzhi']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_binghuan']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_zuzhou']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_diyulieyan']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_diyulieyan']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_chenmo']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_xishengqiyue']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_zhiliaoshui']);
 				}
 				while(addedcardcount2--){
 					for(i=0;i<list2.length;i++){
 						lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),list2[i]]);
 					}
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'liumangxingzhen']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'dianhaishenzhu']);
-					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'yesushengxue']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_morizaihuo']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_zhiliaozhichu']);
+					lib.card.list.push([suit.randomGet(),Math.ceil(Math.random()*13),'spell_wangzhezhufu']);
 				}
 				lib.card.list.randomSort();
 			}
@@ -430,7 +651,8 @@ mode.stone={
 				}
 				else{
 					if(typeof lib.card[i].stoneact==='number'&&!lib.card[i].addinfo){
-						lib.card[i].addinfo='消耗 '+lib.card[i].stoneact;
+						lib.card[i].addinfo='消耗: '+lib.card[i].stoneact;
+						lib.card[i].addinfomenu='消耗：'+lib.card[i].stoneact;
 					}
 				}
 			}
@@ -564,22 +786,42 @@ mode.stone={
 						rename.addEventListener('keyup',removeLine);
 
 						var cardDialog=ui.create.cardDialog(true,function(name){
+							if(lib.card[name].stonehidden) return true;
 							var type=lib.card[name].type;
 							return type!='stonecard'&&type!='stonecharacter';
 						},{seperate:function(list){
 							var nl=[],ns=[];
-							var result={
-								'中立法术':ns,
-								'中立随从':nl,
+							var career={};
+							var careerspell={};
+							for(var i=0;i<lib.careerList.length;i++){
+								career[lib.careerList[i]]=[];
+								careerspell[lib.careerList[i]]=[];
 							}
+							var result={}
 							for(var i=0;i<list.length;i++){
 								if(lib.card[list[i][2]].type=='stonecard'){
-									ns.push(list[i]);
+									if(lib.card[list[i][2]].career&&lib.careerList.contains(lib.card[list[i][2]].career)){
+										careerspell[lib.card[list[i][2]].career].push(list[i]);
+									}
+									else{
+										ns.push(list[i]);
+									}
 								}
 								else{
-									nl.push(list[i]);
+									if(lib.card[list[i][2]].career&&lib.careerList.contains(lib.card[list[i][2]].career)){
+										career[lib.card[list[i][2]].career].push(list[i]);
+									}
+									else{
+										nl.push(list[i]);
+									}
 								}
 							}
+							for(var i=0;i<lib.careerList.length;i++){
+								result['职业法术_link:'+lib.careerList[i]]=careerspell[lib.careerList[i]];
+								result['职业随从_link:'+lib.careerList[i]]=career[lib.careerList[i]];
+							}
+							result['中立法术']=ns;
+							result['中立随从']=nl;
 							return result;
 						}});
 						for(var i=0;i<cardDialog.buttons.length;i++){
@@ -589,6 +831,17 @@ mode.stone={
 								buttonName=lib.character[buttonName];
 								cardDialog.buttons[i].node.info.innerHTML=buttonName[5][1]+'/'+buttonName[2];
 							}
+							if(lib.config.touchscreen){
+								lib.setLongPress(cardDialog.buttons[i],ui.click.intro);
+							}
+							else{
+								if(lib.config.hover_all){
+									lib.setHover(cardDialog.buttons[i],ui.click.hoverplayer);
+								}
+								if(lib.config.right_info){
+									cardDialog.buttons[i].oncontextmenu=ui.click.rightplayer;
+								}
+							}
 						}
 						var updateCardDialog=function(button){
 							if(deckContainer.childElementCount>=30){
@@ -622,6 +875,20 @@ mode.stone={
 									}
 								}
 							}
+							var career=cardDialog.editing.content.career;
+							for(var i=0;i<cardDialog.content.childElementCount;i++){
+								var currentNode=cardDialog.content.childNodes[i];
+								if(currentNode.link){
+									if(currentNode.link==career){
+										currentNode.classList.remove('nodisplay');
+										currentNode.nextSibling.classList.remove('nodisplay');
+									}
+									else{
+										currentNode.classList.add('nodisplay');
+										currentNode.nextSibling.classList.add('nodisplay');
+									}
+								}
+							}
 							cardCount.innerHTML=deckContainer.childElementCount+'/30';
 						};
 						var clickCard=function(){
@@ -1074,29 +1341,23 @@ mode.stone={
 			}
 		},
 	},
-	onWash:function(){
-		if(_status.mode!='deck') return;
-		var list=[];
-		for(var i=0;i<ui.discardPile.childElementCount;i++){
-			var type=get.type(ui.discardPile.childNodes[i]);
-			if(type=='stonecard'||type=='stonecharacter'){
-				list.push(ui.discardPile.childNodes[i]);
-			}
-		}
-		while(list.length){
-			list.shift().remove();
-		}
-	},
 	get:{
 		deck:function(player,name){
 			var career,deck;
-			if(name=='random'){
-				career=lib.careerList.randomGet();
-				deck=lib.minions.randomGets(20).concat(lib.spells.randomGets(10));
-			}
-			else if(name.indexOf('random:')==0){
-				career=name.slice(7);
-				deck=lib.minions.randomGets(20).concat(lib.spells.randomGets(10));
+			if(name=='random'||name.indexOf('random:')==0){
+				if(name=='random'){
+					career=lib.careerList.randomGet();
+				}
+				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));
 			}
 			else{
 				career=lib.storage.deckList[name].career;
@@ -1119,7 +1380,6 @@ mode.stone={
 					}
 				}
 			}
-			deck.randomSort();
 			if(!player.deckCards) player.deckCards=[];
 			for(var i=0;i<deck.length;i++){
 				player.deckCards.push(game.createCard(deck[i]));
@@ -1127,61 +1387,685 @@ mode.stone={
 		}
 	},
 	card:{
-		stonecharacter:{
-			type:'stonecharacter',
-			color:'white',
-			opacity:1,
-			enable:function(event,player){
-				return player.canAddFellow();
+		spell_shenshengxinxing:{
+			type:'stonecard',
+			stoneact:5,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:true,
+			selectTarget:-1,
+			content:function(){
+				if(player.hasFellowSkill('priest_hunwu')){
+					target.loseHp();
+				}
+				else if(player.side==target.side){
+					target.recover();
+				}
+				else{
+					target.damage();
+				}
 			},
-			chongzhu:true,
-			textShadow:'black 0 0 2px',
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(player.hasFellowSkill('priest_hunwu')) return -1;
+						if(player.side==target.side) return 1;
+						return -1;
+					}
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1
+				}
+			}
+		},
+		spell_shengguangzhadan:{
+			type:'stonecard',
+			stoneact:2,
+			career:'priest',
+			enable:true,
+			fullimage:true,
 			filterTarget:function(card,player,target){
-				return player==target;
+				return target.isMin()&&target.num('h')>0;
 			},
 			selectTarget:-1,
 			content:function(){
-				"step 0"
-				var name=card.name.slice(0,card.name.indexOf('_stonecharacter'));
-				var added=false;
-				var i;
-				for(i=0;i<player.actcharacterlist.length;i++){
-					if(player.actcharacterlist[i]===null){
-						added=true;
-						break;
-					}
-				}
-				var pos=i+4;
-				if(player!=game.me){
-					pos+=4;
-				}
-				var fellow=game.addFellow(pos,name);
-				fellow.side=player.side;
-				fellow.classList.add('turnedover');
-				player.actcharacterlist[i]=fellow;
-				fellow.$gain2(card);
-				event.source=fellow;
-				var num=lib.character[name][5][1];
-				if(num){
-					fellow.draw(num,false);
-				}
-				player.updateActCount();
-				"step 1"
-				event.trigger('fellow');
+				target.damage(target.num('h'));
 			},
 			ai:{
-				order:8.5,
-				useful:[5.5,1],
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -Math.min(target.num('h'),target.hp);
+					}
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1
+				}
+			}
+		},
+		spell_maizang:{
+			type:'stonecard',
+			stoneact:3,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side!=player.side;
+			},
+			content:function(){
+				'step 0'
+				target.die();
+				'step 1'
+				player.gain(game.createCard(target.name+'_stonecharacter'),'gain2');
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp-target.num('h')/2;
+					}
+				}
+			}
+		},
+		spell_xinlingshijie:{
+			type:'stonecard',
+			stoneact:0,
+			career:'priest',
+			enable:function(event,player){
+				return player.getEnemy().num('h')>0;
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			selectTarget:-1,
+			content:function(){
+				var card=target.get('h').randomGet();
+				if(card){
+					player.gain(game.createCard(card.name,card.suit,card.number,card.nature),'draw');
+				}
+			},
+			ai:{
+				order:9.5,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_naluzhiguang:{
+			type:'stonecard',
+			stoneact:2,
+			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(){
+				'step 0'
+				if(player.hasFellowSkill('priest_hunwu')){
+					target.loseHp();
+				}
+				else{
+					target.recover();
+				}
+				'step 1'
+				if(target.hp<target.maxHp&&player.canAddFellow()){
+					player.addFellowAuto('stone_shengguanghuwei');
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					player:function(player,target){
+						if(player.hasFellowSkill('priest_hunwu')){
+							return 1;
+						}
+						if(target.hp<target.maxHp-1) return 2;
+						return 0;
+					},
+					target:function(player,target){
+						if(player.hasFellowSkill('priest_hunwu')){
+							return -2
+						}
+						return ai.get.recoverEffect(target,player,target);
+					}
+				}
+			}
+		},
+		spell_zhiliaozhihuan:{
+			type:'stonecard',
+			stoneact:0,
+			career:'priest',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			selectTarget:-1,
+			content:function(){
+				if(player.hasFellowSkill('priest_hunwu')){
+					target.loseHp(2);
+				}
+				else{
+					target.recover(2);
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(player.hasFellowSkill('priest_hunwu')){
+							return -1;
+						}
+						return ai.get.recoverEffect(target,player,target);
+					}
+				}
+			}
+		},
+
+		spell_nuxi:{
+			type:'stonecard',
+			stoneact:2,
+			career:'warrior',
+			enable:true,
+			fullimage:true,
+			filterTarget:true,
+			content:function(){
+				target.damage();
+				player.changeHujia();
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5,
+				},
+				tag:{
+					damage:1
+				}
+			}
+		},
+		spell_dunpaimengji:{
+			type:'stonecard',
+			stoneact:1,
+			career:'warrior',
+			enable:function(event,player){
+				return player.hujia>0;
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.damage(player.hujia);
+			},
+			ai:{
+				order:7.2,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5,
+					tag:{
+						damage:1
+					}
+				}
+			}
+		},
+		spell_zhansha:{
+			type:'stonecard',
+			stoneact:1,
+			career:'warrior',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.hp<target.maxHp;
+			},
+			content:function(){
+				target.die({source:player});
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				}
+			}
+		},
+		spell_nuhuozhongshao:{
+			type:'stonecard',
+			stoneact:0,
+			career:'warrior',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				target.damage();
+				'step 1'
+				if(target.isAlive()){
+					target.draw(2);
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(target.hp==1) return -1;
+						if(target.hp>=4) return 1.5;
+						if(target.hp>=3&&target.num('h')<target.hp) return 1;
+						return 0;
+					}
+				}
+			}
+		},
+		spell_xuanfengzhan:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'warrior',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage();
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_juemingluandou:{
+			type:'stonecard',
+			stoneact:4,
+			career:'warrior',
+			enable:function(){
+				var num=0;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()){
+						num++;
+						if(num>=2) return true;
+					}
+				}
+				return false;
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			selectTarget:-1,
+			content:function(){
+				targets.randomRemove();
+				targets.sort(lib.sort.seat);
+				for(var i=0;i<targets.length;i++){
+					targets[i].die()._triggered=null;
+				}
+				ui.clear();
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				}
+			}
+		},
+
+		spell_lierenyinji:{
+			type:'stonecard',
+			stoneact:0,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.maxHp>1;
+			},
+			content:function(){
+				target.loseMaxHp(target.maxHp-1);
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return 1-target.hp;
+					}
+				}
+			}
+		},
+		spell_kuaisusheji:{
+			type:'stonecard',
+			stoneact:2,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			filterTarget:true,
+			content:function(){
+				target.damage();
+				player.draw();
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5,
+				},
+				tag:{
+					damage:1
+				}
+			}
+		},
+		spell_guanmenfanggou:{
+			type:'stonecard',
+			stoneact:2,
+			career:'hunter',
+			enable:function(event,player){
+				return player.getEnemy().countFellow()>0;
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				event.num=player.getEnemy().countFellow();
+				'step 1'
+				if(player.canAddFellow()&&event.num--){
+					player.addFellowAuto('stone_liegou');
+					event.redo();
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
 				result:{
 					target:1
 				}
 			}
 		},
-		zhaohunfan:{
+		spell_zhaohuanchongwu:{
 			type:'stonecard',
-			fullskin:true,
+			stoneact:2,
+			career:'hunter',
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				var list=['stone_misha','stone_leiouke','stone_huofu',
+				'stone_caoyuanshi','stone_qingwa','stone_mianyang','stone_jiewangzhu'];
+				player.addFellowAuto(list.randomGet());
+			},
+			ai:{
+				order:6,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_zidanshangtang:{
+			type:'stonecard',
+			stoneact:1,
+			career:'hunter',
+			enable:true,
+			fullimage:true,
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				var list=['spell_lierenyinji','spell_guanmenfanggou','spell_duochongsheji','spell_kuaisusheji','spell_zhaohuanchongwu'];
+				player.gain(game.createCard(list.randomGet()),'draw');
+				player.addTempSkill('hunter_zidanshangtang','phaseAfter');
+			},
+			ai:{
+				order:7.5,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_duochongsheji:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side){
+						return true;
+					}
+				}
+				return false;
+			},
+			stoneact:4,
+			career:'hunter',
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					list=list.randomGets(2);
+					list.sort(lib.sort.seat);
+				}
+				event.list=list;
+				'step 1'
+				if(event.list.length){
+					var current=event.list.shift();
+					player.line(current);
+					current.damage(2);
+					event.redo();
+				}
+			},
+			ai:{
+				order:5,
+				result:{
+					player:1
+				},
+			}
+		},
+
+		spell_liliangdaijia:{
+			type:'stonecard',
+			fullimage:true,
 			enable:true,
 			stoneact:1,
+			career:'warlock',
+			filterTarget:function(card,player,target){
+				return target.side==player.side&&target.isMin();
+			},
+			content:function(){
+				target.draw(4);
+				target.hp=5;
+				target.maxHp=5;
+				target.update();
+				target.addSkill('stone_zibao');
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(target.skills.contains('warlock_yongsheng')) return 2;
+						if(target.hp==1&&target.num('h')<=2) return 1;
+						return 0;
+					}
+				},
+			}
+		},
+		spell_xiaoguibaopo:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'warlock',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				event.num=Math.ceil(Math.random()*3);
+				target.damage(event.num);
+				'step 1'
+				if(player.canAddFellow()&&event.num--){
+					player.addFellowAuto('stone_xiaogui');
+					event.redo();
+				}
+			},
+			ai:{
+				order:6,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+				}
+			}
+		},
+		spell_emozhinu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'warlock',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage();
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_anyinglieyan:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'warlock',
+			filterTarget:function(card,player,target){
+				return target.side==player.side&&target.isMin();
+			},
+			content:function(){
+				'step 0'
+				target.die({source:player});
+				event.num=target.hp;
+				'step 1'
+				event.list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side){
+						event.list.push(game.players[i]);
+					}
+				}
+				event.list.sort(lib.sort.seat);
+				'step 2'
+				if(event.list.length){
+					event.list.shift().damage(event.num);
+					event.redo();
+				}
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					player:function(player,target){
+						var list=[];
+						var maxHp=0;
+						for(var i=0;i<game.players.length;i++){
+							if(game.players[i].isMin()&&game.players[i].side!=player.side){
+								list.push(game.players[i]);
+								if(game.players[i].hp>maxHp){
+									maxHp=game.players[i].hp;
+								}
+							}
+						}
+						if(list.length<2) return 0;
+						if(list.length==2&&target.hp>=4) return 0;
+						if(target.hp>maxHp) return 1;
+						return target.hp;
+					}
+				},
+			}
+		},
+		spell_xishengqiyue:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:0,
+			career:'warlock',
 			filterTarget:function(card,player,target){
 				if(!target.isMin()) return false;
 				if(ui.selected.targets.length){
@@ -1210,11 +2094,943 @@ mode.stone={
 				order:6
 			}
 		},
-		jintiao:{
+		spell_zuzhou:{
+			type:'stonecard',
+			enable:true,
+			stoneact:1,
+			fullimage:true,
+			career:'warlock',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.turnOver();
+				player.draw();
+			},
+			ai:{
+				order:6,
+				result:{
+					target:function(player,target){
+						if(target.isTurnedOver()) return 1;
+						return -1;
+					}
+				}
+			}
+		},
+
+		spell_yexingchengzhang:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:0,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				player.actused--;
+				player.updateActCount();
+				player.draw();
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_ziranzhili:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			stoneact:4,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				event.num=3;
+				'step 1'
+				if(player.canAddFellow()&&event.num--){
+					player.addFellowAuto('stone_shuren');
+					event.redo();
+				}
+			},
+			ai:{
+				order:6,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_yemanpaoxiao:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return !player.skills.contains('spell_yemanpaoxiao');
+			},
+			stoneact:2,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				player.addTempSkill('spell_yemanpaoxiao',{player:'phaseBegin'});
+			},
+			ai:{
+				order:1,
+				value:5,
+				useful:5,
+				result:{
+					player:function(player){
+						if(player.countFellow()>=2) return 1;
+						return 0;
+					}
+				},
+			}
+		},
+		spell_hengsao:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:4,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side;
+			},
+			content:function(){
+				'step 0'
+				event.list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i]!=target&&game.players[i].side==target.side){
+						event.list.push(game.players[i]);
+					}
+				}
+				target.damage(2);
+				'step 1'
+				if(event.list.length){
+					event.list.shift().damage();
+					event.redo();
+				}
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:1
+				}
+			}
+		},
+		spell_wuyashenxiang:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'druid',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				player.chooseControl('法术牌','随从牌').ai=function(){
+					return Math.random()<0.5?'法术牌':'随从牌';
+				}
+				'step 1'
+				var list=[];
+				var bool=(result.control=='法术牌');
+				for(var i in lib.card){
+					if(lib.card[i].stonehidden) continue;
+					if(bool){
+						if(lib.card[i].type=='stonecard'){
+							list.push(i);
+						}
+					}
+					else{
+						if(lib.card[i].type=='stonecharacter'){
+							list.push(i);
+						}
+					}
+				}
+				list=list.randomGets(3);
+				var cards=[];
+				for(var i=0;i<list.length;i++){
+					cards.push(game.createCard(list[i]));
+				}
+				player.chooseCardButton(cards,'选择一张加入手牌',true);
+				'step 2'
+				player.gain(result.links,'draw');
+			},
+			ai:{
+				order:2,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_huotigenxu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'druid',
+			filterTarget:true,
+			selectTarget:[0,1],
+			notarget:true,
+			content:function(){
+				'step 0'
+				if(targets.length){
+					targets[0].damage();
+					event.finish();
+				}
+				else{
+					event.num=2;
+				}
+				'step 1'
+				if(player.canAddFellow()&&event.num--){
+					player.addFellowAuto('stone_shumiao');
+					event.redo();
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					player:1,
+					target:-1
+				},
+				tag:{
+					damage:1
+				}
+			}
+		},
+
+		spell_cigu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'rogue',
+			filterTarget:true,
+			contentBefore:function(){
+				'step 0'
+				player.storage.spell_cigu=false;
+				if(player.num('he',{type:'equip'})){
+					player.chooseToDiscard('he','是否弃置一张装备牌令伤害+1？',{type:'equip'}).ai=function(card){
+						return 7-ai.get.value(card);
+					}
+				}
+				else{
+					event.finish();
+				}
+				'step 1'
+				if(result.bool){
+					player.storage.spell_cigu=true;
+				}
+			},
+			content:function(){
+				if(player.storage.spell_cigu){
+					target.damage(2);
+				}
+				else{
+					target.damage();
+				}
+				player.storage.spell_cigu=false;
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+				}
+			}
+		},
+		spell_sijidaifa:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return !player.skills.contains('spell_sijidaifa');
+			},
+			stoneact:0,
+			career:'rogue',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				player.addSkill('spell_sijidaifa');
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_daoshan:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'rogue',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side&&target.isMin();
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage();
+			},
+			contentAfter:function(){
+				player.gain(player.getDeckCards(),'draw');
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_jianrenluanwu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.get('e','1')?true:false;
+			},
+			stoneact:2,
+			career:'rogue',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side;
+			},
+			selectTarget:-1,
+			contentBefore:function(){
+				player.discard(player.get('e','1'));
+			},
+			content:function(){
+				if(typeof player.storage.spell_modaoyou=='number'){
+					target.damage(player.storage.spell_modaoyou+1);
+				}
+				else{
+					target.damage();
+				}
+			},
+			contentAfter:function(){
+				player.storage.spell_modaoyou=0;
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_cisha:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'rogue',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.die({source:player});
+			},
+			ai:{
+				order:8.8,
+				value:5,
+				useful:5,
+				result:{
+					target:-100
+				},
+			}
+		},
+		spell_modaoyou:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'rogue',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				if(typeof player.storage.spell_modaoyou!='number'){
+					player.storage.spell_modaoyou=1;
+				}
+				else{
+					player.storage.spell_modaoyou++;
+				}
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side==player.side){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					list.randomGet().draw(2);
+				}
+			},
+			ai:{
+				order:1,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+
+		spell_fengxian:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'paladin',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side;
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage();
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_fuchouzhinu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:5,
+			career:'paladin',
+			filterTarget:function(card,player,target){
+				return target.side!=player.side;
+			},
+			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<5;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_liliangzhufu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'paladin',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.draw(2);
+			},
+			ai:{
+				order:6,
+				value:5,
+				useful:5,
+				result:{
+					target:1
+				},
+			}
+		},
+		spell_shengliaoshu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'paladin',
+			filterTarget:true,
+			content:function(){
+				target.recover(2);
+				target.draw(2);
+			},
+			ai:{
+				order:5,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return 1+target.maxHp-target.hp;
+					}
+				},
+			}
+		},
+		spell_zuozhandongyuan:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			stoneact:3,
+			career:'paladin',
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			content:function(){
+				'step 0'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_xinbing');
+				}
+				'step 1'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_xinbing');
+				}
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_fennuzhichui:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'paladin',
+			filterTarget:true,
+			content:function(){
+				target.damage();
+				player.gain(player.getDeckCards(),'draw');
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+				}
+			}
+		},
+
+		spell_lianhuanbaolie:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'shaman',
+			filterTarget:true,
+			content:function(){
+				target.damage(Math.ceil(Math.random()*2),'thunder');
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					natureDamage:1,
+					thunderDamage:1
+				}
+			}
+		},
+		spell_shandianfengbao:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'shaman',
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side!=player.side;
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage(Math.ceil(Math.random()*2),'thunder');
+			},
+			ai:{
+				order:9,
+				useful:5,
+				value:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					natureDamage:1,
+					thunderDamage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_yaoshu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'shaman',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.clearSkills();
+				target.init('stone_qingwa');
+				target.noPhaseDelay=true;
+			},
+			ai:{
+				order:5,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp;
+					}
+				},
+			}
+		},
+		spell_shixue:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:4,
+			career:'shaman',
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side==player.side;
+			},
+			multitarget:true,
+			multiline:true,
+			content:function(){
+				game.asyncDraw(targets,2);
+			},
+			ai:{
+				order:5,
+				value:5,
+				useful:5,
+				result:{
+					target:2
+				},
+				tag:{
+					multitarget:1
+				}
+			}
+		},
+		spell_yexinglanghun:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.canAddFellow();
+			},
+			stoneact:4,
+			career:'shaman',
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			content:function(){
+				'step 0'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_youlinglang');
+				}
+				'step 1'
+				if(player.canAddFellow()){
+					player.addFellowAuto('stone_youlinglang');
+				}
+			},
+			ai:{
+				order:9,
+				value:5,
+				useful:5,
+				result:{
+					player:1
+				},
+			}
+		},
+		spell_chazhuangshandian:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side){
+						return true;
+					}
+				}
+				return false;
+			},
+			stoneact:2,
+			career:'shaman',
+			filterTarget:function(card,player,target){
+				return player==target;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					list=list.randomGets(2);
+					list.sort(lib.sort.seat);
+				}
+				event.list=list;
+				'step 1'
+				if(event.list.length){
+					var current=event.list.shift();
+					player.line(current,'thunder');
+					current.damage('thunder');
+					event.redo();
+				}
+			},
+			ai:{
+				order:5,
+				result:{
+					player:1
+				},
+			}
+		},
+
+		spell_hanbingjian:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'mage',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				'step 0'
+				target.damage(2);
+				'step 1'
+				if(target.isAlive()&&!target.isTurnedOver()){
+					target.turnOver();
+				}
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-1
+				},
+				tag:{
+					damage:2,
+				}
+			}
+		},
+		spell_huoqiushu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:3,
+			career:'mage',
+			filterTarget:true,
+			content:function(){
+				target.damage(2,'fire');
+			},
+			ai:{
+				order:8,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2,
+					natureDamage:2,
+					fireDamage:2,
+				}
+			}
+		},
+		spell_lieyanfengbao:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:5,
+			career:'mage',
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side!=player.side;
+			},
+			selectTarget:-1,
+			content:function(){
+				target.damage(2);
+			},
+			ai:{
+				order:9,
+				useful:5,
+				value:5,
+				result:{
+					target:-2
+				},
+				tag:{
+					damage:2,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+		spell_bianxingshu:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			career:'mage',
+			filterTarget:function(card,player,target){
+				return target.isMin();
+			},
+			content:function(){
+				target.clearSkills();
+				target.init('stone_mianyang');
+			},
+			ai:{
+				order:5,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						return -target.hp;
+					}
+				},
+			}
+		},
+		spell_aoshuzhihui:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:1,
+			career:'mage',
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			selectTarget:-1,
+			content:function(){
+				player.gain(player.getDeckCards(2),'draw');
+			},
+			ai:{
+				order:0.5,
+				result:{
+					player:1
+				}
+			}
+		},
+		spell_baofengxue:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:4,
+			career:'mage',
+			filterTarget:function(card,player,target){
+				return target.isMin()&&target.side!=player.side;
+			},
+			selectTarget:-1,
+			content:function(){
+				'step 0'
+				target.damage();
+				'step 1'
+				if(target.isAlive()){
+					target.turnOver();
+				}
+			},
+			ai:{
+				order:9,
+				useful:5,
+				value:5,
+				result:{
+					target:-1.5
+				},
+				tag:{
+					damage:1,
+					multitarget:1,
+					multineg:1,
+				}
+			}
+		},
+
+		spell_chenmo:{
 			type:'stonecard',
 			enable:true,
 			stoneact:2,
-			fullskin:true,
+			fullimage:true,
 			filterTarget:function(card,player,target){
 				return target.isMin()&&(target.maxHp>1||target.num('he')>0);
 			},
@@ -1235,8 +3051,8 @@ mode.stone={
 				order:5
 			}
 		},
-		liumangxingzhen:{
-			fullskin:true,
+		spell_morizaihuo:{
+			fullimage:true,
 			type:'stonecard',
 			enable:true,
 			filterTarget:function(card,player,target){
@@ -1255,7 +3071,7 @@ mode.stone={
 				'step 1'
 				player.recover(2)
 			},
-			stoneact:6,
+			stoneact:5,
 			ai:{
 				order:9,
 				result:{
@@ -1267,8 +3083,8 @@ mode.stone={
 				}
 			}
 		},
-		shengerpingdeng:{
-			fullskin:true,
+		spell_shengerpingdeng:{
+			fullimage:true,
 			type:'stonecard',
 			enable:true,
 			stoneact:2,
@@ -1290,8 +3106,8 @@ mode.stone={
 				}
 			}
 		},
-		emofengdi:{
-			fullskin:true,
+		spell_jingshenkongzhi:{
+			fullimage:true,
 			type:'stonecard',
 			enable:function(event,player){
 				if(player.isMin()) return false;
@@ -1315,9 +3131,9 @@ mode.stone={
 				}
 			}
 		},
-		konghunshi:{
+		spell_anyingkuangluan:{
 			type:'stonecard',
-			fullskin:true,
+			fullimage:true,
 			enable:function(event,player){
 				if(player.isMin()) return false;
 				return player.canAddFellow();
@@ -1330,7 +3146,7 @@ mode.stone={
 				target.getLeader().removeFellow(target);
 				target.side=player.side;
 				player.addFellow(target);
-				target.addSkill('konghunshi_die');
+				target.addSkill('spell_anyingkuangluan_die');
 			},
 			ai:{
 				order:9,
@@ -1341,11 +3157,11 @@ mode.stone={
 				}
 			}
 		},
-		mindieyi:{
-			fullskin:true,
+		spell_binghuan:{
+			fullimage:true,
 			type:'stonecard',
 			enable:true,
-			stoneact:2,
+			stoneact:1,
 			filterTarget:function(card,player,target){
 				return target.isMin();
 			},
@@ -1363,36 +3179,19 @@ mode.stone={
 				}
 			}
 		},
-		miefafu:{
+		spell_zhiliaozhichu:{
+			fullimage:true,
 			type:'stonecard',
 			enable:true,
 			stoneact:1,
-			fullskin:true,
 			filterTarget:function(card,player,target){
-				return target.isMin();
+				return target.isMin()&&target.side==player.side&&
+				(!target.skills.contains('chaofeng')||target.hp<target.maxHp);
 			},
 			content:function(){
-				target.turnOver();
-			},
-			ai:{
-				order:6,
-				result:{
-					target:function(player,target){
-						if(target.isTurnedOver()) return 1;
-						return -1;
-					}
+				if(target.hp<target.maxHp){
+					target.recover(target.maxHp-target.hp);
 				}
-			}
-		},
-		dianhaishenzhu:{
-			fullskin:true,
-			type:'stonecard',
-			enable:true,
-			stoneact:1,
-			filterTarget:function(card,player,target){
-				return target.isMin()&&target.side==player.side&&!target.skills.contains('chaofeng');
-			},
-			content:function(){
 				target.addSkill('chaofeng');
 				target.markSkill('chaofeng');
 				game.log(target,'获得了嘲讽');
@@ -1402,14 +3201,13 @@ mode.stone={
 				order:2,
 				result:{
 					target:function(player,target){
-						if(target.hp>=3) return target.hp;
-						return 0;
+						return target.maxHp-target.hp;
 					}
 				}
 			}
 		},
-		yesushengxue:{
-			fullskin:true,
+		spell_wangzhezhufu:{
+			fullimage:true,
 			type:'stonecard',
 			enable:true,
 			stoneact:4,
@@ -1421,6 +3219,7 @@ mode.stone={
 					target.gainMaxHp(Math.min(2,5-target.maxHp));
 				}
 				target.recover(2);
+				target.draw(2);
 			},
 			ai:{
 				order:7,
@@ -1431,11 +3230,11 @@ mode.stone={
 				}
 			}
 		},
-		sanghunzhao:{
+		spell_diyulieyan:{
 			type:'stonecard',
-			fullskin:true,
+			fullimage:true,
 			enable:true,
-			stoneact:3,
+			stoneact:2,
 			filterTarget:function(card,player,target){
 				return target.isMin();
 			},
@@ -1456,26 +3255,1067 @@ mode.stone={
 				}
 			}
 		},
-		fengraozhijiao:{
+		spell_zhiliaoshui:{
 			type:'stonecard',
-			fullskin:true,
-			enable:true,
-			stoneact:1,
+			fullimage:true,
+			enable:function(event,player){
+				return player.hp<player.maxHp;
+			},
+			savable:true,
+			stoneact:2,
+			selectTarget:-1,
 			filterTarget:function(card,player,target){
-				return target.isMin()&&target.hp<target.maxHp;
+				return target==player;
 			},
 			content:function(){
-				target.recover(target.maxHp-target.hp);
+				if(target==_status.dying){
+					target.recover();
+				}
+				else{
+					target.recover(2);
+				}
 			},
 			ai:{
 				order:8,
+				value:6,
+				useful:6,
 				result:{
 					target:1
 				}
 			}
 		},
+		spell_yanmie:{
+			type:'stonecard',
+			fullimage:true,
+			enable:function(event,player){
+				return player.getEnemy().num('he')>0;
+			},
+			stoneact:5,
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			content:function(){
+				'step 0'
+				target.chooseControl('discard_card','失去体力').ai=function(){
+					if(target.hp>=2&&(target.num('h','tao')||target.hp>=5)&&target.num('h')>2) return '失去体力';
+					return 'discard_card';
+				}
+				'step 1'
+				if(result.control=='discard_card'){
+					target.discard(target.get('he'));
+				}
+				else{
+					target.loseHp(2);
+				}
+			},
+			ai:{
+				order:7,
+				value:5,
+				useful:5,
+				result:{
+					target:-2
+				}
+			}
+		},
+		spell_xiaoshi:{
+			type:'stonecard',
+			fullimage:true,
+			enable:true,
+			stoneact:2,
+			selectTarget:-1,
+			filterTarget:function(card,player,target){
+				return target==player.getEnemy();
+			},
+			content:function(){
+				'step 0'
+				target.gain(target.get('e'),'gain2');
+				'step 1'
+				var dh=target.num('h')-player.num('h');
+				if(dh>0){
+					target.discard(target.get('h').randomGets(dh));
+				}
+			},
+			ai:{
+				order:1,
+				value:5,
+				useful:5,
+				result:{
+					target:function(player,target){
+						if(target.num('he')>=player.num('h')) return -1;
+						return 0;
+					}
+				}
+			}
+		},
 	},
 	skill:{
+		hunter_jiewang2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				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.removeSkill('hunter_jiewang2');
+			}
+		},
+		hunter_zidanshangtang:{
+			trigger:{player:'useCard'},
+			forced:true,
+			mark:true,
+			intro:{
+				content:'每当你使用一张法术牌，便随机获得一张猎人职业法术牌'
+			},
+			filter:function(event){
+				return get.type(event.card)=='stonecard';
+			},
+			content:function(){
+				var list=['spell_lierenyinji','spell_guanmenfanggou','spell_duochongsheji','spell_kuaisusheji','spell_zhaohuanchongwu'];
+				player.gain(game.createCard(list.randomGet()),'draw');
+			}
+		},
+		spell_yemanpaoxiao:{
+			mark:true,
+			intro:{
+				content:'友方角色造成的伤害+1'
+			},
+			global:'spell_yemanpaoxiao2'
+		},
+		spell_yemanpaoxiao2:{
+			trigger:{source:'damageBegin'},
+			forced:true,
+			filter:function(event,player){
+				return player.getLeader().skills.contains('spell_yemanpaoxiao');
+			},
+			content:function(){
+				trigger.num++;
+			}
+		},
+		stone_zibao:{
+			trigger:{player:'phaseAfter'},
+			forced:true,
+			content:function(){
+				player.die();
+			}
+		},
+		spell_sijidaifa:{
+			trigger:{player:'useCard'},
+			forced:true,
+			filter:function(event,player){
+				return get.type(event.card)=='stonecard';
+			},
+			mark:true,
+			intro:{
+				content:'使用下一张法术牌时获得X点行动值，X为该法术的行动值消耗且不超过3'
+			},
+			content:function(){
+				var num=lib.card[trigger.card.name].stoneact;
+				if(num>3) num=3;
+				player.actused-=num;
+				player.updateActCount();
+				player.removeSkill('spell_sijidaifa');
+			}
+		},
+		shaman_qingwa:{
+			trigger:{player:'phaseDrawBefore'},
+			forced:true,
+			unique:true,
+			popup:false,
+			content:function(){
+				trigger.untrigger();
+				trigger.finish();
+			}
+		},
+		mage_mianyang:{
+			mod:{
+				cardEnabled:function(card){
+					if(card.name=='sha') return false;
+				}
+			}
+		},
+		priest_xundao:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return player.getLeader().num('h',{type:'stonecharacter'})>0;
+			},
+			content:function(){
+				player.draw();
+				player.addSkill('chaofeng');
+			}
+		},
+		priest_guangyao:{
+			trigger:{player:'changeHp'},
+			forced:true,
+			unique:true,
+			filter:function(event){
+				return event.num!=0;
+			},
+			content:function(){
+				player.draw(Math.abs(trigger.num));
+			},
+		},
+		priest_zhufu:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&
+					game.players[i].side==player.side&&game.players[i]!=player){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&
+					game.players[i].side==player.side&&game.players[i]!=player){
+						list.push(game.players[i]);
+					}
+				}
+				var target=list.randomGet();
+				player.line(target,'green');
+				target.gainMaxHp();
+				target.recover();
+			}
+		},
+		priest_hunwu:{},
+		priest_faxian:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				'step 0'
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].stonehidden) continue;
+					if(lib.card[i].type=='stonecharacter'){
+						list.push(i);
+					}
+				}
+				list=list.randomGets(3);
+				var cards=[];
+				for(var i=0;i<list.length;i++){
+					cards.push(game.createCard(list[i]));
+				}
+				player.getLeader().chooseCardButton(cards,'选择一个随从加入手牌',true);
+				'step 1'
+				player.getLeader().gain(result.links,'draw');
+			}
+		},
+		priest_shengliao:{
+			trigger:{global:'recoverEnd'},
+			forced:true,
+			unique:true,
+			filter:function(event){
+				return event.player.isMin();
+			},
+			content:function(){
+				var target=player.getLeader();
+				target.gain(target.getDeckCards(),'draw');
+			}
+		},
+		priest_shengguang:{
+			trigger:{global:'recoverEnd'},
+			forced:true,
+			unique:true,
+			filter:function(event){
+				return event.player.isMin();
+			},
+			content:function(){
+				player.draw();
+			}
+		},
+		rogue_cisha:{
+			trigger:{source:'damageEnd'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return event.player.isAlive()&&event.player.isMin();
+			},
+			content:function(){
+				trigger.player.die({source:player});
+			}
+		},
+		rogue_touxi:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				var target=player.getLeader();
+				return target.actcount-target.getActCount()>=2;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('偷袭：对一名对方随从角色一点伤害',function(card,playerx,target){
+					return player.side!=target.side;
+				}).ai=function(target){
+					return ai.get.damageEffect(target,player,player);
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					game.delay();
+					result.targets[0].damage(event.chooser);
+				}
+			}
+		},
+		rogue_qiancang:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side&&
+					game.players[i].hp==game.players[i].maxHp){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side&&
+					game.players[i].hp==game.players[i].maxHp){
+						list.push(game.players[i]);
+					}
+				}
+				list.sort(lib.sort.seat);
+				event.list=list;
+				"step 1"
+				if(event.list.length){
+					var current=event.list.shift();
+					current.damage();
+					player.line(current,'green');
+					event.redo();
+				}
+			}
+		},
+		rogue_xunbao:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().addSkill('rogue_xunbao2');
+			}
+		},
+		rogue_xunbao2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player.skills.contains('rogue_xunbao');
+			},
+			content:function(){
+				player.gain(game.createCard('spell_sijidaifa'),'draw2');
+				player.removeSkill('rogue_xunbao2');
+			}
+		},
+		rogue_touqie:{
+			trigger:{source:'damageEnd'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var target=player.getLeader();
+				target.gain(target.getDeckCards(),'draw');
+			}
+		},
+		rogue_zhaomu:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return player.getLeader().canAddFellow();
+			},
+			content:function(){
+				'step 0'
+				player.getLeader().addFellowAuto('stone_haidao');
+				'step 1'
+				player.line(result,'green');
+			}
+		},
+		warrior_zhujia:{
+			trigger:{player:'damageEnd'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var leader=player.getLeader();
+				leader.changeHujia();
+			}
+		},
+		warrior_tidun:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var leader=player.getLeader();
+				leader.changeHujia(2);
+			}
+		},
+		warrior_tongling:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&
+						game.players[i].side==player.side&&game.players[i].isTurnedOver()){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&
+						game.players[i].side==player.side&&game.players[i].isTurnedOver()){
+						game.players[i].turnOver();
+						player.line(game.players[i],'green');
+					}
+				}
+			}
+		},
+		warrior_baoluan:{
+			trigger:{global:'damageEnd'},
+			forced:true,
+			filter:function(event,player){
+				return event.player.isMin();
+			},
+			content:function(){
+				player.draw();
+			}
+		},
+		warrior_jiangong:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i]!=player&&game.players[i].isMin()){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('监工：对一名随从造成一点伤害然后令其摸两张牌',function(card,playerx,target){
+					return player!=target&&target.isMin();
+				}).ai=function(target){
+					var att=ai.get.attitude(event.chooser,target);
+					if(target.hp==1) return -att;
+					if(target.hp==2) return 0;
+					return att;
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					game.delay();
+					result.targets[0].damage(event.chooser);
+					result.targets[0].draw(2);
+				}
+			}
+		},
+		warlock_yuhuo:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player){
+						list.push(game.players[i]);
+					}
+				}
+				list.sort(lib.sort.seat);
+				event.list=list;
+				"step 1"
+				if(event.list.length){
+					var current=event.list.shift();
+					current.damage();
+					player.line(current,'green');
+					event.redo();
+				}
+			}
+		},
+		warlock_zaihuo:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.classList.remove('turnedover');
+				var target=player.getLeader();
+				var hs=target.get('h');
+				if(hs.length){
+					target.discard(hs.randomGets(2));
+				}
+			}
+		},
+		warlock_yongsheng:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().addSkill('warlock_yongsheng2');
+			},
+			ai:{
+				threaten:0.1
+			}
+		},
+		warlock_yongsheng2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player.skills.contains('warlock_yongsheng');
+			},
+			content:function(){
+				game.delay();
+				player.addFellowAuto('stone_kongjuzhanma');
+				player.removeSkill('warlock_yongsheng2');
+			}
+		},
+		warlock_zhaogui:{
+			trigger:{player:'damageEnd'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return player.getLeader().canAddFellow();
+			},
+			content:function(){
+				player.getLeader().addFellowAuto('stone_xiaogui');
+			}
+		},
+		warlock_nonghuo:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var target=player.getLeader();
+				target.damage('fire');
+				player.line(target,'green');
+				game.delay();
+			}
+		},
+		paladin_zhaohuan:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().addSkill('paladin_zhaohuan2');
+			}
+		},
+		paladin_zhaohuan2:{
+			trigger:{player:'useCard'},
+			forced:true,
+			mark:true,
+			intro:{
+				content:'使用下一张随从牌时，获得一点行动值'
+			},
+			filter:function(event,player){
+				return get.type(event.card)=='stonecharacter';
+			},
+			content:function(){
+				player.actused--;
+				player.updateActCount();
+				player.removeSkill('paladin_zhaohuan2');
+			}
+		},
+		paladin_shouwei:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				var leader=player.getLeader();
+				return leader.hp<leader.maxHp;
+			},
+			content:function(){
+				var leader=player.getLeader();
+				leader.recover(2);
+			}
+		},
+		paladin_chidun:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side!=player.side&&
+						game.players[i].isMin()&&
+						game.players[i].num('he')){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('持盾：弃置对方一名随从的所有牌',function(card,playerx,target){
+					return player.side!=target.side&&target.isMin()&&target.num('he')>0;
+				}).ai=function(target){
+					return target.num('he');
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					game.delay();
+					result.targets[0].discard(result.targets[0].get('he'));
+				}
+			}
+		},
+		paladin_zhaochao:{
+			trigger:{global:'useSkillAfter'},
+			forced:true,
+			filter:function(event,player){
+				return event.career&&event.player.side==player.side;
+			},
+			content:function(){
+				player.draw(2);
+			}
+		},
+		paladin_buji:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].name=='stone_xinbing'&&game.players[i].side==player.side){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].name=='stone_xinbing'&&game.players[i].side==player.side){
+						list.push(game.players[i]);
+					}
+				}
+				for(var i=0;i<list.length;i++){
+					list[i].gainMaxHp();
+					list[i].recover();
+				}
+				game.asyncDraw(list,2);
+				player.line(list,'green');
+			}
+		},
+		paladin_hudun:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.changeHujia();
+			}
+		},
+		mage_shifa:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&
+						game.players[i]!=player) return true;
+				}
+				return false;
+			},
+			content:function(){
+				var target1=player.getLeader();
+				var target2=player.getEnemy();
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].stonehidden) continue;
+					if(lib.card[i].type=='stonecard'){
+						list.push(i);
+					}
+				}
+				target1.gain(game.createCard(list.randomGet()));
+				target2.gain(game.createCard(list.randomGet()));
+				target1.$draw();
+				target2.$draw();
+				game.delay();
+			}
+		},
+		mage_minghuo:{
+			trigger:{global:'damageBegin'},
+			forced:true,
+			filter:function(event,player){
+				return event.source&&event.source==player.getLeader()&&event.parent.name=='_mage_skill';
+			},
+			content:function(){
+				trigger.num++;
+			}
+		},
+		mage_tunfa:{
+			trigger:{global:'useCard'},
+			forced:true,
+			filter:function(event,player){
+				return get.type(event.card)=='stonecard'&&event.player==player.getLeader();
+			},
+			content:function(){
+				player.draw();
+			}
+		},
+		mage_lieyan:{
+			trigger:{global:'useCardAfter'},
+			forced:true,
+			filter:function(event,player){
+				return get.type(event.card)=='stonecard'&&event.player==player.getLeader();
+			},
+			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]);
+					}
+				}
+				var target=list.randomGet();
+				player.line(target,'green');
+				target.damage('fire');
+				game.delay();
+			}
+		},
+		mage_zhufa:{
+			trigger:{global:'useCard'},
+			forced:true,
+			filter:function(event,player){
+				return get.type(event.card)=='stonecard'&&event.player==player.getLeader();
+			},
+			content:function(){
+				trigger.player.actused--;
+				trigger.player.updateActCount();
+			}
+		},
+		mage_bingdong:{
+			trigger:{source:'damageEnd'},
+			forced:true,
+			filter:function(event,player){
+				return event.player.isMin()&&event.player!=player&&!event.player.isTurnedOver();
+			},
+			content:function(){
+				trigger.player.turnOver();
+			}
+		},
+		hunter_xunshou:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==player.side&&
+						game.players[i]!=player) return true;
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('驯兽：选择己方一名随从增加一点体力上限，回复一点体力并摸两张牌',function(card,playerx,target){
+					return player!=target&&player.side==target.side&&target.isMin();
+				}).ai=function(target){
+					return ai.get.attitude(event.chooser,target);
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					result.targets[0].gainMaxHp();
+					result.targets[0].recover();
+					result.targets[0].draw(2);
+				}
+			}
+		},
+		hunter_jiewang:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().addSkill('hunter_jiewang2');
+			}
+		},
+		hunter_zhanhuo:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var targets=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&game.players[i].side==player.side){
+						targets.push(game.players[i]);
+					}
+				}
+				targets.sort(lib.sort.seat);
+				game.asyncDraw(targets);
+			}
+		},
+		stone_zhiyu:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&
+					game.players[i].side==player.side&&game.players[i].hp<game.players[i].maxHp){
+						game.players[i].recover();
+					}
+				}
+			}
+		},
+		hunter_nuhou:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			content:function(){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side!=player.side){
+						game.players[i].addSkill('hunter_nuhou2');
+					}
+				}
+			}
+		},
+		hunter_nuhou2:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			unique:true,
+			filter:function(event,player){
+				return player.skills.contains('hunter_nuhou2');
+			},
+			content:function(){
+				player.damage('nosource');
+				player.removeSkill('hunter_nuhou2');
+			}
+		},
+		stone_jixing:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.classList.remove('turnedover');
+			}
+		},
+		druid_nuhuo:{
+			trigger:{global:'useSkillAfter'},
+			forced:true,
+			filter:function(event,player){
+				return event.career&&event.player.side==player.side;
+			},
+			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]);
+					}
+				}
+				var target=list.randomGet();
+				player.line(target,'green');
+				target.damage();
+				game.delay();
+			}
+		},
+		druid_huwei:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side!=player.side&&
+						game.players[i].isMin()){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('护卫：对一名对方随从造成一点伤害或弃置其所有牌并将其体力上限改为1',function(card,playerx,target){
+					return player.side!=target.side&&target.isMin();
+				}).ai=function(target){
+					return Math.max(1,10-target.hp);
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.target=result.targets[0];
+					event.chooser.chooseControl('造成伤害','discard_card').ai=function(){
+						if(event.target.hp>1) return 'discard_card';
+						return '造成伤害';
+					};
+					event.chooser.line(event.target);
+					game.delay();
+				}
+				else{
+					event.finish();
+				}
+				"step 2"
+				if(result.control=='造成伤害'){
+					event.target.damage();
+				}
+				else{
+					event.target.discard(event.target.get('h'));
+					if(event.target.maxHp>1){
+						event.target.loseMaxHp(event.target.maxHp-1);
+					}
+				}
+			}
+		},
+		druid_chengzhang:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			content:function(){
+				var target=player.getLeader();
+				target.actused--;
+				target.updateActCount();
+			},
+			group:'druid_chengzhang2'
+		},
+		druid_chengzhang2:{
+			trigger:{player:'dieBegin'},
+			forced:true,
+			unique:true,
+			content:function(){
+				player.getLeader().addSkill('druid_chengzhang3');
+			}
+		},
+		druid_chengzhang3:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			popup:false,
+			filter:function(event,player){
+				return event.player.skills.contains('druid_chengzhang');
+			},
+			content:function(){
+				if(player.num('h')){
+					game.delay();
+					player.chooseToDiscard('h',true);
+				}
+				player.removeSkill('druid_chengzhang3');
+			}
+		},
+		shaman_xueju:{
+			trigger:{global:'useCard'},
+			forced:true,
+			filter:function(event,player){
+				return get.type(event.card)=='stonecharacter'&&event.player==player.getLeader();
+			},
+			content:function(){
+				player.draw();
+			}
+		},
+		shaman_huoxi:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side!=player.side&&
+						game.players[i].isMin()){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				"step 0"
+				event.chooser=player.getLeader();
+				event.chooser.chooseTarget('火袭：对一名对方随从造成两点伤害',function(card,playerx,target){
+					return player.side!=target.side&&target.isMin();
+				}).ai=function(target){
+					return Math.max(1,10-target.hp);
+				};
+				player.line(event.chooser);
+				"step 1"
+				if(result.bool){
+					event.chooser.line(result.targets[0]);
+					game.delay();
+					result.targets[0].damage(2,'fire',event.chooser);
+				}
+			}
+		},
+		shaman_fachao:{
+			trigger:{global:'phaseEnd'},
+			forced:true,
+			filter:function(event,player){
+				return event.player.career&&player.side==event.player.side;
+			},
+			content:function(){
+				trigger.player.gain(trigger.player.getDeckCards(),'draw');
+				trigger.player.recover();
+			}
+		},
+		shaman_jili:{
+			trigger:{global:'phaseEnd'},
+			forced:true,
+			filter:function(event,player){
+				if(event.player.career&&player.side==event.player.side){
+					for(var i=0;i<game.players.length;i++){
+						if(!game.players[i].career&&game.players[i].skills.contains('shaman_tuteng')&&
+						game.players[i].side==player.side){
+							return true;
+						}
+					}
+				}
+				return false;
+			},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(!game.players[i].career&&game.players[i].skills.contains('shaman_tuteng')&&
+					game.players[i].side==player.side){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					game.asyncDraw(list);
+				}
+			}
+		},
+		shaman_huoshe:{
+			trigger:{global:'damageBegin'},
+			forced:true,
+			filter:function(event,player){
+				return event.source&&event.source!=player&&player.side==event.source.side;
+			},
+			content:function(){
+				trigger.num++
+			},
+			ai:{
+				threaten:1.8
+			}
+		},
 		_priest_skill:{
 			enable:'phaseUse',
 			filter:function(event,player){
@@ -1484,16 +4324,32 @@ mode.stone={
 				return true;
 			},
 			usable:1,
-			filterTarget:true,
+			prompt:function(event){
+				if(event.player.hasFellowSkill('priest_hunwu')) return '令目标流失一点体力';
+				return '回复一点体力';
+			},
+			filterTarget:function(card,player,target){
+				if(player.hasFellowSkill('priest_hunwu')) return true;
+				return target.hp<target.maxHp;
+			},
 			content:function(){
 				player.actused+=2;
 				player.updateActCount();
-				target.recover();
+				event.parent.career='priest';
+				if(player.hasFellowSkill('priest_hunwu')){
+					target.loseHp();
+				}
+				else{
+					target.recover();
+				}
 			},
 			ai:{
 				order:2,
 				result:{
 					target:function(player,target){
+						if(player.hasFellowSkill('priest_hunwu')){
+							return -1;
+						}
 						return ai.get.recoverEffect(target,player,target);
 					}
 				}
@@ -1515,6 +4371,7 @@ mode.stone={
 				player.actused+=2;
 				player.updateActCount();
 				target.damage('fire');
+				event.parent.career='mage';
 			},
 			ai:{
 				order:2,
@@ -1529,17 +4386,18 @@ mode.stone={
 			enable:'phaseUse',
 			filter:function(event,player){
 				if(player.career!='warlock') return false;
-				if(player.getActCount()+2>player.actcount) return false;
-				return player.num('he')>0;
+				if(player.getActCount()+2>=player.actcount) return false;
+				return true;
 			},
 			usable:1,
 			content:function(){
 				player.actused+=2;
 				player.updateActCount();
 				player.gain(player.getDeckCards(2),'draw');
+				event.parent.career='warlock';
 			},
 			ai:{
-				order:2,
+				order:0.5,
 				result:{
 					player:1
 				}
@@ -1550,7 +4408,7 @@ mode.stone={
 			filter:function(event,player){
 				if(player.career!='hunter') return false;
 				if(player.getActCount()+2>player.actcount) return false;
-				return player.num('he')>0;
+				return true;
 			},
 			usable:1,
 			selectTarget:-1,
@@ -1561,6 +4419,7 @@ mode.stone={
 				player.actused+=2;
 				player.updateActCount();
 				target.damage();
+				event.parent.career='hunter';
 			},
 			ai:{
 				order:2,
@@ -1583,7 +4442,7 @@ mode.stone={
 				player.actused+=2;
 				player.updateActCount();
 				player.changeHujia(1);
-				player.draw();
+				event.parent.career='warrior';
 			},
 			ai:{
 				order:2,
@@ -1628,6 +4487,7 @@ mode.stone={
 				game.delay(0.5);
 				'step 2'
 				player.equip(event.equip4);
+				event.parent.career='rogue';
 			},
 			ai:{
 				order:function(skill,player){
@@ -1656,13 +4516,14 @@ mode.stone={
 			},
 			usable:1,
 			filterTarget:function(card,player,target){
-				return player.canUse('sha',target,false);
+				return player.canUse('sha',target,null,false);
 			},
 			direct:true,
 			content:function(){
 				player.actused+=2;
 				player.updateActCount();
 				player.useCard({name:'sha'},targets,'_druid_skill',false).animate=false;
+				event.parent.career='druid';
 			},
 			ai:{
 				order:function(){
@@ -1685,9 +4546,12 @@ mode.stone={
 			}
 		},
 		shaman_zhiliao:{
-			trigger:{player:'phaseEnd'},
+			trigger:{global:'phaseEnd'},
 			forced:true,
 			direct:true,
+			filter:function(event,player){
+				return event.player==player.getLeader();
+			},
 			content:function(){
 				'step 0'
 				var players=get.players();
@@ -1699,7 +4563,7 @@ mode.stone={
 					}
 				}
 				if(targets.length){
-					player.logSkill('shaman_zhiliao',targets);
+					player.logSkill('shaman_zhiliao');
 				}
 				else{
 					event.finish();
@@ -1709,9 +4573,12 @@ mode.stone={
 			}
 		},
 		shaman_fali:{
-			trigger:{player:'phaseEnd'},
+			trigger:{global:'phaseEnd'},
 			forced:true,
 			direct:true,
+			filter:function(event,player){
+				return event.player==player.getLeader();
+			},
 			content:function(){
 				'step 0'
 				var players=get.players();
@@ -1723,7 +4590,7 @@ mode.stone={
 				}
 				if(targets.length){
 					game.asyncDraw(targets);
-					player.logSkill('shaman_fali',targets);
+					player.logSkill('shaman_fali');
 				}
 				else{
 					event.finish();
@@ -1733,9 +4600,12 @@ mode.stone={
 			}
 		},
 		shaman_zhuore:{
-			trigger:{player:'phaseEnd'},
+			trigger:{global:'phaseEnd'},
 			forced:true,
 			direct:true,
+			filter:function(event,player){
+				return event.player==player.getLeader();
+			},
 			content:function(){
 				'step 0'
 				var players=get.players();
@@ -1767,36 +4637,11 @@ mode.stone={
 			},
 			usable:1,
 			content:function(){
-				"step 0"
 				player.actused+=2;
 				player.updateActCount();
 				var name='stone_tuteng'+Math.ceil(Math.random()*4);
-				var added=false;
-				var i;
-				for(i=0;i<player.actcharacterlist.length;i++){
-					if(player.actcharacterlist[i]===null){
-						added=true;
-						break;
-					}
-				}
-				var pos=i+4;
-				if(player!=game.me){
-					pos+=4;
-				}
-				var fellow=game.addFellow(pos,name);
-				fellow.side=player.side;
-				fellow.classList.add('turnedover');
-				player.actcharacterlist[i]=fellow;
-				event.source=fellow;
-				var num=lib.character[name][5][1];
-				if(num){
-					fellow.draw(num,false);
-				}
-				player.updateActCount();
-				fellow.noPhaseDelay=true;
-				player.line(fellow,'green');
-				"step 1"
-				event.trigger('fellow');
+				player.addFellowAuto(name);
+				event.parent.career='shaman';
 			},
 			ai:{
 				order:2,
@@ -1815,36 +4660,10 @@ mode.stone={
 			},
 			usable:1,
 			content:function(){
-				"step 0"
 				player.actused+=2;
 				player.updateActCount();
-				var name='stone_xinbing';
-				var added=false;
-				var i;
-				for(i=0;i<player.actcharacterlist.length;i++){
-					if(player.actcharacterlist[i]===null){
-						added=true;
-						break;
-					}
-				}
-				var pos=i+4;
-				if(player!=game.me){
-					pos+=4;
-				}
-				var fellow=game.addFellow(pos,name);
-				fellow.side=player.side;
-				fellow.classList.add('turnedover');
-				player.actcharacterlist[i]=fellow;
-				event.source=fellow;
-				var num=lib.character[name][5][1];
-				if(num){
-					fellow.draw(num,false);
-				}
-				player.updateActCount();
-				fellow.noPhaseDelay=true;
-				player.line(fellow,'green');
-				"step 1"
-				event.trigger('fellow');
+				player.addFellowAuto('stone_xinbing');
+				event.parent.career='paladin';
 			},
 			ai:{
 				order:2,
@@ -1873,7 +4692,7 @@ mode.stone={
 				}
 			}
 		},
-		konghunshi_die:{
+		spell_anyingkuangluan_die:{
 			trigger:{player:'phaseAfter'},
 			forced:true,
 			unique:true,
@@ -1881,7 +4700,7 @@ mode.stone={
 				player.die();
 			}
 		},
-		stone_sanxian:{
+		stone_juxingchanchu1:{
 			trigger:{player:'dieBegin'},
 			forced:true,
 			unique:true,
@@ -1897,7 +4716,7 @@ mode.stone={
 			content:function(){
 				"step 0"
 				event.chooser=player.getLeader();
-				event.chooser.chooseTarget('散仙：令一名敌方随从失去一点体力',function(card,playerx,target){
+				event.chooser.chooseTarget('毒液：令一名敌方随从失去一点体力',function(card,playerx,target){
 					return player.side!=target.side&&target.isMin();
 				}).ai=function(target){
 					return Math.max(1,10-target.hp);
@@ -1907,24 +4726,24 @@ mode.stone={
 				if(result.bool){
 					event.chooser.line(result.targets[0]);
 					game.delay();
-					result.targets[0].addSkill('stone_sanxian2');
+					result.targets[0].addSkill('stone_juxingchanchu2');
 				}
 			}
 		},
-		stone_sanxian2:{
+		stone_juxingchanchu2:{
 			trigger:{global:'dieAfter'},
 			forced:true,
 			popup:false,
 			unique:true,
 			filter:function(event,player){
-				return player.skills.contains('stone_sanxian2');
+				return player.skills.contains('stone_juxingchanchu2');
 			},
 			content:function(){
 				player.loseHp();
-				player.removeSkill('stone_sanxian2');
+				player.removeSkill('stone_juxingchanchu2');
 			}
 		},
-		stone_banxian:{
+		stone_shishigui1:{
 			trigger:{player:'dieBegin'},
 			forced:true,
 			unique:true,
@@ -1940,89 +4759,81 @@ mode.stone={
 			content:function(){
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i].isMin()&&game.players[i]!=player){
-						game.players[i].addSkill('stone_banxian2');
+						game.players[i].addSkill('stone_shishigui2');
 					}
 				}
 			}
 		},
-		stone_banxian2:{
+		stone_shishigui2:{
 			trigger:{global:'dieAfter'},
 			forced:true,
 			popup:false,
 			unique:true,
 			filter:function(event,player){
-				return player.skills.contains('stone_banxian2');
+				return player.skills.contains('stone_shishigui2');
 			},
 			content:function(){
 				player.loseHp();
-				player.removeSkill('stone_banxian2');
+				player.removeSkill('stone_shishigui2');
 			}
 		},
-		stone_daoshi:{
+		stone_fennuxiaoji1:{
 			trigger:{player:'phaseBegin'},
 			filter:function(event,player){
 				return player.num('h')==0;
 			},
 			content:function(){
-				player.draw();
+				player.draw(2);
 			}
 		},
-		stone_daogu:{
+		stone_fatiaozhuru1:{
 			trigger:{player:'phaseEnd'},
 			filter:function(event,player){
 				return player.num('h')==0;
 			},
 			content:function(){
-				player.draw();
+				player.draw(2);
 			}
 		},
-		stone_shubing:{
+		stone_qianxing:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
 			content:function(){
-				player.classList.remove('turnedover');
+				player.addTempSkill('stone_qianxing2',{player:'phaseBegin'});
 			}
 		},
-		stone_yinshi:{
-			trigger:{source:'fellow'},
-			forced:true,
-			unique:true,
-			content:function(){
-				player.addTempSkill('stone_yinshi2',{player:'phaseBegin'});
-			}
-		},
-		stone_yinshi2:{
+		stone_qianxing2:{
 			mod:{
 				targetEnabled:function(){
 					return false;
 				}
 			}
 		},
-		stone_shuguan:{
+		stone_kutongsiseng1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
 			content:function(){
-				player.getLeader().addSkill('stone_shuguan2');
+				player.getLeader().addSkill('stone_kutongsiseng2');
 			}
 		},
-		stone_shuguan2:{
+		stone_kutongsiseng2:{
 			trigger:{player:'phaseEnd'},
 			forced:true,
 			content:function(){
 				player.draw();
-				player.removeSkill('stone_shuguan2');
+				player.removeSkill('stone_kutongsiseng2');
 			}
 		},
-		stone_shujiang:{
+		stone_yuanguanying1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
 			content:function(){
 				"step 0"
 				event.chooser=player.getLeader();
-				event.chooser.chooseTarget('蜀将：选择敌方一名角色视为对其使用一张杀',function(card,player,target){
+				event.chooser.chooseTarget('暗影：选择敌方一名角色视为对其使用一张杀',function(card,player,target){
 					return lib.filter.targetEnabled({name:'sha'},event.chooser,target);
 				}).ai=function(target){
 					return ai.get.effect(target,{name:'sha'},event.chooser);
@@ -2035,7 +4846,7 @@ mode.stone={
 
 			}
 		},
-		stone_weiguan:{
+		stone_zhucangzhe1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2049,7 +4860,7 @@ mode.stone={
 			content:function(){
 				"step 0"
 				event.chooser=player.getLeader();
-				event.chooser.chooseTarget('魏官：选择已方一名角色摸一张牌',function(card,playerx,target){
+				event.chooser.chooseTarget('发明：选择己方一名角色摸一张牌',function(card,playerx,target){
 					return player!=target&&player.side==target.side;
 				}).ai=function(target){
 					return ai.get.attitude(event.chooser,target);
@@ -2062,7 +4873,7 @@ mode.stone={
 				}
 			}
 		},
-		stone_weibing:{
+		stone_zhongshi1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2079,7 +4890,7 @@ mode.stone={
 			content:function(){
 				"step 0"
 				event.chooser=player.getLeader();
-				event.chooser.chooseTarget('魏兵：弃置对方一名随从的所有牌',function(card,playerx,target){
+				event.chooser.chooseTarget('叫嚣：弃置对方一名随从的所有牌',function(card,playerx,target){
 					return player.side!=target.side&&target.isMin()&&target.num('he')>0;
 				}).ai=function(target){
 					return target.num('he');
@@ -2093,7 +4904,7 @@ mode.stone={
 				}
 			}
 		},
-		stone_weijiang:{
+		stone_huoqiangshou1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2109,7 +4920,7 @@ mode.stone={
 			content:function(){
 				"step 0"
 				event.chooser=player.getLeader();
-				event.chooser.chooseTarget('魏将：对一名对方随从造成一点伤害',function(card,playerx,target){
+				event.chooser.chooseTarget('火枪：对一名对方随从造成一点伤害',function(card,playerx,target){
 					return player.side!=target.side&&target.isMin();
 				}).ai=function(target){
 					return Math.max(1,10-target.hp);
@@ -2123,7 +4934,7 @@ mode.stone={
 				}
 			}
 		},
-		stone_wubing:{
+		stone_dijieshicong1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2141,22 +4952,22 @@ mode.stone={
 				}
 			}
 		},
-		stone_wuguan:{
+		stone_yaosaishouwei1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
 			content:function(){
-				player.getLeader().addTempSkill('stone_wuguan2','phaseAfter');
+				player.getLeader().addTempSkill('stone_yaosaishouwei2','phaseAfter');
 			}
 		},
-		stone_wuguan2:{
+		stone_yaosaishouwei2:{
 			mod:{
 				maxHandcard:function(player,num){
 					return num+2;
 				}
 			},
 		},
-		stone_wujiang:{
+		stone_famingjia1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2164,23 +4975,23 @@ mode.stone={
 				player.getLeader().draw(2);
 			}
 		},
-		stone_qunbing:{
+		stone_chilundashi1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
 			content:function(){
-				player.addSkill('stone_qunbing2');
+				player.addSkill('stone_chilundashi2');
 			}
 		},
-		stone_qunbing2:{
+		stone_chilundashi2:{
 			trigger:{player:'phaseDrawBegin'},
 			forced:true,
 			content:function(){
 				trigger.num++;
-				player.removeSkill('stone_qunbing2');
+				player.removeSkill('stone_chilundashi2');
 			}
 		},
-		stone_qunguan:{
+		stone_hanguangzhizhe1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2195,7 +5006,7 @@ mode.stone={
 				game.asyncDraw(targets);
 			}
 		},
-		stone_qunjiang:{
+		stone_aihaozhihun1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
@@ -2212,17 +5023,40 @@ mode.stone={
 				}
 			}
 		},
-		stone_huanghou:{
+		stone_yanjingshe1:{
 			trigger:{source:'fellow'},
 			forced:true,
 			unique:true,
 			filter:function(event,player){
-				return player.getEnemy().countFellow()>player.getLeader().countFellow();
+				var num=player.getEnemy().countFellow();
+				return num>0&&num>=player.getLeader().countFellow();
+			},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i].side!=player.side){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					var target=list.randomGet();
+					player.line(target,'green');
+					target.die({source:player});
+					game.delay();
+				}
+			}
+		},
+		stone_yanjingshe_old:{
+			trigger:{source:'fellow'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				return player.getEnemy().countFellow()>=player.getLeader().countFellow();
 			},
 			content:function(){
 				"step 0"
 				event.chooser=player.getEnemy();
-				event.chooser.chooseTarget('皇后：选择己方一名随从令其死亡',function(card,playerx,target){
+				event.chooser.chooseTarget('毒噬：选择己方一名随从令其死亡',function(card,playerx,target){
 					return target.isMin()&&target.side!=player.side;
 				},true).ai=function(target){
 					return -target.hp;
@@ -2236,27 +5070,56 @@ mode.stone={
 				}
 			}
 		},
-		stone_yiji:{
+		stone_mafengzhuru1:{
 			trigger:{player:'dieBegin'},
 			forced:true,
 			filter:function(event){
-				return event.source!=undefined&&event.source.isMin();
+				return event.source&&event.source.isMin();
 			},
 			content:function(){
-				trigger.source.addSkill('stone_yiji2');
+				trigger.source.addSkill('stone_mafengzhuru2');
 			},
 		},
-		stone_yiji2:{
+		stone_mafengzhuru2:{
 			trigger:{global:'dieAfter'},
 			forced:true,
 			popup:false,
 			unique:true,
 			filter:function(event,player){
-				return player.skills.contains('stone_yiji2');
+				return player.skills.contains('stone_mafengzhuru2');
 			},
 			content:function(){
 				player.loseHp();
-				player.removeSkill('stone_yiji2');
+				player.removeSkill('stone_mafengzhuru2');
+			}
+		},
+		stone_zhufu:{
+			trigger:{player:'phaseEnd'},
+			forced:true,
+			unique:true,
+			filter:function(event,player){
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&
+					game.players[i].side==player.side&&game.players[i].hp<game.players[i].maxHp){
+						return true;
+					}
+				}
+				return false;
+			},
+			content:function(){
+				var list=[];
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].isMin()&&game.players[i]!=player&&
+					game.players[i].side==player.side&&game.players[i].hp<game.players[i].maxHp){
+						list.push(game.players[i]);
+					}
+				}
+				if(list.length){
+					var target=list.randomGet();
+					target.recover();
+					game.delay();
+					player.line(target,'green');
+				}
 			}
 		},
 		_actcount:{
@@ -2362,25 +5225,339 @@ mode.stone={
 		}
 	},
 	translate:{
-		shaman:'祭司',
+		shaman:'萨满',
 		mage:'法师',
-		priest:'医生',
+		priest:'牧师',
 		warrior:'战士',
 		warlock:'术士',
 		knight:'死亡骑士',
-		rogue:'游侠',
-		paladin:'谋士',
+		rogue:'潜行者',
+		paladin:'圣骑士',
 		hunter:'猎人',
-		druid:'蛮人',
+		druid:'德鲁伊',
 
+		spell_shenshengxinxing:'神圣新星',
+		spell_shenshengxinxing_info:'对所有敌方角色造成一点伤害，令所有友方角色回复一点体力',
+		spell_shengguangzhadan:'圣光炸弹',
+		spell_shengguangzhadan_info:'对所有随从造成等同于其手牌数的伤害',
+		spell_maizang:'埋葬',
+		spell_maizang_info:'令一名敌方随从死亡，并将一张与该随从同名的随从牌置于你的手牌',
+		spell_xinlingshijie:'心灵视界',
+		spell_xinlingshijie_info:'将一张敌方主将手牌的复制置于你的手牌',
+		spell_naluzhiguang:'纳鲁之光',
+		spell_naluzhiguang_info:'恢复一点体力值，若目标仍处于受伤状态，则召唤一名圣光护卫',
+		spell_zhiliaozhihuan:'治疗之环',
+		spell_zhiliaozhihuan_info:'令所有随从恢复两点体力值',
+
+		stone_shengguanghuwei:'圣光护卫',
+		priest_shengguang:'圣光',
+		priest_shengguang_info:'每当一名随从获得治疗，摸一张牌',
+
+		spell_nuxi:'怒袭',
+		spell_nuxi_info:'造成一点伤害，获得一点护甲',
+		spell_dunpaimengji:'盾牌猛击',
+		spell_dunpaimengji_info:'对一名随从造成等同于你护甲值的伤害',
+		spell_zhansha:'斩杀',
+		spell_zhansha_info:'杀死一名已受伤的敌方随从',
+		spell_nuhuozhongshao:'怒火中烧',
+		spell_nuhuozhongshao_info:'对一名随从造成一点伤害，然后令其摸两张牌',
+		spell_xuanfengzhan:'旋风斩',
+		spell_xuanfengzhan_info:'对所有随从造成一点伤害',
+		spell_juemingluandou:'绝命乱半',
+		spell_juemingluandou_info:'随机保留一名随从，然后令所有其他随从死亡',
+
+		spell_lierenyinji:'猎人印记',
+		spell_lierenyinji_info:'将一名随从的体力上限降至1',
+		spell_kuaisusheji:'快速射击',
+		spell_kuaisusheji_info:'造成一点伤害，摸一张牌',
+		spell_guanmenfanggou:'关门放狗',
+		spell_guanmenfanggou_info:'每有一名敌方随从，便召唤一只猎狗',
+		spell_zhaohuanchongwu:'召唤宠物',
+		spell_zhaohuanchongwu_info:'随机召唤一只野兽',
+		spell_zidanshangtang:'子弹上膛',
+		spell_zidanshangtang_info:'随机获得一张猎人职业法术牌，并获得技能【上膛】直到回合结束',
+		spell_duochongsheji:'多重射击',
+		spell_duochongsheji_info:'对两名随机敌方随从各造成两点伤害',
+
+		stone_liegou:'猎狗',
+		hunter_zidanshangtang:'上膛',
+		hunter_zidanshangtang_bg:'膛',
+		hunter_zidanshangtang_info:'每当你使用一张法术牌，便随机获得一张猎人职业法术牌',
+
+		spell_zuzhou:'诅咒',
+		spell_zuzhou_info:'将目标随从翻面，摸一张牌',
+		spell_xishengqiyue:'牺牲契约',
+		spell_xishengqiyue_info:'令双方各一名随从立即死亡',
+		spell_xiaoguibaopo:'小鬼爆破',
+		spell_xiaoguibaopo_info:'对一名随从造成1〜3点伤害，每造成一点伤害，便召唤一只小鬼',
+		spell_anyinglieyan:'暗影裂焰',
+		spell_anyinglieyan_info:'杀死一名友方随从，并对所有敌方随从造成等于其体力值的伤害',
+		spell_liliangdaijia:'力量代价',
+		spell_liliangdaijia_info:'令一名友方随从摸4张牌，将体力值变为5，并在其下个回合结束后死亡',
+		spell_emozhinu:'恶魔之怒',
+		spell_emozhinu_info:'对所有随从造成一点伤害',
+
+		spell_wuyashenxiang:'乌鸦神像',
+		spell_wuyashenxiang_info:'从三张法术牌或随从牌中选择一张加入手牌',
+		spell_huotigenxu:'活体根须',
+		spell_huotigenxu_info:'造成一点伤害，或召唤两个树苗',
+		spell_hengsao:'横扫',
+		spell_hengsao_info:'对一名敌方角色造成两点伤害，然后对其他敌方角色造成一点伤害',
+		spell_yexingchengzhang:'野性成长',
+		spell_yexingchengzhang_info:'获得一点行动值，摸一张牌',
+		spell_ziranzhili:'自然之力',
+		spell_ziranzhili_info:'召唤三个树人，树人在其回合结束后死亡',
+		spell_yemanpaoxiao:'野蛮咆哮',
+		spell_yemanpaoxiao2:'咆哮',
+		spell_yemanpaoxiao_info:'所有友方角色造成的伤害+1，直到你的下个回合开始',
+
+		stone_shumiao:'树苗',
+		stone_shuren:'树人',
+		stone_zibao:'自爆',
+		stone_zibao_info:'结合结束后立即死亡',
+
+		spell_cigu:'刺骨',
+		spell_cigu_info:'造成一点伤害，你可以弃置一张装备牌令伤害+1',
+		spell_jianrenluanwu:'剑刃乱舞',
+		spell_jianrenluanwu_info:'弃置你的武器牌，并对所有敌方角色造成一点伤害',
+		spell_daoshan:'刀扇',
+		spell_daoshan_info:'对所有敌方随从造成一点伤害，从牌库中获得一张牌',
+		spell_sijidaifa:'伺机待发',
+		spell_sijidaifa_info:'你使用下一张法术牌时获得X点行动值，X为该法术的行动值消耗且不超过3',
+		spell_cisha:'刺杀',
+		spell_cisha_info:'杀死一名随从',
+		spell_modaoyou:'磨刀油',
+		spell_modaoyou_info:'令你下一次剑刃乱舞造成的伤害+1，令一名随机友方角色摸两张牌',
+
+		spell_fengxian:'奉献',
+		spell_fengxian_info:'对所有敌方角色造成一点伤害',
+		spell_fuchouzhinu:'复仇之怒',
+		spell_fuchouzhinu_info:'造成5点伤害，随机分配到所有敌人上',
+		spell_shengliaoshu:'圣疗术',
+		spell_shengliaoshu_info:'恢复两点体力，摸两张牌',
+		spell_fennuzhichui:'愤怒之锤',
+		spell_fennuzhichui_info:'造成一点伤害，从牌库中获得一张牌',
+		spell_zuozhandongyuan:'作战动员',
+		spell_zuozhandongyuan_info:'召唤两个新兵',
+		spell_liliangzhufu:'力量祝福',
+		spell_liliangzhufu_info:'令一名随从摸两张牌',
+
+		spell_lianhuanbaolie:'连环爆裂',
+		spell_lianhuanbaolie_info:'造成1〜2点雷电伤害',
+		spell_shandianfengbao:'闪电风暴',
+		spell_shandianfengbao_info:'对所有敌方随从造成1〜2点伤害',
+		spell_yaoshu:'妖术',
+		spell_yaoshu_info:'将一个随从变成一只青蛙',
+		spell_yexinglanghun:'野性狼魂',
+		spell_yexinglanghun_info:'召唤两个幽灵狼',
+		spell_shixue:'嗜血',
+		spell_shixue_info:'所有友方随从摸两张牌',
+		spell_chazhuangshandian:'叉状闪电',
+		spell_chazhuangshandian_info:'对两个随机敌方随从各造成一点雷电伤害',
+
+		stone_qingwa:'青蛙',
+		stone_youlinglang:'幽灵狼',
+		shaman_qingwa:'青蛙',
+		shaman_qingwa_info:'锁定技，你跳过摸牌阶段',
+
+
+		spell_hanbingjian:'寒冰箭',
+		spell_hanbingjian_info:'对一个随从造成两点伤害，然后将其翻面',
+		spell_lieyanfengbao:'烈焰风暴',
+		spell_lieyanfengbao_info:'对所有敌方随从造成两点伤害',
+		spell_baofengxue:'暴风雪',
+		spell_baofengxue_info:'对所有敌方随从造成一点伤害，然后将其翻面',
+		spell_aoshuzhihui:'奥术智慧',
+		spell_aoshuzhihui_info:'从牌库中获得两张牌',
+		spell_bianxingshu:'变形术',
+		spell_bianxingshu_info:'将一个随从变成一只绵羊',
+		spell_huoqiushu:'火球术',
+		spell_huoqiushu_info:'造成两点火焰伤害',
+
+		stone_mianyang:'绵羊',
+		mage_mianyang:'绵羊',
+		mage_mianyang_info:'锁定技，你不能使用杀',
+
+		stone_beijunmushi:'北郡牧师',
+		stone_guangyaozhizi:'光耀之子',
+		stone_longmianjiaoguan:'龙眠教官',
+		stone_linghunjisi:'灵魂祭司',
+		stone_guanliyuan:'管理员',
+		stone_heianjiaotu:'黑暗教徒',
+
+		priest_shengliao:'圣疗',
+		priest_shengliao_info:'每当一名随从回复体力，己方主将从牌库中获得一张牌',
+		priest_guangyao:'光耀',
+		priest_guangyao_info:'每当你的体力值发生改变，摸一张牌',
+		priest_xundao:'训导',
+		priest_xundao_info:'你出场时，若己方主将手牌中有随从牌，则摸一张牌并获得嘲讽',
+		priest_hunwu:'魂舞',
+		priest_hunwu_info:'己方主将的职业技能及法术的治疗效果改为令目标流失等量体力',
+		priest_faxian:'发现',
+		priest_faxian_info:'你出场时，己方主将从3张随机随从牌中选择一张加入手牌',
+		priest_zhufu:'献身',
+		priest_zhufu_info:'你死亡时，令一名随机友方随从增加一点体力上限并回复一点体力',
+
+		stone_daomufeizei:'盗墓匪贼',
+		stone_haidao:'海盗',
+		stone_haidaotoumu:'海盗头目',
+		stone_cike:'刺客',
+		stone_tegong:'特工',
+		stone_qiezei:'窃贼',
+		stone_heitieairen:'黑铁矮人',
+
+		rogue_touqie:'偷窃',
+		rogue_touqie_info:'每当你造成一次伤害，己方主将从牌库中获得一张牌',
+		rogue_xunbao:'寻宝',
+		rogue_xunbao_info:'你死亡时，将一张伺机行发置于己方主将的手牌',
+		rogue_cisha:'刺杀',
+		rogue_cisha_info:'每当你对一名随从造成伤害，受伤害随从立即死亡',
+		rogue_touxi:'偷袭',
+		rogue_touxi_info:'你出场时，若己方主将拥有至少两点剩余行动值，则可对一名角色造成一点伤害',
+		rogue_qiancang:'潜藏',
+		rogue_qiancang_info:'你出场时，对所有未受伤害的敌方随从造成一点伤害',
+		rogue_zhaomu:'结伙',
+		rogue_zhaomu_info:'你出场时，召唤一个海盗',
+
+		stone_zhihuiguan:'指挥官',
+		stone_jiangong:'监工',
+		stone_yuanhou:'猿猴',
+		stone_chidunshinv:'持盾侍女',
+		stone_zhujiashi:'铸甲师',
+		stone_kuangzhanshi:'狂战士',
+
+		warrior_tongling:'统领',
+		warrior_tongling_info:'你出场时，将所有友方随从的武将牌翻至正面',
+		warrior_baoluan:'暴乱',
+		warrior_baoluan_info:'每当一名随从受到一次伤害，摸一张牌',
+		warrior_jiangong:'监工',
+		warrior_jiangong_info:'你出场时，己方主将可对一名随从造成一点伤害，然后令该随从摸两张牌',
+		warrior_zhujia:'铸甲',
+		warrior_zhujia_info:'每当你受到一次伤害，己方主将获得一点护甲',
+		warrior_tidun:'提盾',
+		warrior_tidun_info:'你出场时，己方主将获得两点护甲',
+
+		stone_lieyanxiaogui:'烈焰小鬼',
+		stone_xiaoguishouling:'小鬼首领',
+		stone_kongjuzhanma:'恐惧战马',
+		stone_morishouwei:'末日守卫',
+		stone_xukongxingzhe:'虚空行者',
+		stone_diyuhuo:'地狱火',
+		stone_xiaogui:'小鬼',
+
+		warlock_nonghuo:'弄火',
+		warlock_nonghuo_info:'你出场时，对己方主将造成1点火焰伤害',
+		warlock_zhaogui:'召鬼',
+		warlock_zhaogui_info:'每当你受到一次伤害，召唤一个小鬼',
+		warlock_yongsheng:'永生',
+		warlock_yongsheng_info:'你死亡后，召唤一匹恐惧战马',
+		warlock_yuhuo:'狱火',
+		warlock_yuhuo_info:'你出场时，对所有其他随从造成一点伤害',
+		warlock_zaihuo:'灾祸',
+		warlock_zaihuo_info:'你出场时，将武将牌翻至正面并随机弃置主将的两张手牌',
+
+		stone_hudunren:'护盾人',
+		stone_junxuguan:'军需官',
+		stone_yurenqishi:'鱼人骑士',
+		stone_chidunweishi:'持盾卫士',
+		stone_liewangshouwei:'列王守卫',
+		stone_longwangpeiou:'龙王配偶',
+
+		paladin_zhaohuan:'召唤',
+		paladin_zhaohuan2:'召唤',
+		paladin_zhaohuan_info:'你出场后，你的主将在使用下一张随从牌时获得一点行动值',
+		paladin_shouwei:'守卫',
+		paladin_shouwei_info:'你出场时，你的主将回复两点体力值',
+		paladin_chidun:'持盾',
+		paladin_chidun_info:'你出场时，己方主将可以弃置对方一名随从的所有牌',
+		paladin_buji:'补给',
+		paladin_buji_info:'你出场时，所有友方新兵增加一点体力上限，回复一点体力并摸两张牌',
+		paladin_hudun:'护盾',
+		paladin_hudun_info:'你出场时，获得一点护甲值',
+		paladin_zhaochao:'招潮',
+		paladin_zhaochao_info:'每当你的主将使用一次英雄技能，便摸两张牌',
+
+		stone_shifazhe:'嗜法者',
+		stone_wushixuetu:'巫师学徒',
+		stone_shuiyuansu:'水元素',
+		stone_falifulong:'法力浮龙',
+		stone_yingxiongzhihun:'英雄之魂',
+		stone_huoyao:'火妖',
+
+		mage_shifa:'嗜法',
+		mage_shifa_info:'你出场时，将一张随机法术牌置入双方主将的手牌',
+		mage_minghuo:'冥火',
+		mage_minghuo_info:'你的主将的职业技能造成的伤害+1',
+		mage_tunfa:'吞法',
+		mage_tunfa_info:'每当己方主将使用一张法术牌，摸一张牌',
+		mage_lieyan:'烈焰',
+		mage_lieyan_info:'每当己方主将使用一张法术牌，对一名随机敌方角色造成一点火焰伤害',
+		mage_zhufa:'助法',
+		mage_zhufa_info:'每当己方主将使用一张法术牌，令其获得一点行动值',
+		mage_bingdong:'冰冻',
+		mage_bingdong_info:'每当你对一个随从造成伤害，该随从将武将牌翻至背面',
+
+		stone_caoyuanshi:'草原狮',
+		stone_leiouke:'雷欧克',
+		stone_misha:'米莎',
+		stone_huofu:'霍弗',
+		stone_jiewangzhu:'结网蛛',
+		stone_xunshoushi:'驯兽师',
+
+		hunter_jiewang:'结网',
+		hunter_jiewang_info:'你死亡时，己方主将获得一张随机随从牌',
+		hunter_xunshou:'驯兽',
+		hunter_xunshou_info:'你出场时，己方主将可选择一名其他友方随从令其增加一点体力上限，回复一点体力并摸两张牌',
+		hunter_zhanhuo:'战火',
+		hunter_zhanhuo_info:'你出场时，所有友方随从摸一张牌',
+		hunter_nuhou:'怒吼',
+		hunter_nuhou_info:'当你死亡时，对所有敌方角色造成一点伤害',
+
+		stone_baoqishi:'豹骑士',
+		stone_conglinshouwei:'从林守卫',
+		stone_baohuzhishu:'保护之树',
+		stone_kuangyedoushi:'狂野斗士',
+		stone_liebao:'猎豹',
+		stone_zongxiong:'棕熊',
+
+		stone_jixing:'疾行',
+		stone_jixing_info:'你出场时，立即将武将牌翻至正面',
+		druid_nuhuo:'怒火',
+		druid_nuhuo_info:'每当己方主将使用一次职业技能，便对一名随机敌人造成一点伤害',
+		druid_chengzhang:'成长',
+		druid_chengzhang2:'成长',
+		druid_chengzhang_info:'你出场时，己方主将获得一点行动值；你死亡时，己方主将需弃置一张手牌',
+		druid_huwei:'护卫',
+		druid_huwei_info:'你出场时，己方主将可以选择一项：对一名随从造成一点伤害，或弃置一名随从的所有牌并将其体力上限改为1',
+
+
+		stone_fachao:'法潮图腾',
+		stone_tutengyongshi:'图腾勇士',
+		stone_huoshe:'火舌图腾',
+		stone_huoyuansu:'火元素',
+		stone_tuyuansu:'土元素',
+		stone_wujiyuansu:'无羁元素',
+		stone_xuejuren:'穴居人',
+
+		shaman_xueju:'穴居',
+		shaman_xueju_info:'每当己主将使用一张随从牌，摸一张牌',
+		shaman_huoxi:'火袭',
+		shaman_huoxi_info:'你出场时，己方主将可以对对方一名随从造成两点火焰伤害',
+		shaman_fachao:'法潮',
+		shaman_fachao_info:'己方主将在其每个回合结束阶从牌库中获得一张牌并回复一点体力',
+		shaman_huoshe:'火舌',
+		shaman_huoshe_info:'其他己方角色造成的伤害始终+1',
+
+		shaman_jili:'激励',
+		shaman_jili_info:'己方主将回合结束时，所有友方图腾摸一张牌',
 		shaman_tuteng:'图腾',
-		shaman_tuteng_info:'锁定技，你跳过摸牌阶段',
-		shaman_fali:'法潮',
-		shaman_fali_info:'回合结束阶段，令所有无手牌的友方随从摸一张牌',
+		shaman_tuteng_info:'你跳过摸牌阶段',
+		shaman_fali:'空气',
+		shaman_fali_info:'已方主将的回合结束阶段，令所有无手牌的友方随从摸一张牌',
 		shaman_zhiliao:'治疗',
-		shaman_zhiliao_info:'回合结束阶段，令所有友方随从回复一点体力',
+		shaman_zhiliao_info:'已方主将的回合结束阶段，令所有友方随从回复一点体力',
 		shaman_zhuore:'灼热',
-		shaman_zhuore_info:'回合结束阶段，对一名随机敌方随从造成一点伤害',
+		shaman_zhuore_info:'已方主将的回合结束阶段，对一名随机敌方随从造成一点伤害',
 
 		_shaman_skill:'祭天',
 		_shaman_skill_info:'召唤一个随机图腾',
@@ -2389,7 +5566,7 @@ mode.stone={
 		_priest_skill:'治疗',
 		_priest_skill_info:'回复一点体力',
 		_warrior_skill:'战甲',
-		_warrior_skill_info:'获得一点护甲，摸一张牌',
+		_warrior_skill_info:'获得一点护甲',
 		_warlock_skill:'作法',
 		_warlock_skill_info:'从牌库中获得两张牌',
 		_rogue_skill:'出鞘',
@@ -2403,61 +5580,82 @@ mode.stone={
 
 		stone_tuteng1:'石爪图腾',
 		stone_tuteng2:'灼热图腾',
-		stone_tuteng3:'法潮图腾',
+		stone_tuteng3:'空气图腾',
 		stone_tuteng4:'治疗图腾',
 
 		stone_xinbing:'新兵',
 
-		stone_weibing:'魏兵',
-		stone_weibing_info:'你出场时，已方主将可以弃置对方一名随从的所有牌',
-		stone_weiguan:'魏官',
-		stone_weiguan_info:'你出场时，已方主将可以令已方一名其他角色摸一张牌',
-		stone_weijiang:'魏将',
-		stone_weijiang_info:'你出场时，已方主将可以对对方一名随从造成一点伤害',
+		stone_zhongshi:'中士',
+		stone_zhongshi1:'叫嚣',
+		stone_zhongshi1_info:'你出场时，己方主将可以弃置对方一名随从的所有牌',
+		stone_zhucangzhe:'伫藏者',
+		stone_zhucangzhe1:'伫藏',
+		stone_zhucangzhe1_info:'你出场时，己方主将可以令己方一名其他角色摸一张牌',
+		stone_huoqiangshou:'火枪手',
+		stone_huoqiangshou1:'火枪',
+		stone_huoqiangshou1_info:'你出场时，己方主将可以对对方一名随从造成一点伤害',
 
-		stone_shubing:'蜀兵',
-		stone_shubing_info:'你出场时，立即将武将牌翻至正面',
-		stone_shuguan:'蜀官',
-		stone_shuguan2:'蜀官',
-		stone_shuguan_info:'你出场时，已方主将于本回合结束阶段摸一张牌',
-		stone_shujiang:'蜀将',
-		stone_shujiang_info:'你出场时，已方主将可视为对一名敌方角色使用一张杀',
+		stone_lansaizhanshi:'蓝腮战士',
+		stone_kutongsiseng:'苦痛侍僧',
+		stone_kutongsiseng1:'苦痛',
+		stone_kutongsiseng2:'苦痛',
+		stone_kutongsiseng1_info:'你出场时，己方主将于本回合结束阶段摸一张牌',
+		stone_yuanguanying:'远古暗影',
+		stone_yuanguanying1:'暗影',
+		stone_yuanguanying1_info:'你出场时，己方主将可视为对一名敌方角色使用一张杀',
 
-		stone_wubing:'吴兵',
-		stone_wubing_info:'你出场时，敌方主将随机弃置一张装备牌',
-		stone_wuguan:'吴官',
-		stone_wuguan_info:'你出场时，已方主将本回合手牌上限+2',
-		stone_wujiang:'吴将',
-		stone_wujiang_info:'你出场时，已方主将摸两张牌',
+		stone_dijieshicong:'低阶侍从',
+		stone_dijieshicong1:'持枪',
+		stone_dijieshicong1_info:'你出场时，敌方主将随机弃置一张装备牌',
+		stone_yaosaishouwei:'要塞守卫',
+		stone_yaosaishouwei1:'守卫',
+		stone_yaosaishouwei1_info:'你出场时，己方主将本回合手牌上限+2',
+		stone_famingjia:'发明家',
+		stone_famingjia1:'发明',
+		stone_famingjia1_info:'你出场时，己方主将摸两张牌',
 
-		stone_qunbing:'群兵',
-		stone_qunbing2:'群兵',
-		stone_qunbing_info:'你出场后的第一个摸牌阶段摸牌数+1',
-		stone_qunguan:'群官',
-		stone_qunguan_info:'你出场时，所有其他随从各摸一张牌',
-		stone_qunjiang:'群将',
-		stone_qunjiang_info:'你出场时，敌方随从弃置所有牌',
+		stone_chilundashi:'齿轮大师',
+		stone_chilundashi1:'齿轮',
+		stone_chilundashi2:'齿轮',
+		stone_chilundashi1_info:'你出场后的第一个摸牌阶段摸牌数+1',
+		stone_hanguangzhizhe:'寒光智者',
+		stone_hanguangzhizhe1:'寒光',
+		stone_hanguangzhizhe1_info:'你出场时，所有其他随从各摸一张牌',
+		stone_aihaozhihun:'哀嚎之魂',
+		stone_aihaozhihun1:'哀嚎',
+		stone_aihaozhihun1_info:'你出场时，敌方随从弃置所有牌',
 
-		stone_daoshi:'道士',
-		stone_daoshi_info:'回合开始阶段，若你没有手牌，你摸一张牌',
-		stone_sanxian:'散仙',
-		stone_sanxian_info:'你死亡前，已方主将可令一名敌方随从失去1点体力',
-		stone_banxian:'半仙',
-		stone_banxian_info:'你死亡后，场上所有其他随从失去1点体力',
-		stone_yisheng:'医生',
-		stone_yinshi:'隐士',
-		stone_yinshi_info:'在你的回合开始前，不能成为任何卡牌的目标',
+		stone_fennuxiaoji:'愤怒小鸡',
+		stone_fennuxiaoji1:'激怒',
+		stone_fennuxiaoji1_info:'回合开始阶段，若你没有手牌，你摸两张牌',
+		stone_juxingchanchu:'巨型蟾蜍',
+		stone_juxingchanchu1:'毒液',
+		stone_juxingchanchu1_info:'你死亡时，己方主将可令一名敌方随从失去1点体力',
+		stone_shishigui:'食尸鬼',
+		stone_shishigui1:'食尸',
+		stone_shishigui1_info:'你死亡后，场上所有其他随从失去1点体力',
+		stone_wuyi:'巫医',
+		stone_langren:'狼人',
+		stone_qianxing:'潜行',
+		stone_qianxing_info:'在你的回合开始前，不能成为任何卡牌的目标',
 
-		stone_gongzhu:'公主',
-		stone_genv:'歌女',
-		stone_wunv:'舞女',
-		stone_huanghou:'皇后',
-		stone_huanghou_info:'你出场时，若敌方随从数多于己方，敌方主将须选择一名随从令其死亡',
-		stone_feipin:'王妃',
-		stone_yiji:'艺伎',
-		stone_yiji_info:'杀死你的随从失去一点体力',
-		stone_daogu:'道姑',
-		stone_daogu_info:'回合结束阶段，若你没有手牌，你摸一张牌',
+		stone_mingguangjisi:'明光祭司',
+		stone_nianqingjisi:'年轻祭司',
+		stone_zhufu:'祝福',
+		stone_zhufu_info:'回合结束阶段，你令一名随机的受伤友方随从回复一点体力',
+		stone_aomishouwei:'奥秘守卫',
+		stone_yanjingshe:'眼镜蛇',
+		stone_yanjingshe1:'毒噬',
+		stone_yanjingshe1_info:'你出场时，若敌方随从数不少于己方，则随机杀死一名随从',
+		stone_zhiyuzhe:'治愈者',
+		stone_zhiyu:'治愈',
+		stone_zhiyu_info:'你出场时，令所有友方随从回复一点体力',
+		stone_mafengzhuru:'麻风侏儒',
+		stone_mafengzhuru1:'麻风',
+		stone_mafengzhuru1_info:'杀死你的随从失去一点体力',
+		stone_fatiaozhuru:'发条侏儒',
+		stone_fatiaozhuru1:'发条',
+		stone_fatiaozhuru1_info:'回合结束阶段，若你没有手牌，你摸两张牌',
 
 		stonesha:'冲锋',
 		stonesha_info:'锁定技，你的装备牌均视为杀',
@@ -2465,34 +5663,34 @@ mode.stone={
 		stoneshan_info:'锁定技，你的随从牌均视为闪',
 
 		stonecharacter:'随从',
-		shengerpingdeng:'生而平等',
-		shengerpingdeng_info:'将所有随从体力上限降为1',
-		emofengdi:'恶魔之眼',
-		emofengdi_info:'限主将使用，将一名敌方随从吸收为已方',
-		konghunshi:'控魂石',
-		konghunshi_info:'限主将使用，将一名敌方随从吸收为已方，并令其于下个回合结束后死亡',
-		konghunshi_die:'控魂石',
-		konghunshi_die_info:'下个回合结束后死亡',
-		mindieyi:'冥蝶翼',
-		mindieyi_info:'将场上所有随从翻面',
-		miefafu:'灭法符',
-		miefafu_info:'将目标随从翻面',
-		liumangxingzhen:'六芒星阵',
-		liumangxingzhen_info:'令场上所有随从立即死亡（无法触发死亡技能），回复两点体力',
-		dianhaishenzhu:'颠海神珠',
-		dianhaishenzhu_info:'令目标随从获得嘲讽',
+		spell_shengerpingdeng:'生而平等',
+		spell_shengerpingdeng_info:'将所有随从体力上限降为1',
+		spell_jingshenkongzhi:'精神控制',
+		spell_jingshenkongzhi_info:'限主将使用，将一名敌方随从吸收为己方',
+		spell_anyingkuangluan:'暗影狂乱',
+		spell_anyingkuangluan_info:'限主将使用，将一名敌方随从吸收为己方，并令其于下个回合结束后死亡',
+		spell_anyingkuangluan_die:'暗影狂乱',
+		spell_anyingkuangluan_die_info:'下个回合结束后死亡',
+		spell_binghuan:'冰环',
+		spell_binghuan_info:'将场上所有随从翻面',
+		spell_morizaihuo:'末日灾祸',
+		spell_morizaihuo_info:'令场上所有随从立即死亡（无法触发死亡技能），回复两点体力',
+		spell_zhiliaozhichu:'治疗之触',
+		spell_zhiliaozhichu_info:'令目标随从恢复所有体力值并获得嘲讽',
 		chaofeng:'嘲讽',
 		chaofeng_info:'同阵营的无嘲讽角色不以能成为杀或决斗的目标',
-		yesushengxue:'耶稣圣血',
-		yesushengxue_info:'令一名随从增加两点体力上限（不能超过5）并回复两点体力',
-		sanghunzhao:'丧魂爪',
-		sanghunzhao_info:'令场上所有随从失去一点体力',
-		jintiao:'荆条',
-		jintiao_info:'弃置一名随从的所有牌，并令其体力上限减至1',
-		zhaohunfan:'招魂幡',
-		zhaohunfan_info:'令双方各一名随从立即死亡',
-		fengraozhijiao:'丰饶之角',
-		fengraozhijiao_info:'令一名随从回复全部体力',
+		spell_wangzhezhufu:'王者祝福',
+		spell_wangzhezhufu_info:'令一名随从增加两点体力上限（不能超过5），回复两点体力并摸两张牌',
+		spell_diyulieyan:'地狱烈焰',
+		spell_diyulieyan_info:'令场上所有随从失去一点体力',
+		spell_chenmo:'沉默',
+		spell_chenmo_info:'弃置一名随从的所有牌，并令其体力上限减至1',
+		spell_zhiliaoshui:'治疗水',
+		spell_zhiliaoshui_info:'出牌阶段对自己使用，恢复两点体力值；或于濒死阶段对一名角色使用，令目标恢复一点体力',
+		spell_yanmie:'湮灭',
+		spell_yanmie_info:'令敌方主将选择一项：弃置所有牌或失去两点体力',
+		spell_xiaoshi:'消失',
+		spell_xiaoshi_info:'令敌方主将将所有装备区内的牌收入手牌，并弃置其若干张手牌，直到其手牌数与你相等',
 
 		stonecard:'法术',
 		mode_stone_card_config:'炉石模式',
diff --git a/package.json b/package.json
index ff717be31..00ce65c6d 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
   "name": "无名杀",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "main": "main.js"
 }