@pkmn/sim 0.9.23 → 0.9.25

package/build/cjs/sim/team-validator.js

@@ -440,7 +440,7 @@ class TeamValidator {
                 tierSpecies = dex.species.get('Zamazenta-Crowned');
             }
         }
-        return [outOfBattleSpecies, tierSpecies];
+        return { outOfBattleSpecies, tierSpecies };
     }
     validateSet(set, teamHas) {
         const format = this.format;
@@ -529,7 +529,7 @@ class TeamValidator {
         species = dex.species.get(set.species);
         item = dex.items.get(set.item);
         ability = dex.abilities.get(set.ability);
-        const [outOfBattleSpecies, tierSpecies] = this.getValidationSpecies(set);
+        const { outOfBattleSpecies, tierSpecies } = this.getValidationSpecies(set);
         if (ability.id === 'battlebond' && (0, dex_1.toID)(species.baseSpecies) === 'greninja') {
             if (ruleTable.has('obtainablemisc')) {
                 if (set.gender && set.gender !== 'M') {
@@ -573,7 +573,7 @@ class TeamValidator {
         }
         if (set.hpType) {
             const type = dex.types.get(set.hpType);
-            if (!type.exists || ['normal', 'fairy'].includes(type.id)) {
+            if (!type.exists || ['normal', 'fairy', 'stellar'].includes(type.id)) {
                 problems.push(`${name}'s Hidden Power type (${set.hpType}) is invalid.`);
             }
             else {
@@ -683,6 +683,10 @@ class TeamValidator {
             problems.push(`${name} has ${set.moves.length} moves, which is more than the limit of ${ruleTable.maxMoveCount}.`);
             return problems;
         }
+        const pokemonGoProblems = this.validatePokemonGo(outOfBattleSpecies, set, setSources);
+        if (ruleTable.isBanned('nonexistent')) {
+            problems.push(...this.validateStats(set, species, setSources, pokemonGoProblems));
+        }
         const moveLegalityWhitelist = {};
         for (const moveName of set.moves) {
             if (!moveName)
@@ -706,7 +710,6 @@ class TeamValidator {
                 }
             }
         }
-        const pokemonGoProblems = this.validatePokemonGo(outOfBattleSpecies, set, setSources);
         const learnsetSpecies = dex.species.getLearnsetData(outOfBattleSpecies.id);
         let isFromRBYEncounter = false;
         if (this.gen === 1 && ruleTable.has('obtainablemisc') && !this.ruleTable.has('allowtradeback')) {
@@ -899,9 +902,6 @@ class TeamValidator {
                 }
             }
         }
-        if (ruleTable.isBanned('nonexistent')) {
-            problems.push(...this.validateStats(set, species, setSources, pokemonGoProblems));
-        }
         // Attempt move validation again after verifying Pokemon GO origin
         if (ruleTable.has('obtainablemoves') && setSources.isFromPokemonGo) {
             setSources.restrictiveMoves = [];
@@ -1081,24 +1081,6 @@ class TeamValidator {
                 problems.push(`${name} has Hidden Power ${set.hpType}, but its IVs don't allow this even with (Bottle Cap) Hyper Training.`);
             }
         }
-        if (setSources.isFromPokemonGo) {
-            // Pokemon from Pokemon GO must have odd IVs in non-Spe stats
-            // Since the set can be fixed while making minimal changes, it does not force the IVs to be manually fixed
-            for (const stat in set.ivs) {
-                if (set.ivs[stat] % 2 === 0 && stat !== 'spe') {
-                    set.ivs[stat]++;
-                }
-            }
-            if (set.ivs.atk !== set.ivs.spa && !(canBottleCap && (set.ivs.atk === 31 || set.ivs.spa === 31))) {
-                problems.push(`${name}'s Atk and Spa IVs must match because it is from Pokemon GO.`);
-            }
-            if (set.ivs.def !== set.ivs.spd && !(canBottleCap && (set.ivs.def === 31 || set.ivs.spd === 31))) {
-                problems.push(`${name}'s Def and Spd IVs must match because it is from Pokemon GO.`);
-            }
-            if (set.hpType && set.hpType !== 'Dark' && set.hpType !== 'Ice') {
-                problems.push(`${name} must have Hidden Power Dark or Ice because it is from Pokemon GO.`);
-            }
-        }
         if (dex.gen <= 2) {
             // validate DVs
             const ivs = set.ivs;
@@ -2252,7 +2234,7 @@ class TeamValidator {
                     minLevel = Math.min(minLevel, 20);
                     minIVs = Math.min(minIVs, 10);
                 }
-                if (species.id === 'mewtwo' && set.level && set.level >= 20) {
+                if (species.id === 'mewtwo' && set.level >= 20) {
                     // A bug allowed Mewtwo to be encountered with an IV floor of 0 from GO Battle League
                     minIVs = Math.min(minIVs, 0);
                 }
@@ -2267,7 +2249,7 @@ class TeamValidator {
                     */
                     minLevel = Math.min(minLevel, 8);
                     minIVs = Math.min(minIVs, 1);
-                    if (set.level && set.level < 12)
+                    if (set.level < 12)
                         setSources.pokemonGoSource = "purified";
                 }
                 // Attempt to trade the Pokemon to reduce level and IVs
@@ -2281,16 +2263,34 @@ class TeamValidator {
                         minIVs = Math.min(minIVs, specialTrade ? 1 : 0);
                     }
                 }
-                if (set.level && set.level < minLevel) {
+                if (set.level < minLevel) {
                     problems.push(`${name} must be at least level ${minLevel} to be from Pokemon GO.`);
                 }
                 const ivs = set.ivs || TeamValidator.fillStats(null, 31);
+                const postTransferMinIVs = minIVs * 2 + 1;
+                let IVsTooLow = false;
+                let hasEvenIVs = false;
                 for (const stat in ivs) {
-                    if (Math.floor(ivs[stat] / 2) < minIVs && stat !== 'spe') {
-                        problems.push(`${name} must have at least ${minIVs} ` +
-                            (minIVs === 1 ? `IV` : `IVs`) + ` in non-Speed stats to be from Pokemon GO.`);
-                        break;
-                    }
+                    if (stat === 'spe')
+                        continue;
+                    if (ivs[stat] < postTransferMinIVs)
+                        IVsTooLow = true;
+                    if (ivs[stat] % 2 === 0)
+                        hasEvenIVs = true;
+                }
+                if (IVsTooLow) {
+                    problems.push(`${name} must have at least ${postTransferMinIVs} ` +
+                        (postTransferMinIVs === 1 ? `IV` : `IVs`) + ` in non-Speed stats to be from Pokemon GO.`);
+                }
+                if (hasEvenIVs) {
+                    problems.push(`${name} must have odd non-Speed IVs to be from Pokemon GO.`);
+                }
+                const canBottleCap = dex.gen >= 7 && set.level >= (dex.gen < 9 ? 100 : 50);
+                if (ivs.atk !== ivs.spa && !(canBottleCap && (ivs.atk === 31 || ivs.spa === 31))) {
+                    problems.push(`${name}'s Atk and Sp. Atk IVs must match to be from Pokemon GO.`);
+                }
+                if (ivs.def !== ivs.spd && !(canBottleCap && (ivs.def === 31 || ivs.spd === 31))) {
+                    problems.push(`${name}'s Def and Sp. Def IVs must match to be from Pokemon GO.`);
                 }
             }
         }