@pkmn/randoms 0.4.19 → 0.4.23

package/build/gen8.js

@@ -133,7 +133,7 @@ class RandomTeams {
             Poison: (movePool, moves, abilities, types, counter) => {
                 if (counter.get('Poison'))
                     return false;
-                return types.has('Ground') || types.has('Psychic') || !!counter.setupType || movePool.includes('gunkshot');
+                return types.has('Ground') || types.has('Psychic') || types.has('Grass') || !!counter.setupType || movePool.includes('gunkshot');
             },
             Psychic: (movePool, moves, abilities, types, counter) => {
                 if (counter.get('Psychic'))
@@ -153,7 +153,7 @@ class RandomTeams {
             Water: (movePool, moves, abilities, types, counter, species) => {
                 if (!counter.get('Water') && !moves.has('hypervoice'))
                     return true;
-                if (movePool.includes('hypervoice') || movePool.includes('liquidation'))
+                if (['hypervoice', 'liquidation', 'surgingstrikes'].some(m => movePool.includes(m)))
                     return true;
                 return abilities.has('Huge Power') && movePool.includes('aquajet');
             },
@@ -233,11 +233,10 @@ class RandomTeams {
         return move.id !== 'bodypress';
     }
     randomCCTeam() {
-        var _a;
         const dex = this.dex;
         const team = [];
-        const natures = Object.keys(this.dex.data.Natures);
-        const items = Object.keys(this.dex.data.Items);
+        const natures = this.dex.natures.all();
+        const items = this.dex.items.all();
         const randomN = this.randomNPokemon(this.maxTeamSize, this.forceMonotype);
         for (let forme of randomN) {
             let species = dex.species.get(forme);
@@ -247,8 +246,8 @@ class RandomTeams {
             let item = '';
             if (this.gen >= 2) {
                 do {
-                    item = this.sample(items);
-                } while (this.dex.items.get(item).gen > this.gen || this.dex.data.Items[item].isNonstandard);
+                    item = this.sample(items).name;
+                } while (this.dex.items.get(item).gen > this.gen || this.dex.items.get(item).isNonstandard);
             }
             // Make sure forme is legal
             if (species.battleOnly) {
@@ -270,33 +269,34 @@ class RandomTeams {
             let itemData = this.dex.items.get(item);
             if (itemData.forcedForme && forme === this.dex.species.get(itemData.forcedForme).baseSpecies) {
                 do {
-                    item = this.sample(items);
-                    itemData = this.dex.items.get(item);
+                    itemData = this.sample(items);
+                    item = itemData.name;
                 } while (itemData.gen > this.gen ||
                     itemData.isNonstandard ||
                     (itemData.forcedForme && forme === this.dex.species.get(itemData.forcedForme).baseSpecies));
             }
             // Random legal ability
             const abilities = Object.values(species.abilities).filter(a => this.dex.abilities.get(a).gen <= this.gen);
-            const ability = this.gen <= 2 ? 'None' : this.sample(abilities);
+            const ability = this.gen <= 2 ? 'No Ability' : this.sample(abilities);
             // Four random unique moves from the movepool
             let pool = ['struggle'];
             if (forme === 'Smeargle') {
-                pool = Object.keys(this.dex.data.Moves).filter(moveid => {
-                    const move = this.dex.data.Moves[moveid];
-                    return !(move.isNonstandard || move.isZ || move.isMax || move.realMove);
-                });
+                pool = this.dex.moves
+                    .all()
+                    .filter(move => !(move.isNonstandard || move.isZ || move.isMax || move.realMove))
+                    .map(m => m.id);
             }
             else {
                 const formes = ['gastrodoneast', 'pumpkaboosuper', 'zygarde10'];
-                let learnset = ((_a = this.dex.data.Learnsets[species.id]) === null || _a === void 0 ? void 0 : _a.learnset) && !formes.includes(species.id) ?
-                    this.dex.data.Learnsets[species.id].learnset :
-                    this.dex.data.Learnsets[this.dex.species.get(species.baseSpecies).id].learnset;
+                let learnset = this.dex.species.getLearnset(species.id);
+                if (formes.includes(species.id) || !learnset) {
+                    learnset = this.dex.species.getLearnset(this.dex.species.get(species.baseSpecies).id);
+                }
                 if (learnset) {
                     pool = Object.keys(learnset).filter(moveid => learnset[moveid].find(learned => learned.startsWith(String(this.gen))));
                 }
                 if (species.changesFrom) {
-                    learnset = this.dex.data.Learnsets[(0, sim_1.toID)(species.changesFrom)].learnset;
+                    learnset = this.dex.species.getLearnset((0, sim_1.toID)(species.changesFrom));
                     const basePool = Object.keys(learnset).filter(moveid => learnset[moveid].find(learned => learned.startsWith(String(this.gen))));
                     pool = [...new Set(pool.concat(basePool))];
                 }
@@ -322,7 +322,7 @@ class RandomTeams {
                 spe: this.random(32),
             };
             // Random nature
-            const nature = this.sample(natures);
+            const nature = this.sample(natures).name;
             // Level balance--calculate directly from stats rather than using some silly lookup table
             const mbstmin = 1307; // Sunkern has the lowest modified base stat total, and that total is 807
             let stats = species.baseStats;
@@ -357,15 +357,15 @@ class RandomTeams {
                 name: species.baseSpecies,
                 species: species.name,
                 gender: species.gender,
-                item: item,
-                ability: ability,
-                moves: moves,
-                evs: evs,
-                ivs: ivs,
-                nature: nature,
+                item,
+                ability,
+                moves,
+                evs,
+                ivs,
+                nature,
                 level,
-                happiness: happiness,
-                shiny: shiny,
+                happiness,
+                shiny,
             });
         }
         return team;
@@ -381,15 +381,14 @@ class RandomTeams {
             throw new Error(`"${requiredType}" is not a valid type.`);
         }
         const pool = [];
-        for (const id in this.dex.data.FormatsData) {
-            if (!this.dex.data.Pokedex[id] ||
-                (this.dex.data.FormatsData[id].isNonstandard && this.dex.data.FormatsData[id].isNonstandard !== 'Unobtainable'))
+        for (const species of this.dex.species.all()) {
+            if (species.isNonstandard && species.isNonstandard !== 'Unobtainable')
                 continue;
-            if (requiredType && !this.dex.data.Pokedex[id].types.includes(requiredType))
+            if (requiredType && !species.types.includes(requiredType))
                 continue;
-            if (minSourceGen && (this.dex.data.Pokedex[id].gen || 8) < minSourceGen)
+            if (minSourceGen && species.gen < minSourceGen)
                 continue;
-            const num = this.dex.data.Pokedex[id].num;
+            const num = species.num;
             if (num <= 0 || pool.includes(num))
                 continue;
             if (num > last)
@@ -402,10 +401,9 @@ class RandomTeams {
             hasDexNumber[num] = i;
         }
         const formes = [];
-        for (const id in this.dex.data.Pokedex) {
-            if (!(this.dex.data.Pokedex[id].num in hasDexNumber))
+        for (const species of this.dex.species.all()) {
+            if (!(species.num in hasDexNumber))
                 continue;
-            const species = this.dex.species.get(id);
             if (species.gen <= this.gen && (!species.isNonstandard || species.isNonstandard === 'Unobtainable')) {
                 if (!formes[hasDexNumber[species.num]])
                     formes[hasDexNumber[species.num]] = [];
@@ -423,35 +421,38 @@ class RandomTeams {
     }
     randomHCTeam() {
         const team = [];
-        const itemPool = Object.keys(this.dex.data.Items);
-        const abilityPool = Object.keys(this.dex.data.Abilities);
-        const movePool = Object.keys(this.dex.data.Moves);
-        const naturePool = Object.keys(this.dex.data.Natures);
+        const itemPool = [...this.dex.items.all()];
+        const abilityPool = [...this.dex.abilities.all()];
+        const movePool = [...this.dex.moves.all()];
+        const naturePool = this.dex.natures.all();
         const randomN = this.randomNPokemon(this.maxTeamSize, this.forceMonotype);
         for (const forme of randomN) {
             // Choose forme
             const species = this.dex.species.get(forme);
             // Random unique item
             let item = '';
+            let itemData;
             if (this.gen >= 2) {
                 do {
-                    item = this.sampleNoReplace(itemPool);
-                } while (this.dex.items.get(item).gen > this.gen || this.dex.data.Items[item].isNonstandard);
+                    itemData = this.sampleNoReplace(itemPool);
+                    item = itemData.name;
+                } while (itemData.gen > this.gen || itemData.isNonstandard);
             }
             // Random unique ability
-            let ability = 'None';
+            let ability = 'No Ability';
+            let abilityData;
             if (this.gen >= 3) {
                 do {
-                    ability = this.sampleNoReplace(abilityPool);
-                } while (this.dex.abilities.get(ability).gen > this.gen || this.dex.data.Abilities[ability].isNonstandard);
+                    abilityData = this.sampleNoReplace(abilityPool);
+                    ability = abilityData.name;
+                } while (abilityData.gen > this.gen || abilityData.isNonstandard);
             }
             // Random unique moves
             const m = [];
             do {
-                const moveid = this.sampleNoReplace(movePool);
-                const move = this.dex.moves.get(moveid);
+                const move = this.sampleNoReplace(movePool);
                 if (move.gen <= this.gen && !move.isNonstandard && !move.name.startsWith('Hidden Power ')) {
-                    m.push(moveid);
+                    m.push(move.id);
                 }
             } while (m.length < 4);
             // Random EVs
@@ -480,7 +481,7 @@ class RandomTeams {
                 spe: this.random(32),
             };
             // Random nature
-            const nature = this.sample(naturePool);
+            const nature = this.sample(naturePool).name;
             // Level balance
             const mbstmin = 1307;
             const stats = species.baseStats;
@@ -510,15 +511,15 @@ class RandomTeams {
                 name: species.baseSpecies,
                 species: species.name,
                 gender: species.gender,
-                item: item,
-                ability: ability,
+                item,
+                ability,
                 moves: m,
-                evs: evs,
-                ivs: ivs,
-                nature: nature,
+                evs,
+                ivs,
+                nature,
                 level,
-                happiness: happiness,
-                shiny: shiny,
+                happiness,
+                shiny,
             });
         }
         return team;
@@ -1136,9 +1137,8 @@ class RandomTeams {
                 return (moves.has('rapidspin') || species.nfe || isDoubles);
             case 'Blaze':
                 return (isDoubles && abilities.has('Solar Power')) || (!isDoubles && !isNoDynamax && species.id === 'charizard');
-            case 'Bulletproof':
-            case 'Overcoat':
-                return !!counter.setupType;
+            // case 'Bulletproof': case 'Overcoat':
+            // 	return !!counter.setupType;
             case 'Chlorophyll':
                 return (species.baseStats.spe > 100 || !counter.get('Fire') && !moves.has('sunnyday') && !teamDetails.sun);
             case 'Cloud Nine':
@@ -1545,7 +1545,7 @@ class RandomTeams {
         const randMoves = (isDoubles && species.randomDoubleBattleMoves) ||
             (isNoDynamax && species.randomBattleNoDynamaxMoves) ||
             species.randomBattleMoves;
-        const movePool = (randMoves || Object.keys(this.dex.data.Learnsets[species.id].learnset)).slice();
+        const movePool = (randMoves || Object.keys(this.dex.species.getLearnset(species.id))).slice();
         if (this.format.gameType === 'multi' || this.format.gameType === 'freeforall') {
             // Random Multi Battle uses doubles move pools, but Ally Switch fails in multi battles
             // Random Free-For-All also uses doubles move pools, for now
@@ -1767,8 +1767,10 @@ class RandomTeams {
             forme = 'Pikachu' + this.sample(['', '-Original', '-Hoenn', '-Sinnoh', '-Unova', '-Kalos', '-Alola', '-Partner', '-World']);
         }
         let level;
+        // doubles levelling
         if (isDoubles && species.randomDoubleBattleLevel) {
             level = species.randomDoubleBattleLevel;
+            // No Dmax levelling
         }
         else if (isNoDynamax) {
             const tier = species.name.endsWith('-Gmax') ? this.dex.species.get(species.changesFrom).tier : species.tier;
@@ -1795,9 +1797,29 @@ class RandomTeams {
                 decidueye: 87, noivern: 85, magnezone: 82, slowking: 81,
             };
             level = customScale[species.id] || tierScale[tier];
+            // BDSP tier levelling
+        }
+        else if (this.dex.currentMod === 'gen8bdsp') {
+            const tierScale = {
+                Uber: 76,
+                OU: 80,
+                UUBL: 81,
+                UU: 82,
+                RUBL: 83,
+                RU: 84,
+                NUBL: 85,
+                NU: 86,
+                PUBL: 87,
+                PU: 88, "(PU)": 88, NFE: 88,
+            };
+            // to override tier scaling if needed
+            const customScale = {};
+            level = customScale[species.id] || tierScale[species.tier];
+            // Arbitrary levelling base on data files (typically winrate-influenced)
         }
         else if (species.randomBattleLevel) {
             level = species.randomBattleLevel;
+            // Default to level 80
         }
         else {
             level = 80;
@@ -1807,7 +1829,7 @@ class RandomTeams {
         const srWeakness = srImmunity ? 0 : this.dex.getEffectiveness('Rock', species);
         while (evs.hp > 1) {
             const hp = Math.floor(Math.floor(2 * species.baseStats.hp + ivs.hp + Math.floor(evs.hp / 4) + 100) * level / 100 + 10);
-            const multipleOfFourNecessary = (moves.has('substitute') && (item === 'Sitrus Berry' ||
+            const multipleOfFourNecessary = (moves.has('substitute') && !['Leftovers', 'Black Sludge'].includes(item) && (item === 'Sitrus Berry' ||
                 item === 'Salac Berry' ||
                 ability === 'Power Construct'));
             if (multipleOfFourNecessary) {
@@ -1835,7 +1857,13 @@ class RandomTeams {
         if (moves.has('shellsidearm') && item === 'Choice Specs')
             evs.atk -= 8;
         // Minimize confusion damage
-        if (!counter.get('Physical') && !moves.has('transform') && (!moves.has('shellsidearm') || !counter.get('Status'))) {
+        const noAttackStatMoves = [...moves].every(m => {
+            const move = this.dex.moves.get(m);
+            if (move.damageCallback || move.damage)
+                return false;
+            return move.category !== 'Physical' || move.id === 'bodypress';
+        });
+        if (noAttackStatMoves && !moves.has('transform') && (!moves.has('shellsidearm') || !counter.get('Status'))) {
             evs.atk = 0;
             ivs.atk = 0;
         }
@@ -1863,8 +1891,7 @@ class RandomTeams {
     getPokemonPool(type, pokemonToExclude = [], isMonotype = false) {
         const exclude = pokemonToExclude.map(p => (0, sim_1.toID)(p.species));
         const pokemonPool = [];
-        for (const id in this.dex.data.FormatsData) {
-            let species = this.dex.species.get(id);
+        for (let species of this.dex.species.all()) {
             if (species.gen > this.gen || exclude.includes(species.id))
                 continue;
             if (isMonotype) {
@@ -1876,7 +1903,7 @@ class RandomTeams {
                         continue;
                 }
             }
-            pokemonPool.push(id);
+            pokemonPool.push(species.id);
         }
         return pokemonPool;
     }