@pkmn/sim 0.5.20 → 0.5.21

package/data/aliases.ts

@@ -68,8 +68,8 @@ export const Aliases: {[alias: string]: string} = {
 	gen6ag: "[Gen 6] Anything Goes",
 	crossevo: "[Gen 8] Cross Evolution",
 	mayhem: "[Gen 8] Random Battle Mayhem",
-	omotm: "[Gen 8] Tier Shift",
-	lcotm: "[Gen 8] Inverse",
+	omotm: "[Gen 8] Broken Record",
+	lcotm: "[Gen 8] Inheritance",
 
 	// mega evos
 	fabio: "Ampharos-Mega",

package/data/formats-data.ts

@@ -949,7 +949,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["clearsmog", "defog", "fireblast", "painsplit", "strangesteam", "toxicspikes", "willowisp"],
 		randomDoubleBattleLevel: 89,
 		tier: "RU",
-		doublesTier: "DUU",
+		doublesTier: "(DUU)",
 	},
 	rhyhorn: {
 		tier: "LC",
@@ -2153,7 +2153,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["acrobatics", "defog", "leechlife", "protect", "swordsdance"],
 		randomDoubleBattleLevel: 88,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 	},
 	shedinja: {
@@ -2494,7 +2494,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["coil", "hypnosis", "muddywater", "recover"],
 		randomDoubleBattleLevel: 80,
 		tier: "RU",
-		doublesTier: "DOU",
+		doublesTier: "DUU",
 	},
 	castform: {
 		isNonstandard: "Past",
@@ -2932,7 +2932,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 84,
 		randomDoubleBattleMoves: ["clearsmog", "earthpower", "icywind", "protect", "recover", "scald", "yawn"],
 		randomDoubleBattleLevel: 80,
-		tier: "RU",
+		tier: "NU",
 		doublesTier: "DOU",
 	},
 	drifloon: {
@@ -2989,7 +2989,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["allyswitch", "bodypress", "explosion", "ironhead", "trickroom"],
 		randomDoubleBattleLevel: 88,
 		tier: "RU",
-		doublesTier: "DUU",
+		doublesTier: "(DUU)",
 	},
 	chatot: {
 		isNonstandard: "Past",
@@ -4082,7 +4082,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		tier: "Illegal",
 	},
 	vullaby: {
-		tier: "NFE",
+		tier: "LC",
 	},
 	mandibuzz: {
 		randomBattleMoves: ["bravebird", "defog", "foulplay", "roost", "toxic"],
@@ -4445,7 +4445,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	doublade: {
 		randomBattleMoves: ["closecombat", "ironhead", "shadowclaw", "shadowsneak", "swordsdance"],
 		randomBattleLevel: 82,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "NFE",
 	},
 	aegislash: {
@@ -4514,7 +4514,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["dracometeor", "dragonpulse", "focusblast", "protect", "sludgebomb"],
 		randomDoubleBattleLevel: 86,
-		tier: "NU",
+		tier: "NUBL",
 		doublesTier: "(DUU)",
 	},
 	clauncher: {
@@ -4962,7 +4962,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["leechlife", "liquidation", "lunge", "protect", "stickyweb", "wideguard"],
 		randomDoubleBattleLevel: 84,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "DUU",
 	},
 	araquanidtotem: {
@@ -5078,7 +5078,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["hypnosis", "protect", "scorchingsands", "shadowball", "shoreup", "stealthrock"],
 		randomDoubleBattleLevel: 88,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 	},
 	pyukumuku: {
@@ -5433,7 +5433,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 84,
 		randomDoubleBattleMoves: ["dracometeor", "fireblast", "knockoff", "protect", "sludgebomb"],
 		randomDoubleBattleLevel: 88,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "(DUU)",
 	},
 	necrozma: {
@@ -5594,7 +5594,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["airslash", "hydropump", "icebeam", "muddywater", "shadowball", "uturn"],
 		randomDoubleBattleLevel: 84,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "(DUU)",
 	},
 	inteleongmax: {
@@ -6531,6 +6531,10 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		isNonstandard: "CAP",
 		tier: "CAP",
 	},
+	saharaja: {
+		isNonstandard: "CAP",
+		tier: "CAP",
+	},
 	pokestarsmeargle: {
 		isNonstandard: "Custom",
 		tier: "Illegal",

package/data/learnsets.ts

@@ -82889,6 +82889,35 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			withdraw: ["8L5"],
 		},
 	},
+	saharaja: {
+		learnset: {
+			attract: ["8M"],
+			bodypress: ["8M"],
+			diamondstorm: ["8L1"],
+			earthquake: ["8M"],
+			endure: ["8M"],
+			facade: ["8M"],
+			healbell: ["8L1"],
+			hornleech: ["8L1"],
+			leechseed: ["8L1"],
+			painsplit: ["8L1"],
+			poisonjab: ["8M"],
+			powerwhip: ["8M"],
+			protect: ["8M"],
+			rapidspin: ["8L1"],
+			rest: ["8M"],
+			rockslide: ["8M"],
+			round: ["8M"],
+			sleeptalk: ["8M"],
+			snore: ["8M"],
+			stealthrock: ["8M"],
+			substitute: ["8M"],
+			suckerpunch: ["8L1"],
+			swordsdance: ["8M"],
+			taunt: ["8M"],
+			thunderwave: ["8M"],
+		},
+	},
 	pokestarsmeargle: {
 		eventData: [
 			{generation: 5, level: 60, gender: "M", abilities: ["owntempo"], moves: ["mindreader", "guillotine", "tailwhip", "gastroacid"]},

package/data/mods/gen1/conditions.ts

@@ -78,6 +78,7 @@ export const Conditions: {[id: string]: ModdedConditionData} = {
 			pokemon.lastMove = null;
 			return false;
 		},
+		onAfterMoveSelfPriority: 3,
 		onAfterMoveSelf(pokemon) {
 			if (pokemon.statusState.time <= 0) pokemon.cureStatus();
 		},
@@ -164,6 +165,9 @@ export const Conditions: {[id: string]: ModdedConditionData} = {
 	flinch: {
 		name: 'flinch',
 		duration: 1,
+		onStart(target) {
+			target.removeVolatile('mustrecharge');
+		},
 		onBeforeMovePriority: 4,
 		onBeforeMove(pokemon) {
 			if (!this.runEvent('Flinch', pokemon)) {

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

@@ -370,7 +370,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "sleeppowder", "stunspore"],
 		essentialMove: "razorleaf",
 		comboMoves: ["hyperbeam", "swordsdance"],
-		tier: "(OU)",
+		tier: "UU",
 	},
 	tentacool: {
 		randomBattleMoves: ["barrier", "hydropump", "surf"],
@@ -414,7 +414,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	slowbro: {
 		randomBattleMoves: ["amnesia", "surf", "thunderwave"],
 		exclusiveMoves: ["blizzard", "psychic", "rest", "rest"],
-		tier: "OU",
+		tier: "UUBL",
 	},
 	magnemite: {
 		randomBattleMoves: ["thunder", "thunderbolt", "thunderwave"],
@@ -667,7 +667,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "confuseray", "rest", "sing", "surf"],
 		essentialMove: "blizzard",
 		exclusiveMoves: ["thunderbolt", "thunderbolt"],
-		tier: "(OU)",
+		tier: "UUBL",
 	},
 	ditto: {
 		randomBattleMoves: ["transform"],

package/data/mods/gen1/moves.ts

@@ -538,15 +538,12 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onBoost(boost, target, source, effect) {
 				if (effect.effectType === 'Move' && effect.category !== 'Status') return;
 				if (source && target !== source) {
-					let showMsg = false;
 					let i: BoostID;
 					for (i in boost) {
 						if (boost[i]! < 0) {
 							delete boost[i];
-							showMsg = true;
 						}
 					}
-					if (showMsg) this.add('-activate', target, 'move: Mist');
 				}
 			},
 		},

package/data/mods/gen2/learnsets.ts

@@ -7593,11 +7593,11 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
 			dragonrage: ["1S0"],
 			flail: ["2L30"],
 			reversal: ["2S2"],
-			splash: ["2L1", "2S2", "2S1", "1L1"],
+			splash: ["2L1", "2S2", "2S1", "1L1", "1S0"],
 			tackle: ["2L15", "1L15"],
 		},
 		eventData: [
-			{generation: 1, level: 5, moves: ["dragonrage"], japan: true},
+			{generation: 1, level: 15, moves: ["splash", "dragonrage"], japan: true},
 			{generation: 2, level: 5, shiny: 1, moves: ["splash", "bubble"]},
 			{generation: 2, level: 5, shiny: 1, moves: ["splash", "reversal"]},
 		],

package/data/mods/gen2/scripts.ts

@@ -160,6 +160,22 @@ export const Scripts: ModdedBattleScriptsData = {
 				return false;
 			}
 
+			if (move.target === 'all' || move.target === 'foeSide' || move.target === 'allySide' || move.target === 'allyTeam') {
+				if (move.target === 'all') {
+					hitResult = this.battle.runEvent('TryHitField', target, pokemon, move);
+				} else {
+					hitResult = this.battle.runEvent('TryHitSide', target, pokemon, move);
+				}
+				if (!hitResult) {
+					if (hitResult === false) {
+						this.battle.add('-fail', pokemon);
+						this.battle.attrLastMove('[still]');
+					}
+					return false;
+				}
+				return this.moveHit(target, pokemon, move);
+			}
+
 			hitResult = this.battle.runEvent('Invulnerability', target, pokemon, move);
 			if (hitResult === false) {
 				this.battle.attrLastMove('[miss]');

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

@@ -882,7 +882,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	mamoswine: {
 		randomBattleMoves: ["earthquake", "endeavor", "iceshard", "stealthrock", "stoneedge", "superpower"],
-		tier: "OU",
+		tier: "(OU)",
 	},
 	corsola: {
 		randomBattleMoves: ["recover", "reflect", "stealthrock", "surf", "toxic"],

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

@@ -3918,7 +3918,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	volcanion: {
 		randomBattleMoves: ["earthpower", "fireblast", "hiddenpowerice", "sludgewave", "steameruption", "substitute", "superpower"],
 		randomDoubleBattleMoves: ["earthquake", "heatwave", "protect", "rockslide", "sludgebomb", "steameruption", "substitute"],
-		tier: "(OU)",
+		tier: "OU",
 		doublesTier: "DOU",
 	},
 };

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/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

@@ -1585,6 +1585,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 +1830,26 @@ export const Rulesets: {[k: string]: FormatData} = {
 			}
 		},
 	},
+	reevolutionmod: {
+		effectType: "Rule",
+		name: "Re-Evolution Mod",
+		desc: "Pokémon gain the boosts 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;
+		},
+	},
 };

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', 'Thundurus-Therian', '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.21",
   "description": "An automatically generated extraction of just the simulator portion of Pokémon Showdown",
   "homepage": "https://psim.us",
   "main": "build/sim/index.js",