@pkmn/sim 0.5.20 → 0.5.23

package/data/mods/gen6/learnsets.ts

@@ -172,79 +172,4 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
 			zenheadbutt: ["7T", "5T"],
 		},
 	},
-	crucibelle: {
-		inherit: true,
-		learnset: {
-			acidarmor: ["7L32", "6L32"],
-			astonish: ["7L1", "6L1"],
-			attract: ["7M", "6M"],
-			block: ["6T"],
-			coil: ["7E", "6E"],
-			confuseray: ["7L16", "6L16"],
-			confusion: ["7L14", "6L14"],
-			defensecurl: ["7E", "6E"],
-			doubleteam: ["7M", "6M"],
-			embargo: ["7M", "6M"],
-			endure: ["7L1", "6L1"],
-			explosion: ["7M", "7L60", "6M", "6L60"],
-			facade: ["7M", "6M"],
-			faketears: ["7L10", "6L10"],
-			frustration: ["7M", "6M"],
-			gigaimpact: ["7M", "6M"],
-			grassknot: ["7M", "6M"],
-			gravity: ["6T"],
-			gunkshot: ["7L56", "6T", "6L56"],
-			headsmash: ["6L1"],
-			helpinghand: ["6T"],
-			hex: ["7L44", "6L44"],
-			hiddenpower: ["7M", "6M"],
-			hyperbeam: ["7M", "6M"],
-			infestation: ["7M", "6M"],
-			ironhead: ["6T"],
-			lowkick: ["6T"],
-			magicroom: ["6T"],
-			payback: ["7M", "6M"],
-			poisonjab: ["7M", "6M"],
-			protect: ["7M", "7L1", "6M", "6L1"],
-			psybeam: ["7L40", "6L40"],
-			psychic: ["7M", "6M"],
-			reflect: ["7M", "7L25", "6M", "6L25"],
-			rest: ["7M", "6M"],
-			return: ["7M", "6M"],
-			rockblast: ["7L52", "6L52"],
-			rockpolish: ["7M", "6M"],
-			rockslide: ["7M", "7L36", "6M", "6L36"],
-			rocksmash: ["7M", "6M"],
-			rockthrow: ["7L5", "6L5"],
-			rocktomb: ["7M", "6M"],
-			rollout: ["7E", "6E"],
-			round: ["7M", "6M"],
-			safeguard: ["7M", "6M"],
-			sandstorm: ["7M", "6M"],
-			secretpower: ["7M"],
-			shadowball: ["7M", "6M"],
-			skillswap: ["6T"],
-			sleeptalk: ["7M", "6M"],
-			sludge: ["7L28", "6L28"],
-			sludgebomb: ["7M", "6M"],
-			sludgewave: ["7M", "6M"],
-			smackdown: ["7M", "7L23", "6M", "6L23"],
-			snatch: ["6T"],
-			snore: ["6T"],
-			stealthrock: ["6T"],
-			stoneedge: ["7M", "6M"],
-			substitute: ["7M", "6M"],
-			swagger: ["7M", "6M"],
-			torment: ["7M", "7L48", "6M", "6L48"],
-			toxic: ["7M", "7L7", "6M", "6L7"],
-			toxicspikes: ["7L19", "6L19"],
-			trick: ["6T"],
-			uturn: ["7M", "6M"],
-			venoshock: ["7M", "6M"],
-			withdraw: ["7L1", "6L1"],
-			wonderroom: ["6T"],
-			woodhammer: ["7E", "6E"],
-			zenheadbutt: ["6T"],
-		},
-	},
 };

package/data/mods/gen7/abilities.ts

@@ -8,6 +8,14 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 			}
 		},
 	},
+	darkaura: {
+		inherit: true,
+		isBreakable: true,
+	},
+	fairyaura: {
+		inherit: true,
+		isBreakable: true,
+	},
 	innerfocus: {
 		inherit: true,
 		rating: 1,

package/data/mods/gen7/moves.ts

@@ -381,7 +381,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onSwitchIn(target) {
 				if (!target.fainted) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					this.add('-heal', target, target.getHealth, '[from] move: Healing Wish');
 					target.side.removeSlotCondition(target, 'healingwish');
 				}
@@ -608,7 +608,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onSwitchIn(target) {
 				if (!target.fainted) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					for (const moveSlot of target.moveSlots) {
 						moveSlot.pp = moveSlot.maxpp;
 					}

package/data/moves.ts

@@ -7828,7 +7828,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			onSwap(target) {
 				if (!target.fainted && (target.hp < target.maxhp || target.status)) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					this.add('-heal', target, target.getHealth, '[from] move: Healing Wish');
 					target.side.removeSlotCondition(target, 'healingwish');
 				}
@@ -9081,7 +9081,12 @@ export const Moves: {[moveid: string]: MoveData} = {
 				return false;
 			}
 			this.add('-singleturn', target, 'move: Instruct', '[of] ' + source);
-			this.actions.runMove(target.lastMove.id, target, target.lastMoveTargetLoc!);
+			this.queue.prioritizeAction(this.queue.resolveAction({
+				choice: 'move',
+				pokemon: target,
+				moveid: target.lastMove.id,
+				targetLoc: target.lastMoveTargetLoc!,
+			})[0] as MoveAction);
 		},
 		secondary: null,
 		target: "normal",
@@ -9929,7 +9934,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 					)
 				) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					for (const moveSlot of target.moveSlots) {
 						moveSlot.pp = moveSlot.maxpp;
 					}

package/data/pokedex.ts

@@ -17419,6 +17419,18 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		changesFrom: "Venomicon",
 		gen: 8,
 	},
+	saharaja: {
+		num: -68,
+		name: "Saharaja",
+		types: ["Ground"],
+		baseStats: {hp: 70, atk: 120, def: 105, spa: 65, spd: 130, spe: 90},
+		abilities: {0: "Water Absorb", 1: "Serene Grace"},
+		heightm: 2.3,
+		weightkg: 303.9,
+		color: "White",
+		eggGroups: ["Undiscovered"],
+		gen: 8,
+	},
 	// NOTE: PokeStar "formes" are not actually formes and thus do not have a formeOrder
 	pokestarsmeargle: {
 		num: -5000,

package/data/rulesets.ts

@@ -399,6 +399,29 @@ export const Rulesets: {[k: string]: FormatData} = {
 			}
 		},
 	},
+	forceselect: {
+		effectType: 'ValidatorRule',
+		name: 'Force Select',
+		desc: `Forces a Pokemon to be on the team and selected at Team Preview. Usage: Force Select = [Pokemon], e.g. "Force Select = Magikarp"`,
+		hasValue: true,
+		onValidateRule(value) {
+			if (!this.dex.species.get(value).exists) throw new Error(`Misspelled Pokemon "${value}"`);
+		},
+		onValidateTeam(team) {
+			let hasSelection = false;
+			const species = this.dex.species.get(this.ruleTable.valueRules.get('forceselect'));
+			for (const set of team) {
+				if (species.name === set.species) {
+					hasSelection = true;
+					break;
+				}
+			}
+			if (!hasSelection) {
+				return [`Your team must contain ${species.name}.`];
+			}
+		},
+		// hardcoded in sim/side
+	},
 	evlimits: {
 		effectType: 'ValidatorRule',
 		name: 'EV Limits',
@@ -1262,6 +1285,19 @@ export const Rulesets: {[k: string]: FormatData} = {
 			}
 		},
 	},
+	gemsclause: {
+		effectType: 'ValidatorRule',
+		name: 'Gems Clause',
+		desc: "Bans all Gems",
+		onValidateSet(set) {
+			if (!set.item) return;
+			const item = this.dex.items.get(set.item);
+			if (item.isGem) {
+				if (this.ruleTable.has(`+item:${item.id}`)) return;
+				return [`${item.name} is banned due to Gems Clause.`];
+			}
+		},
+	},
 	'sketchgen8moves': {
 		effectType: 'ValidatorRule',
 		name: 'Sketch Gen 8 Moves',
@@ -1585,6 +1621,12 @@ export const Rulesets: {[k: string]: FormatData} = {
 		desc: "Prevents Pok\u00e9mon from having moves that would only be obtainable in Pok\u00e9mon Crystal.",
 		// Implemented in mods/gen2/rulesets.ts
 	},
+	aptclause: {
+		effectType: 'ValidatorRule',
+		name: 'APT Clause',
+		desc: "Bans the combination of Agility and partial trapping moves like Wrap.",
+		banlist: ['Agility + Wrap', 'Agility + Fire Spin', 'Agility + Bind', 'Agility + Clamp'],
+	},
 	nintendocup1997movelegality: {
 		effectType: 'ValidatorRule',
 		name: "Nintendo Cup 1997 Move Legality",
@@ -1824,4 +1866,117 @@ export const Rulesets: {[k: string]: FormatData} = {
 			}
 		},
 	},
+	reevolutionmod: {
+		effectType: "Rule",
+		name: "Re-Evolution Mod",
+		desc: "Pokémon gain the stat changes they would gain from evolving again.",
+		ruleset: ['Overflow Stat Mod'],
+		onBegin() {
+			this.add('rule', 'Re-Evolution Mod: Pok\u00e9mon gain the boosts they would gain from evolving again');
+		},
+		onModifySpecies(species, target) {
+			const newSpecies = this.dex.deepClone(species);
+			if (!newSpecies.prevo) return;
+			const prevoSpecies = this.dex.species.get(newSpecies.prevo);
+			let statid: StatID;
+			newSpecies.bst = 0;
+			for (statid in prevoSpecies.baseStats) {
+				const change = newSpecies.baseStats[statid] - prevoSpecies.baseStats[statid];
+				newSpecies.baseStats[statid] = this.clampIntRange(newSpecies.baseStats[statid] + change, 1, 255);
+				newSpecies.bst += newSpecies.baseStats[statid];
+			}
+			return newSpecies;
+		},
+	},
+	brokenrecordmod: {
+		effectType: "Rule",
+		name: "Broken Record Mod",
+		desc: `Pokémon can hold a TR to use that move in battle.`,
+		onValidateSet(set) {
+			if (!set.item) return;
+			const item = this.dex.items.get(set.item);
+			if (!/^tr\d\d/i.test(item.name)) return;
+			const moveName = item.desc.split('move ')[1].split('.')[0];
+			if (set.moves.map(this.toID).includes(this.toID(moveName))) {
+				return [
+					`${set.species} can't run ${item.name} (${moveName}) as its item because it already has that move in its moveset.`,
+				];
+			}
+		},
+		onValidateTeam(team) {
+			const trs = new Set<string>();
+			for (const set of team) {
+				if (!set.item) continue;
+				const item = this.dex.items.get(set.item).name;
+				if (!/^tr\d\d/i.test(item)) continue;
+				if (trs.has(item)) {
+					return [`Your team already has a Pok\u00e9mon with ${item}.`];
+				}
+				trs.add(item);
+			}
+		},
+		onTakeItem(item) {
+			return !/^tr\d\d/i.test(item.name);
+		},
+		onModifyMove(move) {
+			if (move.id === 'knockoff') {
+				move.onBasePower = function (basePower, source, target, m) {
+					const item = target.getItem();
+					if (!this.singleEvent('TakeItem', item, target.itemState, target, target, m, item)) return;
+					// Very hardcode but I'd prefer to not make a mod for one damage calculation change
+					if (item.id && !/^tr\d\d/i.test(item.id)) {
+						return this.chainModify(1.5);
+					}
+				};
+			} else if (move.id === 'fling') {
+				move.onPrepareHit = function (target, source, m) {
+					if (source.ignoringItem()) return false;
+					const item = source.getItem();
+					if (!this.singleEvent('TakeItem', item, source.itemState, source, source, m, item)) return false;
+					if (!item.fling) return false;
+					if (/^tr\d\d/i.test(item.id)) return false;
+					m.basePower = item.fling.basePower;
+					if (item.isBerry) {
+						m.onHit = function (foe) {
+							if (this.singleEvent('Eat', item, null, foe, null, null)) {
+								this.runEvent('EatItem', foe, null, null, item);
+								if (item.id === 'leppaberry') foe.staleness = 'external';
+							}
+							if (item.onEat) foe.ateBerry = true;
+						};
+					} else if (item.fling.effect) {
+						m.onHit = item.fling.effect;
+					} else {
+						if (!m.secondaries) m.secondaries = [];
+						if (item.fling.status) {
+							m.secondaries.push({status: item.fling.status});
+						} else if (item.fling.volatileStatus) {
+							m.secondaries.push({volatileStatus: item.fling.volatileStatus});
+						}
+					}
+					source.addVolatile('fling');
+				};
+			}
+		},
+		onBegin() {
+			for (const pokemon of this.getAllPokemon()) {
+				const item = pokemon.getItem();
+				if (/^tr\d\d/i.test(item.name)) {
+					const move = this.dex.moves.get(item.desc.split('move ')[1].split('.')[0]);
+					pokemon.moveSlots = (pokemon as any).baseMoveSlots = [
+						...pokemon.baseMoveSlots, {
+							id: move.id,
+							move: move.name,
+							pp: move.pp * 8 / 5,
+							maxpp: move.pp * 8 / 5,
+							target: move.target,
+							disabled: false,
+							disabledSource: '',
+							used: false,
+						},
+					];
+				}
+			}
+		},
+	},
 };

package/data/tags.ts

@@ -199,8 +199,8 @@ export const Tags: {[id: string]: TagData} = {
 		speciesFilter: species => [
 			'Aerodactyl-Mega', 'Alakazam', 'Blacephalon', 'Blaziken', 'Diancie-Mega', 'Gallade-Mega', 'Gardevoir-Mega', 'Gengar', 'Gyarados',
 			'Gyarados-Mega', 'Hawlucha', 'Heracross-Mega', 'Hoopa-Unbound', 'Hydreigon', 'Jirachi', 'Latias', 'Latias-Mega', 'Latios',
-			'Latios-Mega', 'Manaphy', 'Medicham-Mega', 'Melmetal', 'Mew', 'Pinsir-Mega', 'Sableye-Mega', 'Slowbro-Mega', 'Slowking-Galar',
-			'Thundurus', 'Thundurus-Therian', 'Venusaur-Mega', 'Xurkitree', 'Zapdos-Galar',
+			'Latios-Mega', 'Manaphy', 'Medicham-Mega', 'Melmetal', 'Mew', 'Moltres-Galar', 'Pinsir-Mega', 'Sableye-Mega', 'Slowbro-Mega',
+			'Slowking-Galar', 'Thundurus', 'Venusaur-Mega', 'Xurkitree', 'Zapdos-Galar',
 		].includes(species.name),
 	},
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/sim",
-  "version": "0.5.20",
+  "version": "0.5.23",
   "description": "An automatically generated extraction of just the simulator portion of Pokémon Showdown",
   "homepage": "https://psim.us",
   "main": "build/sim/index.js",
@@ -27,7 +27,7 @@
     "sim"
   ],
   "dependencies": {
-    "@pkmn/sets": "^3.0.0",
+    "@pkmn/sets": "^3.1.0",
     "@pkmn/streams": "^1.0.0"
   },
   "devDependencies": {

package/sim/battle-stream.ts

@@ -211,6 +211,9 @@ export class BattleStream extends Streams.ObjectReadWriteStream<string> {
 		case 'requestlog':
 			this.push(`requesteddata\n${this.battle!.inputLog.join('\n')}`);
 			break;
+		case 'requestexport':
+			this.push(`requesteddata\n${this.battle!.prngSeed}\n${this.battle!.inputLog.join('\n')}`);
+			break;
 		case 'requestteam':
 			message = message.trim();
 			const slotNum = parseInt(message.slice(1)) - 1;

package/sim/exported-global-types.ts

@@ -515,6 +515,7 @@ export namespace RandomTeamsTypes {
 		shiny: boolean;
 		nature?: string;
 		happiness?: number;
+		dynamaxLevel?: number;
 		gigantamax?: boolean;
 	}
 	export interface RandomFactorySet {
@@ -530,6 +531,7 @@ export namespace RandomTeamsTypes {
 		ivs: SparseStatsTable;
 		nature: string;
 		moves: string[];
+		dynamaxLevel?: number;
 		gigantamax?: boolean;
 	}
 }

package/sim/global-types.ts

@@ -515,6 +515,7 @@ namespace RandomTeamsTypes {
 		shiny: boolean;
 		nature?: string;
 		happiness?: number;
+		dynamaxLevel?: number;
 		gigantamax?: boolean;
 	}
 	export interface RandomFactorySet {
@@ -530,6 +531,7 @@ namespace RandomTeamsTypes {
 		ivs: SparseStatsTable;
 		nature: string;
 		moves: string[];
+		dynamaxLevel?: number;
 		gigantamax?: boolean;
 	}
 }

package/sim/pokemon.ts

@@ -77,6 +77,7 @@ export class Pokemon {
 	readonly gender: GenderName;
 	readonly happiness: number;
 	readonly pokeball: string;
+	readonly dynamaxLevel: number;
 	readonly gigantamax: boolean;
 
 	/** Transform keeps the original pre-transformed Hidden Power in Gen 2-4. */
@@ -326,6 +327,7 @@ export class Pokemon {
 		if (this.gender === 'N') this.gender = '';
 		this.happiness = typeof set.happiness === 'number' ? this.battle.clampIntRange(set.happiness, 0, 255) : 255;
 		this.pokeball = this.set.pokeball || 'pokeball';
+		this.dynamaxLevel = typeof set.dynamaxLevel === 'number' ? this.battle.clampIntRange(set.dynamaxLevel, 0, 10) : 10;
 		this.gigantamax = this.set.gigantamax || false;
 
 		this.baseMoveSlots = [];
@@ -1522,7 +1524,7 @@ export class Pokemon {
 	cureStatus(silent = false) {
 		if (!this.hp || !this.status) return false;
 		this.battle.add('-curestatus', this, this.status, silent ? '[silent]' : '[msg]');
-		if (this.status === 'slp' && !this.hasAbility('comatose') && this.removeVolatile('nightmare')) {
+		if (this.status === 'slp' && this.removeVolatile('nightmare')) {
 			this.battle.add('-end', this, 'Nightmare', '[silent]');
 		}
 		this.setStatus('');
@@ -1599,7 +1601,12 @@ export class Pokemon {
 	 * Unlike cureStatus, does not give cure message
 	 */
 	clearStatus() {
-		return this.setStatus('');
+		if (!this.hp || !this.status) return false;
+		if (this.status === 'slp' && this.removeVolatile('nightmare')) {
+			this.battle.add('-end', this, 'Nightmare', '[silent]');
+		}
+		this.setStatus('');
+		return true;
 	}
 
 	getStatus() {

package/sim/side.ts

@@ -796,6 +796,26 @@ export class Side {
 				}
 			}
 		}
+		if (ruleTable.valueRules.has('forceselect')) {
+			const species = this.battle.dex.species.get(ruleTable.valueRules.get('forceselect'));
+			if (!data) {
+				// autoChoose
+				positions = [...this.pokemon.keys()].filter(pos => this.pokemon[pos].species.name === species.name)
+					.concat([...this.pokemon.keys()].filter(pos => this.pokemon[pos].species.name !== species.name))
+					.slice(0, pickedTeamSize);
+			} else {
+				let hasSelection = false;
+				for (const pos of positions) {
+					if (this.pokemon[pos].species.name === species.name) {
+						hasSelection = true;
+						break;
+					}
+				}
+				if (!hasSelection) {
+					return this.emitChoiceError(`You must bring ${species.name} to the battle.`);
+				}
+			}
+		}
 		for (const [index, pos] of positions.entries()) {
 			this.choice.switchIns.add(pos);
 			this.choice.actions.push({