From 1b0a97bbb492db3e335695de0677809c2374837d Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Tue, 21 Mar 2017 17:46:14 +0800
Subject: [PATCH] d

---
 character/rank.js    | 1 +
 character/shenhua.js | 6 ------
 game/game.js         | 9 +++++++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/character/rank.js b/character/rank.js
index b8febaac3..e3f92ad93 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -55,6 +55,7 @@ window.characterRank={
     ],
     a:[
         'gw_airuiting',
+        'gw_dagong',
         'gw_huoge',
         'gw_xili',
         'gw_yenaifa',
diff --git a/character/shenhua.js b/character/shenhua.js
index 0f1160bdd..c17c6a2fc 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1931,9 +1931,6 @@ character.shenhua={
 			audio:2,
 			trigger:{player:'damageEnd'},
 			direct:true,
-			filter:function(event){
-				return event.num>0;
-			},
 			content:function(){
 				"step 0"
 				player.chooseTarget(get.prompt('fangzhu'),function(card,player,target){
@@ -2908,9 +2905,6 @@ character.shenhua={
 			audio:2,
 			trigger:{player:'damageEnd'},
 			direct:true,
-			filter:function(event,player){
-				return event.num>0
-			},
 			content:function(){
 				"step 0"
 				player.chooseTarget(get.prompt('jieming'),[1,trigger.num],function(card,player,target){
diff --git a/game/game.js b/game/game.js
index a7730aa3f..f0c0dcda1 100644
--- a/game/game.js
+++ b/game/game.js
@@ -11027,7 +11027,12 @@
                         },event.nature,player);
 						player.$damagepop(-num,event.nature);
 					}
-					event.trigger('damage');
+					if(num==0){
+						event._triggered=null;
+					}
+					else{
+						event.trigger('damage');
+					}
 					"step 1"
 					if(player.hp<=0&&player.isAlive()){
 						game.delayx();
@@ -18024,7 +18029,7 @@
                     delete player.storage.counttrigger;
                 }
             },
-			_recoverCheck:{
+			_recovercheck:{
 				trigger:{player:'recoverBefore'},
 				forced:true,
 				priority:20,