Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-03-21 17:50:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Teambuilder: Fix learnset and tier issues for National Dex metas (#1431)

Browse Source 
* Teambuilder: Fix learnsets for National Dex metas

* Fix issue with banned Pokemon still showing as OU

* remove space
This commit is contained in:
Kris Johnson 2019-12-22 06:39:06 -07:00 committed by The Immortal
parent 895f003f13
commit a51fcba53f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-tools/build-indexes
View File

@ -310,11 +310,17 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
let tier = template.tier;
if (template.tier === 'Illegal' || template.isNonstandard === 'Past' || template.isUnreleased === 'Past') tier = Dex.mod('gen7').getTemplate(template.species).tier;
let banlist = Dex.getFormat('gen8nationaldex').banlist;
if (tier === 'Uber') {
if (banlist.includes(template.species) || banlist.includes(template.species + '-Base')) return tier;
if (banlist.includes(template.baseSpecies)) return tier;
if (['Zygarde-Complete', 'Necrozma-Ultra'].includes(template.species)) return tier;
if (
banlist.includes(template.species) ||
banlist.includes(template.species + '-Base') ||
banlist.includes(template.baseSpecies) ||
['Zygarde-Complete', 'Necrozma-Ultra'].includes(template.species)
) {
tier = 'Uber';
return tier;
} else if (tier === 'Uber') { // This check is for Pokemon tiered as Uber but aren't in the banlist for National Dex
tier = 'OU';
return tier;
}
if (['Meltan', 'Melmetal', 'Melmetal-Gmax'].includes(template.species)) tier = 'OU';
if (template.species === 'Toxtricity-Gmax') tier = Dex.getTemplate('toxtricity').tier;

2
js/search.js
View File

@ -811,7 +811,7 @@
}
var requirePentagon = (format === 'battlespotsingles' || format === 'battledoubles' || format.slice(0, 3) === 'vgc');
// CAP check is temporary
var requireGalar = (this.gen === 8 && format.indexOf('nationaldex') < 0 && format.indexOf('cap') < 0);
var requireGalar = (this.gen === 8 && !isNatDex && format.indexOf('cap') < 0);
var template;
var isBH = (format === 'balancedhackmons' || format === 'bh');
this.resultSet = null;