From 5d52df979a67b9fd76f0e30557c54ca4cb273cc7 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sat, 11 Feb 2017 20:35:45 +0800
Subject: [PATCH] 1

---
 card/extra.js | 30 ++++++++++++++----------------
 game/game.js  |  8 +++++++-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/card/extra.js b/card/extra.js
index c993b3b22..80dc0ebc4 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -92,12 +92,13 @@ card.extra={
 							}
 						}
 						if(card){
-							for(var i=0;i<game.players.length;i++){
-								if(ai.get.attitude(target,game.players[i])<0&&
-									target.canUse(card,game.players[i],true,true)&&
-									!game.players[i].num('e','baiyin')){
-									if(ai.get.effect(game.players[i],card,target)>0) return 1;
-								}
+							if(game.hasPlayer(function(current){
+								return (ai.get.attitude(target,current)<0&&
+									target.canUse(card,current,true,true)&&
+									!current.num('e','baiyin')&&
+									ai.get.effect(current,card,target)>0);
+							})){
+								return 1;
 							}
 						}
 						return 0;
@@ -229,13 +230,11 @@ card.extra={
 					target:function(player,target){
 						if(target.isLinked()) return 1;
 						if(ai.get.attitude(player,target)>=0) return -1;
-						// if(player.isMin()) return -1;
 						if(ui.selected.targets.length) return -1;
-						for(var i=0;i<game.players.length;i++){
-							if(ai.get.attitude(player,game.players[i])<=-1&&
-								game.players[i]!=target&&!game.players[i].isLinked()){
-								return -1;
-							}
+						if(game.hasPlayer(function(current){
+							return ai.get.attitude(player,current)<=-1&&current!=target&&!current.isLinked();
+						})){
+							return -1;
 						}
 						return 0;
 					}
@@ -319,10 +318,9 @@ card.extra={
 						if(player.hasSkillTag('maixie')&&player.hp>1) return 0;
 						if(player.hasSkillTag('noDirectDamage')) return 10;
 						if(ai.get.damageEffect(player,player,player,'fire')>=0) return 10;
-						var num=3;
-						for(var i=0;i<game.players.length;i++){
-							if(ai.get.attitude(game.players[i],player)<0) num--;
-						}
+						var num=3-game.countPlayer(function(current){
+							return ai.get.attitude(current,player)<0;
+						});
 						if(player.hp==1) num+=4;
 						if(player.hp==2) num+=1;
 						if(player.hp==3) num--;
diff --git a/game/game.js b/game/game.js
index 566144be5..5be744821 100644
--- a/game/game.js
+++ b/game/game.js
@@ -22677,7 +22677,13 @@
 			var num=0;
 			for(var i=0;i<game.players.length;i++){
 				if(game.players[i].isOut()) continue;
-				if(func(game.players[i])) num++;
+				var result=func(game.players[i]);
+				if(typeof result=='number'){
+					num+=result;
+				}
+				else{
+					num++;
+				}
 			}
 			return num;
 		},