@pkmn/randoms 0.7.5 → 0.7.6

package/build/index.js

@@ -377,16 +377,20 @@ var RandomTeams = class {
     const team = [];
     const natures = this.dex.natures.all();
     const items = this.dex.items.all();
-    const randomN = this.randomNPokemon(this.maxTeamSize, this.forceMonotype);
+    const randomN = this.randomNPokemon(this.maxTeamSize, this.forceMonotype, void 0, void 0, true);
     for (let forme of randomN) {
       let species = dex.species.get(forme);
       if (species.isNonstandard)
         species = dex.species.get(species.baseSpecies);
       let item = "";
+      let isIllegalItem;
+      let isBadItem;
       if (this.gen >= 2) {
         do {
           item = this.sample(items).name;
-        } while (this.dex.items.get(item).gen > this.gen || this.dex.items.get(item).isNonstandard);
+          isIllegalItem = this.dex.items.get(item).gen > this.gen || this.dex.items.get(item).isNonstandard;
+          isBadItem = item.startsWith("TR") || this.dex.items.get(item).isPokeball;
+        } while (isIllegalItem || isBadItem && this.randomChance(19, 20));
       }
       if (species.battleOnly) {
         if (typeof species.battleOnly === "string") {
@@ -501,7 +505,7 @@ var RandomTeams = class {
     }
     return team;
   }
-  randomNPokemon(n, requiredType, minSourceGen, ruleTable) {
+  randomNPokemon(n, requiredType, minSourceGen, ruleTable, requireMoves = false) {
     const last = [0, 151, 251, 386, 493, 649, 721, 807, 898, 1010][this.gen];
     if (n <= 0 || n > last)
       throw new Error(`n must be a number between 1 and ${last} (got ${n})`);
@@ -516,6 +520,11 @@ var RandomTeams = class {
       for (const species of speciesPool) {
         if (species.isNonstandard && species.isNonstandard !== "Unobtainable")
           continue;
+        if (requireMoves) {
+          const hasMovesInCurrentGen = Object.values(this.dex.species.getLearnset(species.id) || {}).some((sources) => sources.some((source) => source.startsWith("9")));
+          if (!hasMovesInCurrentGen)
+            continue;
+        }
         if (requiredType && !species.types.includes(requiredType))
           continue;
         if (minSourceGen && species.gen < minSourceGen)
@@ -753,9 +762,13 @@ var RandomTeams = class {
       const species = this.dex.species.get(forme);
       let item = "";
       let itemData;
+      let isBadItem;
       if (doItemsExist) {
-        itemData = this.sampleNoReplace(itemPool);
-        item = itemData == null ? void 0 : itemData.name;
+        do {
+          itemData = this.sampleNoReplace(itemPool);
+          item = itemData == null ? void 0 : itemData.name;
+          isBadItem = item.startsWith("TR") || itemData.isPokeball;
+        } while (isBadItem && this.randomChance(19, 20) && itemPool.length > this.maxTeamSize);
       }
       let ability = "No Ability";
       let abilityData;