YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

includeOut for player filtering

This commit is contained in:
Spmario233 2023-07-31 09:28:46 +08:00
parent e018c343c9
commit e8d40355ff
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
game/game.js
View File

@ -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];
}

2
mode/boss.js
View File

@ -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();
}
},

2
mode/doudizhu.js
View File

@ -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);

8
mode/identity.js
View File

@ -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++){