From 940954ee05b7fc4f03e87c8ce7ed722fe6f675ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Mon, 13 Apr 2020 19:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=B4=97=E7=89=88=E7=9A=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/zh-CN.js | 90 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/languages/zh-CN.js b/languages/zh-CN.js index d4c16f1c..3a524a3c 100644 --- a/languages/zh-CN.js +++ b/languages/zh-CN.js @@ -1525,7 +1525,52 @@ function parseBigNumber(number) return subskills.some(subskill=>subskill.type == searchType && is3x3(subskill.params)); } })}, - {name:"所有花火（按进化树排列）",function:cards=>cards.filter(card=>{ + {name:"所有普通洗版-含心",function:cards=>cards.filter(card=>{ + function includeHeart(sk) + { + const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); + return color.includes(5); + } + const searchType = 71; + const skill = Skills[card.activeSkillId]; + if (skill.type == searchType && includeHeart(skill.params)) + return true; + else if (skill.type == 116 || skill.type == 118){ + const subskills = skill.params.map(id=>Skills[id]); + return subskills.some(subskill=>subskill.type == searchType && includeHeart(subskill.params)); + } + })}, + {name:"所有普通洗版-不含心",function:cards=>cards.filter(card=>{ + function excludeHeart(sk) + { + const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); + return !color.includes(5); + } + const searchType = 71; + const skill = Skills[card.activeSkillId]; + if (skill.type == searchType && excludeHeart(skill.params)) + return true; + else if (skill.type == 116 || skill.type == 118){ + const subskills = skill.params.map(id=>Skills[id]); + return subskills.some(subskill=>subskill.type == searchType && excludeHeart(subskill.params)); + } + })}, + {name:"所有普通洗版-含毒废",function:cards=>cards.filter(card=>{ + function includeHeart(sk) + { + const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); + return color.includes(6) || color.includes(7) || color.includes(8) || color.includes(9); + } + const searchType = 71; + const skill = Skills[card.activeSkillId]; + if (skill.type == searchType && includeHeart(skill.params)) + return true; + else if (skill.type == 116 || skill.type == 118){ + const subskills = skill.params.map(id=>Skills[id]); + return subskills.some(subskill=>subskill.type == searchType && includeHeart(subskill.params)); + } + })}, + {name:"所有普通洗版1色（花火）",function:cards=>cards.filter(card=>{ function isOnlyColor(sk, colorTypeCount) { const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); @@ -1539,10 +1584,8 @@ function parseBigNumber(number) const subskills = skill.params.map(id=>Skills[id]); return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 1)); } - }).sort((a,b)=>{//优先按技能排列，其次按进化树排列 - return (a.activeSkillId - b.activeSkillId) || (a.evoRootId - b.evoRootId); })}, - {name:"所有2色版",function:cards=>cards.filter(card=>{ + {name:"所有普通洗版2色",function:cards=>cards.filter(card=>{ function isOnlyColor(sk, colorTypeCount) { const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); @@ -1557,22 +1600,22 @@ function parseBigNumber(number) return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 2)); } })}, - {name:"所有2色版（含心）",function:cards=>cards.filter(card=>{ + {name:"所有普通洗版3色",function:cards=>cards.filter(card=>{ function isOnlyColor(sk, colorTypeCount) { const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); - return color.length == colorTypeCount && color.includes(5); + return color.length == colorTypeCount; } const searchType = 71; const skill = Skills[card.activeSkillId]; - if (skill.type == searchType && isOnlyColor(skill.params, 2)) + if (skill.type == searchType && isOnlyColor(skill.params, 3)) return true; else if (skill.type == 116 || skill.type == 118){ const subskills = skill.params.map(id=>Skills[id]); - return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 2)); + return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 3)); } })}, - {name:"所有3色版",function:cards=>cards.filter(card=>{ + {name:"所有普通洗版4色",function:cards=>cards.filter(card=>{ function isOnlyColor(sk, colorTypeCount) { const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); @@ -1580,26 +1623,41 @@ function parseBigNumber(number) } const searchType = 71; const skill = Skills[card.activeSkillId]; - if (skill.type == searchType && isOnlyColor(skill.params, 3)) + if (skill.type == searchType && isOnlyColor(skill.params, 4)) return true; else if (skill.type == 116 || skill.type == 118){ const subskills = skill.params.map(id=>Skills[id]); - return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 3)); + return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 4)); } })}, - {name:"所有3色版（含心）",function:cards=>cards.filter(card=>{ + {name:"所有普通洗版5色",function:cards=>cards.filter(card=>{ function isOnlyColor(sk, colorTypeCount) { const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); - return color.length == colorTypeCount && color.includes(5); + return color.length == colorTypeCount; } const searchType = 71; const skill = Skills[card.activeSkillId]; - if (skill.type == searchType && isOnlyColor(skill.params, 3)) + if (skill.type == searchType && isOnlyColor(skill.params, 5)) return true; else if (skill.type == 116 || skill.type == 118){ const subskills = skill.params.map(id=>Skills[id]); - return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 3)); + return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 5)); + } + })}, + {name:"所有普通洗版6色以上",function:cards=>cards.filter(card=>{ + function isOnlyColor(sk, colorTypeCount) + { + const color = sk.slice(0,sk.includes(-1)?sk.indexOf(-1):undefined); + return color.length >= colorTypeCount; + } + const searchType = 71; + const skill = Skills[card.activeSkillId]; + if (skill.type == searchType && isOnlyColor(skill.params, 6)) + return true; + else if (skill.type == 116 || skill.type == 118){ + const subskills = skill.params.map(id=>Skills[id]); + return subskills.some(subskill=>subskill.type == searchType && isOnlyColor(subskill.params, 6)); } })}, {name:"所有固定30个产珠",function:cards=>cards.filter(card=>{ @@ -1616,7 +1674,7 @@ function parseBigNumber(number) return subskills.some(subskill=>subskill.type == searchType && is30(subskill.params)); } })}, - {name:"所有15×2产珠",function:cards=>cards.filter(card=>{ + {name:"所有固定15×2产珠",function:cards=>cards.filter(card=>{ function is1515(sk) { return Boolean(flags(sk[1]).length == 2 && sk[0] == 15);