@pkmn/sim 0.5.14 → 0.5.15

package/build/config/formats.js

@@ -193,7 +193,8 @@ exports.Formats = [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Dialga', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Jirachi',
             'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mew', 'Mewtwo', 'Mimikyu', 'Necrozma', 'Necrozma-Dawn-Wings',
             'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Sableye', 'Snorlax', 'Solgaleo', 'Victini', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
-            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Perish Song',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw',
+            'Acupressure', 'Hypnosis', 'Perish Song', 'Sing',
         ],
     },
     {
@@ -370,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', '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', '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',
         ],
     },
     {
@@ -469,7 +470,7 @@ exports.Formats = [
             'Magnezone', 'Mawile-Mega', 'Pelipper', 'Rillaboom', 'Scizor-Mega', 'Serperior', 'Slowbro-Base', 'Swampert-Mega', 'Tapu Fini',
             'Tapu Koko', 'Tapu Lele', 'Toxapex', 'Tyranitar', 'Victini', 'Volcarona', 'Weavile', 'Zapdos-Base',
             'ND UUBL',
-            'Drizzle', 'Drought',
+            'Drizzle', 'Drought', 'Light Clay',
             // Slowbronite is banned so it doesn't validate on Galarian Slowbro
             'Slowbronite',
         ],
@@ -515,61 +516,41 @@ exports.Formats = [
         section: "Pet Mods",
     },
     {
-        name: "[Gen 8] Alternatium",
-        desc: `A metagame made up of only Pokémon with alternate forms, with all of them being separate and unique.`,
+        name: "[Gen 8] Restrictions",
+        desc: `A metagame made up of brand new Pokémon that are made according to various random and non-random restrictions.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3683767/">Alternatium</a>`,
-            `&bullet; <a href="https://docs.google.com/spreadsheets/d/1bvvkPg1CrUBJFJJeuwkts8elfJcEcahGOoHm-vGBXOI/edit?usp=sharing">Spreadsheet</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3673824/">Restrictions</a>`,
+            `&bullet; <a href="https://docs.google.com/spreadsheets/d/1XsplBqN8njHZJT9cTP_3i3YSFITB9WaVfNOYAbNY75M/edit?usp=sharing">Spreadsheet</a>`,
         ],
-        mod: 'alternatium',
-        ruleset: ['Standard NatDex', 'Z-Move Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'Sleep Clause Mod'],
+        mod: 'restrictions',
+        ruleset: ['Standard', 'Dynamax Clause'],
         banlist: ['All Pokemon', 'Past'],
         unbanlist: [
-            'Silvally', 'Silvally-Bug', 'Silvally-Dark', 'Silvally-Dragon', 'Silvally-Electric', 'Silvally-Fairy', 'Silvally-Fighting', 'Silvally-Fire', 'Silvally-Flying', 'Silvally-Ghost',
-            'Silvally-Grass', 'Silvally-Ground', 'Silvally-Ice', 'Silvally-Poison', 'Silvally-Psychic', 'Silvally-Rock', 'Silvally-Steel', 'Silvally-Water', 'Pikachu', 'Pikachu-Rock-Star',
-            'Pikachu-Belle', 'Pikachu-Idol', 'Pikachu-PhD', 'Pikachu-Libre', 'Pikachu-Partner', 'Pikachu-Starter', 'Darmanitan', 'Darmanitan-Zen', 'Darmanitan-Galar', 'Darmanitan-Galar-Zen',
-            'Aegishield', 'Aegislash', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Rotom', 'Rotom-Heat', 'Rotom-Wash', 'Rotom-Frost', 'Rotom-Fan', 'Rotom-Mow', 'Dugtrio',
-            'Dugtrio-Alola', 'Muk', 'Muk-Oilslick', 'Slowbro', 'Slowbro-Galar', 'Slowking', 'Slowking-Galar', 'Tornadus', 'Cummulus', 'Thundurus', 'Thundurus-Therian', 'Landorus', 'Landorus-Bengal',
-            'Vivillon-Fancy', 'Vivillon', 'Vivillon-Pokeball', 'Genesect', 'Genesect-Password', 'Genesect-Molten', 'Genesect-Freezer', 'Genesect-Type-Delta', 'Groudon', 'Groudon-Primal', 'Kyogre',
-            'Kyogre-Primal', 'Deoxys-Wood', 'Deoxys-Gem', 'Deoxys-Tank', 'Deoxys-Speed', 'Sandslash-Lustrous', 'Sandslash-Alola', 'Ninetales-Steamwork', 'Ninetales-Alola', 'Giratina', 'Giratina-Shadow',
-            'Eternatus', 'Manustorm', 'Exeggutor', 'Exeggutor-Lighthouse', 'Weezing', 'Weezing-King', 'Raticate', 'Raticate-Alola', 'Linoone', 'Linoone-Punk', 'Catastroform', 'Castform-Firestorm',
-            'Castform-Thunderstorm', 'Castform-Snowy', 'Wormadam', 'Wormadam-Sandy', 'Fibormadam', 'Farfetch\u2019d', 'Farfetch\u2019d-Galar', 'Corsola', 'Corsoul', 'Shaymin', 'Shaymin-Sky', 'Keldeo',
-            'Swordeo', 'Meloetta', 'Meloetta-Fighter', 'Lycanday', 'Lycanroc-Spectre', 'Lycanroc-Dusk', 'Gourgeist', 'Gourgeist-Fae', 'Gourgeist-Pulpy', 'Supergeist', 'Cramorant', 'Cramorant-Swimmer',
-            'Cramorant-Gorging', 'Eiscue', 'Eiscue-Noice', 'Mimikyu', 'Mimikyu-Sparkstone', 'Morpeko-Marsh', 'Morvilant', 'Zygarde-Wyrm', 'Zygarde-Canid', 'Zygarde-Goliath',
-        ],
-        onValidateTeam(team, format) {
-            const speciesTable = new Set();
-            for (const set of team) {
-                const species = this.dex.species.get(set.species);
-                if (speciesTable.has(species.id)) {
-                    return [
-                        `You are limited to one of each Pokémon by Species Clause (except for different formes).`,
-                        `(You have more than one ${species.id}.)`,
-                    ];
-                }
-                speciesTable.add(species.id);
-            }
-        },
+            'Vulcaraptor', 'Parakinesis', 'Serpaint', 'Torgeist', 'Regolite', 'Polbearab', 'Centhorn', 'Donzyxote', 'Scimicobra', 'Folliclawe', 'Afloof', 'Nimbusteed',
+            'Aerock', 'Borassa', 'Sharm', 'Nunopod', 'Crypterid', 'Abysseil', 'Faerenheit', 'Spiriteal', 'Zoltanka', 'Flydra', 'Coracrab', 'Quadringo', 'Teslaple',
+            'Kapagon', 'Cyknight', 'Dirtoad', 'Crystelf', 'Rancourgar', 'Scalaron', 'Dragraceful', 'Tantrary', 'Modolith', 'Snailord', 'Arbrella', 'Draugelid',
+            'Cinnastar', 'Refluse', 'Kelven', 'Kodokai', 'Cindarner', 'Thucotuco', 'Sorree', 'Gembezzle', 'Winterloper', 'Agapest', 'Volvolpa', 'Punduluum', 'Wraithful',
+            'Panzarma', 'Krachiten', 'Cellsius', 'Borelem', 'Electangle', 'Orchile', 'Shinodori', 'Fluidrake', 'Potossum', 'Twygdrasill',
+        ],
     },
     {
-        name: "[Gen 8] Random Dex",
-        desc: `A micrometagame project consisting of 80 randomly selected fully-evolved Pok&eacute;mon.`,
+        name: "[Gen 8] Roulettemons Random Battle",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3690182/">Random Dex</a>`,
-        ],
-        mod: 'randomdex',
-        ruleset: ['Standard NatDex', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Dynamax Clause', 'Sleep Clause Mod'],
-        banlist: ['All Pokemon', 'Past', 'Arena Trap', 'Moody', 'Shadow Tag', 'Baton Pass', 'Bright Powder', 'Lax Incense', 'King\'s Rock', 'Razor Fang', 'Kangaskhanite', 'Medichamite', 'Kommonium Z'],
-        unbanlist: [
-            'Absol', 'Absol-Mega', 'Appletun', 'Articuno', 'Aurorus', 'Basculin', 'Beartic', 'Bisharp', 'Calyrex', 'Camerupt', 'Camerupt-Mega',
-            'Celesteela', 'Cloyster', 'Crawdaunt', 'Cursola', 'Dedenne', 'Delibird', 'Eelektross', 'Espeon', 'Flapple', 'Flareon', 'Flygon',
-            'Galvantula', 'Girafarig', 'Glaceon', 'Goodra', 'Gourgeist', 'Grimmsnarl', 'Guzzlord', 'Heliolisk', 'Hitmonchan', 'Hitmonlee',
-            'Hitmontop', 'Incineroar', 'Indeedee', 'Jolteon', 'Kangaskhan', 'Kommo-o', 'Lanturn', 'Leafeon', 'Leavanny', 'Ludicolo', 'Lunatone',
-            'Luvdisc', 'Machamp', 'Mandibuzz', 'Medicham', 'Nihilego', 'Palossand', 'Pidgeot', 'Pidgeot-Mega', 'Probopass', 'Pyroar', 'Sawk',
-            'Sceptile', 'Sceptile-Mega', 'Scolipede', 'Shiftry', 'Simisage', 'Slowbro', 'Slowbro-Mega', 'Slowking', 'Swoobat', 'Sylveon',
-            'Tapu Bulu', 'Tapu Fini', 'Tauros', 'Typhlosion', 'Umbreon', 'Ursaring', 'Vaporeon', 'Whiscash', 'Wishiwashi', 'Zebstrika', 'Absolite',
-            'Pidgeotite', 'Sceptilite', 'Cameruptite', 'Slowbronite',
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3649106/">Roulettemons</a>`,
+            `&bullet; <a href="https://docs.google.com/spreadsheets/d/1EOA1m7JXTq7Zz0ViVI4n6lBppFjVBa4S1GqhAwkPTZQ/edit?usp=sharing">Spreadsheet</a>`,
         ],
+        team: 'random',
+        mod: 'roulettemons',
+        ruleset: ['Standard NatDex'],
+        onSwitchIn(pokemon) {
+            this.add('-start', pokemon, 'typechange', pokemon.species.types.join('/'), '[silent]');
+        },
+        onChangeSet(set) {
+            if (set.species === 'Chillyte-Mega') {
+                set.species = 'Chillyte';
+                set.ability = 'Grassy Surge';
+            }
+        },
     },
     {
         name: "[Gen 6] NEXT OU",
@@ -589,40 +570,42 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Sketchmons",
-        desc: `Every Pok&eacute;mon gets a new move once.`,
+        name: "[Gen 8] Crazyhouse",
+        desc: `Pok&eacute;mon you KO are added to your team and removed from the opponent's, and vice versa.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3680298/">Sketchmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3699268/">Crazyhouse</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Sketchmons Move Legality', 'Dynamax Clause'],
+        ruleset: ['Standard', 'Crazyhouse Rule', 'Dynamax Clause', 'Sleep Moves Clause', 'Evasion Abilities Clause', '!Sleep Clause Mod'],
         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', 'Porygon-Z', 'Pheromosa', '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', 'Magnet Pull', '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', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Magearna',
+            'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
+            'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
+            'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Bright Powder', 'King\'s Rock', 'Lax Incense',
+            'Baton Pass', 'Explosion', 'Final Gambit', 'Misty Explosion', 'Self-Destruct',
         ],
     },
     {
-        name: "[Gen 8] Flipped",
-        desc: `Pok&eacute;mon have their base stats flipped.`,
+        name: "[Gen 8] Pokebilities AAA",
+        desc: `Pok&eacute;mon have all of their released abilities simultaneously alongside any additional ability.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3662020/">Flipped</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8821047">Pok&eacute;bilities AAA</a>`,
         ],
-        mod: 'gen8',
-        ruleset: ['Standard', 'Flipped Mod', 'Dynamax Clause'],
+        mod: 'pokebilities',
+        ruleset: ['[Gen 8] Pokebilities', '!Obtainable Abilities', 'AAA Restricted Abilities', '2 Ability Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
         banlist: [
-            'Azumarill', 'Blissey', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre',
-            'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn Wings', 'Necrozma-Dusk Mane', 'Palkia',
-            'Rayquaza', 'Reshiram', 'Solgaleo', 'Steelix', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom',
-            'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Psychic Surge', 'Shadow Tag', 'Baton Pass', 'Psychic Terrain', 'Shell Smash',
+            'Blacephalon', 'Buzzwole', 'Clefable', 'Dragapult', 'Dragonite', 'Kartana', 'Melmetal', 'Noivern', 'Pangoro', 'Perrserker', 'Rillaboom',
+            'Tapu Lele', 'Urshifu', 'Urshifu-Rapid-Strike', 'Victini', 'Zamazenta-Crowned', 'Arena Trap', 'Moody', 'Shadow Tag', 'Wonder Guard',
+            'Chlorophyll + Desolate Land', 'Chlorophyll + Drought', 'Regenerator + Emergency Exit', 'Regenerator + Multiscale', 'Regenerator + Shadow Shield',
+            'Regenerator + Wimp Out', 'Sand Rush + Sand Stream', 'Slush Rush + Snow Warning', 'Swift Swim + Drizzle', 'Swift Swim + Primordial Sea',
+            'Regenerator > 2',
+        ],
+        unbanlist: ['Dracozolt'],
+        restricted: [
+            'Comatose', 'Contrary', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter', 'Innards Out',
+            'Intrepid Sword', 'Libero', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Prankster', 'Protean', 'Pure Power', 'Simple', 'Stakeout',
+            'Speed Boost', 'Tinted Lens', 'Water Bubble',
         ],
     },
     // Other Metagames
@@ -812,9 +795,9 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal', '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',
+            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal',
+            '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) {
@@ -2351,37 +2334,33 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 5] UU",
+        name: "[Gen 6] UU",
         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/dex/xy/formats/uu/">ORAS UU Banlist</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3598164/">ORAS UU Viability Rankings</a>`,
         ],
-        mod: 'gen5',
+        mod: 'gen6',
         // 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 6] OU'],
+        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought'],
     },
     {
-        name: "[Gen 5] NU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3484121/">BW2 NU Viability Rankings</a>`,
-        ],
-        mod: 'gen5',
+        name: "[Gen 4] Anything Goes",
+        mod: 'gen4',
         // searchShow: false,
-        ruleset: ['[Gen 5] RU', '!Sleep Moves Clause', 'Sleep Clause Mod'],
-        banlist: ['RU', 'NUBL', 'Assist', 'Copycat'],
+        ruleset: ['Obtainable', 'Arceus EV Limit', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
     },
     {
-        name: "[Gen 6] PU",
+        name: "[Gen 7] RU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/dex/xy/tags/pu/">ORAS PU Banlist</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3528743/">ORAS PU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3645338/">USM RU Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3645873/">USM RU Viability Rankings</a>`,
         ],
-        mod: 'gen6',
+        mod: 'gen7',
         // searchShow: false,
-        ruleset: ['[Gen 6] NU'],
-        banlist: ['NU', 'PUBL', 'Chatter'],
+        ruleset: ['[Gen 7] UU'],
+        banlist: ['UU', 'RUBL', 'Mimikyu', 'Aurora Veil'],
+        unbanlist: ['Drought'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2584,15 +2563,6 @@ exports.Formats = [
         mod: 'gen6',
         ruleset: ['-Nonexistent', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Endless Battle Clause', 'EV limit = 510'],
     },
-    {
-        name: "[Gen 5] ZU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8034680/">BW2 ZU</a>`,
-        ],
-        mod: 'gen5',
-        ruleset: ['[Gen 5] PU'],
-        banlist: ['PU', 'Dragonair', 'Glalie', 'Machoke', 'Marowak', 'Omanyte', 'Regigigas', 'Trubbish', 'Whirlipede', 'Baton Pass'],
-    },
     // US/UM Singles
     ///////////////////////////////////////////////////////////////////
     {
@@ -2620,18 +2590,6 @@ exports.Formats = [
         ruleset: ['[Gen 7] OU'],
         banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
     },
-    {
-        name: "[Gen 7] RU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3645338/">USM RU Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3645873/">USM RU Viability Rankings</a>`,
-        ],
-        mod: 'gen7',
-        searchShow: false,
-        ruleset: ['[Gen 7] UU'],
-        banlist: ['UU', 'RUBL', 'Mimikyu', 'Aurora Veil'],
-        unbanlist: ['Drought'],
-    },
     {
         name: "[Gen 7] NU",
         threads: [
@@ -2730,7 +2688,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 7] PU'],
         banlist: [
-            'PU', 'Carracosta', 'Crabominable', 'Gorebyss', 'Jynx', 'Raticate-Alola',
+            'PU', 'Carracosta', 'Crabominable', 'Exeggutor-Base', 'Gorebyss', 'Jynx', 'Raticate-Alola',
             'Shiftry', 'Throh', 'Turtonator', 'Type: Null', 'Ursaring', 'Victreebel',
         ],
     },
@@ -2901,17 +2859,6 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard', 'Swagger Clause', 'Mega Rayquaza Clause'],
     },
-    {
-        name: "[Gen 6] UU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/uu/">ORAS UU Banlist</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3598164/">ORAS UU Viability Rankings</a>`,
-        ],
-        mod: 'gen6',
-        searchShow: false,
-        ruleset: ['[Gen 6] OU'],
-        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought'],
-    },
     {
         name: "[Gen 6] RU",
         threads: [
@@ -2934,6 +2881,17 @@ exports.Formats = [
         ruleset: ['[Gen 6] RU'],
         banlist: ['RU', 'NUBL'],
     },
+    {
+        name: "[Gen 6] PU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/dex/xy/tags/pu/">ORAS PU Banlist</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3528743/">ORAS PU Viability Rankings</a>`,
+        ],
+        mod: 'gen6',
+        searchShow: false,
+        ruleset: ['[Gen 6] NU'],
+        banlist: ['NU', 'PUBL', 'Chatter'],
+    },
     {
         name: "[Gen 6] LC",
         threads: [
@@ -2996,6 +2954,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: [
@@ -3142,6 +3111,17 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard', 'Sleep Clause Mod'],
     },
+    {
+        name: "[Gen 5] UU",
+        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>`,
+        ],
+        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'],
+    },
     {
         name: "[Gen 5] RU",
         threads: [
@@ -3154,6 +3134,17 @@ exports.Formats = [
         banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
         unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
+    {
+        name: "[Gen 5] NU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3484121/">BW2 NU Viability Rankings</a>`,
+        ],
+        mod: 'gen5',
+        searchShow: false,
+        ruleset: ['[Gen 5] RU', '!Sleep Moves Clause', 'Sleep Clause Mod'],
+        banlist: ['RU', 'NUBL', 'Assist', 'Copycat'],
+    },
     {
         name: "[Gen 5] PU",
         threads: [
@@ -3203,6 +3194,16 @@ exports.Formats = [
         banlist: ['Uber', 'Cottonee', 'Dragonite', 'Jirachi', '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'],
     },
+    {
+        name: "[Gen 5] ZU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8034680/">BW2 ZU</a>`,
+        ],
+        mod: 'gen5',
+        searchShow: false,
+        ruleset: ['[Gen 5] PU'],
+        banlist: ['PU', 'Articuno', 'Dragonair', 'Glalie', 'Machoke', 'Marowak', 'Omanyte', 'Regigigas', 'Trubbish', 'Whirlipede', 'Baton Pass'],
+    },
     {
         name: "[Gen 5] GBU Singles",
         mod: 'gen5',
@@ -3368,10 +3369,20 @@ exports.Formats = [
         unbanlist: ['Wobbuffet', 'Wynaut', 'Sand Veil', 'Swagger'],
     },
     {
-        name: "[Gen 4] Anything Goes",
+        name: "[Gen 4] ZU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8034681/">DPP ZU</a>`,
+        ],
         mod: 'gen4',
         searchShow: false,
-        ruleset: ['Obtainable', 'Arceus EV Limit', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
+        ruleset: ['[Gen 4] PU'],
+        banlist: [
+            'Ampharos', 'Armaldo', 'Bellossom', 'Dragonair', 'Gabite', 'Gastrodon', 'Glaceon', 'Glalie', 'Golduck',
+            'Gorebyss', 'Hippopotas', 'Kadabra', 'Machoke', 'Magmar', 'Mantine', 'Marowak', 'Metang', 'Misdreavus',
+            'Monferno', 'Mr. Mime', 'Muk', 'Murkrow', 'Pinsir', 'Politoed', 'Purugly', 'Quagsire', 'Raichu',
+            'Rampardos', 'Rapidash', 'Regigigas', 'Relicanth', 'Rhydon', 'Scyther', 'Sneasel', 'Snover', 'Solrock',
+            'Tangela', 'Torkoal', 'Victreebel', 'Xatu', 'Zangoose', 'Damp Rock',
+        ],
     },
     {
         name: "[Gen 4] Custom Game",