@pkmn/randoms 0.5.9 → 0.5.12

package/build/gen8.js

@@ -62,6 +62,8 @@ class RandomTeams {
         this.noStab = NoStab;
         const ruleTable = this.dex.formats.getRuleTable(format);
         this.maxTeamSize = ruleTable.maxTeamSize;
+        this.adjustLevel = ruleTable.adjustLevel;
+        this.maxMoveCount = ruleTable.maxMoveCount;
         const forceMonotype = ruleTable.valueRules.get('forcemonotype');
         this.forceMonotype = forceMonotype && this.dex.types.get(forceMonotype).exists ?
             this.dex.types.get(forceMonotype).name : undefined;
@@ -351,7 +353,7 @@ class RandomTeams {
                     pool = [...new Set(pool.concat(basePool))];
                 }
             }
-            const moves = this.multipleSamplesNoReplace(pool, 4);
+            const moves = this.multipleSamplesNoReplace(pool, this.maxMoveCount);
             // Random EVs
             const evs = { hp: 0, atk: 0, def: 0, spa: 0, spd: 0, spe: 0 };
             const s = ["hp", "atk", "def", "spa", "spd", "spe"];
@@ -386,18 +388,24 @@ class RandomTeams {
             mbst += (stats["spa"] * 2 + 31 + 21 + 100) + 5;
             mbst += (stats["spd"] * 2 + 31 + 21 + 100) + 5;
             mbst += (stats["spe"] * 2 + 31 + 21 + 100) + 5;
-            let level = Math.floor(100 * mbstmin / mbst); // Initial level guess will underestimate
-            while (level < 100) {
-                mbst = Math.floor((stats["hp"] * 2 + 31 + 21 + 100) * level / 100 + 10);
-                // Since damage is roughly proportional to level
-                mbst += Math.floor(((stats["atk"] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
-                mbst += Math.floor((stats["def"] * 2 + 31 + 21 + 100) * level / 100 + 5);
-                mbst += Math.floor(((stats["spa"] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
-                mbst += Math.floor((stats["spd"] * 2 + 31 + 21 + 100) * level / 100 + 5);
-                mbst += Math.floor((stats["spe"] * 2 + 31 + 21 + 100) * level / 100 + 5);
-                if (mbst >= mbstmin)
-                    break;
-                level++;
+            let level;
+            if (this.adjustLevel) {
+                level = this.adjustLevel;
+            }
+            else {
+                level = Math.floor(100 * mbstmin / mbst); // Initial level guess will underestimate
+                while (level < 100) {
+                    mbst = Math.floor((stats["hp"] * 2 + 31 + 21 + 100) * level / 100 + 10);
+                    // Since damage is roughly proportional to level
+                    mbst += Math.floor(((stats["atk"] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
+                    mbst += Math.floor((stats["def"] * 2 + 31 + 21 + 100) * level / 100 + 5);
+                    mbst += Math.floor(((stats["spa"] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
+                    mbst += Math.floor((stats["spd"] * 2 + 31 + 21 + 100) * level / 100 + 5);
+                    mbst += Math.floor((stats["spe"] * 2 + 31 + 21 + 100) * level / 100 + 5);
+                    if (mbst >= mbstmin)
+                        break;
+                    level++;
+                }
             }
             // Random happiness
             const happiness = this.random(256);
@@ -466,7 +474,7 @@ class RandomTeams {
                     banReason = ruleTable.check('basepokemon:' + (0, sim_1.toID)(species.baseSpecies));
                     if (banReason)
                         continue;
-                    if (banReason !== '' || this.dex.species.get(species.baseSpecies).isNonstandard === species.isNonstandard) {
+                    if (banReason !== '' || this.dex.species.get(species.baseSpecies).isNonstandard !== species.isNonstandard) {
                         const nonexistentCheck = sim_1.Tags.nonexistent.genericFilter(species) && nonexistentBanReason;
                         let tagWhitelisted = false;
                         let tagBlacklisted = false;
@@ -495,11 +503,11 @@ class RandomTeams {
                         }
                     }
                 }
+                speciesPool.push(species);
                 const num = species.num;
                 if (pool.includes(num))
                     continue;
                 pool.push(num);
-                speciesPool.push(species);
             }
         }
         const hasDexNumber = {};
@@ -741,17 +749,23 @@ class RandomTeams {
             mbst += (stats['spa'] * 2 + 31 + 21 + 100) + 5;
             mbst += (stats['spd'] * 2 + 31 + 21 + 100) + 5;
             mbst += (stats['spe'] * 2 + 31 + 21 + 100) + 5;
-            let level = Math.floor(100 * mbstmin / mbst);
-            while (level < 100) {
-                mbst = Math.floor((stats['hp'] * 2 + 31 + 21 + 100) * level / 100 + 10);
-                mbst += Math.floor(((stats['atk'] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
-                mbst += Math.floor((stats['def'] * 2 + 31 + 21 + 100) * level / 100 + 5);
-                mbst += Math.floor(((stats['spa'] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
-                mbst += Math.floor((stats['spd'] * 2 + 31 + 21 + 100) * level / 100 + 5);
-                mbst += Math.floor((stats['spe'] * 2 + 31 + 21 + 100) * level / 100 + 5);
-                if (mbst >= mbstmin)
-                    break;
-                level++;
+            let level;
+            if (this.adjustLevel) {
+                level = this.adjustLevel;
+            }
+            else {
+                level = Math.floor(100 * mbstmin / mbst);
+                while (level < 100) {
+                    mbst = Math.floor((stats['hp'] * 2 + 31 + 21 + 100) * level / 100 + 10);
+                    mbst += Math.floor(((stats['atk'] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
+                    mbst += Math.floor((stats['def'] * 2 + 31 + 21 + 100) * level / 100 + 5);
+                    mbst += Math.floor(((stats['spa'] * 2 + 31 + 21 + 100) * level / 100 + 5) * level / 100);
+                    mbst += Math.floor((stats['spd'] * 2 + 31 + 21 + 100) * level / 100 + 5);
+                    mbst += Math.floor((stats['spe'] * 2 + 31 + 21 + 100) * level / 100 + 5);
+                    if (mbst >= mbstmin)
+                        break;
+                    level++;
+                }
             }
             // Random happiness
             const happiness = this.random(256);
@@ -1794,7 +1808,7 @@ class RandomTeams {
             // Random Free-For-All also uses doubles move pools, for now
             const allySwitch = movePool.indexOf('allyswitch');
             if (allySwitch > -1) {
-                if (movePool.length > 4) {
+                if (movePool.length > this.maxMoveCount) {
                     this.fastPop(movePool, allySwitch);
                 }
                 else {
@@ -1820,7 +1834,7 @@ class RandomTeams {
         do {
             // Choose next 4 moves from learnset/viable moves and add them to moves list:
             const pool = (movePool.length ? movePool : rejectedPool);
-            while (moves.size < 4 && pool.length) {
+            while (moves.size < this.maxMoveCount && pool.length) {
                 const moveid = this.sampleNoReplace(pool);
                 if (moveid.startsWith('hiddenpower')) {
                     if (hasHiddenPower)
@@ -1913,7 +1927,7 @@ class RandomTeams {
                     break;
                 }
             }
-        } while (moves.size < 4 && (movePool.length || rejectedPool.length));
+        } while (moves.size < this.maxMoveCount && (movePool.length || rejectedPool.length));
         // for BD/SP only
         if (hasHiddenPower) {
             let hpType;
@@ -2038,8 +2052,11 @@ class RandomTeams {
             forme = 'Pikachu' + this.sample(['', '-Original', '-Hoenn', '-Sinnoh', '-Unova', '-Kalos', '-Alola', '-Partner', '-World']);
         }
         let level;
-        // doubles levelling
-        if (isDoubles && species.randomDoubleBattleLevel) {
+        if (this.adjustLevel) {
+            level = this.adjustLevel;
+            // doubles levelling
+        }
+        else if (isDoubles && species.randomDoubleBattleLevel) {
             level = species.randomDoubleBattleLevel;
             // No Dmax levelling
         }
@@ -2083,7 +2100,7 @@ class RandomTeams {
                 PUBL: 87,
                 PU: 88, "(PU)": 88, NFE: 88,
             };
-            const customScale = { delibird: 100, luvdisc: 100, spinda: 100, unown: 100 };
+            const customScale = { delibird: 100, glalie: 76, luvdisc: 100, spinda: 100, unown: 100 };
             level = customScale[species.id] || tierScale[species.tier] || 80;
             // Arbitrary levelling base on data files (typically winrate-influenced)
         }
@@ -2388,11 +2405,14 @@ class RandomTeams {
                 item: this.sampleIfArray(setData.item) || '',
                 ability: (this.sampleIfArray(setData.ability)),
                 shiny: this.randomChance(1, 1024),
+                level: this.adjustLevel || 100,
                 evs: Object.assign({ hp: 0, atk: 0, def: 0, spa: 0, spd: 0, spe: 0 }, setData.evs),
                 nature: setData.nature,
                 ivs: Object.assign({ hp: 31, atk: 31, def: 31, spa: 31, spd: 31, spe: 31 }, setData.ivs || {}),
                 moves: setData.moves.map((move) => this.sampleIfArray(move)),
             };
+            if (this.adjustLevel)
+                set.level = this.adjustLevel;
             pokemon.push(set);
         }
         return pokemon;