@pkmn/sim 0.7.0 → 0.7.2

package/build/cjs/config/formats.js

@@ -66,8 +66,8 @@ exports.Formats = [
         ],
         mod: 'gen9',
         ruleset: [
-            'Picked Team Size = 1', 'Max Team Size = 3', 'Min Source Gen = 9',
-            'Obtainable', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Evasion Items Clause', 'Accuracy Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Endless Battle Clause',
+            'Picked Team Size = 1', 'Max Team Size = 3',
+            'Standard', 'Terastal Clause', 'Accuracy Moves Clause', '!Sleep Clause Mod',
         ],
         banlist: ['Dragonite', 'Koraidon', 'Miraidon', 'Moody', 'Focus Band', 'Focus Sash', 'King\'s Rock', 'Quick Claw', 'Acupressure', 'Hypnosis', 'Perish Song', 'Sing'],
     },
@@ -201,7 +201,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3658587/">National Dex Balanced Hackmons</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['-Nonexistent', 'Standard NatDex', 'Forme Clause', 'Sleep Moves Clause', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'CFZ Clause', '!Obtainable'],
+        ruleset: ['-Nonexistent', 'Standard NatDex', 'Forme Clause', 'Sleep Moves Clause', 'Ability Clause = 2', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'CFZ Clause', '!Obtainable'],
         banlist: [
             // Pokemon
             'Eternatus-Eternamax', 'Groudon-Primal', 'Rayquaza-Mega', 'Shedinja', 'Cramorant-Gorging', 'Calyrex-Shadow', 'Darmanitan-Galar-Zen',
@@ -375,11 +375,11 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3710568/">Almost Any Ability</a>`,
         ],
         mod: 'gen9',
-        ruleset: ['Standard OMs', '!Obtainable Abilities', 'Ability Clause', 'Sleep Moves Clause', 'Min Source Gen = 9'],
+        ruleset: ['Standard OMs', '!Obtainable Abilities', 'Ability Clause = 1', 'Sleep Moves Clause', 'Min Source Gen = 9'],
         banlist: [
-            'Koraidon', 'Miraidon', 'Slaking', 'Arena Trap', 'Comatose', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion',
-            'Imposter', 'Innards Out', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Pure Power', 'Shadow Tag',
-            'Simple', 'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
+            'Annihilape', 'Koraidon', 'Miraidon', 'Slaking', 'Arena Trap', 'Comatose', 'Contrary', 'Gorilla Tactics', 'Huge Power',
+            'Illusion', 'Imposter', 'Innards Out', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Pure Power',
+            'Shadow Tag', 'Simple', 'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
         ],
     },
     {
@@ -405,7 +405,10 @@ exports.Formats = [
         ],
         mod: 'gen9',
         ruleset: ['-Nonexistent', 'OHKO Clause', 'Evasion Clause', 'Species Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Moves Clause', 'Endless Battle Clause'],
-        banlist: ['Arena Trap', 'Huge Power', 'Illusion', 'Innards Out', 'Magnet Pull', 'Neutralizing Gas', 'Parental Bond', 'Pure Power', 'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk'],
+        banlist: [
+            'Arena Trap', 'Huge Power', 'Illusion', 'Innards Out', 'Magnet Pull', 'Neutralizing Gas', 'Parental Bond', 'Pure Power',
+            'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk', 'Shell Smash', 'Rage Fist',
+        ],
     },
     {
         name: "[Gen 9] Mix and Mega",
@@ -534,7 +537,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard OMs', '2 Ability Clause', 'Sleep Clause Mod'],
+        ruleset: ['Standard OMs', 'Ability Clause = 2', 'Sleep Clause Mod'],
         banlist: ['Corsola-Galar', 'Sneasel', 'Type: Null', 'Arena Trap', 'Ice Scales', 'Moody', 'King\'s Rock', 'Baton Pass'],
         restricted: ['Chansey', 'Lunala', 'Shedinja', 'Solgaleo', 'Gorilla Tactics', 'Huge Power', 'Pure Power', 'Shadow Tag'],
         onValidateTeam(team) {
@@ -684,7 +687,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard OMs', '2 Ability Clause', 'Sleep Moves Clause'],
+        ruleset: ['Standard OMs', 'Ability Clause = 2', 'Sleep Moves 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', 'Lugia',
@@ -781,7 +784,7 @@ exports.Formats = [
             return null;
         },
         onValidateTeam(team, f, teamHas) {
-            if (this.ruleTable.has('2abilityclause')) {
+            if (this.ruleTable.has('abilityclause')) {
                 const abilityTable = new Map();
                 const base = {
                     airlock: 'cloudnine',
@@ -801,16 +804,17 @@ exports.Formats = [
                     teravolt: 'moldbreaker',
                     turboblaze: 'moldbreaker',
                 };
+                const num = parseInt(this.ruleTable.valueRules.get('abilityclause'));
                 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) {
+                    if ((abilityTable.get(ability) || 0) >= num) {
                         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)`,
+                            `You are limited to ${num} of each ability by ${num} Ability Clause.`,
+                            `(You have more than ${num} ${this.dex.abilities.get(ability).name} variants)`,
                         ];
                     }
                     abilityTable.set(ability, (abilityTable.get(ability) || 0) + 1);
@@ -905,7 +909,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard OMs', '2 Ability Clause', 'Sleep Moves Clause'],
+        ruleset: ['Standard OMs', 'Ability Clause = 2', 'Sleep Moves Clause'],
         banlist: [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Eternatus',
             'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White',
@@ -949,7 +953,7 @@ exports.Formats = [
             return problems;
         },
         onValidateTeam(team) {
-            if (!this.ruleTable.has('2abilityclause'))
+            if (!this.ruleTable.has('abilityclause'))
                 return;
             const abilityTable = new Map();
             const base = {
@@ -970,6 +974,7 @@ exports.Formats = [
                 teravolt: 'moldbreaker',
                 turboblaze: 'moldbreaker',
             };
+            const num = parseInt(this.ruleTable.valueRules.get('abilityclause'));
             const abilities = [];
             for (const set of team) {
                 abilities.push([set.ability, set.item].map((abil) => {
@@ -986,10 +991,10 @@ exports.Formats = [
                     abilityTable.set(item.id, (abilityTable.get(item.id) || 0) + 1);
             }
             for (const [abilityid, size] of abilityTable) {
-                if (size > 2) {
+                if (size > num) {
                     return [
-                        `You are limited to two of each ability by 2 Ability Clause.`,
-                        `(You have more than two ${this.dex.abilities.get(abilityid).name} variants)`,
+                        `You are limited to ${num} of each ability by ${num} Ability Clause.`,
+                        `(You have more than ${num} ${this.dex.abilities.get(abilityid).name} variants)`,
                     ];
                 }
             }
@@ -1695,7 +1700,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard OMs', '!Obtainable Abilities', '2 Ability Clause', 'Sleep Moves Clause'],
+        ruleset: ['Standard OMs', '!Obtainable Abilities', 'Ability Clause = 2', 'Sleep Moves Clause'],
         banlist: [
             'Archeops', 'Blacephalon', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Genesect',
             'Gengar', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lugia',
@@ -1859,7 +1864,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', 'Forme Clause', 'CFZ Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Clause Mod', 'Endless Battle Clause'],
+        ruleset: ['-Nonexistent', 'Ability Clause = 2', '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',
@@ -1954,7 +1959,7 @@ exports.Formats = [
         ],
         mod: 'gen6',
         searchShow: false,
-        ruleset: ['[Gen 6] OU', '2 Ability Clause', 'AAA Restricted Abilities', '!Obtainable Abilities'],
+        ruleset: ['[Gen 6] OU', 'Ability Clause = 2', 'AAA Restricted Abilities', '!Obtainable Abilities'],
         banlist: ['Archeops', 'Bisharp', 'Chatot', 'Dragonite', 'Keldeo', 'Kyurem-Black', 'Mamoswine', 'Regigigas', 'Shedinja', 'Slaking', 'Smeargle', 'Snorlax', 'Suicune', 'Terrakion', 'Weavile', 'Dynamic Punch', 'Zap Cannon'],
         unbanlist: ['Aegislash', 'Blaziken', 'Deoxys-Defense', 'Deoxys-Speed', 'Genesect', 'Greninja', 'Landorus'],
         restricted: ['Arena Trap', 'Contrary', 'Fur Coat', 'Huge Power', 'Illusion', 'Imposter', 'Parental Bond', 'Protean', 'Pure Power', 'Simple', 'Speed Boost', 'Wonder Guard'],