@pkmn/sim 0.4.23 → 0.5.0

package/build/config/formats.js

@@ -129,7 +129,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         ruleset: ['[Gen 8] RU'],
-        banlist: ['RU', 'NUBL', 'Drizzle', 'Drought', 'Snow Warning'],
+        banlist: ['RU', 'NUBL', 'Drizzle', 'Drought'],
     },
     {
         name: "[Gen 8] PU",
@@ -151,7 +151,7 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Little Cup', 'Standard', 'Dynamax Clause'],
         banlist: [
-            'Corsola-Galar', 'Cutiefly', 'Drifloon', 'Gastly', 'Gothita', 'Rufflet', 'Scraggy', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vullaby', 'Vulpix-Alola', 'Woobat',
+            'Corsola-Galar', 'Cutiefly', 'Drifloon', 'Gastly', 'Gothita', 'Rufflet', 'Scraggy', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vullaby', 'Vulpix-Alola', 'Woobat', 'Zigzagoon-Base',
             'Chlorophyll', 'Moody', 'Baton Pass', 'Sticky Web',
         ],
     },
@@ -213,7 +213,10 @@ exports.Formats = [
         ],
         mod: 'gen8',
         ruleset: ['[Gen 8] PU'],
-        banlist: ['PU', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Omastar', 'Rotom-Frost', 'Turtonator', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed'],
+        banlist: [
+            'PU', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Omastar', 'Rotom-Frost',
+            'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed',
+        ],
     },
     {
         name: "[Gen 8] LC UU",
@@ -253,6 +256,7 @@ exports.Formats = [
         mod: 'gen8',
         searchShow: false,
         ruleset: ['[Gen 8] LC', '+CAP'],
+        banlist: ['Cawdet'],
     },
     {
         name: "[Gen 8] Battle Stadium Singles",
@@ -336,11 +340,32 @@ exports.Formats = [
     },
     {
         name: "[Gen 8] VGC 2021 Series 11",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3677186/">VGC 2021 Series 11 Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3693427/">VGC 2021 Series 11 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3693284/">VGC 2021 Series 11 Viability Rankings</a>`,
+        ],
         mod: 'gen8',
         gameType: 'doubles',
         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',
@@ -558,42 +583,35 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Sketchmons",
-        desc: `Pok&eacute;mon can learn one of any move they don't normally learn, barring the few that are banned.`,
+        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/3680298/">Sketchmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3692297/">Revelationmons</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause', 'Sketchmons Move Legality'],
+        ruleset: ['Standard', 'Dynamax Clause', 'Revelationmons Mod', 'Sleep Moves Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus', 'Genesect',
-            'Giratina', 'Giratina-Origin', 'Groudon', 'Hawlucha', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base',
-            'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa',
-            'Porygon-Z', 'Rayquaza', 'Regieleki', 'Reshiram', 'Rillaboom', 'Shedinja', 'Solgaleo', 'Spectrier', 'Swoobat', 'Tapu Bulu',
-            'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zeraora', 'Zygarde-Base',
-            'Arena Trap', 'Moody', 'Power Construct', 'Sand Rush', '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', 'Lovely Kiss', 'No Retreat', 'Oblivion Wing', 'Octolock', 'Quiver Dance', 'Secret Sword',
-            'Shell Smash', 'Shift Gear', 'Sleep Powder', 'Spore', 'Thousand Arrows', 'Transform', 'V-create', 'Wicked Blow',
+            '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',
         ],
+        restricted: ['Bolt Beak', 'U-turn', 'Volt Switch'],
     },
     {
-        name: "[Gen 8] AAA Doubles",
-        desc: `Pok&eacute;mon have access to almost any ability, in a doubles setting.`,
+        name: "[Gen 8 BDSP] Balanced Hackmons",
+        desc: `Anything that can be hacked in-game and is usable in local battles is allowed.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8299984">AAA Doubles</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/9043074">BDSP Balanced Hackmons</a>`,
         ],
-        mod: 'gen8',
-        gameType: 'doubles',
-        ruleset: ['[Gen 8] Doubles OU', 'Sleep Clause Mod', '2 Ability Clause', '!Obtainable Abilities'],
+        mod: 'gen8bdsp',
+        ruleset: ['-Nonexistent', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Moves Clause', 'Endless Battle Clause'],
         banlist: [
-            'Kyurem-Black', 'Regigigas', 'Shedinja', 'Urshifu-Rapid-Strike', 'Zygarde-Base', 'Anger Point', 'Arena Trap', 'Comatose', 'Contrary',
-            'Desolate Land', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter', 'Innards Out', 'Intrepid Sword',
-            'Libero', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Prankster', 'Primordial Sea', 'Protean', 'Pure Power', 'Rattled', 'Serene Grace',
-            'Simple', 'Soul-Heart', 'Stakeout', 'Steam Engine', 'Speed Boost', 'Water Bubble', 'Water Compaction', 'Wonder Guard', 'King\'s Rock',
-            'Weakness Policy', 'Beat Up', 'Stored Power',
+            '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',
         ],
     },
     // Other Metagames
@@ -737,12 +755,12 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard', 'STABmons Move Legality', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus', 'Genesect', 'Garchomp', 'Giratina',
-            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus', 'Landorus-Therian', 'Lugia', 'Lunala',
-            'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Reshiram',
-            'Silvally', 'Solgaleo', 'Spectrier', 'Tapu Bulu', 'Tapu Koko', 'Thundurus-Base', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
-            'Zamazenta', 'Zamazenta-Crowned', 'Zapdos-Galar', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Magnet Pull', 'Moody', 'Power Construct', 'Shadow Tag',
-            'King\'s Rock', 'Baton Pass',
+            'Aegislash', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Genesect',
+            'Garchomp', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus', 'Landorus-Therian',
+            'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z',
+            'Rayquaza', 'Reshiram', 'Silvally', 'Solgaleo', 'Spectrier', 'Tapu Bulu', 'Tapu Koko', 'Thundurus-Base', 'Urshifu-Base', 'Xerneas', 'Yveltal',
+            'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zapdos-Galar', 'Zekrom', 'Zygarde-Base', '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',
@@ -788,12 +806,12 @@ exports.Formats = [
     {
         name: "[Gen 8 BDSP] Random Battle",
         desc: `Randomized teams of level-balanced Pok&eacute;mon with sets that are generated to be competitively viable.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3693955/">BDSP Random Battle Set Discussion</a>`,
+        ],
         mod: 'gen8bdsp',
         team: 'random',
-        searchShow: false,
-        challengeShow: false,
-        tournamentShow: false,
-        ruleset: ['[Gen 8] Random Battle'],
+        ruleset: ['[Gen 8] Random Battle', '!PotD'],
     },
     {
         name: "[Gen 8 BDSP] OU",
@@ -805,26 +823,69 @@ exports.Formats = [
         ruleset: ['Standard'],
         banlist: ['Uber', 'Arena Trap', 'Drizzle', 'Moody', 'Shadow Tag', 'King\'s Rock', 'Razor Fang', 'Baton Pass'],
     },
+    {
+        name: "[Gen 8 BDSP] Ubers",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3694036/">BDSP Ubers Discussion &amp; Resources</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['Standard'],
+        banlist: ['AG', 'Baton Pass'],
+    },
+    {
+        name: "[Gen 8 BDSP] UU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3694307/">BDSP UU</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['[Gen 8 BDSP] OU'],
+        banlist: ['OU', 'UUBL'],
+    },
+    {
+        name: "[Gen 8 BDSP] Monotype",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3694267/">BDSP Monotype</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['Standard', 'Same Type Clause'],
+        banlist: [
+            'Dialga', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Lugia', 'Mewtwo', 'Palkia', 'Rayquaza',
+            'Arena Trap', 'Moody', 'Shadow Tag', 'Damp Rock', 'King\'s Rock', 'Razor Fang', 'Baton Pass',
+        ],
+    },
+    {
+        name: "[Gen 8 BDSP] CAP",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3694238/">BDSP CAP</a>`,
+        ],
+        mod: 'gen8bdsp',
+        searchShow: false,
+        ruleset: ['[Gen 8 BDSP] OU', '+CAP'],
+    },
     {
         name: "[Gen 8 BDSP] Doubles OU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3693891/">BDSP Doubles OU</a>`,
+        ],
         mod: 'gen8bdsp',
         gameType: 'doubles',
-        searchShow: false,
         ruleset: ['Standard Doubles'],
         banlist: ['DUber'],
     },
     {
         name: "[Gen 8 BDSP] Battle Festival Doubles",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3694269/">Battle Festival Doubles</a>`,
+        ],
         mod: 'gen8bdsp',
         gameType: 'doubles',
-        // VGC Timer is temporary
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer'],
+        ruleset: ['Flat Rules', 'Min Source Gen = 8'],
     },
     {
         name: "[Gen 8 BDSP] Pure Hackmons",
         desc: `Anything that can be hacked in-game and is usable in local battles is allowed.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3656851/">Pure Hackmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3693868/">Pure Hackmons</a>`,
         ],
         mod: 'gen8bdsp',
         searchShow: false,
@@ -846,9 +907,9 @@ exports.Formats = [
         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',
-            'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Shedinja', 'Slowking-Galar', 'Solgaleo',
-            'Tornadus-Therian', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zeraora', 'Zygarde-Base',
-            'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
+            '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) {
@@ -876,8 +937,9 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard', 'Dynamax Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Hawlucha', 'Marowak-Alola', 'Melmetal', 'Pikachu', 'Toxapex', 'Zacian', 'Zacian-Crowned',
-            'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power', 'Moody', 'Pure Power', 'Shadow Tag', 'Baton Pass',
+            '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',
+            'Shadow Tag', 'Baton Pass',
         ],
         onValidateTeam(team) {
             const gods = new Set();
@@ -1928,37 +1990,47 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 6] Ubers",
+        name: "[Gen 1] UU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286277/">ORAS Ubers</a>`,
+            `&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: 'gen6',
+        mod: 'gen1',
         // searchShow: false,
-        ruleset: ['Standard', 'Swagger Clause', 'Mega Rayquaza Clause'],
+        ruleset: ['[Gen 1] OU'],
+        banlist: ['OU', 'UUBL'],
     },
     {
-        name: "[Gen 4] UU",
+        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/threads/3532624/">DPP UU Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3503638/">DPP UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8031459/">ORAS 1v1</a>`,
         ],
-        mod: 'gen4',
+        mod: 'gen6',
         // searchShow: false,
-        ruleset: ['[Gen 4] OU'],
-        banlist: ['OU', 'UUBL'],
-        unbanlist: ['Arena Trap'],
+        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 3] Doubles OU",
+        name: "[Gen 5] Doubles OU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3666831/">ADV Doubles OU</a>`,
+            `&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: 'gen3',
-        // searchShow: false,
+        mod: 'gen5',
         gameType: 'doubles',
-        ruleset: ['Standard', '!Sleep Clause Mod', '!Switch Priority Clause Mod'],
-        banlist: ['Uber'],
-        unbanlist: ['Deoxys-Speed', 'Wobbuffet', 'Wynaut'],
+        // searchShow: false,
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
+        banlist: ['DUber', 'Soul Dew', 'Dark Void', 'Gravity'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2052,7 +2124,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/posts/8407209/">USM Balanced Hackmons</a>`,
         ],
         mod: 'gen7',
-        ruleset: ['-Nonexistent', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'CFZ Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Clause Mod', 'Endless Battle Clause'],
+        ruleset: ['-Nonexistent', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Forme Clause', 'CFZ Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Clause Mod', 'Endless Battle Clause'],
         banlist: [
             'Groudon-Primal', 'Rayquaza-Mega', 'Gengarite', 'Comatose + Sleep Talk', 'Chatter',
             'Arena Trap', 'Contrary', 'Huge Power', 'Illusion', 'Innards Out', 'Magnet Pull', 'Moody', 'Parental Bond', 'Protean', 'Psychic Surge', 'Pure Power', 'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard',
@@ -2252,7 +2324,8 @@ exports.Formats = [
             'Groudon', 'Ho-Oh', 'Hoopa-Unbound', 'Kangaskhan-Mega', 'Kartana', 'Kyogre', 'Kyurem-White', 'Lucario-Mega', 'Lugia', 'Lunala', 'Magearna',
             'Marshadow', 'Mawile-Mega', 'Medicham-Mega', 'Metagross-Mega', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
             'Pheromosa', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Solgaleo', 'Tapu Lele', 'Xerneas', 'Yveltal', 'Zekrom', 'Zygarde',
-            'Battle Bond', 'Shadow Tag', 'Damp Rock', 'Smooth Rock', 'Terrain Extender', 'Baton Pass',
+            'Battle Bond', 'Shadow Tag', 'Bright Powder', 'Damp Rock', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw', 'Razor Fang',
+            'Smooth Rock', 'Terrain Extender', 'Baton Pass',
         ],
     },
     {
@@ -2459,6 +2532,15 @@ exports.Formats = [
         section: "OR/AS Singles",
         column: 4,
     },
+    {
+        name: "[Gen 6] Ubers",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286277/">ORAS Ubers</a>`,
+        ],
+        mod: 'gen6',
+        searchShow: false,
+        ruleset: ['Standard', 'Swagger Clause', 'Mega Rayquaza Clause'],
+    },
     {
         name: "[Gen 6] UU",
         threads: [
@@ -2535,25 +2617,6 @@ 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: [
@@ -2790,7 +2853,7 @@ exports.Formats = [
             'Picked Team Size = 1', 'Max Team Size = 3',
             'Standard', 'Baton Pass Clause', 'Swagger Clause',
         ],
-        banlist: ['Uber', 'Cottonee', 'Dragonite', 'Kyurem-Black', 'Togekiss', 'Whimsicott', 'Victini', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Soul Dew', 'Perish Song'],
+        banlist: ['Uber', 'Cottonee', 'Dragonite', 'Kyurem-Black', 'Mew', 'Togekiss', 'Whimsicott', 'Victini', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Soul Dew', 'Perish Song'],
         unbanlist: ['Genesect', 'Landorus', 'Manaphy', 'Thundurus', 'Tornadus-Therian'],
     },
     {
@@ -2815,19 +2878,6 @@ 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',
@@ -2888,6 +2938,18 @@ exports.Formats = [
         ruleset: ['Standard'],
         banlist: ['AG'],
     },
+    {
+        name: "[Gen 4] UU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3532624/">DPP UU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3503638/">DPP UU Viability Rankings</a>`,
+        ],
+        mod: 'gen4',
+        searchShow: false,
+        ruleset: ['[Gen 4] OU'],
+        banlist: ['OU', 'UUBL'],
+        unbanlist: ['Arena Trap'],
+    },
     {
         name: "[Gen 4] NU",
         threads: [
@@ -3042,6 +3104,18 @@ exports.Formats = [
         banlist: ['UU'],
         unbanlist: ['Baton Pass'],
     },
+    {
+        name: "[Gen 3] Doubles OU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3666831/">ADV Doubles OU</a>`,
+        ],
+        mod: 'gen3',
+        searchShow: false,
+        gameType: 'doubles',
+        ruleset: ['Standard', '!Sleep Clause Mod', '!Switch Priority Clause Mod'],
+        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.`,
@@ -3149,17 +3223,6 @@ 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: [