diff --git a/card/compensate.js b/card/compensate.js
deleted file mode 100644
index 830f9cac2..000000000
--- a/card/compensate.js
+++ /dev/null
@@ -1,105 +0,0 @@
-card.compensate={
-	list:[
-		["diamond",3,'guohe'],
-		['club',8,'guohe'],
-		['spade',13,'guohe'],
-
-		['diamond',8,'shunshou'],
-		['heart',5,'shunshou'],
-
-		["club",10,"wuxie"],
-		["spade",10,"wuxie"],
-		["spade",11,"wuxie"],
-
-		['heart',8,'tao'],
-		['heart',10,'tao'],
-
-		["heart",10,"sha","fire"],
-		["diamond",4,"sha","fire"],
-		["heart",5,"sha","fire"],
-		["spade",4,"sha","thunder"],
-		["spade",5,"sha","thunder"],
-		["club",5,"sha","thunder"],
-		["spade",9,"sha","thunder"],
-		["club",8,"sha"],
-		["club",10,"sha"],
-		["club",2,"sha"],
-		["club",10,"sha"],
-		["spade",10,"sha"],
-		["spade",10,"sha"],
-		["spade",11,"sha"],
-		["spade",6,"sha"],
-		["club",2,"sha"],
-		["club",8,"sha"],
-		["spade",9,"sha"],
-
-		["spade",4,"sha"],
-		["spade",7,"sha"],
-		["spade",1,"sha"],
-		["club",4,"sha"],
-		["club",7,"sha"],
-		["club",2,"sha"],
-
-		["heart",10,"sha","fire"],
-		["diamond",4,"sha","fire"],
-		["heart",5,"sha","fire"],
-		["spade",4,"sha","thunder"],
-		["spade",5,"sha","thunder"],
-		["club",5,"sha","thunder"],
-		["spade",9,"sha","thunder"],
-		["club",8,"sha"],
-		["club",10,"sha"],
-		["club",2,"sha"],
-		["club",10,"sha"],
-		["spade",10,"sha"],
-		["spade",10,"sha"],
-		["spade",11,"sha"],
-		["spade",6,"sha"],
-		["club",2,"sha"],
-		["club",8,"sha"],
-		["spade",9,"sha"],
-
-		["spade",4,"sha"],
-		["spade",7,"sha"],
-		["spade",1,"sha"],
-		["club",4,"sha"],
-		["club",7,"sha"],
-		["club",2,"sha"],
-
-		["spade",4,"sha"],
-		["spade",7,"sha"],
-		["spade",1,"sha"],
-		["club",4,"sha"],
-		["club",7,"sha"],
-		["club",2,"sha"],
-
-		["heart",11,"shan"],
-		["heart",12,"shan"],
-		["diamond",6,"shan"],
-		["heart",11,"shan"],
-		["heart",8,"shan"],
-		["diamond",5,"shan"],
-		["diamond",2,"shan"],
-		["heart",11,"shan"],
-		["heart",12,"shan"],
-		["heart",12,"shan"],
-		["heart",4,"shan"],
-		["heart",4,"shan"],
-		["diamond",6,"shan"],
-		["diamond",7,"shan"],
-		["heart",11,"shan"],
-		["heart",12,"shan"],
-		["diamond",6,"shan"],
-		["diamond",7,"shan"],
-
-		["diamond",6,"shan"],
-		["diamond",7,"shan"],
-		["heart",11,"shan"],
-		["heart",12,"shan"],
-		["diamond",6,"shan"],
-		["diamond",7,"shan"],
-
-		["club",5,"tiesuo"],
-		["spade",8,"tiesuo"],
-	],
-}
diff --git a/card/swd.js b/card/swd.js
index 02c8f19c9..bfffa5a75 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -811,16 +811,25 @@ card.swd={
 		},
 		xianluhui:{
 			fullskin:true,
-			type:'trick',
+			type:'basic',
 			enable:true,
 			selectTarget:-1,
 			filterTarget:function(card,player,target){
 				return target.isDamaged();
 			},
 			content:function(){
-				target.draw(Math.min(3,target.maxHp-target.hp));
+				targets.sort(lib.sort.seat);
+				var list=[];
+				for(var i=0;i<targets.length;i++){
+					list.push(Math.min(3,targets[i].maxHp-targets[i].hp));
+				}
+				game.asyncDraw(targets,list);
 			},
+			multitarget:true,
 			ai:{
+				tag:{
+					multitarget:1,
+				},
 				basic:{
 					order:7,
 					useful:3,
@@ -3926,7 +3935,6 @@ card.swd={
 
 		// ['diamond',9,'tianxianjiu'],
 		['heart',9,'tianxianjiu'],
-		['spade',5,'jiu'],
 		['diamond',2,'tianxianjiu'],
 
 		['spade',2,'qinglonglingzhu'],
diff --git a/extension/cardpile/extension.js b/extension/cardpile/extension.js
new file mode 100644
index 000000000..3652c9b13
--- /dev/null
+++ b/extension/cardpile/extension.js
@@ -0,0 +1,94 @@
+play.cardpile={
+	arenaReady:function(){
+        var data={
+            total:160,
+            sha:{
+                diamond:6,
+                club:14,
+                heart:3,
+                spade:7,
+            },
+            huosha:{
+                diamond:2,
+                hearth:3
+            },
+            leisha:{
+                spade:5,
+                club:4
+            },
+            shan:{
+                heart:6,
+                diamond:18
+            },
+            jiu:{
+                diamond:1,
+                spade:2,
+                club:2
+            },
+            tao:{
+                heart:9,
+                diamond:3,
+            },
+            wanjian:{
+                heart:1,
+            },
+            nanman:{
+                spade:2,
+                club:1,
+            },
+            guohe:{
+                spade:3,
+                club:2,
+                heart:1
+            },
+            shunshou:{
+                spade:3,
+                diamond:2
+            },
+            wuxie:{
+                heart:2,
+                diamond:1,
+                spade:2,
+                club:2
+            },
+            tiesuo:{
+                spade:2,
+                club:4
+            }
+        }
+        var rand=function(){
+            return Math.ceil(Math.random()*13);
+        };
+        var num=0;
+        for(var i in data){
+            if(lib.config['cardpile_'+i+'_playpackconfig']){
+                for(var j in data[i]){
+                    num+=data[i][j];
+                }
+            }
+        }
+        var dn=num*(lib.card.list.length-data.total)/(data.total-num);
+        if(dn>1000) dn=1000;
+        if(dn>0){
+            var p=0;
+            for(var i in data){
+                if(lib.config['cardpile_'+i+'_playpackconfig']){
+                    for(var j in data[i]){
+                        var n=Math.round(dn*data[i][j]/num);
+                        while(n--){
+                            if(i=='huosha'||i=='leisha'){
+                                lib.card.list.push([j,rand(),'sha',i.slice(0,3)]);
+                            }
+                            else{
+                                lib.card.list.push([j,rand(),i]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+	},
+	help:{
+		'牌堆补充':'<ul><li>维持特定卡牌在牌堆中的比例，防止开启扩展包后重要的牌被过多地稀释'
+	},
+}
diff --git a/game/asset.js b/game/asset.js
index 93a46542c..7338784aa 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -6,8 +6,8 @@ window.noname_asset_list=[
     'image/background/yinxiang_bg.jpg',
     'image/background/zhulian_bg.jpg',
     'image/background/zhulin_bg.jpg',
-    'image/card/spell_jingshenkongzhi.jpg',
     'image/card/bagua.png',
+    'image/card/baihupifeng.png',
     'image/card/baishouzhihu.png',
     'image/card/baiyin.png',
     'image/card/bingliang.png',
@@ -15,8 +15,6 @@ window.noname_asset_list=[
     'image/card/caomu.png',
     'image/card/caoyao.png',
     'image/card/chenhuodajie.png',
-    'image/card/chess_chuzhang.png',
-    'image/card/chess_shezhang.png',
     'image/card/chitu.png',
     'image/card/chilongya.png',
     'image/card/chiyuxi.png',
@@ -131,134 +129,8 @@ window.noname_asset_list=[
     'image/card/shunshou.png',
     'image/card/shushangkaihua.png',
     'image/card/sifeizhenmian.png',
-    'image/card/spell_ansezhadan.jpg',
-    'image/card/spell_anyingkuangluan.jpg',
-    'image/card/spell_anyinglieyan.jpg',
-    'image/card/spell_anyingxingtai.jpg',
-    'image/card/spell_anzhongpohuai.jpg',
-    'image/card/spell_aoshufeidan.jpg',
-    'image/card/spell_aoshuzhihui.jpg',
-    'image/card/spell_baofengxue.jpg',
-    'image/card/spell_beici.jpg',
-    'image/card/spell_bianxingshu.jpg',
-    'image/card/spell_bingdong.jpg',
-    'image/card/spell_binghuan.jpg',
-    'image/card/spell_canying.jpg',
-    'image/card/spell_chazhuangshandian.jpg',
-    'image/card/spell_chenmo.jpg',
-    'image/card/spell_chirehuoba.jpg',
-    'image/card/spell_chongfeng.jpg',
-    'image/card/spell_cigu.jpg',
-    'image/card/spell_cisha.jpg',
-    'image/card/spell_conglinzhihun.jpg',
-    'image/card/spell_daoshan.jpg',
-    'image/card/spell_diyulieyan.jpg',
-    'image/card/spell_dubiao.jpg',
-    'image/card/spell_dunpaimengji.jpg',
-    'image/card/spell_duochongsheji.jpg',
-    'image/card/spell_emozhinu.jpg',
-    'image/card/spell_emozhixin.jpg',
-    'image/card/spell_enzeshu.jpg',
-    'image/card/spell_fengnu.jpg',
-    'image/card/spell_fengxian.jpg',
-    'image/card/spell_fennu.jpg',
-    'image/card/spell_fennuzhichui.jpg',
-    'image/card/spell_fuchoudaji.jpg',
-    'image/card/spell_fuchouzhinu.jpg',
-    'image/card/spell_fugen.jpg',
-    'image/card/spell_fushishu.jpg',
-    'image/card/spell_guanmenfanggou.jpg',
-    'image/card/spell_hanbingjian.jpg',
-    'image/card/spell_hanbingpingzhang.jpg',
-    'image/card/spell_heiandiyu.jpg',
-    'image/card/spell_heianqiyue.jpg',
-    'image/card/spell_hengsao.jpg',
-    'image/card/spell_huoqiushu.jpg',
-    'image/card/spell_huotigenxu.jpg',
-    'image/card/spell_jianrenluanwu.jpg',
-    'image/card/baihupifeng.png',
-    'image/card/spell_jingxiang.jpg',
-    'image/card/spell_jinyingduijue.jpg',
-    'image/card/spell_jipao.jpg',
-    'image/card/spell_juemingluandou.jpg',
-    'image/card/spell_kongxinshu.jpg',
-    'image/card/spell_kuaisusheji.jpg',
-    'image/card/spell_kuaisuzhiliao.jpg',
-    'image/card/spell_kuangbao.jpg',
-    'image/card/spell_laojiuhuoba.jpg',
-    'image/card/spell_lianhuanbaolie.jpg',
-    'image/card/spell_lierenyinji.jpg',
-    'image/card/spell_lieyanfengbao.jpg',
-    'image/card/spell_liliangdaijia.jpg',
-    'image/card/spell_liliangzhufu.jpg',
-    'image/card/spell_linghunhongxi.jpg',
-    'image/card/spell_maizang.jpg',
-    'image/card/spell_mengun.jpg',
-    'image/card/spell_modaoyou.jpg',
-    'image/card/spell_morizaihuo.jpg',
-    'image/card/spell_naluzhiguang.jpg',
-    'image/card/spell_niuquxukong.jpg',
-    'image/card/spell_nuhuozhongshao.jpg',
-    'image/card/tao.png',
-    'image/card/spell_nuxi.jpg',
-    'image/card/spell_piaoqie.jpg',
-    'image/card/spell_qiangfengsheji.jpg',
-    'image/card/spell_rongyanbaolie.jpg',
-    'image/card/spell_sanghunzhao.jpg',
-    'image/card/spell_shalumingling.jpg',
-    'image/card/spell_shandianfengbao.jpg',
-    'image/card/spell_shengerpingdeng.jpg',
-    'image/card/spell_shengguangzhadan.jpg',
-    'image/card/spell_shengliaoshu.jpg',
-    'image/card/spell_shenpan.jpg',
-    'image/card/spell_shenshengfennu.jpg',
-    'image/card/spell_shenshengxinxing.jpg',
-    'image/card/spell_shihuawuqi.jpg',
-    'image/card/spell_shixue.jpg',
-    'image/card/spell_sijidaifa.jpg',
-    'image/card/spell_siwangchanrao.jpg',
-    'image/card/spell_tanxianmao.jpg',
-    'image/card/spell_tianjiangzhuqun.jpg',
-    'image/card/spell_wangzhezhufu.jpg',
-    'image/card/spell_weijisifu.jpg',
-    'image/card/spell_wuyashenxiang.jpg',
-    'image/card/spell_xianzuzhaohuan.jpg',
-    'image/card/spell_xianzuzhihun.jpg',
-    'image/card/spell_xianzuzhiliao.jpg',
-    'image/card/spell_xianzuzhishi.jpg',
-    'image/card/spell_xiaoguibaopo.jpg',
-    'image/card/spell_xiaoshi.jpg',
-    'image/card/spell_xingchenzhuiluo.jpg',
-    'image/card/spell_xinlinghanbao.jpg',
-    'image/card/spell_xinlingshijie.jpg',
-    'image/card/spell_xishengqiyue.jpg',
-    'image/card/spell_xuanfengzhan.jpg',
-    'image/card/spell_yanbaoshu.jpg',
-    'image/card/spell_yanmie.jpg',
-    'image/card/spell_yaoshu.jpg',
-    'image/card/spell_yemanpaoxiao.jpg',
-    'image/card/spell_yexingchengzhang.jpg',
-    'image/card/spell_yexinglanghun.jpg',
-    'image/card/spell_yingyongdaji.jpg',
-    'image/card/spell_yongshizhufu.jpg',
-    'image/card/spell_zhandounuhuo.jpg',
-    'image/card/spell_zhansha.jpg',
-    'image/card/spell_zhaohuanchongwu.jpg',
-    'image/card/spell_zhengqianghaosheng.jpg',
-    'image/card/spell_zhenyanshu.jpg',
-    'image/card/spell_zhihuizhufu.jpg',
-    'image/card/spell_zhiliaoshui.jpg',
-    'image/card/spell_zhiliaozhichu.jpg',
-    'image/card/spell_zhiliaozhihuan.jpg',
-    'image/card/spell_zhongnian.jpg',
-    'image/card/spell_zhuizongshu.jpg',
-    'image/card/spell_zhumo.jpg',
-    'image/card/spell_zidanshangtang.jpg',
-    'image/card/spell_ziranzhili.jpg',
-    'image/card/spell_ziyang.jpg',
-    'image/card/spell_zuozhandongyuan.jpg',
-    'image/card/spell_zuzhou.jpg',
     'image/card/suolianjia.png',
+    'image/card/tao.png',
     'image/card/tanshezhiren.png',
     'image/card/taoyuan.png',
     'image/card/tengjia.png',
@@ -884,6 +756,8 @@ window.noname_asset_list=[
     'image/mode/chess/character/chess_wuzhaojinlong.jpg',
     'image/mode/chess/character/chess_xingtian.jpg',
     'image/mode/chess/character/chess_zhangliao.jpg',
+    'image/mode/chess/card/chess_chuzhang.png',
+    'image/mode/chess/card/chess_shezhang.png',
     'image/mode/tafang/character/tafang_mech_dubiaoxianjing.jpg',
     'image/mode/tafang/character/tafang_mech_jiqishi.jpg',
     'image/mode/tafang/character/tafang_mech_shenmidiaoxiang.jpg',
@@ -1078,6 +952,132 @@ window.noname_asset_list=[
     'image/mode/stone/character/stone_zhumo.jpg',
     'image/mode/stone/character/stone_zongxiong.jpg',
     'image/mode/stone/character/stone_zousishangfan.jpg',
+    'image/mode/stone/card/spell_ansezhadan.jpg',
+    'image/mode/stone/card/spell_anyingkuangluan.jpg',
+    'image/mode/stone/card/spell_anyinglieyan.jpg',
+    'image/mode/stone/card/spell_anyingxingtai.jpg',
+    'image/mode/stone/card/spell_anzhongpohuai.jpg',
+    'image/mode/stone/card/spell_aoshufeidan.jpg',
+    'image/mode/stone/card/spell_aoshuzhihui.jpg',
+    'image/mode/stone/card/spell_baofengxue.jpg',
+    'image/mode/stone/card/spell_beici.jpg',
+    'image/mode/stone/card/spell_bianxingshu.jpg',
+    'image/mode/stone/card/spell_bingdong.jpg',
+    'image/mode/stone/card/spell_binghuan.jpg',
+    'image/mode/stone/card/spell_canying.jpg',
+    'image/mode/stone/card/spell_chazhuangshandian.jpg',
+    'image/mode/stone/card/spell_chenmo.jpg',
+    'image/mode/stone/card/spell_chirehuoba.jpg',
+    'image/mode/stone/card/spell_chongfeng.jpg',
+    'image/mode/stone/card/spell_cigu.jpg',
+    'image/mode/stone/card/spell_cisha.jpg',
+    'image/mode/stone/card/spell_conglinzhihun.jpg',
+    'image/mode/stone/card/spell_daoshan.jpg',
+    'image/mode/stone/card/spell_diyulieyan.jpg',
+    'image/mode/stone/card/spell_dubiao.jpg',
+    'image/mode/stone/card/spell_dunpaimengji.jpg',
+    'image/mode/stone/card/spell_duochongsheji.jpg',
+    'image/mode/stone/card/spell_emozhinu.jpg',
+    'image/mode/stone/card/spell_emozhixin.jpg',
+    'image/mode/stone/card/spell_enzeshu.jpg',
+    'image/mode/stone/card/spell_fengnu.jpg',
+    'image/mode/stone/card/spell_fengxian.jpg',
+    'image/mode/stone/card/spell_fennu.jpg',
+    'image/mode/stone/card/spell_fennuzhichui.jpg',
+    'image/mode/stone/card/spell_fuchoudaji.jpg',
+    'image/mode/stone/card/spell_fuchouzhinu.jpg',
+    'image/mode/stone/card/spell_fugen.jpg',
+    'image/mode/stone/card/spell_fushishu.jpg',
+    'image/mode/stone/card/spell_guanmenfanggou.jpg',
+    'image/mode/stone/card/spell_hanbingjian.jpg',
+    'image/mode/stone/card/spell_hanbingpingzhang.jpg',
+    'image/mode/stone/card/spell_heiandiyu.jpg',
+    'image/mode/stone/card/spell_heianqiyue.jpg',
+    'image/mode/stone/card/spell_hengsao.jpg',
+    'image/mode/stone/card/spell_huoqiushu.jpg',
+    'image/mode/stone/card/spell_huotigenxu.jpg',
+    'image/mode/stone/card/spell_jianrenluanwu.jpg',
+    'image/mode/stone/card/spell_jingxiang.jpg',
+    'image/mode/stone/card/spell_jingshenkongzhi.jpg',
+    'image/mode/stone/card/spell_jinyingduijue.jpg',
+    'image/mode/stone/card/spell_jipao.jpg',
+    'image/mode/stone/card/spell_juemingluandou.jpg',
+    'image/mode/stone/card/spell_kongxinshu.jpg',
+    'image/mode/stone/card/spell_kuaisusheji.jpg',
+    'image/mode/stone/card/spell_kuaisuzhiliao.jpg',
+    'image/mode/stone/card/spell_kuangbao.jpg',
+    'image/mode/stone/card/spell_laojiuhuoba.jpg',
+    'image/mode/stone/card/spell_lianhuanbaolie.jpg',
+    'image/mode/stone/card/spell_lierenyinji.jpg',
+    'image/mode/stone/card/spell_lieyanfengbao.jpg',
+    'image/mode/stone/card/spell_liliangdaijia.jpg',
+    'image/mode/stone/card/spell_liliangzhufu.jpg',
+    'image/mode/stone/card/spell_linghunhongxi.jpg',
+    'image/mode/stone/card/spell_maizang.jpg',
+    'image/mode/stone/card/spell_mengun.jpg',
+    'image/mode/stone/card/spell_modaoyou.jpg',
+    'image/mode/stone/card/spell_morizaihuo.jpg',
+    'image/mode/stone/card/spell_naluzhiguang.jpg',
+    'image/mode/stone/card/spell_niuquxukong.jpg',
+    'image/mode/stone/card/spell_nuhuozhongshao.jpg',
+    'image/mode/stone/card/spell_nuxi.jpg',
+    'image/mode/stone/card/spell_piaoqie.jpg',
+    'image/mode/stone/card/spell_qiangfengsheji.jpg',
+    'image/mode/stone/card/spell_rongyanbaolie.jpg',
+    'image/mode/stone/card/spell_sanghunzhao.jpg',
+    'image/mode/stone/card/spell_shalumingling.jpg',
+    'image/mode/stone/card/spell_shandianfengbao.jpg',
+    'image/mode/stone/card/spell_shengerpingdeng.jpg',
+    'image/mode/stone/card/spell_shengguangzhadan.jpg',
+    'image/mode/stone/card/spell_shengliaoshu.jpg',
+    'image/mode/stone/card/spell_shenpan.jpg',
+    'image/mode/stone/card/spell_shenshengfennu.jpg',
+    'image/mode/stone/card/spell_shenshengxinxing.jpg',
+    'image/mode/stone/card/spell_shihuawuqi.jpg',
+    'image/mode/stone/card/spell_shixue.jpg',
+    'image/mode/stone/card/spell_sijidaifa.jpg',
+    'image/mode/stone/card/spell_siwangchanrao.jpg',
+    'image/mode/stone/card/spell_tanxianmao.jpg',
+    'image/mode/stone/card/spell_tianjiangzhuqun.jpg',
+    'image/mode/stone/card/spell_wangzhezhufu.jpg',
+    'image/mode/stone/card/spell_weijisifu.jpg',
+    'image/mode/stone/card/spell_wuyashenxiang.jpg',
+    'image/mode/stone/card/spell_xianzuzhaohuan.jpg',
+    'image/mode/stone/card/spell_xianzuzhihun.jpg',
+    'image/mode/stone/card/spell_xianzuzhiliao.jpg',
+    'image/mode/stone/card/spell_xianzuzhishi.jpg',
+    'image/mode/stone/card/spell_xiaoguibaopo.jpg',
+    'image/mode/stone/card/spell_xiaoshi.jpg',
+    'image/mode/stone/card/spell_xingchenzhuiluo.jpg',
+    'image/mode/stone/card/spell_xinlinghanbao.jpg',
+    'image/mode/stone/card/spell_xinlingshijie.jpg',
+    'image/mode/stone/card/spell_xishengqiyue.jpg',
+    'image/mode/stone/card/spell_xuanfengzhan.jpg',
+    'image/mode/stone/card/spell_yanbaoshu.jpg',
+    'image/mode/stone/card/spell_yanmie.jpg',
+    'image/mode/stone/card/spell_yaoshu.jpg',
+    'image/mode/stone/card/spell_yemanpaoxiao.jpg',
+    'image/mode/stone/card/spell_yexingchengzhang.jpg',
+    'image/mode/stone/card/spell_yexinglanghun.jpg',
+    'image/mode/stone/card/spell_yingyongdaji.jpg',
+    'image/mode/stone/card/spell_yongshizhufu.jpg',
+    'image/mode/stone/card/spell_zhandounuhuo.jpg',
+    'image/mode/stone/card/spell_zhansha.jpg',
+    'image/mode/stone/card/spell_zhaohuanchongwu.jpg',
+    'image/mode/stone/card/spell_zhengqianghaosheng.jpg',
+    'image/mode/stone/card/spell_zhenyanshu.jpg',
+    'image/mode/stone/card/spell_zhihuizhufu.jpg',
+    'image/mode/stone/card/spell_zhiliaoshui.jpg',
+    'image/mode/stone/card/spell_zhiliaozhichu.jpg',
+    'image/mode/stone/card/spell_zhiliaozhihuan.jpg',
+    'image/mode/stone/card/spell_zhongnian.jpg',
+    'image/mode/stone/card/spell_zhuizongshu.jpg',
+    'image/mode/stone/card/spell_zhumo.jpg',
+    'image/mode/stone/card/spell_zidanshangtang.jpg',
+    'image/mode/stone/card/spell_ziranzhili.jpg',
+    'image/mode/stone/card/spell_ziyang.jpg',
+    'image/mode/stone/card/spell_zuozhandongyuan.jpg',
+    'image/mode/stone/card/spell_zuzhou.jpg',
     'image/splash/boss.jpg',
     'image/splash/chess.jpg',
     'image/splash/guozhan.jpg',
diff --git a/game/game.js b/game/game.js
index 5d7ac23f7..f637aa041 100644
--- a/game/game.js
+++ b/game/game.js
@@ -727,7 +727,7 @@
 						onclick:function(bool){
                             if(lib.config.show_history=='right') ui.window.animate('rightbar2');
 							game.saveConfig('show_history',bool);
-                            if(_status.video||!_status.gameStarted) return;
+                            if(_status.video||!_status.prepareArena) return;
                             if(bool=='left'){
                                 ui.window.classList.add('leftbar');
                                 ui.window.classList.remove('rightbar');
@@ -1572,7 +1572,7 @@
 							if(this.innerHTML!='已隐藏'){
 								this.innerHTML='已隐藏';
 								game.saveConfig('hiddenModePack',['stone','chess','boss','tafang']);
-								game.saveConfig('hiddenCardPack',['zhenfa','yunchou','swd','shenqi','hearth','compensate']);
+								game.saveConfig('hiddenCardPack',['zhenfa','yunchou','swd','shenqi','hearth']);
 								game.saveConfig('hiddenCharacterPack',['diy','yxs','hearth','swd','gujian','xianjian','xiake','boss','ow']);
 								var that=this;
 								setTimeout(function(){
@@ -1586,6 +1586,70 @@
 			}
 		},
         extensionMenu:{
+            cardpile:{
+                enable:{
+    			    name:'开启',
+    			    init:false,
+    			    restart:true,
+    			},
+    			sha:{
+    			    name:'杀',
+                    init:true,
+    			},
+                huosha:{
+                    name:'火杀',
+                    init:true,
+                },
+                leisha:{
+                    name:'雷杀',
+                    init:true,
+                },
+                shan:{
+                    name:'闪',
+                    init:true,
+                },
+                tao:{
+                    name:'桃',
+                    init:true,
+                },
+                jiu:{
+                    name:'酒',
+                    init:true,
+                },
+                wuxie:{
+                    name:'无懈可击',
+                    init:false,
+                },
+                nanman:{
+                    name:'南蛮入侵',
+                    init:false,
+                },
+                wanjian:{
+                    name:'万箭齐发',
+                    init:false,
+                },
+                guohe:{
+                    name:'过河拆桥',
+                    init:false,
+                },
+                shunshou:{
+                    name:'顺手牵羊',
+                    init:false,
+                },
+                tiesuo:{
+                    name:'铁索连环',
+                    init:false,
+                },
+    			hide:{
+    			    name:'隐藏此扩展',
+    			    clear:true,
+    			    onclick:function(){
+                        this.innerHTML='此扩展将在重启后隐藏';
+    					lib.config.hiddenPlayPack.add('cardpile');
+    					game.saveConfig('hiddenPlayPack',lib.config.hiddenPlayPack);
+    				}
+    			},
+            },
             character:{
                 enable:{
     			    name:'开启',
@@ -2807,10 +2871,10 @@
 					// 	name:'守卫剑阁',
 					// 	init:true,
 					// },
-					chess_card:{
-						name:'战棋卡牌',
-						init:true,
-					},
+					// chess_card:{
+					// 	name:'战棋卡牌',
+					// 	init:true,
+					// },
 					free_choose:{
 						name:'自由选将',
 						init:true,
@@ -4100,57 +4164,59 @@
 							delete lib.cardPack.mode_derivation;
 						}
 					}
-					for(i in play){
-						if(lib.config.hiddenPlayPack.contains(i)) continue;
-						if(play[i].forbid&&play[i].forbid.contains(lib.config.mode)) continue;
-						if(play[i].mode&&play[i].mode.contains(lib.config.mode)==false) continue;
-						for(j in play[i].element){
-							if(!lib.element[j]) lib.element[j]=[];
-							for(k in play[i].element[j]){
-								if(k=='init'){
-									if(!lib.element[j].inits) lib.element[j].inits=[];
-									lib.element[j].inits.push(lib.init.eval(play[i].element[j][k]));
-								}
-								else{
-									lib.element[j][k]=lib.init.eval(play[i].element[j][k]);
-								}
-							}
-						}
-						for(j in play[i].ui){
-							if(typeof play[i].ui[j]=='object'){
-								if(ui[j]==undefined) ui[j]={};
-								for(k in play[i].ui[j]){
-									ui[j][k]=lib.init.eval(play[i].ui[j][k]);
-								}
-							}
-							else{
-								ui[j]=lib.init.eval(play[i].ui[j]);
-							}
-						}
-						for(j in play[i].game){
-							game[j]=lib.init.eval(play[i].game[j]);
-						}
-						for(j in play[i].get){
-							get[j]=lib.init.eval(play[i].get[j]);
-						}
-						for(j in play[i]){
-							if(j=='mode'||j=='forbid'||j=='init'||j=='element'||
-							j=='game'||j=='get'||j=='ui'||j=='arenaReady') continue;
-							for(k in play[i][j]){
-								if(j=='translate'&&k==i){
-									// lib[j][k+'_play_config']=play[i][j][k];
-								}
-								else{
-									if(lib[j][k]!=undefined){
-										console.log('dublicate '+j+' in play '+i+':\n'+k+'\n'+': '+lib[j][k]+'\n'+play[i][j][k]);
-									}
-									lib[j][k]=lib.init.eval(play[i][j][k]);
-								}
-							}
-						}
-						if(typeof play[i].init=='function') (lib.init.eval(play[i].init))();
-						if(typeof play[i].arenaReady=='function') lib.arenaReady.push(play[i].arenaReady);
-					}
+                    if(lib.config.mode!='connect'){
+                        for(i in play){
+    						if(lib.config.hiddenPlayPack.contains(i)) continue;
+    						if(play[i].forbid&&play[i].forbid.contains(lib.config.mode)) continue;
+    						if(play[i].mode&&play[i].mode.contains(lib.config.mode)==false) continue;
+    						for(j in play[i].element){
+    							if(!lib.element[j]) lib.element[j]=[];
+    							for(k in play[i].element[j]){
+    								if(k=='init'){
+    									if(!lib.element[j].inits) lib.element[j].inits=[];
+    									lib.element[j].inits.push(lib.init.eval(play[i].element[j][k]));
+    								}
+    								else{
+    									lib.element[j][k]=lib.init.eval(play[i].element[j][k]);
+    								}
+    							}
+    						}
+    						for(j in play[i].ui){
+    							if(typeof play[i].ui[j]=='object'){
+    								if(ui[j]==undefined) ui[j]={};
+    								for(k in play[i].ui[j]){
+    									ui[j][k]=lib.init.eval(play[i].ui[j][k]);
+    								}
+    							}
+    							else{
+    								ui[j]=lib.init.eval(play[i].ui[j]);
+    							}
+    						}
+    						for(j in play[i].game){
+    							game[j]=lib.init.eval(play[i].game[j]);
+    						}
+    						for(j in play[i].get){
+    							get[j]=lib.init.eval(play[i].get[j]);
+    						}
+    						for(j in play[i]){
+    							if(j=='mode'||j=='forbid'||j=='init'||j=='element'||
+    							j=='game'||j=='get'||j=='ui'||j=='arenaReady') continue;
+    							for(k in play[i][j]){
+    								if(j=='translate'&&k==i){
+    									// lib[j][k+'_play_config']=play[i][j][k];
+    								}
+    								else{
+    									if(lib[j][k]!=undefined){
+    										console.log('dublicate '+j+' in play '+i+':\n'+k+'\n'+': '+lib[j][k]+'\n'+play[i][j][k]);
+    									}
+    									lib[j][k]=lib.init.eval(play[i][j][k]);
+    								}
+    							}
+    						}
+    						if(typeof play[i].init=='function') (lib.init.eval(play[i].init))();
+    						if(typeof play[i].arenaReady=='function') lib.arenaReady.push(play[i].arenaReady);
+    					}
+                    }
 
                     lib.connectCharacterPack=[];
                     lib.connectCardPack=[];
@@ -12687,7 +12753,13 @@
                             this.setBackground(lib.card[bg].image);
                         }
 						else{
-							this.setBackground('card/'+bg);
+                            var cardPack=lib.cardPack['mode_'+get.mode()];
+                            if(Array.isArray(cardPack)&&cardPack.contains(bg)){
+                                this.setBackground('mode/'+get.mode()+'/card/'+bg);
+                            }
+							else{
+                                this.setBackground('card/'+bg);
+                            }
 						}
 					}
 					else if(lib.card[bg].image=='card'){
@@ -19417,6 +19489,7 @@
 			return arg[arg.length-1];
 		},
 		prepareArena:function(num){
+            _status.prepareArena=true;
             game.showHistory();
 			ui.create.players(num);
 			ui.create.me();
diff --git a/game/package.js b/game/package.js
index 5eb0d337f..8b493689e 100644
--- a/game/package.js
+++ b/game/package.js
@@ -25,9 +25,9 @@ card.pack={
     yunchou:'运筹帷幄',
     swd:'轩辕剑',
     hearth:'炉石传说',
-    compensate:'补充卡牌',
 };
 play.pack={
+    cardpile:'牌堆补充',
     character:'技能卡牌',
     soldier:'士兵模式',
     wuxing:'五行生克',
diff --git a/game/source.js b/game/source.js
index 40f0fe314..1388cb76f 100644
--- a/game/source.js
+++ b/game/source.js
@@ -1,5 +1,4 @@
 window.noname_source_list=[
-    'card/compensate.js',
     'card/extra.js',
     'card/guozhan.js',
     'card/hearth.js',
@@ -60,6 +59,7 @@ window.noname_source_list=[
     'mode/brawl.js',
     'mode/versus.js',
     'mode/connect.js',
+    'extension/cardpile/extension.js',
     'extension/character/extension.js',
     'extension/coin/extension.js',
     'extension/soldier/extension.js',
diff --git a/game/update.js b/game/update.js
index 09f580f19..9ad13cf25 100644
--- a/game/update.js
+++ b/game/update.js
@@ -17,3 +17,6 @@ window.noname_update={
         '1.9.0.1':[]
     }
 }
+
+//增加牌堆补充扩展
+//改进塔防模式
diff --git a/image/mode/chess/.DS_Store b/image/mode/chess/.DS_Store
index c608257fd..032998b7a 100644
Binary files a/image/mode/chess/.DS_Store and b/image/mode/chess/.DS_Store differ
diff --git a/image/card/chess_chuzhang.png b/image/mode/chess/card/chess_chuzhang.png
similarity index 100%
rename from image/card/chess_chuzhang.png
rename to image/mode/chess/card/chess_chuzhang.png
diff --git a/image/card/chess_shezhang.png b/image/mode/chess/card/chess_shezhang.png
similarity index 100%
rename from image/card/chess_shezhang.png
rename to image/mode/chess/card/chess_shezhang.png
diff --git a/image/mode/chess/leader_easy.jpg b/image/mode/chess/difficulty/leader_easy.jpg
similarity index 100%
rename from image/mode/chess/leader_easy.jpg
rename to image/mode/chess/difficulty/leader_easy.jpg
diff --git a/image/mode/chess/leader_hard.jpg b/image/mode/chess/difficulty/leader_hard.jpg
similarity index 100%
rename from image/mode/chess/leader_hard.jpg
rename to image/mode/chess/difficulty/leader_hard.jpg
diff --git a/image/mode/chess/leader_medium.jpg b/image/mode/chess/difficulty/leader_medium.jpg
similarity index 100%
rename from image/mode/chess/leader_medium.jpg
rename to image/mode/chess/difficulty/leader_medium.jpg
diff --git a/image/mode/stone/.DS_Store b/image/mode/stone/.DS_Store
index 03b52dd92..f3a072877 100644
Binary files a/image/mode/stone/.DS_Store and b/image/mode/stone/.DS_Store differ
diff --git a/image/card/spell_ansezhadan.jpg b/image/mode/stone/card/spell_ansezhadan.jpg
similarity index 100%
rename from image/card/spell_ansezhadan.jpg
rename to image/mode/stone/card/spell_ansezhadan.jpg
diff --git a/image/card/spell_anyingkuangluan.jpg b/image/mode/stone/card/spell_anyingkuangluan.jpg
similarity index 100%
rename from image/card/spell_anyingkuangluan.jpg
rename to image/mode/stone/card/spell_anyingkuangluan.jpg
diff --git a/image/card/spell_anyinglieyan.jpg b/image/mode/stone/card/spell_anyinglieyan.jpg
similarity index 100%
rename from image/card/spell_anyinglieyan.jpg
rename to image/mode/stone/card/spell_anyinglieyan.jpg
diff --git a/image/card/spell_anyingxingtai.jpg b/image/mode/stone/card/spell_anyingxingtai.jpg
similarity index 100%
rename from image/card/spell_anyingxingtai.jpg
rename to image/mode/stone/card/spell_anyingxingtai.jpg
diff --git a/image/card/spell_anzhongpohuai.jpg b/image/mode/stone/card/spell_anzhongpohuai.jpg
similarity index 100%
rename from image/card/spell_anzhongpohuai.jpg
rename to image/mode/stone/card/spell_anzhongpohuai.jpg
diff --git a/image/card/spell_aoshufeidan.jpg b/image/mode/stone/card/spell_aoshufeidan.jpg
similarity index 100%
rename from image/card/spell_aoshufeidan.jpg
rename to image/mode/stone/card/spell_aoshufeidan.jpg
diff --git a/image/card/spell_aoshuzhihui.jpg b/image/mode/stone/card/spell_aoshuzhihui.jpg
similarity index 100%
rename from image/card/spell_aoshuzhihui.jpg
rename to image/mode/stone/card/spell_aoshuzhihui.jpg
diff --git a/image/card/spell_baofengxue.jpg b/image/mode/stone/card/spell_baofengxue.jpg
similarity index 100%
rename from image/card/spell_baofengxue.jpg
rename to image/mode/stone/card/spell_baofengxue.jpg
diff --git a/image/card/spell_beici.jpg b/image/mode/stone/card/spell_beici.jpg
similarity index 100%
rename from image/card/spell_beici.jpg
rename to image/mode/stone/card/spell_beici.jpg
diff --git a/image/card/spell_bianxingshu.jpg b/image/mode/stone/card/spell_bianxingshu.jpg
similarity index 100%
rename from image/card/spell_bianxingshu.jpg
rename to image/mode/stone/card/spell_bianxingshu.jpg
diff --git a/image/card/spell_bingdong.jpg b/image/mode/stone/card/spell_bingdong.jpg
similarity index 100%
rename from image/card/spell_bingdong.jpg
rename to image/mode/stone/card/spell_bingdong.jpg
diff --git a/image/card/spell_binghuan.jpg b/image/mode/stone/card/spell_binghuan.jpg
similarity index 100%
rename from image/card/spell_binghuan.jpg
rename to image/mode/stone/card/spell_binghuan.jpg
diff --git a/image/card/spell_canying.jpg b/image/mode/stone/card/spell_canying.jpg
similarity index 100%
rename from image/card/spell_canying.jpg
rename to image/mode/stone/card/spell_canying.jpg
diff --git a/image/card/spell_chazhuangshandian.jpg b/image/mode/stone/card/spell_chazhuangshandian.jpg
similarity index 100%
rename from image/card/spell_chazhuangshandian.jpg
rename to image/mode/stone/card/spell_chazhuangshandian.jpg
diff --git a/image/card/spell_chenmo.jpg b/image/mode/stone/card/spell_chenmo.jpg
similarity index 100%
rename from image/card/spell_chenmo.jpg
rename to image/mode/stone/card/spell_chenmo.jpg
diff --git a/image/card/spell_chirehuoba.jpg b/image/mode/stone/card/spell_chirehuoba.jpg
similarity index 100%
rename from image/card/spell_chirehuoba.jpg
rename to image/mode/stone/card/spell_chirehuoba.jpg
diff --git a/image/card/spell_chongfeng.jpg b/image/mode/stone/card/spell_chongfeng.jpg
similarity index 100%
rename from image/card/spell_chongfeng.jpg
rename to image/mode/stone/card/spell_chongfeng.jpg
diff --git a/image/card/spell_cigu.jpg b/image/mode/stone/card/spell_cigu.jpg
similarity index 100%
rename from image/card/spell_cigu.jpg
rename to image/mode/stone/card/spell_cigu.jpg
diff --git a/image/card/spell_cisha.jpg b/image/mode/stone/card/spell_cisha.jpg
similarity index 100%
rename from image/card/spell_cisha.jpg
rename to image/mode/stone/card/spell_cisha.jpg
diff --git a/image/card/spell_conglinzhihun.jpg b/image/mode/stone/card/spell_conglinzhihun.jpg
similarity index 100%
rename from image/card/spell_conglinzhihun.jpg
rename to image/mode/stone/card/spell_conglinzhihun.jpg
diff --git a/image/card/spell_daoshan.jpg b/image/mode/stone/card/spell_daoshan.jpg
similarity index 100%
rename from image/card/spell_daoshan.jpg
rename to image/mode/stone/card/spell_daoshan.jpg
diff --git a/image/card/spell_diyulieyan.jpg b/image/mode/stone/card/spell_diyulieyan.jpg
similarity index 100%
rename from image/card/spell_diyulieyan.jpg
rename to image/mode/stone/card/spell_diyulieyan.jpg
diff --git a/image/card/spell_dubiao.jpg b/image/mode/stone/card/spell_dubiao.jpg
similarity index 100%
rename from image/card/spell_dubiao.jpg
rename to image/mode/stone/card/spell_dubiao.jpg
diff --git a/image/card/spell_dunpaimengji.jpg b/image/mode/stone/card/spell_dunpaimengji.jpg
similarity index 100%
rename from image/card/spell_dunpaimengji.jpg
rename to image/mode/stone/card/spell_dunpaimengji.jpg
diff --git a/image/card/spell_duochongsheji.jpg b/image/mode/stone/card/spell_duochongsheji.jpg
similarity index 100%
rename from image/card/spell_duochongsheji.jpg
rename to image/mode/stone/card/spell_duochongsheji.jpg
diff --git a/image/card/spell_emozhinu.jpg b/image/mode/stone/card/spell_emozhinu.jpg
similarity index 100%
rename from image/card/spell_emozhinu.jpg
rename to image/mode/stone/card/spell_emozhinu.jpg
diff --git a/image/card/spell_emozhixin.jpg b/image/mode/stone/card/spell_emozhixin.jpg
similarity index 100%
rename from image/card/spell_emozhixin.jpg
rename to image/mode/stone/card/spell_emozhixin.jpg
diff --git a/image/card/spell_enzeshu.jpg b/image/mode/stone/card/spell_enzeshu.jpg
similarity index 100%
rename from image/card/spell_enzeshu.jpg
rename to image/mode/stone/card/spell_enzeshu.jpg
diff --git a/image/card/spell_fengnu.jpg b/image/mode/stone/card/spell_fengnu.jpg
similarity index 100%
rename from image/card/spell_fengnu.jpg
rename to image/mode/stone/card/spell_fengnu.jpg
diff --git a/image/card/spell_fengxian.jpg b/image/mode/stone/card/spell_fengxian.jpg
similarity index 100%
rename from image/card/spell_fengxian.jpg
rename to image/mode/stone/card/spell_fengxian.jpg
diff --git a/image/card/spell_fennu.jpg b/image/mode/stone/card/spell_fennu.jpg
similarity index 100%
rename from image/card/spell_fennu.jpg
rename to image/mode/stone/card/spell_fennu.jpg
diff --git a/image/card/spell_fennuzhichui.jpg b/image/mode/stone/card/spell_fennuzhichui.jpg
similarity index 100%
rename from image/card/spell_fennuzhichui.jpg
rename to image/mode/stone/card/spell_fennuzhichui.jpg
diff --git a/image/card/spell_fuchoudaji.jpg b/image/mode/stone/card/spell_fuchoudaji.jpg
similarity index 100%
rename from image/card/spell_fuchoudaji.jpg
rename to image/mode/stone/card/spell_fuchoudaji.jpg
diff --git a/image/card/spell_fuchouzhinu.jpg b/image/mode/stone/card/spell_fuchouzhinu.jpg
similarity index 100%
rename from image/card/spell_fuchouzhinu.jpg
rename to image/mode/stone/card/spell_fuchouzhinu.jpg
diff --git a/image/card/spell_fugen.jpg b/image/mode/stone/card/spell_fugen.jpg
similarity index 100%
rename from image/card/spell_fugen.jpg
rename to image/mode/stone/card/spell_fugen.jpg
diff --git a/image/card/spell_fushishu.jpg b/image/mode/stone/card/spell_fushishu.jpg
similarity index 100%
rename from image/card/spell_fushishu.jpg
rename to image/mode/stone/card/spell_fushishu.jpg
diff --git a/image/card/spell_guanmenfanggou.jpg b/image/mode/stone/card/spell_guanmenfanggou.jpg
similarity index 100%
rename from image/card/spell_guanmenfanggou.jpg
rename to image/mode/stone/card/spell_guanmenfanggou.jpg
diff --git a/image/card/spell_hanbingjian.jpg b/image/mode/stone/card/spell_hanbingjian.jpg
similarity index 100%
rename from image/card/spell_hanbingjian.jpg
rename to image/mode/stone/card/spell_hanbingjian.jpg
diff --git a/image/card/spell_hanbingpingzhang.jpg b/image/mode/stone/card/spell_hanbingpingzhang.jpg
similarity index 100%
rename from image/card/spell_hanbingpingzhang.jpg
rename to image/mode/stone/card/spell_hanbingpingzhang.jpg
diff --git a/image/card/spell_heiandiyu.jpg b/image/mode/stone/card/spell_heiandiyu.jpg
similarity index 100%
rename from image/card/spell_heiandiyu.jpg
rename to image/mode/stone/card/spell_heiandiyu.jpg
diff --git a/image/card/spell_heianqiyue.jpg b/image/mode/stone/card/spell_heianqiyue.jpg
similarity index 100%
rename from image/card/spell_heianqiyue.jpg
rename to image/mode/stone/card/spell_heianqiyue.jpg
diff --git a/image/card/spell_hengsao.jpg b/image/mode/stone/card/spell_hengsao.jpg
similarity index 100%
rename from image/card/spell_hengsao.jpg
rename to image/mode/stone/card/spell_hengsao.jpg
diff --git a/image/card/spell_huoqiushu.jpg b/image/mode/stone/card/spell_huoqiushu.jpg
similarity index 100%
rename from image/card/spell_huoqiushu.jpg
rename to image/mode/stone/card/spell_huoqiushu.jpg
diff --git a/image/card/spell_huotigenxu.jpg b/image/mode/stone/card/spell_huotigenxu.jpg
similarity index 100%
rename from image/card/spell_huotigenxu.jpg
rename to image/mode/stone/card/spell_huotigenxu.jpg
diff --git a/image/card/spell_jianrenluanwu.jpg b/image/mode/stone/card/spell_jianrenluanwu.jpg
similarity index 100%
rename from image/card/spell_jianrenluanwu.jpg
rename to image/mode/stone/card/spell_jianrenluanwu.jpg
diff --git a/image/card/spell_jingshenkongzhi.jpg b/image/mode/stone/card/spell_jingshenkongzhi.jpg
similarity index 100%
rename from image/card/spell_jingshenkongzhi.jpg
rename to image/mode/stone/card/spell_jingshenkongzhi.jpg
diff --git a/image/card/spell_jingxiang.jpg b/image/mode/stone/card/spell_jingxiang.jpg
similarity index 100%
rename from image/card/spell_jingxiang.jpg
rename to image/mode/stone/card/spell_jingxiang.jpg
diff --git a/image/card/spell_jinyingduijue.jpg b/image/mode/stone/card/spell_jinyingduijue.jpg
similarity index 100%
rename from image/card/spell_jinyingduijue.jpg
rename to image/mode/stone/card/spell_jinyingduijue.jpg
diff --git a/image/card/spell_jipao.jpg b/image/mode/stone/card/spell_jipao.jpg
similarity index 100%
rename from image/card/spell_jipao.jpg
rename to image/mode/stone/card/spell_jipao.jpg
diff --git a/image/card/spell_juemingluandou.jpg b/image/mode/stone/card/spell_juemingluandou.jpg
similarity index 100%
rename from image/card/spell_juemingluandou.jpg
rename to image/mode/stone/card/spell_juemingluandou.jpg
diff --git a/image/card/spell_kongxinshu.jpg b/image/mode/stone/card/spell_kongxinshu.jpg
similarity index 100%
rename from image/card/spell_kongxinshu.jpg
rename to image/mode/stone/card/spell_kongxinshu.jpg
diff --git a/image/card/spell_kuaisusheji.jpg b/image/mode/stone/card/spell_kuaisusheji.jpg
similarity index 100%
rename from image/card/spell_kuaisusheji.jpg
rename to image/mode/stone/card/spell_kuaisusheji.jpg
diff --git a/image/card/spell_kuaisuzhiliao.jpg b/image/mode/stone/card/spell_kuaisuzhiliao.jpg
similarity index 100%
rename from image/card/spell_kuaisuzhiliao.jpg
rename to image/mode/stone/card/spell_kuaisuzhiliao.jpg
diff --git a/image/card/spell_kuangbao.jpg b/image/mode/stone/card/spell_kuangbao.jpg
similarity index 100%
rename from image/card/spell_kuangbao.jpg
rename to image/mode/stone/card/spell_kuangbao.jpg
diff --git a/image/card/spell_laojiuhuoba.jpg b/image/mode/stone/card/spell_laojiuhuoba.jpg
similarity index 100%
rename from image/card/spell_laojiuhuoba.jpg
rename to image/mode/stone/card/spell_laojiuhuoba.jpg
diff --git a/image/card/spell_lianhuanbaolie.jpg b/image/mode/stone/card/spell_lianhuanbaolie.jpg
similarity index 100%
rename from image/card/spell_lianhuanbaolie.jpg
rename to image/mode/stone/card/spell_lianhuanbaolie.jpg
diff --git a/image/card/spell_lierenyinji.jpg b/image/mode/stone/card/spell_lierenyinji.jpg
similarity index 100%
rename from image/card/spell_lierenyinji.jpg
rename to image/mode/stone/card/spell_lierenyinji.jpg
diff --git a/image/card/spell_lieyanfengbao.jpg b/image/mode/stone/card/spell_lieyanfengbao.jpg
similarity index 100%
rename from image/card/spell_lieyanfengbao.jpg
rename to image/mode/stone/card/spell_lieyanfengbao.jpg
diff --git a/image/card/spell_liliangdaijia.jpg b/image/mode/stone/card/spell_liliangdaijia.jpg
similarity index 100%
rename from image/card/spell_liliangdaijia.jpg
rename to image/mode/stone/card/spell_liliangdaijia.jpg
diff --git a/image/card/spell_liliangzhufu.jpg b/image/mode/stone/card/spell_liliangzhufu.jpg
similarity index 100%
rename from image/card/spell_liliangzhufu.jpg
rename to image/mode/stone/card/spell_liliangzhufu.jpg
diff --git a/image/card/spell_linghunhongxi.jpg b/image/mode/stone/card/spell_linghunhongxi.jpg
similarity index 100%
rename from image/card/spell_linghunhongxi.jpg
rename to image/mode/stone/card/spell_linghunhongxi.jpg
diff --git a/image/card/spell_maizang.jpg b/image/mode/stone/card/spell_maizang.jpg
similarity index 100%
rename from image/card/spell_maizang.jpg
rename to image/mode/stone/card/spell_maizang.jpg
diff --git a/image/card/spell_mengun.jpg b/image/mode/stone/card/spell_mengun.jpg
similarity index 100%
rename from image/card/spell_mengun.jpg
rename to image/mode/stone/card/spell_mengun.jpg
diff --git a/image/card/spell_modaoyou.jpg b/image/mode/stone/card/spell_modaoyou.jpg
similarity index 100%
rename from image/card/spell_modaoyou.jpg
rename to image/mode/stone/card/spell_modaoyou.jpg
diff --git a/image/card/spell_morizaihuo.jpg b/image/mode/stone/card/spell_morizaihuo.jpg
similarity index 100%
rename from image/card/spell_morizaihuo.jpg
rename to image/mode/stone/card/spell_morizaihuo.jpg
diff --git a/image/card/spell_naluzhiguang.jpg b/image/mode/stone/card/spell_naluzhiguang.jpg
similarity index 100%
rename from image/card/spell_naluzhiguang.jpg
rename to image/mode/stone/card/spell_naluzhiguang.jpg
diff --git a/image/card/spell_niuquxukong.jpg b/image/mode/stone/card/spell_niuquxukong.jpg
similarity index 100%
rename from image/card/spell_niuquxukong.jpg
rename to image/mode/stone/card/spell_niuquxukong.jpg
diff --git a/image/card/spell_nuhuozhongshao.jpg b/image/mode/stone/card/spell_nuhuozhongshao.jpg
similarity index 100%
rename from image/card/spell_nuhuozhongshao.jpg
rename to image/mode/stone/card/spell_nuhuozhongshao.jpg
diff --git a/image/card/spell_nuxi.jpg b/image/mode/stone/card/spell_nuxi.jpg
similarity index 100%
rename from image/card/spell_nuxi.jpg
rename to image/mode/stone/card/spell_nuxi.jpg
diff --git a/image/card/spell_piaoqie.jpg b/image/mode/stone/card/spell_piaoqie.jpg
similarity index 100%
rename from image/card/spell_piaoqie.jpg
rename to image/mode/stone/card/spell_piaoqie.jpg
diff --git a/image/card/spell_qiangfengsheji.jpg b/image/mode/stone/card/spell_qiangfengsheji.jpg
similarity index 100%
rename from image/card/spell_qiangfengsheji.jpg
rename to image/mode/stone/card/spell_qiangfengsheji.jpg
diff --git a/image/card/spell_rongyanbaolie.jpg b/image/mode/stone/card/spell_rongyanbaolie.jpg
similarity index 100%
rename from image/card/spell_rongyanbaolie.jpg
rename to image/mode/stone/card/spell_rongyanbaolie.jpg
diff --git a/image/card/spell_sanghunzhao.jpg b/image/mode/stone/card/spell_sanghunzhao.jpg
similarity index 100%
rename from image/card/spell_sanghunzhao.jpg
rename to image/mode/stone/card/spell_sanghunzhao.jpg
diff --git a/image/card/spell_shalumingling.jpg b/image/mode/stone/card/spell_shalumingling.jpg
similarity index 100%
rename from image/card/spell_shalumingling.jpg
rename to image/mode/stone/card/spell_shalumingling.jpg
diff --git a/image/card/spell_shandianfengbao.jpg b/image/mode/stone/card/spell_shandianfengbao.jpg
similarity index 100%
rename from image/card/spell_shandianfengbao.jpg
rename to image/mode/stone/card/spell_shandianfengbao.jpg
diff --git a/image/card/spell_shengerpingdeng.jpg b/image/mode/stone/card/spell_shengerpingdeng.jpg
similarity index 100%
rename from image/card/spell_shengerpingdeng.jpg
rename to image/mode/stone/card/spell_shengerpingdeng.jpg
diff --git a/image/card/spell_shengguangzhadan.jpg b/image/mode/stone/card/spell_shengguangzhadan.jpg
similarity index 100%
rename from image/card/spell_shengguangzhadan.jpg
rename to image/mode/stone/card/spell_shengguangzhadan.jpg
diff --git a/image/card/spell_shengliaoshu.jpg b/image/mode/stone/card/spell_shengliaoshu.jpg
similarity index 100%
rename from image/card/spell_shengliaoshu.jpg
rename to image/mode/stone/card/spell_shengliaoshu.jpg
diff --git a/image/card/spell_shenpan.jpg b/image/mode/stone/card/spell_shenpan.jpg
similarity index 100%
rename from image/card/spell_shenpan.jpg
rename to image/mode/stone/card/spell_shenpan.jpg
diff --git a/image/card/spell_shenshengfennu.jpg b/image/mode/stone/card/spell_shenshengfennu.jpg
similarity index 100%
rename from image/card/spell_shenshengfennu.jpg
rename to image/mode/stone/card/spell_shenshengfennu.jpg
diff --git a/image/card/spell_shenshengxinxing.jpg b/image/mode/stone/card/spell_shenshengxinxing.jpg
similarity index 100%
rename from image/card/spell_shenshengxinxing.jpg
rename to image/mode/stone/card/spell_shenshengxinxing.jpg
diff --git a/image/card/spell_shihuawuqi.jpg b/image/mode/stone/card/spell_shihuawuqi.jpg
similarity index 100%
rename from image/card/spell_shihuawuqi.jpg
rename to image/mode/stone/card/spell_shihuawuqi.jpg
diff --git a/image/card/spell_shixue.jpg b/image/mode/stone/card/spell_shixue.jpg
similarity index 100%
rename from image/card/spell_shixue.jpg
rename to image/mode/stone/card/spell_shixue.jpg
diff --git a/image/card/spell_sijidaifa.jpg b/image/mode/stone/card/spell_sijidaifa.jpg
similarity index 100%
rename from image/card/spell_sijidaifa.jpg
rename to image/mode/stone/card/spell_sijidaifa.jpg
diff --git a/image/card/spell_siwangchanrao.jpg b/image/mode/stone/card/spell_siwangchanrao.jpg
similarity index 100%
rename from image/card/spell_siwangchanrao.jpg
rename to image/mode/stone/card/spell_siwangchanrao.jpg
diff --git a/image/card/spell_tanxianmao.jpg b/image/mode/stone/card/spell_tanxianmao.jpg
similarity index 100%
rename from image/card/spell_tanxianmao.jpg
rename to image/mode/stone/card/spell_tanxianmao.jpg
diff --git a/image/card/spell_tianjiangzhuqun.jpg b/image/mode/stone/card/spell_tianjiangzhuqun.jpg
similarity index 100%
rename from image/card/spell_tianjiangzhuqun.jpg
rename to image/mode/stone/card/spell_tianjiangzhuqun.jpg
diff --git a/image/card/spell_wangzhezhufu.jpg b/image/mode/stone/card/spell_wangzhezhufu.jpg
similarity index 100%
rename from image/card/spell_wangzhezhufu.jpg
rename to image/mode/stone/card/spell_wangzhezhufu.jpg
diff --git a/image/card/spell_weijisifu.jpg b/image/mode/stone/card/spell_weijisifu.jpg
similarity index 100%
rename from image/card/spell_weijisifu.jpg
rename to image/mode/stone/card/spell_weijisifu.jpg
diff --git a/image/card/spell_wuyashenxiang.jpg b/image/mode/stone/card/spell_wuyashenxiang.jpg
similarity index 100%
rename from image/card/spell_wuyashenxiang.jpg
rename to image/mode/stone/card/spell_wuyashenxiang.jpg
diff --git a/image/card/spell_xianzuzhaohuan.jpg b/image/mode/stone/card/spell_xianzuzhaohuan.jpg
similarity index 100%
rename from image/card/spell_xianzuzhaohuan.jpg
rename to image/mode/stone/card/spell_xianzuzhaohuan.jpg
diff --git a/image/card/spell_xianzuzhihun.jpg b/image/mode/stone/card/spell_xianzuzhihun.jpg
similarity index 100%
rename from image/card/spell_xianzuzhihun.jpg
rename to image/mode/stone/card/spell_xianzuzhihun.jpg
diff --git a/image/card/spell_xianzuzhiliao.jpg b/image/mode/stone/card/spell_xianzuzhiliao.jpg
similarity index 100%
rename from image/card/spell_xianzuzhiliao.jpg
rename to image/mode/stone/card/spell_xianzuzhiliao.jpg
diff --git a/image/card/spell_xianzuzhishi.jpg b/image/mode/stone/card/spell_xianzuzhishi.jpg
similarity index 100%
rename from image/card/spell_xianzuzhishi.jpg
rename to image/mode/stone/card/spell_xianzuzhishi.jpg
diff --git a/image/card/spell_xiaoguibaopo.jpg b/image/mode/stone/card/spell_xiaoguibaopo.jpg
similarity index 100%
rename from image/card/spell_xiaoguibaopo.jpg
rename to image/mode/stone/card/spell_xiaoguibaopo.jpg
diff --git a/image/card/spell_xiaoshi.jpg b/image/mode/stone/card/spell_xiaoshi.jpg
similarity index 100%
rename from image/card/spell_xiaoshi.jpg
rename to image/mode/stone/card/spell_xiaoshi.jpg
diff --git a/image/card/spell_xingchenzhuiluo.jpg b/image/mode/stone/card/spell_xingchenzhuiluo.jpg
similarity index 100%
rename from image/card/spell_xingchenzhuiluo.jpg
rename to image/mode/stone/card/spell_xingchenzhuiluo.jpg
diff --git a/image/card/spell_xinlinghanbao.jpg b/image/mode/stone/card/spell_xinlinghanbao.jpg
similarity index 100%
rename from image/card/spell_xinlinghanbao.jpg
rename to image/mode/stone/card/spell_xinlinghanbao.jpg
diff --git a/image/card/spell_xinlingshijie.jpg b/image/mode/stone/card/spell_xinlingshijie.jpg
similarity index 100%
rename from image/card/spell_xinlingshijie.jpg
rename to image/mode/stone/card/spell_xinlingshijie.jpg
diff --git a/image/card/spell_xishengqiyue.jpg b/image/mode/stone/card/spell_xishengqiyue.jpg
similarity index 100%
rename from image/card/spell_xishengqiyue.jpg
rename to image/mode/stone/card/spell_xishengqiyue.jpg
diff --git a/image/card/spell_xuanfengzhan.jpg b/image/mode/stone/card/spell_xuanfengzhan.jpg
similarity index 100%
rename from image/card/spell_xuanfengzhan.jpg
rename to image/mode/stone/card/spell_xuanfengzhan.jpg
diff --git a/image/card/spell_yanbaoshu.jpg b/image/mode/stone/card/spell_yanbaoshu.jpg
similarity index 100%
rename from image/card/spell_yanbaoshu.jpg
rename to image/mode/stone/card/spell_yanbaoshu.jpg
diff --git a/image/card/spell_yanmie.jpg b/image/mode/stone/card/spell_yanmie.jpg
similarity index 100%
rename from image/card/spell_yanmie.jpg
rename to image/mode/stone/card/spell_yanmie.jpg
diff --git a/image/card/spell_yaoshu.jpg b/image/mode/stone/card/spell_yaoshu.jpg
similarity index 100%
rename from image/card/spell_yaoshu.jpg
rename to image/mode/stone/card/spell_yaoshu.jpg
diff --git a/image/card/spell_yemanpaoxiao.jpg b/image/mode/stone/card/spell_yemanpaoxiao.jpg
similarity index 100%
rename from image/card/spell_yemanpaoxiao.jpg
rename to image/mode/stone/card/spell_yemanpaoxiao.jpg
diff --git a/image/card/spell_yexingchengzhang.jpg b/image/mode/stone/card/spell_yexingchengzhang.jpg
similarity index 100%
rename from image/card/spell_yexingchengzhang.jpg
rename to image/mode/stone/card/spell_yexingchengzhang.jpg
diff --git a/image/card/spell_yexinglanghun.jpg b/image/mode/stone/card/spell_yexinglanghun.jpg
similarity index 100%
rename from image/card/spell_yexinglanghun.jpg
rename to image/mode/stone/card/spell_yexinglanghun.jpg
diff --git a/image/card/spell_yingyongdaji.jpg b/image/mode/stone/card/spell_yingyongdaji.jpg
similarity index 100%
rename from image/card/spell_yingyongdaji.jpg
rename to image/mode/stone/card/spell_yingyongdaji.jpg
diff --git a/image/card/spell_yongshizhufu.jpg b/image/mode/stone/card/spell_yongshizhufu.jpg
similarity index 100%
rename from image/card/spell_yongshizhufu.jpg
rename to image/mode/stone/card/spell_yongshizhufu.jpg
diff --git a/image/card/spell_zhandounuhuo.jpg b/image/mode/stone/card/spell_zhandounuhuo.jpg
similarity index 100%
rename from image/card/spell_zhandounuhuo.jpg
rename to image/mode/stone/card/spell_zhandounuhuo.jpg
diff --git a/image/card/spell_zhansha.jpg b/image/mode/stone/card/spell_zhansha.jpg
similarity index 100%
rename from image/card/spell_zhansha.jpg
rename to image/mode/stone/card/spell_zhansha.jpg
diff --git a/image/card/spell_zhaohuanchongwu.jpg b/image/mode/stone/card/spell_zhaohuanchongwu.jpg
similarity index 100%
rename from image/card/spell_zhaohuanchongwu.jpg
rename to image/mode/stone/card/spell_zhaohuanchongwu.jpg
diff --git a/image/card/spell_zhengqianghaosheng.jpg b/image/mode/stone/card/spell_zhengqianghaosheng.jpg
similarity index 100%
rename from image/card/spell_zhengqianghaosheng.jpg
rename to image/mode/stone/card/spell_zhengqianghaosheng.jpg
diff --git a/image/card/spell_zhenyanshu.jpg b/image/mode/stone/card/spell_zhenyanshu.jpg
similarity index 100%
rename from image/card/spell_zhenyanshu.jpg
rename to image/mode/stone/card/spell_zhenyanshu.jpg
diff --git a/image/card/spell_zhihuizhufu.jpg b/image/mode/stone/card/spell_zhihuizhufu.jpg
similarity index 100%
rename from image/card/spell_zhihuizhufu.jpg
rename to image/mode/stone/card/spell_zhihuizhufu.jpg
diff --git a/image/card/spell_zhiliaoshui.jpg b/image/mode/stone/card/spell_zhiliaoshui.jpg
similarity index 100%
rename from image/card/spell_zhiliaoshui.jpg
rename to image/mode/stone/card/spell_zhiliaoshui.jpg
diff --git a/image/card/spell_zhiliaozhichu.jpg b/image/mode/stone/card/spell_zhiliaozhichu.jpg
similarity index 100%
rename from image/card/spell_zhiliaozhichu.jpg
rename to image/mode/stone/card/spell_zhiliaozhichu.jpg
diff --git a/image/card/spell_zhiliaozhihuan.jpg b/image/mode/stone/card/spell_zhiliaozhihuan.jpg
similarity index 100%
rename from image/card/spell_zhiliaozhihuan.jpg
rename to image/mode/stone/card/spell_zhiliaozhihuan.jpg
diff --git a/image/card/spell_zhongnian.jpg b/image/mode/stone/card/spell_zhongnian.jpg
similarity index 100%
rename from image/card/spell_zhongnian.jpg
rename to image/mode/stone/card/spell_zhongnian.jpg
diff --git a/image/card/spell_zhuizongshu.jpg b/image/mode/stone/card/spell_zhuizongshu.jpg
similarity index 100%
rename from image/card/spell_zhuizongshu.jpg
rename to image/mode/stone/card/spell_zhuizongshu.jpg
diff --git a/image/card/spell_zhumo.jpg b/image/mode/stone/card/spell_zhumo.jpg
similarity index 100%
rename from image/card/spell_zhumo.jpg
rename to image/mode/stone/card/spell_zhumo.jpg
diff --git a/image/card/spell_zidanshangtang.jpg b/image/mode/stone/card/spell_zidanshangtang.jpg
similarity index 100%
rename from image/card/spell_zidanshangtang.jpg
rename to image/mode/stone/card/spell_zidanshangtang.jpg
diff --git a/image/card/spell_ziranzhili.jpg b/image/mode/stone/card/spell_ziranzhili.jpg
similarity index 100%
rename from image/card/spell_ziranzhili.jpg
rename to image/mode/stone/card/spell_ziranzhili.jpg
diff --git a/image/card/spell_ziyang.jpg b/image/mode/stone/card/spell_ziyang.jpg
similarity index 100%
rename from image/card/spell_ziyang.jpg
rename to image/mode/stone/card/spell_ziyang.jpg
diff --git a/image/card/spell_zuozhandongyuan.jpg b/image/mode/stone/card/spell_zuozhandongyuan.jpg
similarity index 100%
rename from image/card/spell_zuozhandongyuan.jpg
rename to image/mode/stone/card/spell_zuozhandongyuan.jpg
diff --git a/image/card/spell_zuzhou.jpg b/image/mode/stone/card/spell_zuzhou.jpg
similarity index 100%
rename from image/card/spell_zuzhou.jpg
rename to image/mode/stone/card/spell_zuzhou.jpg
diff --git a/mode/chess.js b/mode/chess.js
index 5b7729fc9..430ddf65f 100644
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -37,13 +37,13 @@ mode.chess={
 				}
 			}
 		}
-		if(get.config('chess_card')){
-			lib.card.list=lib.card.list.concat(lib.chess_cardlist);
-			if(parseFloat(get.config('chess_obstacle'))>0){
-				lib.card.list=lib.card.list.concat(lib.chess_obstaclelist);
-				delete lib.chess_obstaclelist
-			}
-		}
+		// if(get.config('chess_card')){
+		// 	lib.card.list=lib.card.list.concat(lib.chess_cardlist);
+		// 	if(parseFloat(get.config('chess_obstacle'))>0){
+		// 		lib.card.list=lib.card.list.concat(lib.chess_obstaclelist);
+		// 		delete lib.chess_obstaclelist
+		// 	}
+		// }
 		ui.create.cards();
 		game.finishCards();
 		ui.chessContainer=ui.create.div('#chess-container',ui.arena);
@@ -5438,19 +5438,19 @@ mode.chess={
 			color:'white',
 			opacity:1,
 			textShadow:'black 0 0 2px',
-			image:'mode/chess/leader_easy'
+			image:'mode/chess/difficulty/leader_easy'
 		},
 		leader_medium:{
 			color:'white',
 			opacity:1,
 			textShadow:'black 0 0 2px',
-			image:'mode/chess/leader_medium'
+			image:'mode/chess/difficulty/leader_medium'
 		},
 		leader_hard:{
 			color:'white',
 			opacity:1,
 			textShadow:'black 0 0 2px',
-			image:'mode/chess/leader_hard'
+			image:'mode/chess/difficulty/leader_hard'
 		}
 	},
 	characterPack:{
@@ -5499,9 +5499,9 @@ mode.chess={
 			chess_xingtian:['male','qun',99,['boss_moyan','wushuang'],['boss','chessboss']],
 		}
 	},
-	cardPack:{
-		mode_chess:['chess_shezhang','chess_chuzhang']
-	},
+	// cardPack:{
+	// 	mode_chess:['chess_shezhang','chess_chuzhang']
+	// },
 	chess_cardlist:[],
 	chess_obstaclelist:[
 		// ['club',3,'chess_shezhang'],
diff --git a/mode/stone.js b/mode/stone.js
index 52a6c99dc..01b5dff29 100644
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -1067,7 +1067,7 @@ mode.stone={
 			'spell_xianzuzhihun','spell_xianzuzhaohuan','spell_fengnu','spell_shihuawuqi','spell_xianzuzhishi','spell_rongyanbaolie',
 			'spell_laojiuhuoba','spell_chirehuoba','spell_aoshufeidan','spell_canying','spell_yanbaoshu','spell_hanbingpingzhang','spell_jingxiang',
 			'spell_mengun','spell_jipao','spell_beici','spell_weijisifu','spell_anzhongpohuai','spell_piaoqie',
-			'spell_conglinzhihun','spell_heiandiyu','spell_fugen','spell_xingchenzhuiluo','spell_fengnu','spell_ziyang',
+			'spell_conglinzhihun','spell_heiandiyu','spell_fugen','spell_xingchenzhuiluo','spell_fennu','spell_ziyang',
 			'spell_shalumingling','spell_tianjiangzhuqun','spell_tanxianmao','spell_dubiao','spell_qiangfengsheji','spell_zhuizongshu',
 			'spell_zhenyanshu','spell_enzeshu','spell_anyingxingtai','spell_kuaisuzhiliao','spell_kongxinshu','spell_xinlinghanbao',
 			'spell_jinyingduijue','spell_zhihuizhufu','spell_shenshengfennu','spell_yongshizhufu','spell_shenpan','spell_zhengqianghaosheng',