@pkmn/sim 0.6.3 → 0.6.4

package/data/mods/gen1/moves.ts

@@ -253,7 +253,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			duration: 2,
 			onLockMove: 'dig',
 			onInvulnerability(target, source, move) {
-				if (move.id === 'swift') return true;
+				if (move.id === 'swift' || move.id === 'transform') return true;
 				this.add('-message', 'The foe ' + target.name + ' can\'t be hit underground!');
 				return false;
 			},
@@ -372,7 +372,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			duration: 2,
 			onLockMove: 'fly',
 			onInvulnerability(target, source, move) {
-				if (move.id === 'swift') return true;
+				if (move.id === 'swift' || move.id === 'transform') return true;
 				this.add('-message', 'The foe ' + target.name + ' can\'t be hit while flying!');
 				return false;
 			},
@@ -835,6 +835,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 				uncappedDamage = this.runEvent('SubDamage', target, source, move, uncappedDamage);
 				if (!uncappedDamage) return uncappedDamage;
 				source.lastDamage = uncappedDamage;
+				this.lastDamage = uncappedDamage;
 				target.volatiles['substitute'].hp -= uncappedDamage > target.volatiles['substitute'].hp ?
 					target.volatiles['substitute'].hp : uncappedDamage;
 				if (target.volatiles['substitute'].hp <= 0) {

package/data/mods/gen1/scripts.ts

@@ -242,13 +242,13 @@ export const Scripts: ModdedBattleScriptsData = {
 			}
 			damage = this.tryMoveHit(target, pokemon, move);
 
-			// Store 0 damage for last damage if move failed or dealt 0 damage.
+			// Store 0 damage for last damage if move failed.
 			// This only happens on moves that don't deal damage but call GetDamageVarsForPlayerAttack (disassembly).
 			const neverDamageMoves = [
 				'conversion', 'haze', 'mist', 'focusenergy', 'confuseray', 'supersonic', 'transform', 'lightscreen', 'reflect', 'substitute', 'mimic', 'leechseed', 'splash', 'softboiled', 'recover', 'rest',
 			];
 			if (
-				!damage &&
+				!damage && damage !== 0 &&
 				(move.category !== 'Status' || (move.status && !['psn', 'tox', 'par'].includes(move.status))) &&
 				!neverDamageMoves.includes(move.id)
 			) {
@@ -425,7 +425,7 @@ export const Scripts: ModdedBattleScriptsData = {
 			// We get the sub to the target to see if it existed
 			const targetSub = (target) ? target.volatiles['substitute'] : false;
 			const targetHadSub = (targetSub !== null && targetSub !== false && (typeof targetSub !== 'undefined'));
-			let targetHasSub: boolean;
+			let targetHasSub: boolean | undefined = undefined;
 
 			if (target) {
 				hitResult = this.battle.singleEvent('TryHit', moveData, {}, target, pokemon, move);
@@ -588,7 +588,7 @@ export const Scripts: ModdedBattleScriptsData = {
 					return false;
 				}
 			}
-			targetHasSub ??= !!(target?.volatiles['substitute']);
+			if (targetHasSub === undefined) targetHasSub = !!(target?.volatiles['substitute']);
 
 			// Here's where self effects are applied.
 			const doSelf = (targetHadSub && targetHasSub) || !targetHadSub;

package/data/moves.ts

@@ -11157,9 +11157,10 @@ export const Moves: {[moveid: string]: MoveData} = {
 		priority: 0,
 		flags: {protect: 1, mirror: 1},
 		mindBlownRecoil: true,
-		onAfterMove(pokemon, target, move) {
-			if (move.mindBlownRecoil && !move.multihit) {
-				this.damage(Math.round(pokemon.maxhp / 2), pokemon, pokemon, this.dex.conditions.get('Mind Blown'), true);
+		onAfterMoveSecondarySelf(pokemon, target, move) {
+			const maxhp = pokemon.getUndynamaxedHP(pokemon.maxhp);
+			if (pokemon.hp && pokemon.ability === "emergencyexit" && pokemon.getUndynamaxedHP() <= maxhp / 2) {
+				this.runEvent('EmergencyExit', pokemon);
 			}
 		},
 		secondary: null,
@@ -16768,9 +16769,10 @@ export const Moves: {[moveid: string]: MoveData} = {
 		priority: 0,
 		flags: {protect: 1, mirror: 1},
 		mindBlownRecoil: true,
-		onAfterMove(pokemon, target, move) {
-			if (move.mindBlownRecoil && !move.multihit) {
-				this.damage(Math.round(pokemon.maxhp / 2), pokemon, pokemon, this.dex.conditions.get('Steel Beam'), true);
+		onAfterMoveSecondarySelf(pokemon, target, move) {
+			const maxhp = pokemon.getUndynamaxedHP(pokemon.maxhp);
+			if (pokemon.hp && pokemon.ability === "emergencyexit" && pokemon.getUndynamaxedHP() <= maxhp / 2) {
+				this.runEvent('EmergencyExit', pokemon);
 			}
 		},
 		secondary: null,

package/data/pokedex.ts

@@ -820,6 +820,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		prevo: "Pikachu",
 		evoType: "useItem",
 		evoItem: "Thunder Stone",
+		evoRegion: "Alola",
 		eggGroups: ["Field", "Fairy"],
 	},
 	sandshrew: {
@@ -2350,6 +2351,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		prevo: "Exeggcute",
 		evoType: "useItem",
 		evoItem: "Leaf Stone",
+		evoRegion: "Alola",
 		eggGroups: ["Grass"],
 	},
 	cubone: {
@@ -2393,6 +2395,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		prevo: "Cubone",
 		evoLevel: 28,
 		evoCondition: "at night",
+		evoRegion: "Alola",
 		eggGroups: ["Monster"],
 	},
 	marowakalolatotem: {
@@ -2490,6 +2493,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		color: "Gray",
 		prevo: "Koffing",
 		evoLevel: 35,
+		evoRegion: "Galar",
 		eggGroups: ["Amorphous"],
 	},
 	rhyhorn: {
@@ -2687,6 +2691,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		prevo: "Mime Jr.",
 		evoType: "levelMove",
 		evoMove: "Mimic",
+		evoRegion: "Galar",
 		evos: ["Mr. Rime"],
 		eggGroups: ["Human-Like"],
 		canHatch: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/sim",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "An automatically generated extraction of just the simulator portion of Pokémon Showdown",
   "homepage": "https://psim.us",
   "main": "build/sim/index.js",

package/sim/battle-queue.ts

@@ -281,9 +281,10 @@ export class BattleQueue {
 		for (const choice of choices) {
 			const resolvedChoices = this.resolveAction(choice);
 			this.list.push(...resolvedChoices);
-			const resolvedChoice = resolvedChoices[0];
-			if (resolvedChoice && resolvedChoice.choice === 'move' && resolvedChoice.move.id !== 'recharge') {
-				resolvedChoice.pokemon.side.lastSelectedMove = resolvedChoice.move.id;
+			for (const resolvedChoice of resolvedChoices) {
+				if (resolvedChoice && resolvedChoice.choice === 'move' && resolvedChoice.move.id !== 'recharge') {
+					resolvedChoice.pokemon.side.lastSelectedMove = resolvedChoice.move.id;
+				}
 			}
 		}
 	}

package/sim/dex-species.ts

@@ -148,6 +148,8 @@ export class Species extends BasicEffect implements Readonly<BasicEffect & Speci
 	declare readonly evoItem?: string;
 	/** Evolution move. falsy if doesn't evolve. */
 	readonly evoMove?: string;
+	/** Region required to be in for evolution. falsy if doesn't evolve. */
+	readonly evoRegion?: 'Alola' | 'Galar';
 	/** Evolution level. falsy if doesn't evolve. */
 	readonly evoLevel?: number;
 	/** Is NFE? True if this Pokemon can evolve (Mega evolution doesn't count). */

package/sim/team-validator.ts

@@ -2060,6 +2060,11 @@ export class TeamValidator {
 					// redundant
 					if (learnedGen <= moveSources.sourcesBefore) continue;
 
+					if (baseSpecies.evoRegion === 'Alola' && checkingPrevo && learnedGen >= 8) {
+						cantLearnReason = `is from a ${species.name} that can't be transferred to USUM to evolve into ${baseSpecies.name}.`;
+						continue;
+					}
+
 					const canUseAbilityPatch = dex.gen >= 8 && format.mod !== 'gen8dlc1';
 					if (
 						learnedGen < 7 && setSources.isHidden && !canUseAbilityPatch &&