@pkmn/sim 0.5.2 → 0.5.3

package/build/config/formats.js

@@ -231,9 +231,9 @@ exports.Formats = [
         ruleset: ['[Gen 8] LC'],
         banlist: [
             // LC OU
-            'Abra', 'Archen', 'Carvanha', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey', 'Koffing',
-            'Larvesta', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard', 'Ponyta',
-            'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Spritzee', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt', 'Vulpix',
+            'Abra', 'Carvanha', 'Croagunk', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey',
+            'Koffing', 'Larvesta', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard',
+            'Ponyta', 'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt', 'Vulpix',
             // LC UUBL
             'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
         ],
@@ -277,6 +277,20 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
     },
+    {
+        name: "[Gen 8] Test Your Luck!",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3695144/">Test Your Luck! Discussion</a>`,
+        ],
+        mod: 'gen8',
+        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'VGC Timer', 'Min Source Gen = 8'],
+        banlist: ['Azelf', 'Mesprit', 'Uxie'],
+        onValidateSet(set, format) {
+            if (set.moves.length !== 1 || this.dex.moves.get(set.moves[0]).id !== 'metronome') {
+                return [`${set.name || set.species} has illegal moves.`, `(${format.name} only allows the move Metronome)`];
+            }
+        },
+    },
     {
         name: "[Gen 8] Custom Game",
         mod: 'gen8',
@@ -341,6 +355,13 @@ exports.Formats = [
         ruleset: ['Standard Doubles', 'Little Cup', 'Dynamax Clause', 'Swagger Clause', 'Sleep Clause Mod'],
         banlist: ['Corsola-Galar', 'Cutiefly', 'Ponyta-Base', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vulpix', 'Vulpix-Alola'],
     },
+    {
+        name: "[Gen 8] VGC 2022",
+        mod: 'gen8',
+        gameType: 'doubles',
+        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer', 'Limit Two Restricted'],
+        restricted: ['Restricted Legendary'],
+    },
     {
         name: "[Gen 8] VGC 2021 Series 11",
         threads: [
@@ -353,22 +374,6 @@ exports.Formats = [
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer', 'Limit One Restricted'],
         restricted: ['Restricted Legendary'],
     },
-    {
-        name: "[Gen 8] Tiny Tourney",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3694047/">Tiny Tourney Metagame Discussion</a>`,
-        ],
-        mod: 'gen8',
-        gameType: 'doubles',
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
-        onValidateSet(set) {
-            const species = this.dex.species.get(set.species);
-            if (!species.nfe || species.prevo)
-                return [`Non-first-stage Pok\u00e9mon cannot be used in Tiny Tourney.`];
-            if (species.heightm > 1)
-                return [`${species.name} is too tall to be used in Tiny Tourney.`];
-        },
-    },
     {
         name: "[Gen 8] VGC 2021 Series 9",
         mod: 'gen8',
@@ -488,11 +493,10 @@ exports.Formats = [
         ruleset: ['[Gen 8] National Dex'],
         banlist: [
             // National Dex OU
-            'Blaziken', 'Blissey', 'Chansey', 'Charizard-Mega-X', 'Charizard-Mega-Y', 'Clefable', 'Corviknight', 'Diancie-Mega',
-            'Excadrill', 'Ferrothorn', 'Garchomp', 'Gliscor', 'Greninja', 'Heatran', 'Kartana', 'Kommo-o', 'Kyurem', 'Landorus-Therian',
-            'Lopunny-Mega', 'Magnezone', 'Mawile-Mega', 'Medicham-Mega', 'Pelipper', 'Rillaboom', 'Scizor-Mega', 'Serperior',
-            'Slowbro-Base', 'Swampert-Mega', 'Tapu Fini', 'Tapu Koko', 'Tapu Lele', 'Toxapex', 'Tyranitar', 'Victini', 'Volcarona',
-            'Weavile', 'Zapdos-Base',
+            'Blissey', 'Chansey', 'Charizard-Mega-X', 'Charizard-Mega-Y', 'Clefable', 'Corviknight', 'Diancie-Mega', 'Excadrill',
+            'Ferrothorn', 'Garchomp', 'Gliscor', 'Greninja', 'Heatran', 'Kartana', 'Kommo-o', 'Kyurem', 'Landorus-Therian', 'Lopunny-Mega',
+            'Magnezone', 'Mawile-Mega', 'Pelipper', 'Rillaboom', 'Scizor-Mega', 'Serperior', 'Slowbro-Base', 'Swampert-Mega', 'Tapu Fini',
+            'Tapu Koko', 'Tapu Lele', 'Toxapex', 'Tyranitar', 'Victini', 'Volcarona', 'Weavile', 'Zapdos-Base',
             'ND UUBL',
             'Drizzle', 'Drought',
             // Slowbronite is banned so it doesn't validate on Galarian Slowbro
@@ -500,10 +504,12 @@ exports.Formats = [
         ],
         // Used to distinguish UU from below UU in the client
         restricted: [
-            'Absol-Mega', 'Aegislash', 'Alomomola', 'Altaria-Mega', 'Amoonguss', 'Beedrill-Mega', 'Bisharp', 'Breloom', 'Celesteela',
-            'Donphan', 'Dragonite', 'Hippowdon', 'Infernape', 'Keldeo', 'Krookodile', 'Mandibuzz', 'Manectric-Mega', 'Melmetal', 'Mew',
-            'Moltres-Base', 'Porygon2', 'Regieleki', 'Rotom-Heat', 'Rotom-Wash', 'Scizor', 'Skarmory', 'Slowking', 'Slowking-Galar',
-            'Swampert-Base', 'Tangrowth', 'Umbreon', 'Urshifu-Rapid-Strike',
+            'Aegislash', 'Alakazam-Base', 'Altaria-Mega', 'Amoonguss', 'Beedrill-Mega', 'Blaziken-Base', 'Breloom', 'Celesteela',
+            'Chandelure', 'Donphan', 'Dracozolt', 'Dragonite', 'Feraligatr', 'Gastrodon', 'Hatterene', 'Hippowdon', 'Infernape',
+            'Keldeo', 'Krookodile', 'Mamoswine', 'Mandibuzz', 'Manectric-Mega', 'Medicham-Mega', 'Melmetal', 'Mienshao', 'Moltres-Base',
+            'Nidoking', 'Nidoqueen', 'Nihilego', 'Quagsire', 'Regieleki', 'Ribombee', 'Rotom-Heat', 'Rotom-Wash', 'Salamence',
+            'Scizor', 'Skarmory', 'Slowking-Base', 'Swampert-Base', 'Talonflame', 'Tangrowth', 'Tornadus-Base', 'Umbreon',
+            'Urshifu-Rapid-Strike',
         ],
     },
     {
@@ -586,36 +592,81 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Revelationmons",
-        desc: `The moves in the first slot(s) of a Pok&eacute;mon's set have their types changed to match the Pok&eacute;mon's type(s).`,
+        name: "[Gen 8] Pokebilities",
+        desc: `Pok&eacute;mon have all of their released abilities simultaneously.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3692297/">Revelationmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3679692/">Pok&eacute;bilities</a>`,
         ],
-        mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause', 'Revelationmons Mod', 'Sleep Moves Clause'],
+        mod: 'pokebilities',
+        ruleset: ['Standard', 'Dynamax Clause'],
         banlist: [
-            'Barraskewda', 'Blacephalon', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Dragapult',
-            'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kommo-o', 'Kyogre', 'Kyurem-Black', 'Kyurem-White',
-            'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
-            'Noivern', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian',
-            'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Magnet Pull', 'Moody', 'Power Construct',
-            'Shadow Tag', 'King\'s Rock', 'Baton Pass',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Excadrill',
+            'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base',
+            'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
+            'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian',
+            'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zygarde-Base', 'Power Construct', 'Baton Pass',
+            // Moody users
+            'Glalie', 'Octillery', 'Remoraid', 'Snorunt',
+            // Shadow Tag/Arena Trap
+            'Diglett-Base', 'Dugtrio-Base', 'Gothita', 'Gothitelle', 'Gothorita', 'Trapinch', 'Wobbuffet', 'Wynaut',
         ],
-        restricted: ['Bolt Beak', 'U-turn', 'Volt Switch'],
+        onBegin() {
+            for (const pokemon of this.getAllPokemon()) {
+                if (pokemon.ability === this.toID(pokemon.species.abilities['S'])) {
+                    continue;
+                }
+                pokemon.m.innates = Object.keys(pokemon.species.abilities)
+                    .filter(key => key !== 'S' && (key !== 'H' || !pokemon.species.unreleasedHidden))
+                    .map(key => this.toID(pokemon.species.abilities[key]))
+                    .filter(ability => ability !== pokemon.ability);
+            }
+        },
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
+            if (pokemon.m.innates) {
+                for (const innate of pokemon.m.innates) {
+                    pokemon.addVolatile("ability:" + innate, pokemon);
+                }
+            }
+        },
+        onAfterMega(pokemon) {
+            for (const innate of Object.keys(pokemon.volatiles).filter(i => i.startsWith('ability:'))) {
+                pokemon.removeVolatile(innate);
+            }
+            pokemon.m.innates = undefined;
+        },
     },
     {
-        name: "[Gen 8 BDSP] Balanced Hackmons",
-        desc: `Anything that can be hacked in-game and is usable in local battles is allowed.`,
+        name: "[Gen 8] Camomons",
+        desc: `Pok&eacute;mon change type to match their first two moves.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/9043074">BDSP Balanced Hackmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3656413/">Camomons</a>`,
         ],
-        mod: 'gen8bdsp',
-        ruleset: ['-Nonexistent', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Moves Clause', 'Endless Battle Clause'],
+        mod: 'gen8',
+        // searchShow: false,
+        ruleset: ['Obtainable', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Dynamax Clause', 'Sleep Clause Mod', 'Endless Battle Clause'],
         banlist: [
-            'Shedinja', 'Arena Trap', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion', 'Innards Out', 'Intrepid Sword',
-            'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Pure Power', 'Shadow Tag', 'Stakeout', 'Water Bubble',
-            'Wonder Guard', 'Comatose + Sleep Talk', 'Shell Smash',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin',
+            'Groudon', 'Ho-Oh', 'Hydreigon', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Latias', 'Latios', 'Lugia',
+            'Lunala', 'Marshadow', 'Mew', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
+            'Reuniclus', 'Shedinja', 'Slowking-Galar', 'Solgaleo', 'Spectrier', 'Tornadus-Therian', 'Volcarona', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
         ],
+        onModifySpeciesPriority: 2,
+        onModifySpecies(species, target, source, effect) {
+            if (!target)
+                return; // Chat command
+            if (effect && ['imposter', 'transform'].includes(effect.id))
+                return;
+            const types = [...new Set(target.baseMoveSlots.slice(0, 2).map(move => this.dex.moves.get(move.id).type))];
+            return { ...species, types: types };
+        },
+        onSwitchIn(pokemon) {
+            this.add('-start', pokemon, 'typechange', (pokemon.illusion || pokemon).getTypes(true).join('/'), '[silent]');
+        },
+        onAfterMega(pokemon) {
+            this.add('-start', pokemon, 'typechange', (pokemon.illusion || pokemon).getTypes(true).join('/'), '[silent]');
+        },
     },
     // Other Metagames
     ///////////////////////////////////////////////////////////////////
@@ -731,13 +782,13 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Obtainable', '!Obtainable Abilities', 'Species Clause', 'Nickname Clause', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Dynamax Clause', 'Sleep Moves Clause', 'Endless Battle Clause'],
         banlist: [
-            'Archeops', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Gengar', 'Giratina', 'Giratina-Origin',
-            'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo',
-            'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Noivern', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regigigas', 'Reshiram', 'Shedinja', 'Solgaleo', 'Spectrier',
-            'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Victini', 'Weavile', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zeraora', 'Zygarde-Base',
-            'Arena Trap', 'Comatose', 'Contrary', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter', 'Innards Out', 'Intrepid Sword',
-            'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Power Construct', 'Protean', 'Pure Power', 'Shadow Tag', 'Simple', 'Stakeout',
-            'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
+            'Archeops', 'Blacephalon', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Gengar', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow',
+            'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Noivern', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regigigas', 'Reshiram', 'Shedinja',
+            'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Victini', 'Weavile', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom',
+            'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Comatose', 'Contrary', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter',
+            'Innards Out', 'Intrepid Sword', 'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Power Construct', 'Protean', 'Pure Power',
+            'Shadow Tag', 'Simple', 'Stakeout', 'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
         ],
         onValidateSet(set) {
             // Temporary fix until battle-only is implemented properly
@@ -791,7 +842,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3660461/">Godly Gift</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
             'Blissey', 'Calyrex-Shadow', 'Chansey', 'Dragapult', 'Hawlucha', 'Marowak-Alola', 'Melmetal', 'Pikachu', 'Toxapex',
             'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power', 'Moody', 'Pure Power',
@@ -904,6 +955,12 @@ exports.Formats = [
         ruleset: ['[Gen 8 BDSP] OU'],
         banlist: ['OU', 'UUBL'],
     },
+    {
+        name: "[Gen 8 BDSP] RU",
+        mod: 'gen8bdsp',
+        ruleset: ['[Gen 8 BDSP] UU'],
+        banlist: ['UU', 'RUBL'],
+    },
     {
         name: "[Gen 8 BDSP] Monotype",
         threads: [
@@ -925,6 +982,14 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 8 BDSP] OU', '+CAP'],
     },
+    {
+        name: "[Gen 8 BDSP] 3v3 Singles",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3695092/">BDSP 3v3 Singles</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['Flat Rules', 'Min Source Gen = 8'],
+    },
     {
         name: "[Gen 8 BDSP] Doubles OU",
         threads: [
@@ -958,38 +1023,6 @@ exports.Formats = [
         section: "Challengeable OMs",
         column: 2,
     },
-    {
-        name: "[Gen 8] Camomons",
-        desc: `Pok&eacute;mon change type to match their first two moves.`,
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3656413/">Camomons</a>`,
-        ],
-        mod: 'gen8',
-        searchShow: false,
-        ruleset: ['Obtainable', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Dynamax Clause', 'Sleep Clause Mod', 'Endless Battle Clause'],
-        banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon',
-            'Ho-Oh', 'Hydreigon', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Latias', 'Latios', 'Lugia', 'Lunala', 'Marshadow',
-            'Mew', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Reuniclus', 'Shedinja',
-            'Slowking-Galar', 'Solgaleo', 'Spectrier', 'Tornadus-Therian', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom',
-            'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
-        ],
-        onModifySpeciesPriority: 2,
-        onModifySpecies(species, target, source, effect) {
-            if (!target)
-                return; // Chat command
-            if (effect && ['imposter', 'transform'].includes(effect.id))
-                return;
-            const types = [...new Set(target.baseMoveSlots.slice(0, 2).map(move => this.dex.moves.get(move.id).type))];
-            return { ...species, types: types };
-        },
-        onSwitchIn(pokemon) {
-            this.add('-start', pokemon, 'typechange', (pokemon.illusion || pokemon).getTypes(true).join('/'), '[silent]');
-        },
-        onAfterMega(pokemon) {
-            this.add('-start', pokemon, 'typechange', (pokemon.illusion || pokemon).getTypes(true).join('/'), '[silent]');
-        },
-    },
     {
         name: "[Gen 8] Inheritance",
         desc: `Pok&eacute;mon may use the ability and moves of another, as long as they forfeit their own learnset.`,
@@ -1995,47 +2028,37 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 1] UU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3573896/">RBY UU Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3647713/">RBY UU Viability Rankings</a>`,
-        ],
-        mod: 'gen1',
+        name: "[Gen 2] UU",
+        threads: [`&bullet; <a href="https://www.smogon.com/forums/threads/3576710/">GSC UU</a>`],
+        mod: 'gen2',
         // searchShow: false,
-        ruleset: ['[Gen 1] OU'],
+        ruleset: ['[Gen 2] OU'],
         banlist: ['OU', 'UUBL'],
     },
     {
-        name: "[Gen 6] 1v1",
-        desc: `Bring three Pok&eacute;mon to Team Preview and choose one to battle.`,
+        name: "[Gen 5] NU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8031459/">ORAS 1v1</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3484121/">BW2 NU Viability Rankings</a>`,
         ],
-        mod: 'gen6',
+        mod: 'gen5',
         // searchShow: false,
-        ruleset: [
-            'Max Team Size = 3', 'Picked Team Size = 1',
-            'Obtainable', 'Nickname Clause', 'Moody Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Accuracy Moves Clause', 'Swagger Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod', 'Team Preview',
-        ],
-        banlist: [
-            'Arceus', 'Blaziken', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina',
-            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White', 'Lugia', 'Mewtwo',
-            'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Xerneas', 'Yveltal', 'Zekrom',
-            'Focus Sash', 'Soul Dew', 'Perish Song',
-        ],
+        ruleset: ['[Gen 5] RU', '!Sleep Moves Clause', 'Sleep Clause Mod'],
+        banlist: ['RU', 'NUBL', 'Assist', 'Copycat'],
     },
     {
-        name: "[Gen 5] Doubles OU",
+        name: "[Gen 5] LC",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3606719/">BW2 Doubles Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/7393048/">BW2 Doubles Viability Rankings</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/7393081/">BW2 Doubles Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3485860/">BW2 LC Viability Rankings</a>`,
         ],
         mod: 'gen5',
-        gameType: 'doubles',
         // searchShow: false,
-        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
-        banlist: ['DUber', 'Soul Dew', 'Dark Void', 'Gravity'],
+        ruleset: ['Standard', 'Little Cup', 'Sleep Moves Clause'],
+        banlist: [
+            'Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scraggy', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma',
+            'Sand Rush', 'Sand Veil', 'Berry Juice', 'Soul Dew', 'Baton Pass', 'Dragon Rage', 'Sonic Boom', 'Swagger',
+        ],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2094,7 +2117,7 @@ exports.Formats = [
         ],
         mod: 'gen3',
         ruleset: ['Standard', 'One Boost Passer Clause'],
-        banlist: ['Uber', 'Sand Veil', 'Smeargle + Ingrain'],
+        banlist: ['Uber', 'Sand Veil', 'Assist', 'Smeargle + Ingrain'],
     },
     {
         name: "[Gen 2] OU",
@@ -2622,6 +2645,25 @@ exports.Formats = [
             'Soul Dew', 'Baton Pass',
         ],
     },
+    {
+        name: "[Gen 6] 1v1",
+        desc: `Bring three Pok&eacute;mon to Team Preview and choose one to battle.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8031459/">ORAS 1v1</a>`,
+        ],
+        mod: 'gen6',
+        searchShow: false,
+        ruleset: [
+            'Max Team Size = 3', 'Picked Team Size = 1',
+            'Obtainable', 'Nickname Clause', 'Moody Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Accuracy Moves Clause', 'Swagger Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod', 'Team Preview',
+        ],
+        banlist: [
+            'Arceus', 'Blaziken', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White', 'Lugia', 'Mewtwo',
+            'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Xerneas', 'Yveltal', 'Zekrom',
+            'Focus Sash', 'Soul Dew', 'Perish Song',
+        ],
+    },
     {
         name: "[Gen 6] Anything Goes",
         threads: [
@@ -2801,17 +2843,6 @@ exports.Formats = [
         banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
         unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
-    {
-        name: "[Gen 5] NU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3484121/">BW2 NU Viability Rankings</a>`,
-        ],
-        mod: 'gen5',
-        searchShow: false,
-        ruleset: ['[Gen 5] RU', '!Sleep Moves Clause', 'Sleep Clause Mod'],
-        banlist: ['RU', 'NUBL', 'Assist', 'Copycat'],
-    },
     {
         name: "[Gen 5] PU",
         threads: [
@@ -2822,20 +2853,6 @@ exports.Formats = [
         ruleset: ['[Gen 5] NU', 'Sleep Moves Clause'],
         banlist: ['NU', 'Combusken', 'Gothorita', 'Linoone', 'Riolu', 'Rotom-Frost', 'Simipour', 'Throh', 'Vigoroth'],
     },
-    {
-        name: "[Gen 5] LC",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3485860/">BW2 LC Viability Rankings</a>`,
-        ],
-        mod: 'gen5',
-        searchShow: false,
-        ruleset: ['Standard', 'Little Cup', 'Sleep Moves Clause'],
-        banlist: [
-            'Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scraggy', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma',
-            'Sand Rush', 'Sand Veil', 'Berry Juice', 'Soul Dew', 'Baton Pass', 'Dragon Rage', 'Sonic Boom', 'Swagger',
-        ],
-    },
     {
         name: "[Gen 5] Monotype",
         desc: `All the Pok&eacute;mon on a team must share a type.`,
@@ -2883,6 +2900,19 @@ exports.Formats = [
         section: 'B2/W2 Doubles',
         column: 4,
     },
+    {
+        name: "[Gen 5] Doubles OU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3606719/">BW2 Doubles Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/7393048/">BW2 Doubles Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/7393081/">BW2 Doubles Sample Teams</a>`,
+        ],
+        mod: 'gen5',
+        gameType: 'doubles',
+        searchShow: false,
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
+        banlist: ['DUber', 'Soul Dew', 'Dark Void', 'Gravity'],
+    },
     {
         name: "[Gen 5] VGC 2013",
         mod: 'gen5',
@@ -3009,7 +3039,7 @@ exports.Formats = [
             'Picked Team Size = 1', 'Max Team Size = 3',
             '[Gen 4] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
         ],
-        banlist: ['Latias', 'Machamp', 'Porygon-Z', 'Snorlax', 'Togekiss', 'Focus Sash', 'Destiny Bond', 'Explosion', 'Perish Song', 'Self-Destruct'],
+        banlist: ['Latias', 'Machamp', 'Porygon-Z', 'Shaymin', 'Snorlax', 'Togekiss', 'Focus Sash', 'Destiny Bond', 'Explosion', 'Perish Song', 'Self-Destruct'],
         unbanlist: ['Wobbuffet', 'Wynaut', 'Sand Veil'],
     },
     {
@@ -3161,14 +3191,6 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard'],
     },
-    {
-        name: "[Gen 2] UU",
-        threads: [`&bullet; <a href="https://www.smogon.com/forums/threads/3576710/">GSC UU</a>`],
-        mod: 'gen2',
-        searchShow: false,
-        ruleset: ['[Gen 2] OU'],
-        banlist: ['OU', 'UUBL'],
-    },
     {
         name: "[Gen 2] NU",
         threads: [`&bullet; <a href="https://www.smogon.com/forums/threads/3642565/">GSC NU</a>`],
@@ -3229,6 +3251,17 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard'],
     },
+    {
+        name: "[Gen 1] UU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3573896/">RBY UU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3647713/">RBY UU Viability Rankings</a>`,
+        ],
+        mod: 'gen1',
+        searchShow: false,
+        ruleset: ['[Gen 1] OU'],
+        banlist: ['OU', 'UUBL'],
+    },
     {
         name: "[Gen 1] NU",
         threads: [