@pkmn/sim 0.5.25 → 0.5.27

package/build/config/formats.js

@@ -134,7 +134,7 @@ exports.Formats = [
     {
         name: "[Gen 8] PU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3686048/">PU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3707179/">PU Metagame Discussion</a>`,
             `&bullet; <a href="https://www.smogon.com/forums/threads/3676106/">PU Viability Rankings</a>`,
         ],
         mod: 'gen8',
@@ -232,7 +232,7 @@ exports.Formats = [
             // LC OU
             'Abra', 'Carvanha', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey', 'Koffing',
             'Larvesta', 'Magby', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Natu', 'Onix', 'Pawniard',
-            'Ponyta-Base', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
+            'Ponyta-Base', 'Porygon', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
             // LC UUBL
             'Archen', 'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
         ],
@@ -268,14 +268,21 @@ exports.Formats = [
         unbanlist: ['Mythical', 'Restricted Legendary'],
     },
     {
-        name: "[Gen 8] I Choose 'Chu!",
+        name: "[Gen 8] Champion League",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3705481/">I Choose 'Chu! Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3707533/">Champion League Discussion</a>`,
         ],
         mod: 'gen8',
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
-        banlist: ['All Pokemon', 'Raichu-Alola + Sing'],
-        unbanlist: ['Pichu', 'Pikachu', 'Raichu'],
+        banlist: ['All Pokemon'],
+        unbanlist: [
+            'Venusaur', 'Charizard', 'Blastoise', 'Sandslash-Base', 'Ninetales-Base', 'Arcanine', 'Alakazam', 'Tentacruel', 'Magneton', 'Cloyster',
+            'Exeggutor-Base', 'Rhydon', 'Gyarados', 'Lapras', 'Vaporeon', 'Jolteon', 'Flareon', 'Aerodactyl', 'Dragonite', 'Heracross', 'Skarmory',
+            'Tyranitar', 'Ludicolo', 'Gardevoir', 'Aggron', 'Wailord', 'Altaria', 'Whiscash', 'Claydol', 'Cradily', 'Armaldo', 'Milotic', 'Salamence',
+            'Metagross', 'Roserade', 'Gastrodon', 'Spiritomb', 'Garchomp', 'Lucario', 'Rhyperior', 'Togekiss', 'Seismitoad', 'Archeops',
+            'Vanilluxe', 'Escavalier', 'Haxorus', 'Accelgor', 'Druddigon', 'Bouffalant', 'Hydreigon', 'Volcarona', 'Aegislash', 'Tyrantrum',
+            'Aurorus', 'Hawlucha', 'Carbink', 'Goodra', 'Gourgeist', 'Rillaboom', 'Cinderace', 'Inteleon', 'Mr. Rime', 'Dragapult',
+        ],
     },
     {
         name: "[Gen 8] Custom Game",
@@ -530,7 +537,7 @@ exports.Formats = [
         ruleset: ['-Nonexistent', 'Standard NatDex', 'Forme Clause', 'Sleep Moves Clause', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'CFZ Clause', '!Obtainable'],
         banlist: [
             // Pokemon
-            'Eternatus-Eternamax', 'Groudon-Primal', 'Rayquaza-Mega', 'Shedinja', 'Cramorant-Gorging', 'Calyrex-Shadow',
+            'Eternatus-Eternamax', 'Groudon-Primal', 'Rayquaza-Mega', 'Shedinja', 'Cramorant-Gorging', 'Calyrex-Shadow', 'Darmanitan-Galar-Zen',
             // Abilities
             'Arena Trap', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion', 'Innards Out', 'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Protean', 'Pure Power', 'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard',
             // Items
@@ -591,117 +598,35 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Partners in Crime",
-        desc: `Doubles-based metagame where both active ally Pok&eacute;mon share abilities and moves.`,
+        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).`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3706080/">Partners in Crime</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3692297/">Revelationmons</a>`,
         ],
-        mod: 'partnersincrime',
-        gameType: 'doubles',
-        // searchShow: false,
-        ruleset: ['Standard Doubles', 'Dynamax Clause'],
+        mod: 'gen8',
+        ruleset: ['Standard OMs', 'Revelationmons Mod', 'Sleep Moves Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin',
-            'Groudon', 'Ho-Oh', 'Jirachi', 'Kyogre', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna',
-            'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
-            'Rayquaza', 'Reshiram', 'Solgaleo', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
-            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Bolt Beak', 'Fishious Rend', 'Shell Smash',
-            'Emergency Exit', 'Huge Power', 'Moody', 'Power Construct', 'Shadow Tag', 'Wimp Out', 'Wonder Guard',
+            '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', 'Thundurus-Therian', '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',
         ],
-        onBeforeSwitchIn(pokemon) {
-            pokemon.m.curMoves = this.dex.deepClone(pokemon.moves);
-            let ngas = false;
-            for (const poke of this.getAllActive()) {
-                if (this.toID(poke.ability) === 'neutralizinggas') {
-                    ngas = true;
-                    break;
-                }
-            }
-            const BAD_ABILITIES = ['trace', 'imposter', 'neutralizinggas'];
-            // Abilities that must be applied before both sides trigger onSwitchIn to correctly
-            // handle switch-in ability-to-ability interactions, e.g. Intimidate counters
-            const NEEDED_BEFORE_SWITCH_IN_ABILITIES = [
-                'clearbody', 'competitive', 'contrary', 'defiant', 'fullmetalbody', 'hypercutter', 'innerfocus',
-                'mirrorarmor', 'oblivious', 'owntempo', 'rattled', 'scrappy', 'simple', 'whitesmoke',
-            ];
-            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
-            if (ally && ally.ability !== pokemon.ability) {
-                if (!pokemon.m.innate && !BAD_ABILITIES.includes(this.toID(ally.ability)) &&
-                    NEEDED_BEFORE_SWITCH_IN_ABILITIES.includes(this.toID(ally.ability))) {
-                    pokemon.m.innate = 'ability:' + ally.ability;
-                    delete pokemon.volatiles[pokemon.m.innate];
-                    if (!ngas || ally.getAbility().isPermanent)
-                        pokemon.addVolatile(pokemon.m.innate);
-                }
-                if (!ally.m.innate && !BAD_ABILITIES.includes(this.toID(pokemon.ability)) &&
-                    NEEDED_BEFORE_SWITCH_IN_ABILITIES.includes(this.toID(pokemon.ability))) {
-                    ally.m.innate = 'ability:' + pokemon.ability;
-                    delete ally.volatiles[ally.m.innate];
-                    if (!ngas || pokemon.getAbility().isPermanent)
-                        ally.addVolatile(ally.m.innate);
-                }
-            }
-        },
-        onSwitchInPriority: 2,
-        onSwitchIn(pokemon) {
-            let ngas = false;
-            for (const poke of this.getAllActive()) {
-                if (this.toID(poke.ability) === 'neutralizinggas') {
-                    ngas = true;
-                    break;
-                }
-            }
-            const BAD_ABILITIES = ['trace', 'imposter', 'neutralizinggas'];
-            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
-            if (ally && ally.ability !== pokemon.ability) {
-                if (!pokemon.m.innate && !BAD_ABILITIES.includes(this.toID(ally.ability))) {
-                    pokemon.m.innate = 'ability:' + ally.ability;
-                    delete pokemon.volatiles[pokemon.m.innate];
-                    if (!ngas || ally.getAbility().isPermanent)
-                        pokemon.addVolatile(pokemon.m.innate);
-                }
-                if (!ally.m.innate && !BAD_ABILITIES.includes(this.toID(pokemon.ability))) {
-                    ally.m.innate = 'ability:' + pokemon.ability;
-                    delete ally.volatiles[ally.m.innate];
-                    if (!ngas || pokemon.getAbility().isPermanent)
-                        ally.addVolatile(ally.m.innate);
-                }
-            }
-        },
-        onSwitchOut(pokemon) {
-            if (pokemon.m.innate) {
-                pokemon.removeVolatile(pokemon.m.innate);
-                delete pokemon.m.innate;
-            }
-            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
-            if (ally && ally.m.innate) {
-                ally.removeVolatile(ally.m.innate);
-                delete ally.m.innate;
-            }
-        },
-        onFaint(pokemon) {
-            if (pokemon.m.innate) {
-                pokemon.removeVolatile(pokemon.m.innate);
-                delete pokemon.m.innate;
-            }
-            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
-            if (ally && ally.m.innate) {
-                ally.removeVolatile(ally.m.innate);
-                delete ally.m.innate;
-            }
-        },
+        restricted: ['Bolt Beak', 'Close Combat', 'U-turn', 'Volt Switch'],
     },
     {
-        name: "[Gen 8] Chimera 1v1",
-        desc: `One Pok&eacute;mon inherits specific traits from your entire 6-mon team, based on their order.`,
+        name: "[Gen 8] Tag Team Singles",
+        desc: `Bring four Pok&eacute;mon to Team Preview and choose two to battle in a singles battle.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3661215/">Chimera 1v1</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3705415/">Tag Team Singles</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Chimera 1v1 Rule', 'Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
+        ruleset: ['Picked Team Size = 2', 'Max Team Size = 4', 'Standard OMs', 'Sleep Moves Clause', 'Evasion Abilities Clause'],
         banlist: [
-            'Shedinja', 'Huge Power', 'Moody', 'Neutralizing Gas', 'Truant', 'Perish Body', 'Eviolite', 'Focus Sash', 'Leek', 'Light Ball',
-            'Bolt Beak', 'Disable', 'Double Iron Bash', 'Fishious Rend', 'Perish Song', 'Switcheroo', 'Transform', 'Trick',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black',
+            'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
+            'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
+            'Zekrom', 'Moody', 'Power Construct', 'Bright Powder', 'Focus Sash', 'King\'s Rock', 'Lax Incense', 'Final Gambit',
         ],
     },
     // Other Metagames
@@ -863,10 +788,10 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard OMs', 'Sleep Moves Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal', 'Nidoking',
-            'Nidoqueen', 'Pikachu', 'Toxapex', 'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power',
-            'Moody', 'Pure Power', 'Shadow Tag', 'Swift Swim', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw',
-            'Baton Pass',
+            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Kyogre', 'Marowak-Alola', 'Melmetal',
+            'Nidoking', 'Nidoqueen', 'Pikachu', 'Toxapex', 'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap',
+            'Huge Power', 'Moody', 'Pure Power', 'Shadow Tag', 'Swift Swim', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense',
+            'Quick Claw', 'Baton Pass',
         ],
         onValidateTeam(team) {
             const gods = new Set();
@@ -1723,6 +1648,107 @@ exports.Formats = [
             },
         },
     },
+    {
+        name: "[Gen 8] Partners in Crime",
+        desc: `Doubles-based metagame where both active ally Pok&eacute;mon share abilities and moves.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3706080/">Partners in Crime</a>`,
+        ],
+        mod: 'partnersincrime',
+        gameType: 'doubles',
+        searchShow: false,
+        ruleset: ['Standard Doubles', 'Dynamax Clause'],
+        banlist: [
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh',
+            'Jirachi', 'Kyogre', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo',
+            'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Urshifu-Base',
+            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Emergency Exit',
+            'Huge Power', 'Moody', 'Power Construct', 'Shadow Tag', 'Wimp Out', 'Wonder Guard', 'Bolt Beak', 'Fishious Rend',
+            'Shell Smash', 'Swagger',
+        ],
+        onBeforeSwitchIn(pokemon) {
+            pokemon.m.curMoves = this.dex.deepClone(pokemon.moves);
+            let ngas = false;
+            for (const poke of this.getAllActive()) {
+                if (this.toID(poke.ability) === 'neutralizinggas') {
+                    ngas = true;
+                    break;
+                }
+            }
+            const BAD_ABILITIES = ['trace', 'imposter', 'neutralizinggas'];
+            // Abilities that must be applied before both sides trigger onSwitchIn to correctly
+            // handle switch-in ability-to-ability interactions, e.g. Intimidate counters
+            const NEEDED_BEFORE_SWITCH_IN_ABILITIES = [
+                'clearbody', 'competitive', 'contrary', 'defiant', 'fullmetalbody', 'hypercutter', 'innerfocus',
+                'mirrorarmor', 'oblivious', 'owntempo', 'rattled', 'scrappy', 'simple', 'whitesmoke',
+            ];
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.ability !== pokemon.ability) {
+                if (!pokemon.m.innate && !BAD_ABILITIES.includes(this.toID(ally.ability)) &&
+                    NEEDED_BEFORE_SWITCH_IN_ABILITIES.includes(this.toID(ally.ability))) {
+                    pokemon.m.innate = 'ability:' + ally.ability;
+                    delete pokemon.volatiles[pokemon.m.innate];
+                    if (!ngas || ally.getAbility().isPermanent)
+                        pokemon.addVolatile(pokemon.m.innate);
+                }
+                if (!ally.m.innate && !BAD_ABILITIES.includes(this.toID(pokemon.ability)) &&
+                    NEEDED_BEFORE_SWITCH_IN_ABILITIES.includes(this.toID(pokemon.ability))) {
+                    ally.m.innate = 'ability:' + pokemon.ability;
+                    delete ally.volatiles[ally.m.innate];
+                    if (!ngas || pokemon.getAbility().isPermanent)
+                        ally.addVolatile(ally.m.innate);
+                }
+            }
+        },
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
+            let ngas = false;
+            for (const poke of this.getAllActive()) {
+                if (this.toID(poke.ability) === 'neutralizinggas') {
+                    ngas = true;
+                    break;
+                }
+            }
+            const BAD_ABILITIES = ['trace', 'imposter', 'neutralizinggas'];
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.ability !== pokemon.ability) {
+                if (!pokemon.m.innate && !BAD_ABILITIES.includes(this.toID(ally.ability))) {
+                    pokemon.m.innate = 'ability:' + ally.ability;
+                    delete pokemon.volatiles[pokemon.m.innate];
+                    if (!ngas || ally.getAbility().isPermanent)
+                        pokemon.addVolatile(pokemon.m.innate);
+                }
+                if (!ally.m.innate && !BAD_ABILITIES.includes(this.toID(pokemon.ability))) {
+                    ally.m.innate = 'ability:' + pokemon.ability;
+                    delete ally.volatiles[ally.m.innate];
+                    if (!ngas || pokemon.getAbility().isPermanent)
+                        ally.addVolatile(ally.m.innate);
+                }
+            }
+        },
+        onSwitchOut(pokemon) {
+            if (pokemon.m.innate) {
+                pokemon.removeVolatile(pokemon.m.innate);
+                delete pokemon.m.innate;
+            }
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.m.innate) {
+                ally.removeVolatile(ally.m.innate);
+                delete ally.m.innate;
+            }
+        },
+        onFaint(pokemon) {
+            if (pokemon.m.innate) {
+                pokemon.removeVolatile(pokemon.m.innate);
+                delete pokemon.m.innate;
+            }
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.m.innate) {
+                ally.removeVolatile(ally.m.innate);
+                delete ally.m.innate;
+            }
+        },
+    },
     {
         name: "[Gen 8] Pokebilities",
         desc: `Pok&eacute;mon have all of their released abilities simultaneously.`,
@@ -2128,10 +2154,11 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 3] Challenge Cup",
-        mod: 'gen3',
-        team: 'randomCC',
-        ruleset: ['Obtainable', 'HP Percentage Mod', 'Cancel Mod'],
+        name: "[Gen 7] Pick-Your-Team Random Battle",
+        mod: 'gen7',
+        team: 'random',
+        ruleset: ['[Gen 7] Random Battle', 'Max Team Size = 12', 'Picked Team Size = 6', 'Team Preview'],
+        desc: `Twelve Pokémon sets are randomly chosen, then you pick six for your team!`,
     },
     // Randomized Metas
     ///////////////////////////////////////////////////////////////////
@@ -2186,6 +2213,13 @@ exports.Formats = [
             }
         },
     },
+    {
+        name: "[Gen 8] Battle Factory",
+        desc: `Randomized teams of Pok&eacute;mon for a generated Smogon tier with sets that are competitively viable.`,
+        mod: 'gen8',
+        team: 'randomFactory',
+        ruleset: ['Standard', 'Dynamax Clause'],
+    },
     {
         name: "[Gen 8] BSS Factory",
         desc: `Randomized 3v3 Singles featuring Pok&eacute;mon and movesets popular in Battle Stadium Singles.`,
@@ -2453,36 +2487,32 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 3] Ubers",
+        name: "[Gen 5] Ubers",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286280/">ADV Ubers</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286278/">BW2 Ubers</a>`,
         ],
-        mod: 'gen3',
+        mod: 'gen5',
         // searchShow: false,
-        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
-        banlist: ['Wobbuffet + Leftovers'],
+        ruleset: ['Standard', 'Sleep Clause Mod'],
     },
     {
-        name: "[Gen 5] RU",
+        name: "[Gen 7] PU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3473124/">BW2 RU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3611496/">USM PU Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3614892/">USM PU Viability Rankings</a>`,
         ],
-        mod: 'gen5',
+        mod: 'gen7',
         // searchShow: false,
-        ruleset: ['[Gen 5] UU', 'Baton Pass Clause', '!Sleep Clause Mod', 'Sleep Moves Clause'],
-        banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
-        unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
+        ruleset: ['[Gen 7] NU'],
+        banlist: ['NU', 'PUBL'],
     },
     {
-        name: "[Gen 7 Let's Go] UU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3659882/">LGPE UU Metagame Discussion &amp; Resources</a>`,
-        ],
-        mod: 'gen7letsgo',
-        // searchShow: false,
-        ruleset: ['[Gen 7 Let\'s Go] OU'],
-        banlist: ['OU', 'UUBL'],
+        name: "[Gen 2] UUBL",
+        threads: [`&bullet; <a href="https://www.smogon.com/forums/threads/3662389/">GSC UUBL</a>`],
+        mod: 'gen2',
+        ruleset: ['[Gen 2] OU'],
+        banlist: ['OU'],
+        unbanlist: ['Mean Look + Baton Pass', 'Spider Web + Baton Pass'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2735,17 +2765,6 @@ exports.Formats = [
         ruleset: ['[Gen 7] RU'],
         banlist: ['RU', 'NUBL', 'Drought'],
     },
-    {
-        name: "[Gen 7] PU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3611496/">USM PU Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3614892/">USM PU Viability Rankings</a>`,
-        ],
-        mod: 'gen7',
-        searchShow: false,
-        ruleset: ['[Gen 7] NU'],
-        banlist: ['NU', 'PUBL'],
-    },
     {
         name: "[Gen 7] LC",
         threads: [
@@ -2792,10 +2811,11 @@ exports.Formats = [
             'Obtainable', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Swagger Clause', 'Evasion Moves Clause', 'Accuracy Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Endless Battle Clause',
         ],
         banlist: [
-            'Arceus', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega',
-            'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Mimikyu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
-            'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Snorlax', 'Solgaleo', 'Tapu Koko', 'Xerneas', 'Yveltal', 'Zekrom',
-            'Moody', 'Focus Sash', 'Grass Whistle', 'Hypnosis', 'Perish Song', 'Sing', 'Detect + Fightinium Z',
+            'Arceus', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina', 'Giratina-Origin', 'Groudon',
+            'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mew', 'Mewtwo',
+            'Mimikyu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky',
+            'Snorlax', 'Solgaleo', 'Tapu Koko', 'Xerneas', 'Yveltal', 'Zekrom', 'Moody', 'Focus Sash', 'Grass Whistle', 'Hypnosis',
+            'Perish Song', 'Sing', 'Detect + Fightinium Z',
         ],
     },
     {
@@ -3246,24 +3266,27 @@ exports.Formats = [
         column: 4,
     },
     {
-        name: "[Gen 5] Ubers",
+        name: "[Gen 5] UU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286278/">BW2 Ubers</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3474024/">BW2 UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
         ],
         mod: 'gen5',
         searchShow: false,
-        ruleset: ['Standard', 'Sleep Clause Mod'],
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
+        banlist: ['Uber', 'OU', 'UUBL', 'Arena Trap', 'Drought', 'Sand Stream', 'Snow Warning', 'Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
     {
-        name: "[Gen 5] UU",
+        name: "[Gen 5] RU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3474024/">BW2 UU Viability Rankings</a>`,
             `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3473124/">BW2 RU Viability Rankings</a>`,
         ],
         mod: 'gen5',
         searchShow: false,
-        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
-        banlist: ['Uber', 'OU', 'UUBL', 'Arena Trap', 'Drought', 'Sand Stream', 'Snow Warning', 'Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
+        ruleset: ['[Gen 5] UU', 'Baton Pass Clause', '!Sleep Clause Mod', 'Sleep Moves Clause'],
+        banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
+        unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
     {
         name: "[Gen 5] NU",
@@ -3581,6 +3604,16 @@ exports.Formats = [
         section: "Past Generations",
         column: 5,
     },
+    {
+        name: "[Gen 3] Ubers",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286280/">ADV Ubers</a>`,
+        ],
+        mod: 'gen3',
+        searchShow: false,
+        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
+        banlist: ['Wobbuffet + Leftovers'],
+    },
     {
         name: "[Gen 3] UU",
         threads: [
@@ -3618,7 +3651,7 @@ exports.Formats = [
             'Clefable', 'Slaking', 'Snorlax', 'Suicune', 'Zapdos', 'Destiny Bond', 'Explosion', 'Ingrain', 'Perish Song',
             'Self-Destruct', 'Focus Band', 'King\'s Rock', 'Quick Claw',
         ],
-        unbanlist: ['Mr. Mime', 'Wobbuffet', 'Wynaut', 'Sand Veil'],
+        unbanlist: ['Mr. Mime', 'Wobbuffet', 'Wynaut', 'Sand Veil', 'Soundproof'],
     },
     {
         name: "[Gen 3] Doubles OU",
@@ -3737,7 +3770,7 @@ exports.Formats = [
         ],
         mod: 'gen1',
         searchShow: false,
-        ruleset: ['[Gen 1] OU', 'APT Clause'],
+        ruleset: ['[Gen 1] OU', 'APT Clause', 'Sleep Moves Clause'],
         banlist: ['OU', 'UUBL'],
     },
     {
@@ -3747,7 +3780,7 @@ exports.Formats = [
         ],
         mod: 'gen1',
         searchShow: false,
-        ruleset: ['[Gen 1] UU', '!APT Clause'],
+        ruleset: ['[Gen 1] UU', '!APT Clause', '!Sleep Moves Clause'],
         banlist: ['UU', 'NUBL'],
     },
     {
@@ -3780,7 +3813,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: [
             'Picked Team Size = 3', 'Min Level = 50', 'Max Level = 55', 'Max Total Level = 155',
-            'Obtainable', 'Team Preview', 'Sleep Clause Mod', 'Species Clause', 'Nickname Clause', 'HP Percentage Mod', 'Cancel Mod', 'Nintendo Cup 1997 Move Legality',
+            'Obtainable', 'Team Preview', 'Stadium Sleep Clause', 'Species Clause', 'Nickname Clause', 'HP Percentage Mod', 'Cancel Mod', 'Nintendo Cup 1997 Move Legality',
         ],
         banlist: ['Uber'],
     },