@pkmn/randoms 0.5.28 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/randoms",
-  "version": "0.5.28",
+  "version": "0.6.2",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "description": "Random team generation logic for Pokémon Showdown's Random Battle formats",
@@ -16,7 +16,7 @@
     "!src/test"
   ],
   "dependencies": {
-    "@pkmn/sim": "^0.5.28"
+    "@pkmn/sim": "^0.6.2"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts",

package/src/gen2.ts

@@ -68,13 +68,13 @@ export class RandomGen2Teams extends RandomGen3Teams {
 		// Ineffective to have both
 		case 'doubleedge':
 			return {cull: moves.has('bodyslam') || moves.has('return')};
-		case 'explosion':
-			return {cull: moves.has('softboiled')};
+		case 'explosion': case 'selfdestruct':
+			return {cull: moves.has('softboiled') || restTalk};
 		case 'extremespeed':
 			return {cull: moves.has('bodyslam') || restTalk};
 		case 'hyperbeam':
 			return {cull: moves.has('rockslide')};
-		case 'quickattack': case 'selfdestruct':
+		case 'quickattack':
 			return {cull: moves.has('rest')};
 		case 'rapidspin':
 			return {cull: !!teamDetails.rapidSpin || moves.has('sleeptalk')};

package/src/gen7.ts

@@ -1312,7 +1312,7 @@ export class RandomGen7Teams extends RandomTeams {
 			} else if (abilities.has('Moxie') && (counter.get('Physical') > 3 || moves.has('bounce')) && !isDoubles) {
 				ability = 'Moxie';
 			} else if (isDoubles) {
-				if (abilities.has('Intimidate')) ability = 'Intimidate';
+				if (abilities.has('Intimidate') && !battleOnly) ability = 'Intimidate';
 				if (abilities.has('Guts') && ability !== 'Intimidate') ability = 'Guts';
 				if (abilities.has('Storm Drain')) ability = 'Storm Drain';
 				if (abilities.has('Harvest')) ability = 'Harvest';

package/src/gen8.ts

@@ -78,7 +78,7 @@ const ContraryMoves = [
 ];
 // Moves that boost Attack:
 const PhysicalSetup = [
-	'bellydrum', 'bulkup', 'coil', 'curse', 'dragondance', 'honeclaws', 'howl', 'poweruppunch', 'swordsdance',
+	'bellydrum', 'bulkup', 'coil', 'curse', 'dragondance', 'honeclaws', 'howl', 'meditate', 'poweruppunch', 'swordsdance',
 ];
 // Moves which boost Special Attack:
 const SpecialSetup = [
@@ -1181,7 +1181,7 @@ export class RandomTeams {
 			if (movePool.includes('leechseed') || (movePool.includes('toxic') && !moves.has('wish'))) return {cull: true};
 			if (isDoubles && (
 				['bellydrum', 'fakeout', 'shellsmash', 'spore'].some(m => movePool.includes(m)) ||
-				moves.has('tailwind') || moves.has('waterspout')
+				moves.has('tailwind') || moves.has('waterspout') || counter.get('recovery')
 			)) return {cull: true};
 			return {cull: false};
 		case 'rapidspin':
@@ -1265,6 +1265,8 @@ export class RandomTeams {
 				(counter.get('Special') < 4 && !moves.has('uturn')) ||
 				(species.types.length > 1 && counter.get('stab') < 3)
 			)};
+		case 'muddywater':
+			return {cull: moves.has('liquidation')};
 		case 'scald':
 			// Special case for Clawitzer
 			return {cull: moves.has('waterpulse')};
@@ -1805,7 +1807,9 @@ export class RandomTeams {
 				species.baseStats.spe >= 60 && species.baseStats.spe <= 100 && this.randomChance(1, 2)
 			) ? 'Choice Scarf' : 'Choice Specs';
 		}
-		if (counter.damagingMoves.size >= 4 && defensiveStatTotal >= 280) return 'Assault Vest';
+		// This one is intentionally below the Choice item checks.
+		if ((defensiveStatTotal < 250 && ability === 'Regenerator') || species.name === 'Pheromosa') return 'Life Orb';
+		if (counter.damagingMoves.size >= 4 && defensiveStatTotal >= 275) return 'Assault Vest';
 		if (
 			counter.damagingMoves.size >= 3 &&
 			species.baseStats.spe >= 60 &&