diff --git a/build-tools/build-indexes b/build-tools/build-indexes index 62aea4e48..7cbcd27d7 100755 --- a/build-tools/build-indexes +++ b/build-tools/build-indexes @@ -430,15 +430,15 @@ process.stdout.write("Building `data/teambuilder-tables.js`... "); if (!tierTable[speciesTier]) tierTable[speciesTier] = []; tierTable[speciesTier].push(id); - if (genNum >= 6) { + if (genNum >= 5) { for (const meta of [ '1v1', '2v2doubles', 'lcuu', 'freeforall', 'ubersuu', 'almostanyability', 'balancedhackmons', 'godlygift', 'mixandmega', 'sharedpower', 'stabmons', '12switch', '350cup', 'alphabetcup', 'badnboosted', 'battlefields', 'biomechmons', 'camomons', 'categoryswap', 'categoryswap', 'convergence', 'crossevolution', 'categoryswap', 'ferventimpersonation', 'foresighters', 'formemons', 'fortemons', 'franticfusions', 'fullpotential', 'inheritance', 'inverse', 'natureswap', 'partnersincrime', 'passiveaggressive', 'pokebilities', 'pokemoves', 'relayrace', 'revelationmons', 'sharingiscaring', 'teradonation', 'teraoverride', 'thecardgame', - 'thelosersgame', 'trademarked', 'triples', 'typesplit', 'voltturnmayhem', - 'aaa', 'bh', // natdex abbreviations + 'thelosersgame', 'trademarked', 'triples', 'typesplit', 'voltturnmayhem', 'flipped', 'monotype', + 'aaa', 'bh', 'doubles', // natdex abbreviations 'tiershift', ]) { const format = Dex.formats.get(`${gen}${isNatDex ? 'nationaldex' : ''}${meta}`); @@ -479,15 +479,6 @@ process.stdout.write("Building `data/teambuilder-tables.js`... "); metagameBans['nationaldex35pokes'][species.id] = 1; } } - if (genNum >= 8) { - for (const meta of ['nationaldexdoubles', 'nationaldexmonotype']) { - const format = Dex.formats.get(gen + meta); - if (format.exists && Dex.formats.getRuleTable(format).isBannedSpecies(species)) { - if (!metagameBans[meta]) metagameBans[meta] = {}; - metagameBans[meta][species.id] = 1; - } - } - } if (genNum >= 5) { if (genNum === 5) { const gen5zu = Dex.formats.get(gen + 'zu'); @@ -495,11 +486,6 @@ process.stdout.write("Building `data/teambuilder-tables.js`... "); gen5zuBans[species.id] = 1; } } - const mono = Dex.formats.get(gen + 'monotype'); - if (mono.exists && Dex.formats.getRuleTable(mono).isBannedSpecies(species)) { - if (!metagameBans['monotype']) metagameBans['monotype'] = {}; - metagameBans['monotype'][species.id] = 1; - } } if (genNum === 4) { const gen4pu = Dex.formats.get(gen + 'pu'); diff --git a/play.pokemonshowdown.com/js/client-mainmenu.js b/play.pokemonshowdown.com/js/client-mainmenu.js index e34751078..ace85ea2a 100644 --- a/play.pokemonshowdown.com/js/client-mainmenu.js +++ b/play.pokemonshowdown.com/js/client-mainmenu.js @@ -1270,8 +1270,8 @@ // avoiding that decision for now because it requires either an ugly hack // or an overhaul of BattleFormats. this.open = Storage.prefs('openformats') || { - "S/V Singles": true, "S/V Doubles": true, "Unofficial Metagames": true, "National Dex": true, "OM of the Month": true, - "Other Metagames": true, "Randomized Format Spotlight": true, "RoA Spotlight": true, + "S/V Singles": true, "S/V Doubles": true, "Unofficial Metagames": true, "National Dex": true, "Ladder Spotlight": true, + "Other Metagames": true, // For AFD "Random Meta of the Decade": true }; diff --git a/play.pokemonshowdown.com/src/battle-dex-search.ts b/play.pokemonshowdown.com/src/battle-dex-search.ts index 875a13a46..3e07d848c 100644 --- a/play.pokemonshowdown.com/src/battle-dex-search.ts +++ b/play.pokemonshowdown.com/src/battle-dex-search.ts @@ -1160,8 +1160,8 @@ class BattlePokemonSearch extends BattleTypedSearch<'pokemon'> { 'convergence', 'crossevolution', 'categoryswap', 'ferventimpersonation', 'foresighters', 'formemons', 'fortemons', 'franticfusions', 'fullpotential', 'inheritance', 'inverse', 'natureswap', 'partnersincrime', 'passiveaggressive', 'pokebilities', 'pokemoves', 'relayrace', 'revelationmons', 'sharingiscaring', 'teradonation', 'teraoverride', 'thecardgame', - 'thelosersgame', 'trademarked', 'triples', 'typesplit', 'voltturnmayhem', - 'aaa', 'bh', // natdex abbreviations + 'thelosersgame', 'trademarked', 'triples', 'typesplit', 'voltturnmayhem', 'flipped', 'monotype', 'stabmonsmixandmega', + 'aaa', 'bh', 'doubles', // natdex abbreviations 'tiershift', ]; if (dex.gen >= 6) {