diff --git a/card/swd.js b/card/swd.js
index ec94d3dc5..51aaa61bc 100755
--- a/card/swd.js
+++ b/card/swd.js
@@ -1,5 +1,86 @@
 card.swd={
 	card:{
+		lingjiandai:{
+			fullskin:true,
+			enable:true,
+			type:'basic',
+			range:{global:1},
+			filterTarget:true,
+			content:function(){
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].type=='hslingjian'){
+						list.push(i);
+					}
+				}
+				if(list.length){
+					list=list.randomGets(3);
+					for(var i=0;i<list.length;i++){
+						list[i]=game.createCard(list[i]);
+					}
+				}
+				target.gain(list,'gain2');
+			},
+			ai:{
+				result:{
+					target:1
+				}
+			}
+		},
+		jiguanshu:{
+			fullskin:true,
+			enable:true,
+			type:'basic',
+			range:{global:1},
+			filterTarget:true,
+			content:function(){
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].type=='hslingjian'){
+						list.push(i);
+					}
+				}
+				if(list.length){
+					list=list.randomGets(3);
+					for(var i=0;i<list.length;i++){
+						list[i]=game.createCard(list[i]);
+					}
+				}
+				target.gain(list,'gain2');
+			},
+			ai:{
+				result:{
+					target:1
+				}
+			}
+		},
+		mujiaren:{
+			fullskin:true,
+			enable:true,
+			type:'basic',
+			range:{global:1},
+			filterTarget:true,
+			content:function(){
+				var list=[];
+				for(var i in lib.card){
+					if(lib.card[i].type=='hslingjian'){
+						list.push(i);
+					}
+				}
+				if(list.length){
+					list=list.randomGets(3);
+					for(var i=0;i<list.length;i++){
+						list[i]=game.createCard(list[i]);
+					}
+				}
+				target.gain(list,'gain2');
+			},
+			ai:{
+				result:{
+					target:1
+				}
+			}
+		},
 		xingjunyan:{
 			fullskin:true,
 			type:'equip',
@@ -638,6 +719,34 @@ card.swd={
 		},
 	},
 	skill:{
+		mujiaren:{},
+		_lingjianduanzao:{
+			enable:'phaseUse',
+			check:function(card){
+				return 1+ai.get.value(card);
+			},
+			lose:true,
+			discard:false,
+			process:function(cards){
+
+			},
+			selectCard:2,
+			filter:function(event,player){
+				return player.num('h',{type:'equip'})&&player.num('h',{type:'hslingjian'});
+			},
+			prepare:function(cards,player){
+				player.$throw(cards);
+			},
+			content:function(){
+
+			},
+			ai:{
+				result:{
+					player:1,
+					order:10,
+				}
+			}
+		},
 		qinglonglingzhu:{
 			trigger:{source:'damageEnd'},
 			direct:true,
@@ -1125,13 +1234,70 @@ card.swd={
 		},
 	},
 	translate:{
+		hslingjian_xuanfengzhiren_duanzao:'旋风',
+		hslingjian_xuanfengzhiren_duanzao2:'风',
+		hslingjian_xuanfengzhiren_equip1:'随机弃置一名角色的一张牌',
+		hslingjian_xuanfengzhiren_equip2:'随机弃置一名角色的一张牌',
+		hslingjian_xuanfengzhiren_equip3:'随机弃置一名角色的一张牌',
+		hslingjian_xuanfengzhiren_equip4:'随机弃置一名角色的一张牌',
+		hslingjian_xuanfengzhiren_equip5:'随机弃置一名角色的一张牌',
+		hslingjian_zhongxinghujia_duanzao:'重甲',
+		hslingjian_zhongxinghujia_duanzao2:'护',
+		hslingjian_zhongxinghujia_equip1:'令一名角色装备一件随机防具，然后随机弃置其一张手牌',
+		hslingjian_zhongxinghujia_equip2:'令一名角色装备一件随机防具，然后随机弃置其一张手牌',
+		hslingjian_zhongxinghujia_equip3:'令一名角色装备一件随机防具，然后随机弃置其一张手牌',
+		hslingjian_zhongxinghujia_equip4:'令一名角色装备一件随机防具，然后随机弃置其一张手牌',
+		hslingjian_zhongxinghujia_equip5:'令一名角色装备一件随机防具，然后随机弃置其一张手牌',
+		hslingjian_jinjilengdong_duanzao:'冷冻',
+		hslingjian_jinjilengdong_duanzao2:'冰',
+		hslingjian_jinjilengdong_equip1:'令一名武将牌正面朝上的其他角色摸两张牌并翻面',
+		hslingjian_jinjilengdong_equip2:'令一名武将牌正面朝上的其他角色摸两张牌并翻面',
+		hslingjian_jinjilengdong_equip3:'令一名武将牌正面朝上的其他角色摸两张牌并翻面',
+		hslingjian_jinjilengdong_equip4:'令一名武将牌正面朝上的其他角色摸两张牌并翻面',
+		hslingjian_jinjilengdong_equip5:'令一名武将牌正面朝上的其他角色摸两张牌并翻面',
+		hslingjian_yinmilichang_duanzao:'隐秘',
+		hslingjian_yinmilichang_duanzao2:'隐秘',
+		hslingjian_yinmilichang_equip1:'令一名其他角色获得技能潜行，直到其下一回合开始',
+		hslingjian_yinmilichang_equip2:'令一名其他角色获得技能潜行，直到其下一回合开始',
+		hslingjian_yinmilichang_equip3:'令一名其他角色获得技能潜行，直到其下一回合开始',
+		hslingjian_yinmilichang_equip4:'令一名其他角色获得技能潜行，直到其下一回合开始',
+		hslingjian_yinmilichang_equip5:'令一名其他角色获得技能潜行，直到其下一回合开始',
+		hslingjian_xingtigaizao_duanzao:'移形',
+		hslingjian_xingtigaizao_duanzao2:'形',
+		hslingjian_xingtigaizao_equip1:'摸一张牌，本回合手牌上限-1',
+		hslingjian_xingtigaizao_equip2:'摸一张牌，本回合手牌上限-1',
+		hslingjian_xingtigaizao_equip3:'摸一张牌，本回合手牌上限-1',
+		hslingjian_xingtigaizao_equip4:'摸一张牌，本回合手牌上限-1',
+		hslingjian_xingtigaizao_equip5:'摸一张牌，本回合手牌上限-1',
+		hslingjian_shengxiuhaojiao_duanzao:'号角',
+		hslingjian_shengxiuhaojiao_duanzao2:'角',
+		hslingjian_shengxiuhaojiao_equip1:'令一名角色获得技能嘲讽，直到其下一回合开始',
+		hslingjian_shengxiuhaojiao_equip2:'令一名角色获得技能嘲讽，直到其下一回合开始',
+		hslingjian_shengxiuhaojiao_equip3:'令一名角色获得技能嘲讽，直到其下一回合开始',
+		hslingjian_shengxiuhaojiao_equip4:'令一名角色获得技能嘲讽，直到其下一回合开始',
+		hslingjian_shengxiuhaojiao_equip5:'令一名角色获得技能嘲讽，直到其下一回合开始',
+		hslingjian_shijianhuisu_duanzao:'回溯',
+		hslingjian_shijianhuisu_duanzao2:'溯',
+		hslingjian_shijianhuisu_equip1:'令一名其他角色将其装备牌收回手牌',
+		hslingjian_shijianhuisu_equip2:'令一名其他角色将其装备牌收回手牌',
+		hslingjian_shijianhuisu_equip3:'令一名其他角色将其装备牌收回手牌',
+		hslingjian_shijianhuisu_equip4:'令一名其他角色将其装备牌收回手牌',
+		hslingjian_shijianhuisu_equip5:'令一名其他角色将其装备牌收回手牌',
+		_lingjianduanzao:'煅造',
+		_lingjianduanzao_info:'出牌阶段，你可以选择手牌中的一张零件牌和一张装备牌，将它们合成为一件强化装备，并装备给距离1以内的一名角色',
+		jiguanshu:'机关鼠',
+		jiguanshu_info:'出牌阶段对距离1以内的一名角色使用，用随机零件强化目标装备区内的装备',
+		lingjiandai:'零件袋',
+		lingjiandai_info:'出牌阶段对距离1以内的一名角色使用，目标获得3张随机零件',
+		mujiaren:'木甲人',
+		mujiaren_info:'出牌阶段对距离1以内的一名角色使用，在本局游戏中，目标在煅造装备时可以额外加入一个零件',
 		qinglonglingzhu:'青龙灵珠',
 		qinglonglingzhu_info:'每当你造成一次属性伤害，你可以获得对方的一张牌',
 		xingjunyan:'星君眼',
 		xingjunyan_info:'你的杀造成的伤害+1；杀对你造成的伤害+1',
 		guiyanfadao:'鬼眼法刀',
 		guiyanfadao_bg:'眼',
-		// guiyanfadao_info:'你可以将一张普通杀当毒杀使用',
+		// guiyanfadao_info:'每当你使用杀命中目标，你可以防止伤害，改为令目标失去一点体力',
 		tianxianjiu:'天仙酒',
 		tianxianjiu_bg:'仙',
 		tianxianjiu_info:'出牌阶段对自己使用，你使用的下一张杀造成伤害后可以摸两张牌',
@@ -1278,5 +1444,20 @@ card.swd={
 		// ['diamond',13,'guangshatianyi'],
 		['club',13,'sadengjinhuan'],
 		//['spade',6,'xiangyuye','poison'],
+
+		['club',1,'lingjiandai'],
+		['spade',1,'lingjiandai'],
+		['heart',1,'lingjiandai'],
+		['diamond',1,'lingjiandai'],
+
+		['club',2,'jiguanshu'],
+		['spade',2,'jiguanshu'],
+		['heart',2,'jiguanshu'],
+		['diamond',2,'jiguanshu'],
+
+		['club',3,'mujiaren'],
+		['spade',3,'mujiaren'],
+		['heart',3,'mujiaren'],
+		['diamond',3,'mujiaren'],
 	],
 }
diff --git a/game/asset.js b/game/asset.js
index 5f9704440..08e135c6e 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -71,6 +71,7 @@ window.noname_asset_list=[
     'image/card/huxinjing.png',
     'image/card/jiedao.png',
     'image/card/jihuocard.png',
+    'image/card/jiguanshu.png',
     'image/card/jingfanma.png',
     'image/card/jingleishan.png',
     'image/card/jiu.png',
@@ -83,9 +84,11 @@ window.noname_asset_list=[
     'image/card/lianyaohu.png',
     'image/card/lianjunshengyan.png',
     'image/card/linghunzhihuo.png',
+    'image/card/lingjiandai.png',
     'image/card/liuxinghuoyu.png',
     'image/card/lulitongxin.png',
     'image/card/muniu.png',
+    'image/card/mujiaren.png',
     'image/card/nanman.png',
     'image/card/nvwashi.png',
     'image/card/pangufu.png',
diff --git a/game/update.js b/game/update.js
index 90f4c962a..1f84be02e 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,37 +1,16 @@
 window.noname_update={
-    version:'1.8.16.3',
+    version:'1.8.17',
     changeLog:[
         '修bug',
     ],
     files:{
         global:[
-            'character/hearth.js',
-            'character/ow.js',
-            'character/swd.js',
-            'character/shenhua.js',
-            'character/yijiang.js',
-            'character/sp.js',
-            'character/xianjian.js',
-            'character/refresh.js',
-            'character/gujian.js',
-            'character/standard.js',
-            'card/swd.js',
-            'card/guozhan.js',
-            'card/yunchou.js',
-            'card/shenqi.js',
-            'card/hearth.js',
-            'card/mingzhong.js',
-            'card/standard.js',
-            'card/refresh.js',
             'game/game.js',
-            'game/config.js',
-            'mode/stone.js',
+            'game/asset.js',
+            'card/swd.js',
             'layout/default/layout.css',
-            'layout/mobile/layout.css',
-            'layout/newlayout/global.css',
-            'layout/mode/chess.css',
+            'theme/woodden/style.css',
         ],
-        '1.8.16.1':[],
-        '1.8.16.2':[]
+        '1.8.16.3':[]
     }
 }
diff --git a/image/card/jiguanshu.png b/image/card/jiguanshu.png
new file mode 100644
index 000000000..c79bf4856
Binary files /dev/null and b/image/card/jiguanshu.png differ
diff --git a/image/card/lingjiandai.png b/image/card/lingjiandai.png
new file mode 100644
index 000000000..cad951bdd
Binary files /dev/null and b/image/card/lingjiandai.png differ
diff --git a/image/card/mujiaren.png b/image/card/mujiaren.png
new file mode 100644
index 000000000..472304a3b
Binary files /dev/null and b/image/card/mujiaren.png differ
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 93a54ae38..c0b81d9bf 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -1510,6 +1510,29 @@ span[data-color="unknownm"]{
 	color:#631515;
 	border:1px solid #631515;
 }
+.card.fullskin.poison>.name{
+	color:#631515;
+	border:1px solid #631515;
+}
+.card.fullskin.epic>.name{
+	color: white;
+    background: rgba(0, 66, 165, 0.6);
+    border: 1px solid rgba(0, 66, 165, 1);
+    box-shadow: rgba(0,0,0,0.4) 0 0 10px inset;
+}
+.card.fullskin.epic>.name2{
+	color: rgb(117,186,255);
+}
+.card.fullskin.legend>.name{
+	color: white;
+    background: rgba(106, 27, 154, 0.6);
+    border: 1px solid rgba(106, 27, 154, 1);
+    box-shadow: rgba(0,0,0,0.4) 0 0 10px inset;
+}
+.card.fullskin.legend>.name2{
+	color: rgb(233, 131, 255);
+	/*color: rgb(117,186,0);*/
+}
 /*.card.fullskin.fire>.image{
 	-webkit-filter:saturate(2);
 }*/
diff --git a/theme/woodden/style.css b/theme/woodden/style.css
index c72c76495..1f601f6bd 100755
--- a/theme/woodden/style.css
+++ b/theme/woodden/style.css
@@ -157,6 +157,13 @@ html{
 	color:rgb(77, 60, 51);
 	text-shadow:none;
 }
+.card.fullskin.epic>.name2{
+	color: rgba(0, 66, 165, 1);
+}
+.card.fullskin.legend>.name2{
+	color: rgba(106, 27, 154, 1);
+	/*color: rgb(117,186,0);*/
+}
 .bordered{
 	border:1px solid rgba(255, 255, 255,0.5);
 }