@pkmn/sim 0.5.9 → 0.5.12

package/data/text/moves.ts

@@ -900,6 +900,8 @@ export const MovesText: {[k: string]: MoveText} = {
 			desc: "Causes the user's types to become the same as the current types of the target.",
 			shortDesc: "User becomes the same type as the target.",
 		},
+
+		typeChange: "  Converted type to [SOURCE]'s!", // gen 1 only
 	},
 	conversion2: {
 		name: "Conversion 2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/sim",
-  "version": "0.5.9",
+  "version": "0.5.12",
   "description": "An automatically generated extraction of just the simulator portion of Pokémon Showdown",
   "homepage": "https://psim.us",
   "main": "build/sim/index.js",
@@ -31,7 +31,7 @@
     "@pkmn/streams": "^1.0.0"
   },
   "devDependencies": {
-    "mocha": "^9.2.1"
+    "mocha": "^9.2.2"
   },
   "scripts": {
     "compile": "tsc -p .",

package/sim/battle-actions.ts

@@ -1779,13 +1779,6 @@ export class BattleActions {
 		const speciesid = pokemon.canMegaEvo || pokemon.canUltraBurst;
 		if (!speciesid) return false;
 
-		// Pokémon affected by Sky Drop cannot mega evolve. Enforce it here for now.
-		for (const foeActive of pokemon.foes()) {
-			if (foeActive.volatiles['skydrop']?.source === pokemon) {
-				return false;
-			}
-		}
-
 		pokemon.formeChange(speciesid, pokemon.getItem(), true);
 
 		// Limit one mega evolution

package/sim/battle-queue.ts

@@ -203,9 +203,7 @@ export class BattleQueue {
 						choice: 'beforeTurnMove', pokemon: action.pokemon, move: action.move, targetLoc: action.targetLoc,
 					}));
 				}
-				if (action.mega) {
-					// TODO: Check that the Pokémon is not affected by Sky Drop.
-					// (This is currently being done in `runMegaEvo`).
+				if (action.mega && !action.pokemon.isSkyDropped()) {
 					actions.unshift(...this.resolveAction({
 						choice: 'megaEvo',
 						pokemon: action.pokemon,

package/sim/battle.ts

@@ -479,6 +479,7 @@ export class Battle {
 				if (!handler.state.duration) {
 					const endCallArgs = handler.endCallArgs || [handler.effectHolder, effect.id];
 					handler.end.call(...endCallArgs as [any, ...any[]]);
+					if (this.ended) return;
 					continue;
 				}
 			}
@@ -1557,8 +1558,9 @@ export class Battle {
 		// These are checked before the 100 turn minimum as the battle cannot progress if they are true
 		if (this.gen <= 1) {
 			const noProgressPossible = this.sides.every(side => {
-				const foeAllGhosts = side.foe.pokemon.every(pokemon => pokemon.types.includes('Ghost'));
+				const foeAllGhosts = side.foe.pokemon.every(pokemon => pokemon.fainted || pokemon.types.includes('Ghost'));
 				const foeAllTransform = side.foe.pokemon.every(pokemon => (
+					pokemon.fainted ||
 					// true if transforming into this pokemon would lead to an endless battle
 					// Transform will fail (depleting PP) if used against Ditto in Stadium 1
 					(this.dex.currentMod !== 'gen1stadium' || pokemon.species.id !== 'ditto') &&
@@ -1567,6 +1569,7 @@ export class Battle {
 					pokemon.moves.every(moveid => moveid === 'transform')
 				));
 				return side.pokemon.every(pokemon => (
+					pokemon.fainted ||
 					// frozen pokemon can't thaw in gen 1 without outside help
 					pokemon.status === 'frz' ||
 					// a pokemon can't lose PP if it Transforms into a pokemon with only Transform

package/sim/dex-conditions.ts

@@ -659,7 +659,10 @@ export class DexConditions {
 		if (!name) return EMPTY_CONDITION;
 		if (typeof name !== 'string') return name as Condition;
 
-		return this.getByID(name.startsWith('item:') || name.startsWith('ability:') ? name as ID : toID(name));
+		const special = name.startsWith('item:') ? `item:${toID(name.slice(5))}` as ID :
+			name.startsWith('ability:') ? `ability:${toID(name.slice(8))}` as ID :
+			name.startsWith('move:') ? `move:${toID(name.slice(5))}` as ID : undefined;
+		return this.getByID(special || toID(name));
 	}
 
 	getByID(id: ID): Condition {
@@ -671,10 +674,13 @@ export class DexConditions {
 		let found;
 		if (id.startsWith('item:')) {
 			const item = this.dex.items.getByID(id.slice(5) as ID);
-			condition = {...item, id: 'item:' + item.id as ID} as any as Condition;
+			condition = item as any as Condition;
 		} else if (id.startsWith('ability:')) {
 			const ability = this.dex.abilities.getByID(id.slice(8) as ID);
-			condition = {...ability, id: 'ability:' + ability.id as ID} as any as Condition;
+			condition = ability as any as Condition;
+		} else if (id.startsWith('move:')) {
+			const move = this.dex.moves.getByID(id.slice(5) as ID);
+			condition = move as any as Condition;
 		} else if (this.dex.data.Rulesets.hasOwnProperty(id)) {
 			condition = this.dex.formats.get(id) as any as Condition;
 		} else if (this.dex.data.Conditions.hasOwnProperty(id)) {

package/sim/team-validator.ts

@@ -712,7 +712,7 @@ export class TeamValidator {
 		}
 
 		let isFromRBYEncounter = false;
-		if (this.gen === 1 && !this.ruleTable.has('allowtradeback')) {
+		if (this.gen === 1 && ruleTable.has('obtainablemisc') && !this.ruleTable.has('allowtradeback')) {
 			let lowestEncounterLevel;
 			for (const encounter of learnsetSpecies.encounters || []) {
 				if (encounter.generation !== 1) continue;