From 4085bedb6ad3ea616e25bef086129e88082b9997 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 7 Apr 2016 00:26:44 +0800
Subject: [PATCH] 1

---
 character/hearth.js | 10 +++++++---
 game/game.js        |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index 8b6c0d91a..c15abc04b 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -73,14 +73,18 @@ character.hearth={
 		tanmi:{
 			trigger:{global:'phaseEnd'},
 			filter:function(event,player){
-				return player.num('h')==0;
+				return player.num('h')==0&&event.player!=player;
 			},
+			frequent:true,
 			content:function(){
 				'step 0'
 				player.draw(2);
-				player.recover();
 				'step 1'
 				player.chooseToUse();
+				'step 2'
+				if(result.bool){
+					event.goto(1);
+				}
 			}
 		},
 		xueren:{
@@ -3600,7 +3604,7 @@ character.hearth={
 		maoxian2:'冒险',
 		maoxian_info:'出牌阶段限两次，你可以从三个来自其他存活角色的技能中选择一个作为你的技能',
 		tanmi:'探秘',
-		tanmi_info:'在任意一名角色的回合结束阶段，若你没有手牌，你可以摸两张牌并回复一点体力，然后你可以立即使用一张牌',
+		tanmi_info:'在一名其他角色的回合结束阶段，若你没有手牌，你可以摸两张牌并进行一个出牌阶段',
 		yiwen:'轶闻',
 		yiwen_info:'锁定技，每当其他角色于回合内首次使用卡牌指定你为惟一目标，你获得一张此牌的复制',
 		tanbao_old:'探宝',
diff --git a/game/game.js b/game/game.js
index 2ada3b0f6..72b420cde 100755
--- a/game/game.js
+++ b/game/game.js
@@ -3745,7 +3745,7 @@
                     else if(lib.config.mode=='connect'){
                         _status.connectMode=true;
                     }
-					if(lib.config.cheat&&!_status.connectMode){
+					if(lib.config.cheat&&(!_status.connectMode||lib.config.debug)){
                         cheat.i();
                     }
                     else{
@@ -4232,8 +4232,8 @@
                                 }
                                 return;
                             }
-                            if(!_status.connectMode&&lib.config.wuxie_self){
-                                var tw=event.parent._trigger.parent;
+                            if(!_status.connectMode&&lib.config.wuxie_self&&event.getParent().state){
+                                var tw=event.getParent()._trigger.parent;
                                 if(tw.player==player&&tw.targets&&tw.targets.length==1){
                                     event.result={
                                         bool:false