From 6e0364795be86dafb4b9bb8060b16ebf89b58a4d Mon Sep 17 00:00:00 2001 From: Rintim Date: Thu, 12 Oct 2023 18:28:54 +0800 Subject: [PATCH 1/4] fix: type hint fixed. --- game/game.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/game.js b/game/game.js index 044701d7c..39009c93d 100644 --- a/game/game.js +++ b/game/game.js @@ -56906,7 +56906,7 @@ } return true; }, - altered:lib.filter.none, + altered:()=>false, /* skill=>{ return false; From f49fc05864c0b52a71bdaad307af555ba1d9cd20 Mon Sep 17 00:00:00 2001 From: Rintim Date: Fri, 13 Oct 2023 01:23:16 +0800 Subject: [PATCH 2/4] fix: `get.population` returnType error. --- game/game.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/game.js b/game/game.js index 39009c93d..5c73e0651 100644 --- a/game/game.js +++ b/game/game.js @@ -58877,7 +58877,7 @@ noSelected:()=>ui.selected.buttons.length+ui.selected.cards.length+ui.selected.targets.length==0, population:identity=>identity==undefined? game.players.length+game.dead.length: - game.players.filter(current=>current.identity==identity), + game.players.filter(current=>current.identity==identity).length, totalPopulation:identity=>{ if(identity==undefined) return game.players.length+game.dead.length; var i,players=game.players.concat(game.dead); From 79207630019a46a53e3d43042acd02616ee4ead5 Mon Sep 17 00:00:00 2001 From: Rintim Date: Fri, 13 Oct 2023 01:25:54 +0800 Subject: [PATCH 3/4] perf: use lambda refactor. --- game/game.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/game/game.js b/game/game.js index 5c73e0651..4afabfbe6 100644 --- a/game/game.js +++ b/game/game.js @@ -58878,15 +58878,9 @@ population:identity=>identity==undefined? game.players.length+game.dead.length: game.players.filter(current=>current.identity==identity).length, - totalPopulation:identity=>{ - if(identity==undefined) return game.players.length+game.dead.length; - var i,players=game.players.concat(game.dead); - var num=0; - for(i=0;iidentity==undefined? + game.players.length+game.dead.length: + game.players.concat(game.dead).filter(current=>current.identity==identity).length, cardtag:(item,tag)=>{ if(item.cardid&&(get.itemtype(item)=='card'||!item.cards||!item.cards.length||item.name==item.cards[0].name)&&_status.cardtag&&_status.cardtag[tag]&&_status.cardtag[tag].contains(item.cardid)){ return true; From 93b2dbc0ab0c9650e19da68116803aca9c0a1908 Mon Sep 17 00:00:00 2001 From: Rintim Date: Fri, 13 Oct 2023 01:32:44 +0800 Subject: [PATCH 4/4] perf: just expresion determined. --- game/game.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/game/game.js b/game/game.js index 4afabfbe6..bd168b00a 100644 --- a/game/game.js +++ b/game/game.js @@ -58848,8 +58848,9 @@ result._filter_args=[filter,i]; return result; }, - cardCount:function(card,player){ + cardCount:(card,player)=>{ var num; + if(player==undefined) player=_status.event.player; if(card==true){ num=0; var stat=player.getStat('card'); @@ -58858,7 +58859,6 @@ } return num; } - if(player==undefined) player=_status.event.player; if(typeof card=='object'){ card=card.name; } @@ -58866,7 +58866,7 @@ if(num==undefined) return 0; return num; }, - skillCount:function(skill,player){ + skillCount:(skill,player)=>{ if(player==undefined) player=_status.event.player; var num=player.getStat('skill')[skill]; if(num==undefined) return 0; @@ -58881,13 +58881,9 @@ totalPopulation:identity=>identity==undefined? game.players.length+game.dead.length: game.players.concat(game.dead).filter(current=>current.identity==identity).length, - cardtag:(item,tag)=>{ - if(item.cardid&&(get.itemtype(item)=='card'||!item.cards||!item.cards.length||item.name==item.cards[0].name)&&_status.cardtag&&_status.cardtag[tag]&&_status.cardtag[tag].contains(item.cardid)){ - return true; - } - if(item.cardtags&&item.cardtags.contains(tag)) return true; - return false; - }, + cardtag:(item,tag)=> + (item.cardid&&(get.itemtype(item)=='card'||!item.cards||!item.cards.length||item.name==item.cards[0].name)&&_status.cardtag&&_status.cardtag[tag]&&_status.cardtag[tag].contains(item.cardid)) + ||(item.cardtags&&item.cardtags.contains(tag)), tag:(item,tag,item2,bool)=>{ var result; if(get.info(item)&&get.info(item).ai&&get.info(item).ai.tag){