@pkmn/sim 0.5.19 → 0.5.22

package/build/config/formats.js

@@ -163,7 +163,7 @@ exports.Formats = [
         desc: `All the Pokémon on a team must share a type.`,
         threads: [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3672167/">Monotype Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3673391/">Monotype Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3702647/">Monotype Sample Teams</a>`,
             `&bullet; <a href="https://www.smogon.com/forums/threads/3673165">Monotype Viability Rankings</a>`,
         ],
         mod: 'gen8',
@@ -218,8 +218,8 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['[Gen 8] PU'],
         banlist: [
-            'PU', 'Arctovish', 'Aurorus', 'Basculin', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Omastar',
-            'Rotom-Frost', 'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed',
+            'PU', 'Arctovish', 'Aurorus', 'Basculin', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Malamar',
+            'Omastar', 'Rotom-Frost', 'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed',
         ],
     },
     {
@@ -233,8 +233,8 @@ exports.Formats = [
         banlist: [
             // LC OU
             'Abra', 'Carvanha', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey', 'Koffing',
-            'Larvesta', 'Magby', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard',
-            'Ponyta', 'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
+            'Larvesta', 'Magby', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Natu', 'Onix', 'Pawniard',
+            'Ponyta-Base', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
             // LC UUBL
             'Archen', 'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
         ],
@@ -371,10 +371,10 @@ exports.Formats = [
             'Standard Doubles', 'Accuracy Moves Clause', 'Dynamax Clause', 'Sleep Clause Mod',
         ],
         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', 'Tornadus-Base', 'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Whimsicott', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta',
-            'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Focus Sash', 'Ally Switch', 'Final Gambit', 'Perish Song', 'Swagger',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cottonee', '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', 'Tornadus-Base', 'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Whimsicott', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Focus Sash', 'Ally Switch', 'Final Gambit', 'Perish Song', 'Swagger',
         ],
     },
     {
@@ -418,6 +418,17 @@ exports.Formats = [
             }
         },
     },
+    {
+        name: "[Gen 8] Jump! Magikarp!",
+        desc: `Every team must contain Magikarp and bring it to the game.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3704588/">Jump! Magikarp!</a>`,
+        ],
+        mod: 'gen8',
+        gameType: 'doubles',
+        ruleset: ['Flat Rules', '!! Picked Team Size = 2', '!! Adjust Level = 50', 'Min Source Gen = 8', 'Force Select = Magikarp'],
+        banlist: ['Sub-Legendary'],
+    },
     {
         name: "[Gen 8] Doubles Custom Game",
         mod: 'gen8',
@@ -570,36 +581,272 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Tier Shift",
-        desc: `Pok&eacute;mon get a +10 boost to each stat, barring HP, per tier below OU they are in.`,
+        name: "[Gen 8] Broken Record",
+        desc: `Pok&eacute;mon can hold a TR to use that move in battle.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3662165/">Tier Shift</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3701270/">Broken Record</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Tier Shift Mod', 'Dynamax Clause'],
+        ruleset: ['Standard', '!Sleep Clause Mod', 'Sleep Moves Clause', 'Dynamax Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin',
-            'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo',
-            'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base',
-            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Sand Veil',
-            'Shadow Tag', 'Snow Cloak', 'Bright Powder', 'Damp Rock', 'Eviolite', 'Heat Rock', 'King\'s Rock', 'Lax Incense', 'Baton Pass',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus', 'Genesect', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala',
+            'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza',
+            'Regieleki', 'Reshiram', 'Rillaboom', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta',
+            'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Magnet Pull', 'Moody', 'Power Construct', 'Shadow Tag', 'TR29 (Baton Pass)',
+            'TR82 (Stored Power)', 'Baton Pass',
         ],
+        onValidateSet(set) {
+            if (!set.item)
+                return;
+            const item = this.dex.items.get(set.item);
+            if (!/^tr\d\d/i.test(item.name))
+                return;
+            const moveName = item.desc.split('move ')[1].split('.')[0];
+            if (set.moves.map(this.toID).includes(this.toID(moveName))) {
+                return [
+                    `${set.species} can't run ${item.name} (${moveName}) as its item because it already has that move in its moveset.`,
+                ];
+            }
+        },
+        onValidateTeam(team) {
+            const trs = new Set();
+            for (const set of team) {
+                if (!set.item)
+                    continue;
+                const item = this.dex.items.get(set.item).name;
+                if (!/^tr\d\d/i.test(item))
+                    continue;
+                if (trs.has(item)) {
+                    return [`Your team already has a Pok\u00e9mon with ${item}.`];
+                }
+                trs.add(item);
+            }
+        },
+        onTakeItem(item) {
+            return !/^tr\d\d/i.test(item.name);
+        },
+        onModifyMove(move) {
+            if (move.id === 'knockoff') {
+                move.onBasePower = function (basePower, source, target, m) {
+                    const item = target.getItem();
+                    if (!this.singleEvent('TakeItem', item, target.itemState, target, target, m, item))
+                        return;
+                    // Very hardcode but I'd prefer to not make a mod for one damage calculation change
+                    if (item.id && !/^tr\d\d/i.test(item.id)) {
+                        return this.chainModify(1.5);
+                    }
+                };
+            }
+        },
+        onBegin() {
+            for (const pokemon of this.getAllPokemon()) {
+                const item = pokemon.getItem();
+                if (/^tr\d\d/i.test(item.name)) {
+                    const move = this.dex.moves.get(item.desc.split('move ')[1].split('.')[0]);
+                    pokemon.moveSlots = pokemon.baseMoveSlots = [
+                        ...pokemon.baseMoveSlots, {
+                            id: move.id,
+                            move: move.name,
+                            pp: move.pp * 8 / 5,
+                            maxpp: move.pp * 8 / 5,
+                            target: move.target,
+                            disabled: false,
+                            disabledSource: '',
+                            used: false,
+                        },
+                    ];
+                }
+            }
+        },
     },
     {
-        name: "[Gen 8] Inverse",
-        desc: `Weaknesses become resistances, while resistances and immunities become weaknesses.`,
+        name: "[Gen 8] Inheritance",
+        desc: `Pok&eacute;mon may use the ability and moves of another, as long as they forfeit their own learnset.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3666858/">Inverse</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3656811/">Inheritance</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Inverse Mod', 'Dynamax Clause'],
+        // searchShow: false,
+        ruleset: ['Standard', '!Sleep Clause Mod', 'Sleep Moves Clause', '2 Ability Clause', 'Dynamax Clause'],
         banlist: [
-            'Cinderace', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Diggersby', 'Dracovish', 'Dracozolt', 'Eternatus', 'Genesect', 'Giratina',
-            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Marshadow',
-            'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Regidrago', 'Regieleki', 'Reshiram',
-            'Reuniclus', 'Rillaboom', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Arena Trap',
-            'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Baton Pass',
+            'Blacephalon', 'Blaziken', 'Butterfree', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chansey', 'Combusken', 'Cresselia', 'Darmanitan-Galar', 'Dialga', 'Dracovish',
+            'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala',
+            'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Natu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regieleki',
+            'Regigigas', 'Reshiram', 'Sableye', 'Shedinja', 'Solgaleo', 'Spectrier', 'Tapu Koko', 'Toxtricity', 'Torkoal', 'Urshifu-Base', 'Xatu', 'Xerneas', 'Yveltal',
+            'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zeraora', 'Zekrom', 'Arena Trap', 'Contrary', 'Drizzle', 'Huge Power', 'Imposter', 'Innards Out',
+            'Libero', 'Moody', 'Power Construct', 'Pure Power', 'Quick Draw', 'Shadow Tag', 'Sheer Force', 'Simple', 'Unaware', 'Unburden', 'Water Bubble', 'King\'s Rock',
+            'Quick Claw', 'Baton Pass', 'Bolt Beak', 'Fishious Rend', 'Shell Smash', 'Thousand Arrows',
         ],
+        getEvoFamily(speciesid) {
+            let species = Dex.species.get(speciesid);
+            while (species.prevo) {
+                species = Dex.species.get(species.prevo);
+            }
+            return species.id;
+        },
+        validateSet(set, teamHas) {
+            const unreleased = (pokemon) => pokemon.tier === "Unreleased" && pokemon.isNonstandard === "Unobtainable";
+            if (!teamHas.abilityMap) {
+                teamHas.abilityMap = Object.create(null);
+                for (const pokemon of Dex.species.all()) {
+                    if (pokemon.isNonstandard || unreleased(pokemon))
+                        continue;
+                    if (pokemon.requiredAbility || pokemon.requiredItem || pokemon.requiredMove)
+                        continue;
+                    if (this.ruleTable.isBannedSpecies(pokemon))
+                        continue;
+                    for (const key of Object.values(pokemon.abilities)) {
+                        const abilityId = this.dex.toID(key);
+                        if (abilityId in teamHas.abilityMap) {
+                            teamHas.abilityMap[abilityId][pokemon.evos ? 'push' : 'unshift'](pokemon.id);
+                        }
+                        else {
+                            teamHas.abilityMap[abilityId] = [pokemon.id];
+                        }
+                    }
+                }
+            }
+            const problem = this.validateForme(set);
+            if (problem.length)
+                return problem;
+            const species = this.dex.species.get(set.species);
+            if (!species.exists || species.num < 1)
+                return [`The Pok\u00e9mon "${set.species}" does not exist.`];
+            if (species.isNonstandard || unreleased(species)) {
+                return [`${species.name} is not obtainable in Generation ${this.dex.gen}.`];
+            }
+            const name = set.name;
+            if (this.ruleTable.isBannedSpecies(species)) {
+                return this.validateSet(set, teamHas);
+            }
+            const ability = this.dex.abilities.get(set.ability);
+            if (!ability.exists || ability.isNonstandard)
+                return [`${name} needs to have a valid ability.`];
+            const pokemonWithAbility = teamHas.abilityMap[ability.id];
+            if (!pokemonWithAbility)
+                return [`${ability.name} is not available on a legal Pok\u00e9mon.`];
+            this.format.debug = true;
+            if (!teamHas.abilitySources)
+                teamHas.abilitySources = Object.create(null);
+            const validSources = teamHas.abilitySources[this.dex.toID(set.species)] = []; // Evolution families
+            let canonicalSource = ''; // Specific for the basic implementation of Donor Clause (see onValidateTeam).
+            for (const donor of pokemonWithAbility) {
+                const donorSpecies = this.dex.species.get(donor);
+                let format = this.format;
+                if (!format.getEvoFamily)
+                    format = this.dex.formats.get('gen8inheritance');
+                const evoFamily = format.getEvoFamily(donorSpecies.id);
+                if (validSources.includes(evoFamily))
+                    continue;
+                set.species = donorSpecies.name;
+                set.name = donorSpecies.baseSpecies;
+                const problems = this.validateSet(set, teamHas) || [];
+                if (!problems.length) {
+                    validSources.push(evoFamily);
+                    canonicalSource = donorSpecies.name;
+                }
+                // Specific for the basic implementation of Donor Clause (see onValidateTeam).
+                if (validSources.length > 1)
+                    break;
+            }
+            this.format.debug = false;
+            set.name = name;
+            set.species = species.name;
+            if (!validSources.length) {
+                if (pokemonWithAbility.length > 1)
+                    return [`${name}'s set is illegal.`];
+                return [`${name} has an illegal set with an ability from ${this.dex.species.get(pokemonWithAbility[0]).name}.`];
+            }
+            // Protocol: Include the data of the donor species in the `ability` data slot.
+            // Afterwards, we are going to reset the name to what the user intended.
+            set.ability = `${set.ability}0${canonicalSource}`;
+            return null;
+        },
+        onValidateTeam(team, f, teamHas) {
+            if (this.ruleTable.has('2abilityclause')) {
+                const abilityTable = new Map();
+                const base = {
+                    airlock: 'cloudnine',
+                    battlearmor: 'shellarmor',
+                    clearbody: 'whitesmoke',
+                    dazzling: 'queenlymajesty',
+                    emergencyexit: 'wimpout',
+                    filter: 'solidrock',
+                    gooey: 'tanglinghair',
+                    insomnia: 'vitalspirit',
+                    ironbarbs: 'roughskin',
+                    libero: 'protean',
+                    minus: 'plus',
+                    moxie: 'chillingneigh',
+                    powerofalchemy: 'receiver',
+                    propellertail: 'stalwart',
+                    teravolt: 'moldbreaker',
+                    turboblaze: 'moldbreaker',
+                };
+                for (const set of team) {
+                    let ability = this.toID(set.ability.split('0')[0]);
+                    if (!ability)
+                        continue;
+                    if (ability in base)
+                        ability = base[ability];
+                    if ((abilityTable.get(ability) || 0) >= 2) {
+                        return [
+                            `You are limited to two of each ability by 2 Ability Clause.`,
+                            `(You have more than two ${this.dex.abilities.get(ability).name} variants)`,
+                        ];
+                    }
+                    abilityTable.set(ability, (abilityTable.get(ability) || 0) + 1);
+                }
+            }
+            // Donor Clause
+            const evoFamilyLists = [];
+            for (const set of team) {
+                const abilitySources = teamHas.abilitySources?.[this.dex.toID(set.species)];
+                if (!abilitySources)
+                    continue;
+                let format = this.format;
+                if (!format.getEvoFamily)
+                    format = this.dex.formats.get('gen8inheritance');
+                evoFamilyLists.push(abilitySources.map(format.getEvoFamily));
+            }
+            // Checking actual full incompatibility would require expensive algebra.
+            // Instead, we only check the trivial case of multiple Pokémon only legal for exactly one family. FIXME?
+            const requiredFamilies = Object.create(null);
+            for (const evoFamilies of evoFamilyLists) {
+                if (evoFamilies.length !== 1)
+                    continue;
+                const [familyId] = evoFamilies;
+                if (!(familyId in requiredFamilies))
+                    requiredFamilies[familyId] = 1;
+                requiredFamilies[familyId]++;
+                if (requiredFamilies[familyId] > 2) {
+                    return [
+                        `You are limited to up to two inheritances from each evolution family by the Donor Clause.`,
+                        `(You inherit more than twice from ${this.dex.species.get(familyId).name}).`,
+                    ];
+                }
+            }
+        },
+        onBegin() {
+            for (const pokemon of this.getAllPokemon()) {
+                if (pokemon.baseAbility.includes('0')) {
+                    const donor = pokemon.baseAbility.split('0')[1];
+                    pokemon.m.donor = this.toID(donor);
+                    pokemon.baseAbility = this.toID(pokemon.baseAbility.split('0')[0]);
+                    pokemon.ability = pokemon.baseAbility;
+                }
+            }
+        },
+        onSwitchIn(pokemon) {
+            if (!pokemon.m.donor)
+                return;
+            const donorTemplate = this.dex.species.get(pokemon.m.donor);
+            if (!donorTemplate.exists)
+                return;
+            // Place volatiles on the Pokémon to show the donor details.
+            this.add('-start', pokemon, donorTemplate.name, '[silent]');
+        },
     },
     // Other Metagames
     ///////////////////////////////////////////////////////////////////
@@ -620,8 +867,8 @@ exports.Formats = [
             'Calyrex-Shadow', 'Cramorant-Gorging', 'Darmanitan-Galar-Zen', 'Eternatus-Eternamax', 'Shedinja', 'Zacian-Crowned',
             'Arena Trap', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion', 'Innards Out', 'Intrepid Sword', 'Libero',
             'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Protean', 'Pure Power', 'Shadow Tag', 'Stakeout',
-            'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk', 'Rusted Sword', 'Court Change', 'Bolt Beak', 'Double Iron Bash',
-            'Octolock', 'Shell Smash',
+            'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk', 'Rusted Sword', 'Belly Drum', 'Bolt Beak', 'Court Change',
+            'Double Iron Bash', 'Octolock', 'Shell Smash',
         ],
     },
     {
@@ -634,8 +881,8 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard', '!Obtainable Abilities', '2 Ability Clause', 'Dynamax Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
         banlist: [
-            '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',
+            'Archeops', 'Blacephalon', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Gengar',
+            'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kommo-o', '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', 'Urshifu-Rapid-Strike',
             'Victini', 'Weavile', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zeraora', 'Zygarde-Base',
@@ -732,9 +979,9 @@ exports.Formats = [
             'Arena Trap', 'Magnet Pull', 'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Baton Pass',
         ],
         restricted: [
-            'Acupressure', 'Astral Barrage', 'Belly Drum', 'Bolt Beak', 'Clangorous Soul', 'Double Iron Bash', 'Electrify', 'Extreme Speed', 'Fishious Rend',
-            'Geomancy', 'Glacial Lance', 'Oblivion Wing', 'Precipice Blades', 'Shell Smash', 'Shift Gear', 'Thousand Arrows', 'Thunderous Kick', 'V-create',
-            'Wicked Blow',
+            'Acupressure', 'Astral Barrage', 'Belly Drum', 'Bolt Beak', 'Clangorous Soul', 'Double Iron Bash', 'Electrify', 'Extreme Speed', 'Final Gambit',
+            'Fishious Rend', 'Geomancy', 'Glacial Lance', 'Oblivion Wing', 'Precipice Blades', 'Shell Smash', 'Shift Gear', 'Thousand Arrows', 'Thunderous Kick',
+            'V-create', 'Wicked Blow',
         ],
     },
     {
@@ -921,7 +1168,7 @@ exports.Formats = [
         ],
         mod: 'gen8bdsp',
         ruleset: ['Little Cup', 'Standard'],
-        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass', 'Sticky Web'],
+        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Munchlax', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass', 'Sticky Web'],
     },
     {
         name: "[Gen 8 BDSP] Monotype",
@@ -1149,194 +1396,6 @@ exports.Formats = [
             }
         },
     },
-    {
-        name: "[Gen 8] Inheritance",
-        desc: `Pok&eacute;mon may use the ability and moves of another, as long as they forfeit their own learnset.`,
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3656811/">Inheritance</a>`,
-        ],
-        mod: 'gen8',
-        searchShow: false,
-        ruleset: ['Standard', '2 Ability Clause', 'Dynamax Clause'],
-        banlist: [
-            'Blacephalon', 'Blaziken', 'Butterfree', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chansey', 'Combusken', 'Cresselia', 'Darmanitan-Galar', 'Dialga', 'Dracovish',
-            'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala',
-            'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Natu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regieleki',
-            'Regigigas', 'Reshiram', 'Sableye', 'Shedinja', 'Solgaleo', 'Spectrier', 'Tapu Koko', 'Toxtricity', 'Torkoal', 'Urshifu-Base', 'Xatu', 'Xerneas', 'Yveltal',
-            'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zeraora', 'Zekrom', 'Arena Trap', 'Contrary', 'Drizzle', 'Huge Power', 'Imposter', 'Innards Out',
-            'Libero', 'Moody', 'Power Construct', 'Pure Power', 'Quick Draw', 'Shadow Tag', 'Sheer Force', 'Simple', 'Unaware', 'Unburden', 'Water Bubble', 'King\'s Rock',
-            'Quick Claw', 'Baton Pass', 'Bolt Beak', 'Fishious Rend', 'Shell Smash', 'Thousand Arrows',
-        ],
-        getEvoFamily(speciesid) {
-            let species = Dex.species.get(speciesid);
-            while (species.prevo) {
-                species = Dex.species.get(species.prevo);
-            }
-            return species.id;
-        },
-        validateSet(set, teamHas) {
-            const unreleased = (pokemon) => pokemon.tier === "Unreleased" && pokemon.isNonstandard === "Unobtainable";
-            if (!teamHas.abilityMap) {
-                teamHas.abilityMap = Object.create(null);
-                for (const pokemon of Dex.species.all()) {
-                    if (pokemon.isNonstandard || unreleased(pokemon))
-                        continue;
-                    if (pokemon.requiredAbility || pokemon.requiredItem || pokemon.requiredMove)
-                        continue;
-                    if (this.ruleTable.isBannedSpecies(pokemon))
-                        continue;
-                    for (const key of Object.values(pokemon.abilities)) {
-                        const abilityId = this.dex.toID(key);
-                        if (abilityId in teamHas.abilityMap) {
-                            teamHas.abilityMap[abilityId][pokemon.evos ? 'push' : 'unshift'](pokemon.id);
-                        }
-                        else {
-                            teamHas.abilityMap[abilityId] = [pokemon.id];
-                        }
-                    }
-                }
-            }
-            const problem = this.validateForme(set);
-            if (problem.length)
-                return problem;
-            const species = this.dex.species.get(set.species);
-            if (!species.exists || species.num < 1)
-                return [`The Pok\u00e9mon "${set.species}" does not exist.`];
-            if (species.isNonstandard || unreleased(species)) {
-                return [`${species.name} is not obtainable in Generation ${this.dex.gen}.`];
-            }
-            const name = set.name;
-            if (this.ruleTable.isBannedSpecies(species)) {
-                return this.validateSet(set, teamHas);
-            }
-            const ability = this.dex.abilities.get(set.ability);
-            if (!ability.exists || ability.isNonstandard)
-                return [`${name} needs to have a valid ability.`];
-            const pokemonWithAbility = teamHas.abilityMap[ability.id];
-            if (!pokemonWithAbility)
-                return [`${ability.name} is not available on a legal Pok\u00e9mon.`];
-            this.format.debug = true;
-            if (!teamHas.abilitySources)
-                teamHas.abilitySources = Object.create(null);
-            const validSources = teamHas.abilitySources[this.dex.toID(set.species)] = []; // Evolution families
-            let canonicalSource = ''; // Specific for the basic implementation of Donor Clause (see onValidateTeam).
-            for (const donor of pokemonWithAbility) {
-                const donorSpecies = this.dex.species.get(donor);
-                let format = this.format;
-                if (!format.getEvoFamily)
-                    format = this.dex.formats.get('gen8inheritance');
-                const evoFamily = format.getEvoFamily(donorSpecies.id);
-                if (validSources.includes(evoFamily))
-                    continue;
-                set.species = donorSpecies.name;
-                set.name = donorSpecies.baseSpecies;
-                const problems = this.validateSet(set, teamHas) || [];
-                if (!problems.length) {
-                    validSources.push(evoFamily);
-                    canonicalSource = donorSpecies.name;
-                }
-                // Specific for the basic implementation of Donor Clause (see onValidateTeam).
-                if (validSources.length > 1)
-                    break;
-            }
-            this.format.debug = false;
-            set.name = name;
-            set.species = species.name;
-            if (!validSources.length) {
-                if (pokemonWithAbility.length > 1)
-                    return [`${name}'s set is illegal.`];
-                return [`${name} has an illegal set with an ability from ${this.dex.species.get(pokemonWithAbility[0]).name}.`];
-            }
-            // Protocol: Include the data of the donor species in the `ability` data slot.
-            // Afterwards, we are going to reset the name to what the user intended.
-            set.ability = `${set.ability}0${canonicalSource}`;
-            return null;
-        },
-        onValidateTeam(team, f, teamHas) {
-            if (this.ruleTable.has('2abilityclause')) {
-                const abilityTable = new Map();
-                const base = {
-                    airlock: 'cloudnine',
-                    battlearmor: 'shellarmor',
-                    clearbody: 'whitesmoke',
-                    dazzling: 'queenlymajesty',
-                    emergencyexit: 'wimpout',
-                    filter: 'solidrock',
-                    gooey: 'tanglinghair',
-                    insomnia: 'vitalspirit',
-                    ironbarbs: 'roughskin',
-                    libero: 'protean',
-                    minus: 'plus',
-                    moxie: 'chillingneigh',
-                    powerofalchemy: 'receiver',
-                    propellertail: 'stalwart',
-                    teravolt: 'moldbreaker',
-                    turboblaze: 'moldbreaker',
-                };
-                for (const set of team) {
-                    let ability = this.toID(set.ability.split('0')[0]);
-                    if (!ability)
-                        continue;
-                    if (ability in base)
-                        ability = base[ability];
-                    if ((abilityTable.get(ability) || 0) >= 2) {
-                        return [
-                            `You are limited to two of each ability by 2 Ability Clause.`,
-                            `(You have more than two ${this.dex.abilities.get(ability).name} variants)`,
-                        ];
-                    }
-                    abilityTable.set(ability, (abilityTable.get(ability) || 0) + 1);
-                }
-            }
-            // Donor Clause
-            const evoFamilyLists = [];
-            for (const set of team) {
-                const abilitySources = teamHas.abilitySources?.[this.dex.toID(set.species)];
-                if (!abilitySources)
-                    continue;
-                let format = this.format;
-                if (!format.getEvoFamily)
-                    format = this.dex.formats.get('gen8inheritance');
-                evoFamilyLists.push(abilitySources.map(format.getEvoFamily));
-            }
-            // Checking actual full incompatibility would require expensive algebra.
-            // Instead, we only check the trivial case of multiple Pokémon only legal for exactly one family. FIXME?
-            const requiredFamilies = Object.create(null);
-            for (const evoFamilies of evoFamilyLists) {
-                if (evoFamilies.length !== 1)
-                    continue;
-                const [familyId] = evoFamilies;
-                if (!(familyId in requiredFamilies))
-                    requiredFamilies[familyId] = 1;
-                requiredFamilies[familyId]++;
-                if (requiredFamilies[familyId] > 2) {
-                    return [
-                        `You are limited to up to two inheritances from each evolution family by the Donor Clause.`,
-                        `(You inherit more than twice from ${this.dex.species.get(familyId).name}).`,
-                    ];
-                }
-            }
-        },
-        onBegin() {
-            for (const pokemon of this.getAllPokemon()) {
-                if (pokemon.baseAbility.includes('0')) {
-                    const donor = pokemon.baseAbility.split('0')[1];
-                    pokemon.m.donor = this.toID(donor);
-                    pokemon.baseAbility = this.toID(pokemon.baseAbility.split('0')[0]);
-                    pokemon.ability = pokemon.baseAbility;
-                }
-            }
-        },
-        onSwitchIn(pokemon) {
-            if (!pokemon.m.donor)
-                return;
-            const donorTemplate = this.dex.species.get(pokemon.m.donor);
-            if (!donorTemplate.exists)
-                return;
-            // Place volatiles on the Pokémon to show the donor details.
-            this.add('-start', pokemon, donorTemplate.name, '[silent]');
-        },
-    },
     {
         name: "[Gen 8] Linked",
         desc: `The first two moves in a Pok&eacute;mon's moveset are used simultaneously.`,
@@ -2318,35 +2377,44 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 7] UU",
+        name: "[Gen 2] Ubers",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3621217/">USM UU Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3641346/">USM UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286282/">GSC Ubers</a>`,
         ],
-        mod: 'gen7',
+        mod: 'gen2',
         // searchShow: false,
-        ruleset: ['[Gen 7] OU'],
-        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
+        ruleset: ['Standard'],
     },
     {
-        name: "[Gen 6] ZU",
+        name: "[Gen 3] 1v1",
+        desc: `Bring three Pok&eacute;mon to Team Preview and choose one to battle.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/zu/">ORAS ZU Banlist</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8034679/">ORAS ZU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8031456/">ADV 1v1</a>`,
         ],
-        mod: 'gen6',
+        mod: 'gen3',
         // searchShow: false,
-        ruleset: ['[Gen 6] PU'],
-        banlist: ['PU', 'Fraxure', 'Regigigas', 'Simisear'],
+        ruleset: [
+            'Picked Team Size = 1', 'Max Team Size = 3',
+            '[Gen 3] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview', '!Freeze Clause Mod',
+        ],
+        banlist: [
+            'Clefable', 'Slaking', 'Snorlax', 'Suicune', 'Zapdos', 'Destiny Bond', 'Explosion', 'Ingrain', 'Perish Song',
+            'Self-Destruct', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw',
+        ],
+        unbanlist: ['Mr. Mime', 'Wobbuffet', 'Wynaut', 'Sand Veil'],
     },
     {
-        name: "[Gen 1] Ubers",
+        name: "[Gen 1] Stadium OU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286283/">RBY Ubers</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3685877/">Stadium OU Viability Rankings</a>`,
         ],
-        mod: 'gen1',
+        mod: 'gen1stadium',
         // searchShow: false,
-        ruleset: ['Standard'],
+        ruleset: ['Standard', 'Team Preview'],
+        banlist: ['Uber',
+            'Nidoking + Fury Attack + Thrash', 'Exeggutor + Poison Powder + Stomp', 'Exeggutor + Sleep Powder + Stomp',
+            'Exeggutor + Stun Spore + Stomp', 'Jolteon + Focus Energy + Thunder Shock', 'Flareon + Focus Energy + Ember',
+        ],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2383,7 +2451,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3668699/">BW2 OU Viability Rankings</a>`,
         ],
         mod: 'gen5',
-        ruleset: ['Standard', 'Evasion Abilities Clause', 'Sleep Moves Clause', 'Swagger Clause'],
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Sleep Moves Clause', 'Swagger Clause', 'Gems Clause'],
         banlist: ['Uber', 'Arena Trap', 'Drizzle ++ Swift Swim', 'Drought ++ Chlorophyll', 'Sand Rush', 'Shadow Tag', 'King\'s Rock', 'Razor Fang', 'Soul Dew', 'Assist', 'Baton Pass'],
     },
     {
@@ -2394,7 +2462,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3683332/">DPP OU Viability Rankings</a>`,
         ],
         mod: 'gen4',
-        ruleset: ['Standard'],
+        ruleset: ['Standard', 'Freeze Clause Mod'],
         banlist: ['AG', 'Uber', 'Arena Trap', 'Sand Veil', 'Swinub + Snow Cloak', 'Piloswine + Snow Cloak', 'Mamoswine + Snow Cloak', 'Soul Dew', 'Baton Pass', 'Swagger'],
     },
     {
@@ -2404,7 +2472,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3503019/">ADV OU Viability Rankings</a>`,
         ],
         mod: 'gen3',
-        ruleset: ['Standard', 'One Boost Passer Clause'],
+        ruleset: ['Standard', 'One Boost Passer Clause', 'Freeze Clause Mod'],
         banlist: ['Uber', 'Sand Veil', 'Soundproof', 'Assist', 'Baton Pass + Block', 'Baton Pass + Mean Look', 'Baton Pass + Spider Web', 'Smeargle + Ingrain'],
     },
     {
@@ -2415,7 +2483,7 @@ exports.Formats = [
         ],
         mod: 'gen2',
         ruleset: ['Standard'],
-        banlist: ['Uber'],
+        banlist: ['Uber', 'Mean Look + Baton Pass', 'Spider Web + Baton Pass'],
     },
     {
         name: "[Gen 1] OU",
@@ -2565,6 +2633,17 @@ exports.Formats = [
         ruleset: ['Standard', 'Mega Rayquaza Clause'],
         banlist: ['Baton Pass'],
     },
+    {
+        name: "[Gen 7] UU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3621217/">USM UU Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3641346/">USM UU Viability Rankings</a>`,
+        ],
+        mod: 'gen7',
+        searchShow: false,
+        ruleset: ['[Gen 7] OU'],
+        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
+    },
     {
         name: "[Gen 7] RU",
         threads: [
@@ -2649,7 +2728,7 @@ exports.Formats = [
             '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', 'Perish Song', 'Detect + Fightinium Z',
+            'Moody', 'Focus Sash', 'Grass Whistle', 'Hypnosis', 'Perish Song', 'Sing', 'Detect + Fightinium Z',
         ],
     },
     {
@@ -2952,6 +3031,17 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Obtainable', 'Team Preview', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
     },
+    {
+        name: "[Gen 6] ZU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/zu/">ORAS ZU Banlist</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8034679/">ORAS ZU Viability Rankings</a>`,
+        ],
+        mod: 'gen6',
+        searchShow: false,
+        ruleset: ['[Gen 6] PU'],
+        banlist: ['PU', 'Fraxure', 'Regigigas', 'Simisear'],
+    },
     {
         name: "[Gen 6] CAP",
         threads: [
@@ -2962,7 +3052,7 @@ exports.Formats = [
         mod: 'gen6',
         searchShow: false,
         ruleset: ['[Gen 6] OU', '+CAP'],
-        banlist: ['Aurumoth', 'Cawmodore', 'Crucibelle-Mega'],
+        banlist: ['Aurumoth', 'Cawmodore'],
     },
     {
         name: "[Gen 6] Battle Spot Singles",
@@ -3140,7 +3230,7 @@ exports.Formats = [
         mod: 'gen5',
         searchShow: false,
         ruleset: ['[Gen 5] NU', 'Sleep Moves Clause'],
-        banlist: ['NU', 'PUBL'],
+        banlist: ['NU', 'PUBL', 'Damp Rock'],
     },
     {
         name: "[Gen 5] LC",
@@ -3164,7 +3254,7 @@ exports.Formats = [
         ],
         mod: 'gen5',
         searchShow: false,
-        ruleset: ['[Gen 5] OU', 'Same Type Clause'],
+        ruleset: ['[Gen 5] OU', 'Same Type Clause', '!Gems Clause'],
     },
     {
         name: "[Gen 5] 1v1",
@@ -3294,7 +3384,7 @@ exports.Formats = [
         ],
         mod: 'gen4',
         searchShow: false,
-        ruleset: ['[Gen 4] OU'],
+        ruleset: ['[Gen 4] OU', '!Freeze Clause Mod'],
         banlist: ['OU', 'UUBL'],
         unbanlist: ['Arena Trap', 'Swagger'],
     },
@@ -3356,7 +3446,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: [
             'Picked Team Size = 1', 'Max Team Size = 3',
-            '[Gen 4] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
+            '[Gen 4] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview', '!Freeze Clause Mod',
         ],
         banlist: ['Latias', 'Machamp', 'Porygon-Z', 'Shaymin', 'Snorlax', 'Togekiss', 'Focus Sash', 'Destiny Bond', 'Explosion', 'Perish Song', 'Self-Destruct'],
         unbanlist: ['Wobbuffet', 'Wynaut', 'Sand Veil', 'Swagger'],
@@ -3398,7 +3488,7 @@ exports.Formats = [
         mod: 'gen4',
         gameType: 'doubles',
         searchShow: false,
-        ruleset: ['[Gen 4] OU'],
+        ruleset: ['[Gen 4] OU', '!Freeze Clause Mod'],
         banlist: ['Explosion'],
         unbanlist: ['Garchomp', 'Latias', 'Latios', 'Manaphy', 'Mew', 'Salamence', 'Wobbuffet', 'Wynaut', 'Swagger'],
     },
@@ -3453,9 +3543,8 @@ exports.Formats = [
         ],
         mod: 'gen3',
         searchShow: false,
-        ruleset: ['Standard', 'NFE Clause'],
-        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Baton Pass'],
-        unbanlist: ['Scyther'],
+        ruleset: ['Standard'],
+        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Arena Trap', 'Bright Powder', 'Lax Incense', 'Baton Pass', 'Swagger'],
     },
     {
         name: "[Gen 3] NU",
@@ -3464,9 +3553,8 @@ exports.Formats = [
         ],
         mod: 'gen3',
         searchShow: false,
-        ruleset: ['[Gen 3] UU', '!NFE Clause'],
-        banlist: ['UU'],
-        unbanlist: ['Baton Pass'],
+        ruleset: ['Standard'],
+        banlist: ['Uber', 'OU', 'UUBL', 'UU', 'Smeargle + Ingrain'],
     },
     {
         name: "[Gen 3] Doubles OU",
@@ -3480,21 +3568,6 @@ exports.Formats = [
         banlist: ['Uber'],
         unbanlist: ['Deoxys-Speed', 'Wobbuffet', 'Wynaut'],
     },
-    {
-        name: "[Gen 3] 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/8031456/">ADV 1v1</a>`,
-        ],
-        mod: 'gen3',
-        searchShow: false,
-        ruleset: [
-            'Picked Team Size = 1', 'Max Team Size = 3',
-            '[Gen 3] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
-        ],
-        banlist: ['Clefable', 'Slaking', 'Snorlax', 'Suicune', 'Destiny Bond', 'Explosion', 'Ingrain', 'Perish Song', 'Self-Destruct', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw'],
-        unbanlist: ['Mr. Mime', 'Wobbuffet', 'Wynaut', 'Sand Veil'],
-    },
     {
         name: "[Gen 3] Custom Game",
         mod: 'gen3',
@@ -3511,15 +3584,6 @@ exports.Formats = [
         debug: true,
         ruleset: ['HP Percentage Mod', 'Cancel Mod', 'Max Team Size = 24', 'Max Move Count = 24', 'Max Level = 9999', 'Default Level = 100'],
     },
-    {
-        name: "[Gen 2] Ubers",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286282/">GSC Ubers</a>`,
-        ],
-        mod: 'gen2',
-        searchShow: false,
-        ruleset: ['Standard'],
-    },
     {
         name: "[Gen 2] UU",
         threads: [`&bullet; <a href="https://www.smogon.com/forums/threads/3576710/">GSC UU</a>`],
@@ -3582,6 +3646,15 @@ exports.Formats = [
         battle: { trunc: Math.trunc },
         ruleset: ['HP Percentage Mod', 'Cancel Mod', 'Max Team Size = 24', 'Max Move Count = 24', 'Max Level = 9999', 'Default Level = 100'],
     },
+    {
+        name: "[Gen 1] Ubers",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286283/">RBY Ubers</a>`,
+        ],
+        mod: 'gen1',
+        searchShow: false,
+        ruleset: ['Standard'],
+    },
     {
         name: "[Gen 1] UU",
         threads: [
@@ -3590,7 +3663,7 @@ exports.Formats = [
         ],
         mod: 'gen1',
         searchShow: false,
-        ruleset: ['[Gen 1] OU'],
+        ruleset: ['[Gen 1] OU', 'APT Clause'],
         banlist: ['OU', 'UUBL'],
     },
     {
@@ -3624,19 +3697,6 @@ exports.Formats = [
         ],
         banlist: ['Uber'],
     },
-    {
-        name: "[Gen 1] Stadium OU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3685877/">Stadium OU Viability Rankings</a>`,
-        ],
-        mod: 'gen1stadium',
-        searchShow: false,
-        ruleset: ['Standard', 'Team Preview'],
-        banlist: ['Uber',
-            'Nidoking + Fury Attack + Thrash', 'Exeggutor + Poison Powder + Stomp', 'Exeggutor + Sleep Powder + Stomp',
-            'Exeggutor + Stun Spore + Stomp', 'Jolteon + Focus Energy + Thunder Shock', 'Flareon + Focus Energy + Ember',
-        ],
-    },
     {
         name: "[Gen 1] Tradebacks OU",
         desc: `RBY OU with movepool additions from the Time Capsule.`,