@pkmn/sim 0.4.24 → 0.5.1

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

@@ -691,7 +691,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	azumarill: {
-		randomBattleMoves: ["charm", "rest", "sleeptalk", "surf", "toxic"],
+		randomBattleMoves: ["perishsong", "rest", "toxic", "whirlpool"],
 		tier: "NU",
 	},
 	sudowoodo: {
@@ -817,7 +817,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	octillery: {
-		randomBattleMoves: ["fireblast", "hiddenpowerelectric", "icebeam", "rest", "sleeptalk", "surf"],
+		randomBattleMoves: ["flamethrower", "hiddenpowerelectric", "icebeam", "rest", "sleeptalk", "surf"],
 		tier: "NU",
 	},
 	delibird: {

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

@@ -1364,7 +1364,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "Uber",
 	},
 	kyogre: {
-		randomBattleMoves: ["calmmind", "icebeam", "rest", "sleeptalk", "surf", "thunder", "waterspout"],
+		randomBattleMoves: ["calmmind", "icebeam", "rest", "sleeptalk", "surf", "thunder"],
 		tier: "Uber",
 	},
 	groudon: {

package/data/mods/gen6/pokedex.ts

@@ -171,87 +171,87 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
 	arceusbug: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Insect Plate",
+		requiredItems: ["Insect Plate"],
 	},
 	arceusdark: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Dread Plate",
+		requiredItems: ["Dread Plate"],
 	},
 	arceusdragon: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Draco Plate",
+		requiredItems: ["Draco Plate"],
 	},
 	arceuselectric: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Zap Plate",
+		requiredItems: ["Zap Plate"],
 	},
 	arceusfairy: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Pixie Plate",
+		requiredItems: ["Pixie Plate"],
 	},
 	arceusfighting: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Fist Plate",
+		requiredItems: ["Fist Plate"],
 	},
 	arceusfire: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Flame Plate",
+		requiredItems: ["Flame Plate"],
 	},
 	arceusflying: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Sky Plate",
+		requiredItems: ["Sky Plate"],
 	},
 	arceusghost: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Spooky Plate",
+		requiredItems: ["Spooky Plate"],
 	},
 	arceusgrass: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Meadow Plate",
+		requiredItems: ["Meadow Plate"],
 	},
 	arceusground: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Earth Plate",
+		requiredItems: ["Earth Plate"],
 	},
 	arceusice: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Icicle Plate",
+		requiredItems: ["Icicle Plate"],
 	},
 	arceuspoison: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Toxic Plate",
+		requiredItems: ["Toxic Plate"],
 	},
 	arceuspsychic: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Mind Plate",
+		requiredItems: ["Mind Plate"],
 	},
 	arceusrock: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Stone Plate",
+		requiredItems: ["Stone Plate"],
 	},
 	arceussteel: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Iron Plate",
+		requiredItems: ["Iron Plate"],
 	},
 	arceuswater: {
 		inherit: true,
 		color: "Gray",
-		requiredItem: "Splash Plate",
+		requiredItems: ["Splash Plate"],
 	},
 	roggenrola: {
 		inherit: true,

package/data/moves.ts

@@ -15857,6 +15857,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			onRestart(pokemon) {
 				if (pokemon.removeVolatile('fly') || pokemon.removeVolatile('bounce')) {
 					this.queue.cancelMove(pokemon);
+					pokemon.removeVolatile('twoturnmove');
 					this.add('-start', pokemon, 'Smack Down');
 				}
 			},

package/data/pokedex.ts

@@ -16910,6 +16910,39 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		eggGroups: ["Water 1", "Fairy"],
 		gen: 4,
 	},
+	venomicon: {
+		num: -67,
+		name: "Venomicon",
+		baseForme: "Prologue",
+		types: ["Poison", "Flying"],
+		gender: "N",
+		baseStats: {hp: 85, atk: 70, def: 113, spa: 118, spd: 90, spe: 64},
+		abilities: {0: "Stamina"},
+		heightm: 0.8,
+		weightkg: 11.5,
+		color: "Purple",
+		eggGroups: ["Undiscovered"],
+		otherFormes: ["Venomicon-Epilogue"],
+		formeOrder: ["Venomicon", "Venomicon-Epilogue"],
+		gen: 8,
+	},
+	venomiconepilogue: {
+		num: -67,
+		name: "Venomicon-Epilogue",
+		baseSpecies: "Venomicon",
+		forme: "Epilogue",
+		types: ["Poison", "Flying"],
+		gender: "N",
+		baseStats: {hp: 85, atk: 110, def: 85, spa: 55, spd: 85, spe: 120},
+		abilities: {0: "Tinted Lens"},
+		heightm: 0.8,
+		weightkg: 12.4,
+		color: "Purple",
+		eggGroups: ["Undiscovered"],
+		requiredItem: "Vile Vial",
+		changesFrom: "Venomicon",
+		gen: 8,
+	},
 	// NOTE: PokeStar "formes" are not actually formes and thus do not have a formeOrder
 	pokestarsmeargle: {
 		num: -5000,

package/data/text/items.ts

@@ -2336,4 +2336,8 @@ export const ItemsText: {[k: string]: ItemText} = {
 		name: "Crucibellite",
 		desc: "If held by a Crucibelle, this item allows it to Mega Evolve in battle.",
 	},
+	vilevial: {
+		name: "Vile Vial",
+		desc: "If held by a Venomicon, its Poison- and Flying-type attacks have 1.2x power.",
+	},
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/sim",
-  "version": "0.4.24",
+  "version": "0.5.1",
   "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-actions.ts

@@ -549,7 +549,7 @@ export class BattleActions {
 			[moveSteps[2], moveSteps[4]] = [moveSteps[4], moveSteps[2]];
 		}
 
-		if (!notActive) this.battle.setActiveMove(move, pokemon, targets[0]);
+		if (notActive) this.battle.setActiveMove(move, pokemon, targets[0]);
 
 		const hitResult = this.battle.singleEvent('Try', move, null, pokemon, targets[0], move) &&
 			this.battle.singleEvent('PrepareHit', move, {}, targets[0], pokemon, move) &&

package/sim/dex-formats.ts

@@ -883,7 +883,7 @@ export class DexFormats {
 			if (table.hasOwnProperty(id)) {
 				if (matchType === 'pokemon') {
 					const species: Species = table[id] as Species;
-					if (species.otherFormes && ruleid !== species.id + toID(species.baseForme)) {
+					if ((species.otherFormes || species.cosmeticFormes) && ruleid !== species.id + toID(species.baseForme)) {
 						matches.push('basepokemon:' + id);
 						continue;
 					}

package/sim/dex-species.ts

@@ -485,9 +485,10 @@ export class DexSpecies {
 				if (!isLetsGo) species.isNonstandard = 'Past';
 			}
 			if (this.dex.currentMod === 'gen8bdsp' &&
-				(!species.isNonstandard || species.isNonstandard === "Gigantamax")) {
-				if (species.gen > 4 || species.num < 1 || species.id === 'pichuspikyeared') {
-					species.isNonstandard = 'Past';
+				(!species.isNonstandard || ["Gigantamax", "CAP"].includes(species.isNonstandard))) {
+				if (species.gen > 4 || (species.num < 1 && species.isNonstandard !== 'CAP') ||
+					species.id === 'pichuspikyeared') {
+					species.isNonstandard = 'Future';
 					species.tier = species.doublesTier = 'Illegal';
 				}
 			}