From e8d40355ff4e27e1b6572b8bced066c28b7be697 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Mon, 31 Jul 2023 09:28:46 +0800
Subject: [PATCH] includeOut for player filtering

---
 game/game.js     | 34 +++++++++++++++++-----------------
 mode/boss.js     |  2 +-
 mode/doudizhu.js |  2 +-
 mode/identity.js |  8 ++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/game/game.js b/game/game.js
index 7f0c506ef..b2edf7ae4 100644
--- a/game/game.js
+++ b/game/game.js
@@ -27295,7 +27295,7 @@
 						}
 					}
 					if(!start) return;
-					if(!game.players.contains(start)){
+					if(!game.players.contains(start)&&!game.dead.contains(start)){
 						start=game.findNext(start);
 					}
 					var list=[];
@@ -38173,28 +38173,28 @@
 				}
 			}
 		},
-		hasPlayer:function(func){
+		hasPlayer:function(func,includeOut){
 			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].isOut()) continue;
+				if(!includeOut&&game.players[i].isOut()) continue;
 				if(func(game.players[i])) return true;
 			}
 			return false;
 		},
-		hasPlayer2:function(func){
+		hasPlayer2:function(func,includeOut){
 			var players=game.players.slice(0).concat(game.dead);
 			for(var i=0;i<players.length;i++){
-				if(players[i].isOut()) continue;
+				if(!includeOut&&players[i].isOut()) continue;
 				if(func(players[i])) return true;
 			}
 			return false;
 		},
-		countPlayer:function(func){
+		countPlayer:function(func,includeOut){
 			var num=0;
 			if(typeof func!='function'){
 				func=lib.filter.all;
 			}
 			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].isOut()) continue;
+				if(!includeOut&&game.players[i].isOut()) continue;
 				var result=func(game.players[i]);
 				if(typeof result=='number'){
 					num+=result;
@@ -38205,14 +38205,14 @@
 			}
 			return num;
 		},
-		countPlayer2:function(func){
+		countPlayer2:function(func,includeOut){
 			var num=0;
 			if(typeof func!='function'){
 				func=lib.filter.all;
 			}
 			var players=game.players.slice(0).concat(game.dead);
 			for(var i=0;i<players.length;i++){
-				if(players[i].isOut()) continue;
+				if(!includeOut&&players[i].isOut()) continue;
 				var result=func(players[i]);
 				if(typeof result=='number'){
 					num+=result;
@@ -38223,7 +38223,7 @@
 			}
 			return num;
 		},
-		filterPlayer:function(func,list){
+		filterPlayer:function(func,list,includeOut){
 			if(!Array.isArray(list)){
 				list=[];
 			}
@@ -38231,14 +38231,14 @@
 				func=lib.filter.all;
 			}
 			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].isOut()) continue;
+				if(!includeOut&&game.players[i].isOut()) continue;
 				if(func(game.players[i])){
 					list.add(game.players[i]);
 				}
 			}
 			return list;
 		},
-		filterPlayer2:function(func,list){
+		filterPlayer2:function(func,list,includeOut){
 			if(!Array.isArray(list)){
 				list=[];
 			}
@@ -38247,26 +38247,26 @@
 			}
 			var players=game.players.slice(0).concat(game.dead);
 			for(var i=0;i<players.length;i++){
-				if(players[i].isOut()) continue;
+				if(!includeOut&&players[i].isOut()) continue;
 				if(func(players[i])){
 					list.add(players[i]);
 				}
 			}
 			return list;
 		},
-		findPlayer:function(func){
+		findPlayer:function(func,includeOut){
 			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].isOut()) continue;
+				if(!includeOut&&game.players[i].isOut()) continue;
 				if(func(game.players[i])){
 					return game.players[i];
 				}
 			}
 			return null;
 		},
-		findPlayer2:function(func){
+		findPlayer2:function(func,includeOut){
 			var players=game.players.slice(0).concat(game.dead);
 			for(var i=0;i<players.length;i++){
-				if(players[i].isOut()) continue;
+				if(!includeOut&&players[i].isOut()) continue;
 				if(func(players[i])){
 					return players[i];
 				}
diff --git a/mode/boss.js b/mode/boss.js
index daad28e65..dd5d7a734 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -465,7 +465,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 					if(this==game.boss||!game.hasPlayer(function(current){
 						return !current.side;
-					})){
+					},true)){
 						game.checkResult();
 					}
 				},
diff --git a/mode/doudizhu.js b/mode/doudizhu.js
index 2acb75a04..15f76becf 100644
--- a/mode/doudizhu.js
+++ b/mode/doudizhu.js
@@ -1897,7 +1897,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					if(_status.mode=='binglin'||_status.mode=='online'||this.identity!='fan') return;
 					var player=this,target=game.findPlayer(function(current){
 						return current!=player&&current.identity=='fan';
-					});
+					},true);
 					if(target){
 						target.showGiveup();
 						target.chooseDrawRecover(2);
diff --git a/mode/identity.js b/mode/identity.js
index 400625de8..1bedb6dfe 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -523,13 +523,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					var loser=[];
 					var ye=game.filterPlayer(function(current){
 						return ['rYe','bYe'].contains(current.identity);
-					});
+					},null,true);
 					var red=game.filterPlayer(function(current){
 						return ['rZhu','rZhong','bNei'].contains(current.identity);
-					});
+					},null,true);
 					var blue=game.filterPlayer(function(current){
 						return ['bZhu','bZhong','rNei'].contains(current.identity);
-					})
+					},null,true)
 					game.countPlayer2(function(current){
 						switch(current.identity){
 							case 'rZhu':
@@ -553,7 +553,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 								else if(game.rZhu.isDead()&&game.bZhu.isDead()) loser.push(current);
 								break;
 						}
-					});
+					},true);
 					var winner2=winner.slice(0);
 					var loser2=loser.slice(0);
 					for(var i=0;i<winner.length;i++){