@pkmn/randoms 0.5.8 → 0.5.11

package/src/gen6.ts

@@ -409,7 +409,11 @@ export class RandomGen6Teams extends RandomGen7Teams {
 		case 'originpulse': case 'surf':
 			return {cull: moves.has('hydropump') || moves.has('scald')};
 		case 'scald':
-			return {cull: moves.has('waterfall') || moves.has('waterpulse')};
+			return {cull: (
+				moves.has('waterfall') ||
+				moves.has('waterpulse') ||
+				(species.id === 'quagsire' && movePool.includes('recover'))
+			)};
 
 		// Status:
 		case 'glare': case 'headbutt':
@@ -567,7 +571,7 @@ export class RandomGen6Teams extends RandomGen7Teams {
 		case 'Unburden':
 			return (!!species.isMega || abilities.has('Prankster') || !counter.setupType && !moves.has('acrobatics'));
 		case 'Water Absorb':
-			return (moves.has('raindance') || abilities.has('Drizzle') || abilities.has('Volt Absorb'));
+			return (moves.has('raindance') || ['Drizzle', 'Unaware', 'Volt Absorb'].some(a => abilities.has(a)));
 		case 'Weak Armor':
 			return counter.setupType !== 'Physical';
 		}
@@ -794,9 +798,8 @@ export class RandomGen6Teams extends RandomGen7Teams {
 		const ivs = {hp: 31, atk: 31, def: 31, spa: 31, spd: 31, spe: 31};
 
 		const types = new Set(species.types);
-		const abilities = new Set(Object.values(species.abilities));
+		let abilities = new Set(Object.values(species.abilities));
 		if (species.unreleasedHidden) abilities.delete(species.abilities.H);
-
 		let availableHP = 0;
 		for (const setMoveid of movePool) {
 			if (setMoveid.startsWith('hiddenpower')) availableHP++;
@@ -995,10 +998,10 @@ export class RandomGen6Teams extends RandomGen7Teams {
 			moves.add('thunder');
 		}
 
-		const battleOnly = species.battleOnly && !species.requiredAbility;
-		const baseSpecies: Species = battleOnly ? this.dex.species.get(species.battleOnly as string) : species;
-
-		const abilityData = Object.values(baseSpecies.abilities).map(a => this.dex.abilities.get(a));
+		if (species.battleOnly && !species.requiredAbility) {
+			abilities = new Set(Object.values(this.dex.species.get(species.battleOnly as string).abilities));
+		}
+		const abilityData = [...abilities].map(a => this.dex.abilities.get(a));
 		Utils.sortBy(abilityData, abil => -abil.rating);
 
 		if (abilityData.length > 1) {

package/src/gen8.ts

@@ -563,7 +563,7 @@ export class RandomTeams {
 
 					banReason = ruleTable.check('basepokemon:' + 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 = Tags.nonexistent.genericFilter!(species) && nonexistentBanReason;
 						let tagWhitelisted = false;
 						let tagBlacklisted = false;
@@ -588,10 +588,10 @@ export class RandomTeams {
 						}
 					}
 				}
+				speciesPool.push(species);
 				const num = species.num;
 				if (pool.includes(num)) continue;
 				pool.push(num);
-				speciesPool.push(species);
 			}
 		}
 
@@ -2261,7 +2261,7 @@ export class RandomTeams {
 				PUBL: 87,
 				PU: 88, "(PU)": 88, NFE: 88,
 			};
-			const customScale: {[k: string]: number} = {delibird: 100, luvdisc: 100, spinda: 100, unown: 100};
+			const customScale: {[k: string]: number} = {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)