@pkmn/randoms 0.7.57 → 0.7.58

package/build/index.js

@@ -446,21 +446,35 @@ var RandomGen8Teams = class {
       } else {
         const formes = ["gastrodoneast", "pumpkaboosuper", "zygarde10"];
         let learnset = this.dex.species.getLearnset(species.id);
+        let learnsetSpecies = species;
         if (formes.includes(species.id) || !learnset) {
-          learnset = this.dex.species.getLearnset(this.dex.species.get(species.baseSpecies).id);
+          learnsetSpecies = this.dex.species.get(species.baseSpecies);
+          learnset = this.dex.species.getLearnset(learnsetSpecies.id);
         }
         if (learnset) {
           pool = Object.keys(learnset).filter(
             (moveid) => learnset[moveid].find((learned) => learned.startsWith(String(this.gen)))
           );
         }
-        if (species.changesFrom) {
+        if (learnset && learnsetSpecies === species && species.changesFrom) {
           learnset = this.dex.species.getLearnset(_sim.toID.call(void 0, species.changesFrom));
           const basePool = Object.keys(learnset).filter(
             (moveid) => learnset[moveid].find((learned) => learned.startsWith(String(this.gen)))
           );
           pool = [...new Set(pool.concat(basePool))];
         }
+        const evoRegion = learnsetSpecies.evoRegion && learnsetSpecies.gen !== this.gen;
+        for (let i = 0; i < 2 && learnsetSpecies.prevo; i++) {
+          learnsetSpecies = this.dex.species.get(learnsetSpecies.prevo);
+          learnset = this.dex.species.getLearnset(learnsetSpecies.id);
+          for (const moveid in learnset) {
+            if (!pool.includes(moveid) && !evoRegion || learnset[moveid].some(
+              (source) => !source.startsWith(`${learnsetSpecies.gen}`) || source.charAt(1) === "E"
+            )) {
+              pool.push(moveid);
+            }
+          }
+        }
       }
       const moves = this.multipleSamplesNoReplace(pool, this.maxMoveCount);
       const evs = { hp: 0, atk: 0, def: 0, spa: 0, spd: 0, spe: 0 };
@@ -9347,7 +9361,7 @@ var RandomGen1Teams = class extends RandomGen2Teams {
     const randomN = this.randomNPokemon(this.maxTeamSize, this.forceMonotype);
     for (const pokemon of randomN) {
       const species = this.dex.species.get(pokemon);
-      const learnset = this.dex.species.getLearnset(species.id);
+      let learnset = this.dex.species.getLearnset(species.id);
       const mbstmin = 1307;
       const stats = species.baseStats;
       let mbst = stats["hp"] * 2 + 30 + 63 + 100 + 10;
@@ -9398,6 +9412,18 @@ var RandomGen1Teams = class extends RandomGen2Teams {
           }
         }
       }
+      let learnsetSpecies = species;
+      for (let i = 0; i < 2 && learnsetSpecies.prevo; i++) {
+        learnsetSpecies = this.dex.species.get(learnsetSpecies.prevo);
+        learnset = this.dex.species.getLearnset(learnsetSpecies.id);
+        for (const move in learnset) {
+          if (this.dex.moves.get(move).gen !== 1)
+            continue;
+          if (learnset[move].some((learned) => learned.startsWith("1"))) {
+            pool.push(move);
+          }
+        }
+      }
       team.push({
         name: species.baseSpecies,
         species: species.name,
@@ -11779,10 +11805,13 @@ var RandomTeams = class {
           }
         }
         const evoRegion = learnsetSpecies.evoRegion && learnsetSpecies.gen !== this.gen;
-        while (learnsetSpecies.prevo) {
+        for (let i = 0; i < 2 && learnsetSpecies.prevo; i++) {
           learnsetSpecies = this.dex.species.get(learnsetSpecies.prevo);
+          learnset = this.dex.species.getLearnset(learnsetSpecies.id);
           for (const moveid in learnset) {
-            if (!pool.includes(moveid) && learnset[moveid].some((source) => source.startsWith(String(this.gen)) && !evoRegion)) {
+            if (!pool.includes(moveid) && learnset[moveid].some(
+              (source) => source.startsWith(String(this.gen)) && (!evoRegion || source.charAt(1) === "E")
+            )) {
               pool.push(moveid);
             }
           }