From 9f162bb1c699fab27c428c895d2163ca0de21c38 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sun, 12 Feb 2017 10:25:24 +0800
Subject: [PATCH] s

---
 character/refresh.js      | 43 ++++++++++++++++++++-------------------
 game/game.js              |  2 +-
 layout/default/layout.css |  1 +
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/character/refresh.js b/character/refresh.js
index 82eec4c3b..77075da44 100644
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -45,12 +45,13 @@ character.refresh={
 				var player=get.owner(card);
 				if(ui.selected.cards.length>=Math.max(2,player.num('h')-player.hp)) return 0;
 				if(player.hp==player.maxHp||player.storage.rerende<0||player.num('h')<=1){
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].get('s').contains('haoshi')&&
-							!game.players[i].isTurnedOver()&&
-							!game.players[i].num('j','lebu')&&
-							ai.get.attitude(player,game.players[i])>=3&&
-							ai.get.attitude(game.players[i],player)>=3){
+					var players=game.filterPlayer();
+					for(var i=0;i<players.length;i++){
+						if(players[i].get('s').contains('haoshi')&&
+							!players[i].isTurnedOver()&&
+							!players[i].num('j','lebu')&&
+							ai.get.attitude(player,players[i])>=3&&
+							ai.get.attitude(players[i],player)>=3){
 							return 11-ai.get.value(card);
 						}
 					}
@@ -75,10 +76,10 @@ character.refresh={
 					if(player.storage.rerende>=2){
 						var list=[];
 						if(lib.filter.cardUsable({name:'sha'},player,event.getParent('chooseToUse'))){
-							for(var i=0;i<game.players.length;i++){
-								if(player.canUse('sha',game.players[i])){
-									list.push('sha');break;
-								}
+							if(game.hasPlayer(function(current){
+								return player.canUse('sha',current);
+							})){
+								list.push('sha');
 							}
 						}
 						if(player.canUse('tao',player,true,true)){
@@ -94,9 +95,10 @@ character.refresh={
 								var player=_status.event.player;
 								if(controls.contains('tao')) return 'tao';
 								if(controls.contains('sha')){
-									for(var i=0;i<game.players.length;i++){
-										if(player.canUse('sha',game.players[i],true,true)){
-											if(ai.get.effect(game.players[i],{name:'sha'},player,player)>0){
+									var players=game.filterPlayer();
+									for(var i=0;i<players.length;i++){
+										if(player.canUse('sha',players[i],true,true)){
+											if(ai.get.effect(players[i],{name:'sha'},player,player)>0){
 												return 'sha';
 											}
 										}
@@ -165,10 +167,10 @@ character.refresh={
 					target:function(card,player,target){
 						if(player==target&&get.type(card)=='equip'){
 							if(player.num('e',{subtype:get.subtype(card)})){
-								for(var i=0;i<game.players.length;i++){
-									if(game.players[i]!=player&&ai.get.attitude(player,game.players[i])>0){
-										return 0;
-									}
+								if(game.hasPlayer(function(current){
+									return current!=player&&ai.get.attitude(player,current)>0;
+								})){
+									return 0;
 								}
 							}
 						}
@@ -1213,10 +1215,9 @@ character.refresh={
 			enable:'phaseUse',
 			usable:1,
 			filter:function(event,player){
-				for(var i=0;i<game.players.length;i++){
-					if(game.players[i].sex=='male') return true;
-				}
-				return false;
+				return game.hasPlayer(function(current){
+					return current.sex=='male';
+				});
 			},
 			content:function(){
 				"step 0"
diff --git a/game/game.js b/game/game.js
index 12643f494..1fd4bf48f 100644
--- a/game/game.js
+++ b/game/game.js
@@ -30150,7 +30150,7 @@
                 ipbar.style.borderRadius='2px';
                 ipbar.style.position='relative';
 
-                var button=ui.create.div('.menubutton.large.highlight.connectbutton',game.online?'退出联机':'开始游戏',ui.window,function(){
+                var button=ui.create.div('.menubutton.large.highlight.connectbutton.pointerdiv',game.online?'退出联机':'开始游戏',ui.window,function(){
                     if(button.clicked) return;
                     if(game.online){
                         if(game.onlinezhu){
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 81e0f4479..fd556297d 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -2622,6 +2622,7 @@ div:not(.handcards)>.card>.info>span,
 
 #window:not(.nopointer) #system>div>div:not(.hidden),
 #window:not(.nopointer) .choosedouble.character,
+#window:not(.nopointer) .pointerdiv,
 #window:not(.nopointer) .pointernode div,
 #window:not(.nopointer) .pointerspan span,
 #window:not(.nopointer) .pointertable td>span,