From 001fb1550e35759d7edcf350e3458b219ab451b3 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sat, 18 Feb 2017 22:00:35 +0800
Subject: [PATCH] r

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

diff --git a/card/gujian.js b/card/gujian.js
index 4dabd5ceb..0b447db85 100644
--- a/card/gujian.js
+++ b/card/gujian.js
@@ -1532,6 +1532,7 @@ card.gujian={
 			trigger:{global:'phaseUseBegin'},
 			direct:true,
 			filter:function(event,player){
+                if(event.player.hasSkill('shihuifen')) return false;
 				if(event.player==player) return false;
 				if(!lib.filter.targetEnabled({name:'shihuifen'},player,event.player)) return false;
 				return player.hasCard('shihuifen');
diff --git a/character/hearth.js b/character/hearth.js
index 4ccda931d..522f80813 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -159,7 +159,7 @@ character.hearth={
 			},
 			content:function(){
 				'step 0'
-				player.chooseCard('he',true,'交给'+player.storage.fuhua2+'一张牌');
+				player.chooseCard('he',true,'交给'+get.translation(player.storage.fuhua2)+'一张牌');
 				'step 1'
 				if(result.bool){
 					player.storage.fuhua2.gain(result.cards,player);
@@ -5896,7 +5896,7 @@ character.hearth={
 		lianjin:'炼金',
 		lianjin_info:'出牌阶段限两次，你可以将一张手牌永久转化为一张由三张随机牌组成的药水',
 		shouji:'收集',
-		shouji_info:'每回合限发动一次，每当你使用一张杀，你可以获得一张目标随机手牌的复制；每当你的杀被闪避，你可以获得一张目标随机装备牌的复制',
+		shouji_info:'每当你使用一张杀，你可以获得一张目标随机手牌的复制；每当你的杀被闪避，你可以获得一张目标随机装备牌的复制；每回合限各限一次',
 		guimou:'鬼谋',
 		guimou_info:'每当你受到一次伤害，你可以获得伤害来源的一张手牌，若此牌是黑色，你展示此牌并重复此过程',
 		yingxi:'影袭',
diff --git a/character/rank.js b/character/rank.js
index f474aceee..27c73eab6 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -68,14 +68,12 @@ window.characterRank={
         'hs_tyrande',
         'diaochan',
         'diy_zaozhirenjun',
-        'pal_muchanglan',
         'ow_heiying',
         'pal_longkui',
         'pal_nangonghuang',
         'pal_xingxuan',
         'hs_walian',
         'hs_laxiao',
-        'hs_shaku',
         'hs_fandral',
         'sundeng',
         'hs_xialikeer',
@@ -138,9 +136,11 @@ window.characterRank={
         'hs_fuding',
         'wangji',
         're_luxun',
+        'pal_muchanglan',
     ],
     am:[
         'old_wangyi',
+        'hs_shaku',
         're_zhangliao',
         'jianyong',
         'zhoutai',
diff --git a/game/game.js b/game/game.js
index d81b55d30..1ca3fb8de 100644
--- a/game/game.js
+++ b/game/game.js
@@ -13536,7 +13536,6 @@
                 hasShan:function(){
     				if(this.num('h','shan')) return true;
     				if(this.num('h','hufu')) return true;
-    				if(this.num('h','yuchankun')) return true;
     				if(this.hasSkillTag('respondShan',true)) return true;
     				return false;
     			},