@pkmn/sim 0.5.11 → 0.5.14

package/data/mods/gen1/formats-data.ts

@@ -61,7 +61,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	butterfree: {
 		randomBattleMoves: ["psychic", "sleeppowder", "stunspore"],
 		exclusiveMoves: ["megadrain", "psywave"],
-		tier: "NU",
+		tier: "PU",
 	},
 	weedle: {
 		randomBattleMoves: ["poisonsting", "stringshot"],
@@ -75,25 +75,27 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["megadrain", "swordsdance", "twineedle"],
 		exclusiveMoves: ["doubleedge", "doubleedge", "hyperbeam"],
 		comboMoves: ["agility", "hyperbeam", "swordsdance", "twineedle"],
-		tier: "NU",
+		tier: "PU",
 	},
 	pidgey: {
 		randomBattleMoves: ["agility", "doubleedge", "skyattack"],
-		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "toxic"],
+		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "quickattack", "toxic"],
 		tier: "LC",
 	},
 	pidgeotto: {
 		randomBattleMoves: ["agility", "doubleedge", "skyattack"],
-		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "toxic"],
+		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "quickattack", "toxic"],
 		tier: "NFE",
 	},
 	pidgeot: {
 		randomBattleMoves: ["agility", "doubleedge", "hyperbeam"],
-		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "skyattack", "skyattack", "substitute", "toxic"],
-		tier: "NU",
+		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "skyattack", "skyattack", "substitute", "quickattack", "toxic"],
+		tier: "PU",
 	},
 	rattata: {
-		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
+		randomBattleMoves: ["blizzard", "bodyslam"],
+		// The two Thunderbolts are not a mistake, but specifically requested
+		exclusiveMoves: ["thunderbolt", "thunderbolt", "quickattack"],
 		essentialMove: "superfang",
 		tier: "LC",
 	},
@@ -109,7 +111,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	fearow: {
 		randomBattleMoves: ["agility", "doubleedge", "drillpeck", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	ekans: {
 		randomBattleMoves: ["bodyslam", "earthquake", "glare", "rockslide"],
@@ -118,7 +120,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	arbok: {
 		randomBattleMoves: ["earthquake", "glare", "hyperbeam"],
 		exclusiveMoves: ["bodyslam", "rockslide"],
-		tier: "NU",
+		tier: "PU",
 	},
 	pikachu: {
 		randomBattleMoves: ["surf", "thunderwave"],
@@ -140,7 +142,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	sandslash: {
 		randomBattleMoves: ["bodyslam", "rockslide", "swordsdance"],
 		essentialMove: "earthquake",
-		tier: "NU",
+		tier: "PU",
 	},
 	nidoranf: {
 		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
@@ -155,7 +157,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	nidoqueen: {
 		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
 		essentialMove: "earthquake",
-		tier: "NU",
+		tier: "PU",
 	},
 	nidoranm: {
 		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
@@ -211,7 +213,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	golbat: {
 		randomBattleMoves: ["confuseray", "doubleedge", "hyperbeam", "megadrain"],
-		tier: "NU",
+		tier: "PU",
 	},
 	oddish: {
 		randomBattleMoves: ["doubleedge", "sleeppowder"],
@@ -228,7 +230,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	vileplume: {
 		randomBattleMoves: ["bodyslam", "sleeppowder", "stunspore", "swordsdance"],
 		essentialMove: "megadrain",
-		tier: "NU",
+		tier: "PU",
 	},
 	paras: {
 		randomBattleMoves: ["bodyslam", "megadrain"],
@@ -240,7 +242,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "megadrain"],
 		essentialMove: "spore",
 		exclusiveMoves: ["growth", "hyperbeam", "slash", "stunspore", "stunspore", "swordsdance"],
-		tier: "NU",
+		tier: "PU",
 	},
 	venonat: {
 		randomBattleMoves: ["psychic", "sleeppowder", "stunspore"],
@@ -294,7 +296,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	primeape: {
 		randomBattleMoves: ["bodyslam", "rockslide", "submission"],
 		exclusiveMoves: ["counter", "hyperbeam", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	growlithe: {
 		randomBattleMoves: ["bodyslam", "fireblast", "flamethrower", "reflect"],
@@ -303,7 +305,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	arcanine: {
 		randomBattleMoves: ["bodyslam", "fireblast", "hyperbeam"],
 		exclusiveMoves: ["flamethrower", "reflect"],
-		tier: "NU",
+		tier: "PU",
 	},
 	poliwag: {
 		randomBattleMoves: ["blizzard", "surf"],
@@ -315,7 +317,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["blizzard", "surf"],
 		essentialMove: "amnesia",
 		exclusiveMoves: ["counter", "hypnosis", "hypnosis", "psychic"],
-		tier: "NFE",
+		tier: "NU",
 	},
 	poliwrath: {
 		randomBattleMoves: ["blizzard", "bodyslam", "earthquake", "submission"],
@@ -352,7 +354,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	machamp: {
 		randomBattleMoves: ["bodyslam", "earthquake", "submission"],
 		exclusiveMoves: ["counter", "hyperbeam", "rockslide", "rockslide"],
-		tier: "NU",
+		tier: "PU",
 	},
 	bellsprout: {
 		randomBattleMoves: ["doubleedge", "sleeppowder", "stunspore", "swordsdance"],
@@ -400,7 +402,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	rapidash: {
 		randomBattleMoves: ["agility", "bodyslam", "fireblast", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	slowpoke: {
 		randomBattleMoves: ["earthquake", "surf"],
@@ -422,12 +424,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	magneton: {
 		randomBattleMoves: ["thunder", "thunderbolt", "thunderwave"],
 		exclusiveMoves: ["doubleedge", "hyperbeam", "hyperbeam", "mimic", "substitute", "toxic"],
-		tier: "NU",
+		tier: "PU",
 	},
 	farfetchd: {
 		randomBattleMoves: ["agility", "bodyslam", "swordsdance"],
 		essentialMove: "slash",
-		tier: "NU",
+		tier: "PU",
 	},
 	doduo: {
 		randomBattleMoves: ["agility", "bodyslam", "doubleedge", "drillpeck"],
@@ -457,7 +459,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "sludge"],
 		essentialMove: "explosion",
 		exclusiveMoves: ["fireblast", "hyperbeam", "megadrain", "megadrain"],
-		tier: "NU",
+		tier: "PU",
 	},
 	shellder: {
 		randomBattleMoves: ["blizzard", "doubleedge", "explosion", "surf"],
@@ -488,7 +490,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	onix: {
 		randomBattleMoves: ["bodyslam", "earthquake", "explosion", "rockslide"],
-		tier: "NU",
+		tier: "PU",
 	},
 	drowzee: {
 		randomBattleMoves: ["hypnosis", "psychic", "thunderwave"],
@@ -516,13 +518,13 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	electrode: {
 		randomBattleMoves: ["explosion", "thunderbolt", "thunderwave"],
 		exclusiveMoves: ["hyperbeam", "screech", "thunder", "toxic"],
-		tier: "NU",
+		tier: "PU",
 	},
 	exeggcute: {
 		randomBattleMoves: ["sleeppowder", "stunspore"],
 		essentialMove: "psychic",
 		exclusiveMoves: ["doubleedge", "explosion", "explosion"],
-		tier: "LC",
+		tier: "NU",
 	},
 	exeggutor: {
 		randomBattleMoves: ["explosion", "psychic", "sleeppowder"],
@@ -535,23 +537,23 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	marowak: {
 		randomBattleMoves: ["blizzard", "bodyslam", "earthquake", "seismictoss"],
-		tier: "NU",
+		tier: "PU",
 	},
 	hitmonlee: {
 		randomBattleMoves: ["bodyslam", "highjumpkick", "seismictoss"],
 		exclusiveMoves: ["counter", "counter", "meditate"],
-		tier: "NU",
+		tier: "PU",
 	},
 	hitmonchan: {
 		randomBattleMoves: ["bodyslam", "seismictoss", "submission"],
 		exclusiveMoves: ["agility", "counter", "counter"],
-		tier: "NU",
+		tier: "PU",
 	},
 	lickitung: {
 		randomBattleMoves: ["hyperbeam", "swordsdance"],
 		essentialMove: "bodyslam",
 		exclusiveMoves: ["blizzard", "earthquake", "earthquake", "earthquake"],
-		tier: "NU",
+		tier: "PU",
 	},
 	koffing: {
 		randomBattleMoves: ["explosion", "fireblast", "sludge", "thunderbolt"],
@@ -559,7 +561,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	weezing: {
 		randomBattleMoves: ["explosion", "fireblast", "sludge", "thunderbolt"],
-		tier: "NU",
+		tier: "PU",
 	},
 	rhyhorn: {
 		randomBattleMoves: ["bodyslam", "earthquake", "rockslide", "substitute"],
@@ -606,7 +608,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	seaking: {
 		randomBattleMoves: ["blizzard", "doubleedge", "surf"],
 		exclusiveMoves: ["agility", "agility", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	staryu: {
 		randomBattleMoves: ["blizzard", "thunderbolt", "thunderwave"],
@@ -626,7 +628,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	scyther: {
 		randomBattleMoves: ["agility", "hyperbeam", "slash", "swordsdance"],
-		tier: "NU",
+		tier: "PU",
 	},
 	jynx: {
 		randomBattleMoves: ["blizzard", "lovelykiss", "psychic"],
@@ -640,12 +642,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	magmar: {
 		randomBattleMoves: ["bodyslam", "confuseray", "fireblast"],
 		exclusiveMoves: ["hyperbeam", "psychic"],
-		tier: "NU",
+		tier: "PU",
 	},
 	pinsir: {
 		randomBattleMoves: ["bodyslam", "hyperbeam", "swordsdance"],
 		exclusiveMoves: ["seismictoss", "submission", "submission"],
-		tier: "NU",
+		tier: "PU",
 	},
 	tauros: {
 		randomBattleMoves: ["bodyslam", "earthquake", "hyperbeam"],
@@ -669,7 +671,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	ditto: {
 		randomBattleMoves: ["transform"],
-		tier: "NU",
+		tier: "PU",
 	},
 	eevee: {
 		randomBattleMoves: ["doubleedge", "quickattack", "reflect"],
@@ -690,7 +692,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	flareon: {
 		randomBattleMoves: ["bodyslam", "fireblast", "hyperbeam", "quickattack"],
-		tier: "NU",
+		tier: "PU",
 	},
 	porygon: {
 		randomBattleMoves: ["blizzard", "thunderwave"],

package/data/mods/gen1/moves.ts

@@ -196,12 +196,10 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	},
 	conversion: {
 		inherit: true,
-		volatileStatus: 'conversion',
-		accuracy: true,
 		target: "normal",
 		onHit(target, source) {
-			source.types = target.types;
-			this.add('-start', source, 'typechange', source.types.join(', '), '[from] move: Conversion', '[of] ' + source);
+			source.setType(target.getTypes(true));
+			this.add('-start', source, 'typechange', source.types.join('/'), '[from] move: Conversion', '[of] ' + target);
 		},
 	},
 	counter: {

package/data/mods/gen3/formats-data.ts

@@ -694,7 +694,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	azumarill: {
-		randomBattleMoves: ["encore", "focuspunch", "hiddenpowerghost", "hydropump", "return", "substitute"],
+		randomBattleMoves: ["brickbreak", "encore", "hiddenpowerghost", "hydropump", "return"],
 		tier: "UU",
 	},
 	sudowoodo: {

package/data/mods/gen6/formats-data.ts

@@ -2245,7 +2245,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		doublesTier: "NFE",
 	},
 	infernape: {
-		randomBattleMoves: ["closecombat", "earthquake", "fireblast", "flareblitz", "grassknot", "machpunch", "nastyplot", "stealthrock", "stoneedge", "uturn", "vacuumwave"],
+		randomBattleMoves: ["closecombat", "earthquake", "fireblast", "flareblitz", "grassknot", "machpunch", "stealthrock", "stoneedge", "uturn"],
 		randomDoubleBattleMoves: ["closecombat", "fakeout", "feint", "flareblitz", "grassknot", "heatwave", "machpunch", "protect", "stoneedge", "taunt", "thunderpunch", "uturn"],
 		tier: "UU",
 		doublesTier: "DUU",
@@ -3279,8 +3279,8 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	haxorus: {
-		randomBattleMoves: ["dragondance", "earthquake", "outrage", "poisonjab", "swordsdance", "taunt"],
-		randomDoubleBattleMoves: ["dragonclaw", "dragondance", "earthquake", "poisonjab", "protect", "substitute", "swordsdance", "taunt"],
+		randomBattleMoves: ["dragondance", "earthquake", "outrage", "poisonjab", "swordsdance"],
+		randomDoubleBattleMoves: ["dragonclaw", "dragondance", "earthquake", "poisonjab", "protect", "substitute", "swordsdance"],
 		tier: "UU",
 		doublesTier: "(DUU)",
 	},

package/data/moves.ts

@@ -664,9 +664,9 @@ export const Moves: {[moveid: string]: MoveData} = {
 					return false;
 				}
 
-				if (effect.id === 'cutecharm') {
+				if (effect.name === 'Cute Charm') {
 					this.add('-start', pokemon, 'Attract', '[from] ability: Cute Charm', '[of] ' + source);
-				} else if (effect.id === 'destinyknot') {
+				} else if (effect.name === 'Destiny Knot') {
 					this.add('-start', pokemon, 'Attract', '[from] item: Destiny Knot', '[of] ' + source);
 				} else {
 					this.add('-start', pokemon, 'Attract');
@@ -1006,6 +1006,13 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 40,
 		priority: 0,
 		flags: {},
+		onHit(target) {
+			if (!this.canSwitch(target.side)) {
+				this.attrLastMove('[still]');
+				this.add('-fail', target);
+				return this.NOT_FAIL;
+			}
+		},
 		self: {
 			onHit(source) {
 				source.skipBeforeSwitchOutEventFlag = true;
@@ -4103,7 +4110,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			},
 			onFieldStart(field, source, effect) {
 				if (effect?.effectType === 'Ability') {
-					this.add('-fieldstart', 'move: Electric Terrain', '[from] ability: ' + effect, '[of] ' + source);
+					this.add('-fieldstart', 'move: Electric Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
 				} else {
 					this.add('-fieldstart', 'move: Electric Terrain');
 				}
@@ -7196,7 +7203,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			},
 			onFieldStart(field, source, effect) {
 				if (effect?.effectType === 'Ability') {
-					this.add('-fieldstart', 'move: Grassy Terrain', '[from] ability: ' + effect, '[of] ' + source);
+					this.add('-fieldstart', 'move: Grassy Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
 				} else {
 					this.add('-fieldstart', 'move: Grassy Terrain');
 				}
@@ -7800,10 +7807,12 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 10,
 		priority: 0,
 		flags: {snatch: 1, heal: 1},
-		onTryHit(pokemon, target, move) {
-			if (!this.canSwitch(pokemon.side)) {
+		onHit(target, source, move) {
+			if (!this.canSwitch(target.side)) {
 				delete move.selfdestruct;
-				return false;
+				this.attrLastMove('[still]');
+				this.add('-fail', target);
+				return this.NOT_FAIL;
 			}
 		},
 		selfdestruct: "ifHit",
@@ -9894,10 +9903,12 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 10,
 		priority: 0,
 		flags: {snatch: 1, heal: 1, dance: 1},
-		onTryHit(pokemon, target, move) {
-			if (!this.canSwitch(pokemon.side)) {
+		onHit(target, source, move) {
+			if (!this.canSwitch(target.side)) {
 				delete move.selfdestruct;
-				return false;
+				this.attrLastMove('[still]');
+				this.add('-fail', target);
+				return this.NOT_FAIL;
 			}
 		},
 		selfdestruct: "ifHit",
@@ -11449,7 +11460,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			},
 			onFieldStart(field, source, effect) {
 				if (effect?.effectType === 'Ability') {
-					this.add('-fieldstart', 'move: Misty Terrain', '[from] ability: ' + effect, '[of] ' + source);
+					this.add('-fieldstart', 'move: Misty Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
 				} else {
 					this.add('-fieldstart', 'move: Misty Terrain');
 				}
@@ -13244,7 +13255,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			},
 			onFieldStart(field, source, effect) {
 				if (effect?.effectType === 'Ability') {
-					this.add('-fieldstart', 'move: Psychic Terrain', '[from] ability: ' + effect, '[of] ' + source);
+					this.add('-fieldstart', 'move: Psychic Terrain', '[from] ability: ' + effect.name, '[of] ' + source);
 				} else {
 					this.add('-fieldstart', 'move: Psychic Terrain');
 				}
@@ -14122,17 +14133,18 @@ export const Moves: {[moveid: string]: MoveData} = {
 		num: 804,
 		accuracy: 100,
 		basePower: 70,
+		basePowerCallback(source, target, move) {
+			if (this.field.isTerrain('electricterrain') && target.isGrounded()) {
+				if (!source.isAlly(target)) this.hint(`${move.name}'s BP doubled on grounded target.`);
+				return move.basePower * 2;
+			}
+			return move.basePower;
+		},
 		category: "Special",
 		name: "Rising Voltage",
 		pp: 20,
 		priority: 0,
 		flags: {protect: 1, mirror: 1},
-		onBasePower(basePower, pokemon, target) {
-			if (this.field.isTerrain('electricterrain') && target.isGrounded()) {
-				this.debug('terrain buff');
-				return this.chainModify(2);
-			}
-		},
 		secondary: null,
 		target: "normal",
 		type: "Electric",
@@ -17944,8 +17956,10 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 20,
 		priority: -6,
 		flags: {},
+		onTry(source) {
+			return !!this.canSwitch(source.side);
+		},
 		selfSwitch: true,
-		onTryHit: true,
 		secondary: null,
 		target: "self",
 		type: "Psychic",

package/data/pokedex.ts

@@ -16366,7 +16366,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		color: "Green",
 		prevo: "Basculin-White-Striped",
 		evoType: "other",
-		evoCondition: "Receive 294+ recoil from one move without fainting",
+		evoCondition: "Receive 294+ recoil without fainting",
 		eggGroups: ["Water 2"],
 		otherFormes: ["Basculegion-F"],
 		formeOrder: ["Basculegion", "Basculegion-F"],
@@ -16385,7 +16385,7 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		color: "Green",
 		prevo: "Basculin-White-Striped",
 		evoType: "other",
-		evoCondition: "Receive 294+ recoil from one move without fainting",
+		evoCondition: "Receive 294+ recoil without fainting",
 		eggGroups: ["Water 2"],
 	},
 	sneasler: {

package/data/rulesets.ts

@@ -671,7 +671,7 @@ export const Rulesets: {[k: string]: FormatData} = {
 		name: 'Gravity Sleep Clause',
 		desc: "Bans sleep moves below 100% accuracy, in conjunction with Gravity or Gigantamax Orbeetle",
 		banlist: [
-			'Gravity ++ Grass Whistle', 'Gravity ++ Hypnosis', 'Gravity ++ Lovely Kiss', 'Gravity ++ Sing', 'Gravity ++ Sleep Powder',
+			'Gravity ++ Dark Void', 'Gravity ++ Grass Whistle', 'Gravity ++ Hypnosis', 'Gravity ++ Lovely Kiss', 'Gravity ++ Sing', 'Gravity ++ Sleep Powder',
 		],
 		onValidateTeam(team) {
 			let hasOrbeetle = false;

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.11",
+  "version": "0.5.14",
   "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": "^2.0.0",
+    "@pkmn/sets": "^3.0.0",
     "@pkmn/streams": "^1.0.0"
   },
   "devDependencies": {

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

@@ -640,6 +640,7 @@ export class Condition extends BasicEffect implements
 
 	constructor(data: AnyObject) {
 		super(data);
+		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		data = this;
 		this.effectType = (['Weather', 'Status'].includes(data.effectType) ? data.effectType : 'Condition');
 	}
@@ -659,7 +660,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 +675,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/dex-data.ts

@@ -148,6 +148,7 @@ export class Nature extends BasicEffect implements Readonly<BasicEffect & Nature
 	readonly minus?: StatIDExceptHP;
 	constructor(data: AnyObject) {
 		super(data);
+		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		data = this;
 
 		this.fullname = `nature: ${this.name}`;

package/sim/dex-formats.ts

@@ -435,6 +435,7 @@ export class Format extends BasicEffect implements Readonly<BasicEffect> {
 
 	constructor(data: AnyObject) {
 		super(data);
+		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		data = this;
 
 		this.mod = Utils.getString(data.mod) || 'gen8';

package/sim/dex-items.ts

@@ -113,6 +113,7 @@ export class Item extends BasicEffect implements Readonly<BasicEffect> {
 
 	constructor(data: AnyObject) {
 		super(data);
+		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		data = this;
 
 		this.fullname = `item: ${this.name}`;

package/sim/dex-moves.ts

@@ -470,6 +470,7 @@ export class DataMove extends BasicEffect implements Readonly<BasicEffect & Move
 
 	constructor(data: AnyObject) {
 		super(data);
+		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		data = this;
 
 		this.fullname = `move: ${this.name}`;

package/sim/dex-species.ts

@@ -242,6 +242,7 @@ export class Species extends BasicEffect implements Readonly<BasicEffect & Speci
 
 	constructor(data: AnyObject) {
 		super(data);
+		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		data = this;
 
 		this.fullname = `pokemon: ${data.name}`;

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;