From 588920ae419fd2feb48ea0a2cd4c10585387d214 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sat, 30 Jul 2016 23:08:21 +0800
Subject: [PATCH] u

---
 card/swd.js         |  5 +++++
 character/hearth.js |  4 ++--
 character/rank.js   | 10 ++++++++--
 character/swd.js    |  1 -
 game/update.js      |  1 +
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index b75fd0724..7ad60d425 100755
--- a/card/swd.js
+++ b/card/swd.js
@@ -2601,6 +2601,11 @@ card.swd={
 				return name;
 			},
 			selectCard:function(){
+				if(ui.selected.cards.length==2&&
+					get.type(ui.selected.cards[0])=='hslingjian'&&
+					get.type(ui.selected.cards[1])=='hslingjian'){
+					return [3,3];
+				}
 				if(_status.event.player.hasSkill('mujiaren_skill')) return [2,3];
 				return 2;
 			},
diff --git a/character/hearth.js b/character/hearth.js
index 732eeb40a..c57e38137 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -581,7 +581,7 @@ character.hearth={
 			trigger:{player:'equipEnd'},
 			frequent:true,
 			filter:function(event){
-				return get.subtype(event.card)=='equip1'&&typeof lib.cardType.hslingjian=='number';
+				return lib.inpile.contains(event.card.name)&&get.subtype(event.card)=='equip1'&&typeof lib.cardType.hslingjian=='number';
 			},
 			content:function(){
 				var num=1;
@@ -4584,7 +4584,7 @@ character.hearth={
 		zengli:'赠礼',
 		zengli_info:'出牌阶段限一次，你指定一名其他角色与你各装备一把武器',
 		xiubu:'修补',
-		xiubu_info:'每当你装备一把武器，你可以获得数量等同于武器攻击范围的随机零件',
+		xiubu_info:'每当你装备一把未强化的武器，你可以获得数量等同于武器攻击范围的随机零件',
 		mobao:'魔爆',
 		mobao_info:'出牌阶段限一次，你可以弃置至多三张黑色牌，然后对所有于上轮对你造成过伤害的角色造成等同于你弃牌数的雷电伤害',
 		xianji:'献祭',
diff --git a/character/rank.js b/character/rank.js
index cff5ffa59..61d8ea45d 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -8,6 +8,8 @@ window.characterRank={
         'swd_duguningke',
         'swd_guyue',
         'swd_murongshi',
+        'swd_cheyun',
+        'swd_huanyuanzhi',
         'swd_tuobayuer',
         'swd_yuxiaoxue',
         'gjqt_bailitusu',
@@ -16,13 +18,13 @@ window.characterRank={
         'pal_liumengli',
     ],
     ap:[
+        'ow_dva',
+        'ow_mei',
         'ow_yuanshi',
         'swd_xuanyuanjianxian',
         'swd_yuwentuo',
         'pal_xuanxiao',
         'xk_fujianhan',
-        'swd_cheyun',
-        'swd_huanyuanzhi',
         'swd_jipeng',
         'lusu',
         'yuanshu',
@@ -113,6 +115,10 @@ window.characterRank={
         'ow_tianshi',
         'ow_shibing',
         'ow_liekong',
+        'ow_ana',
+        'ow_heibaihe',
+        'ow_maikelei',
+        'ow_kuangshu',
     ],
     am:[
         'guohuanghou',
diff --git a/character/swd.js b/character/swd.js
index ce1444b60..2ef44f4cb 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -4155,7 +4155,6 @@ character.swd={
 				expose:0.2
 			}
 		},
-
 		chuanyang:{
 			trigger:{player:'shaBegin'},
 			check:function(event,player){
diff --git a/game/update.js b/game/update.js
index 59efb0423..a39038b99 100644
--- a/game/update.js
+++ b/game/update.js
@@ -13,6 +13,7 @@ window.noname_update={
             'character/sp.js',
             'character/shenhua.js',
             'character/yxs.js',
+            'character/rank.js',
             'card/swd.js',
             'card/hearth.js',
             'layout/default/menu.css',