@pkmn/sim 0.4.21 → 0.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/sim",
-  "version": "0.4.21",
+  "version": "0.4.25",
   "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,8 @@
     "sim"
   ],
   "dependencies": {
-    "@pkmn/sets": "^2.0.0"
+    "@pkmn/sets": "^2.0.0",
+    "@pkmn/streams": "^1.0.0"
   },
   "devDependencies": {
     "mocha": "^9.1.3"

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) &&
@@ -1505,7 +1505,7 @@ export class BattleActions {
 	 * undefined = success, null = silent failure, false = loud failure
 	 */
 	 getDamage(
-		pokemon: Pokemon, target: Pokemon, move: string | number | ActiveMove,
+		source: Pokemon, target: Pokemon, move: string | number | ActiveMove,
 		suppressMessages = false
 	): number | undefined | null | false {
 		if (typeof move === 'string') move = this.dex.getActiveMove(move);
@@ -1528,25 +1528,24 @@ export class BattleActions {
 		}
 
 		if (move.ohko) return target.maxhp;
-		if (move.damageCallback) return move.damageCallback.call(this.battle, pokemon, target);
+		if (move.damageCallback) return move.damageCallback.call(this.battle, source, target);
 		if (move.damage === 'level') {
-			return pokemon.level;
+			return source.level;
 		} else if (move.damage) {
 			return move.damage;
 		}
 
 		const category = this.battle.getCategory(move);
-		const defensiveCategory = move.defensiveCategory || category;
 
 		let basePower: number | false | null = move.basePower;
 		if (move.basePowerCallback) {
-			basePower = move.basePowerCallback.call(this.battle, pokemon, target, move);
+			basePower = move.basePowerCallback.call(this.battle, source, target, move);
 		}
 		if (!basePower) return basePower === 0 ? undefined : basePower;
 		basePower = this.battle.clampIntRange(basePower, 1);
 
 		let critMult;
-		let critRatio = this.battle.runEvent('ModifyCritRatio', pokemon, target, move, move.critRatio || 0);
+		let critRatio = this.battle.runEvent('ModifyCritRatio', source, target, move, move.critRatio || 0);
 		if (this.battle.gen <= 5) {
 			critRatio = this.battle.clampIntRange(critRatio, 0, 5);
 			critMult = [0, 16, 8, 4, 3, 2];
@@ -1572,39 +1571,23 @@ export class BattleActions {
 		}
 
 		// happens after crit calculation
-		basePower = this.battle.runEvent('BasePower', pokemon, target, move, basePower, true);
+		basePower = this.battle.runEvent('BasePower', source, target, move, basePower, true);
 
 		if (!basePower) return 0;
 		basePower = this.battle.clampIntRange(basePower, 1);
 
-		const level = pokemon.level;
+		const level = source.level;
 
-		const attacker = pokemon;
-		const defender = target;
-		let attackStat: StatIDExceptHP = category === 'Physical' ? 'atk' : 'spa';
-		const defenseStat: StatIDExceptHP = defensiveCategory === 'Physical' ? 'def' : 'spd';
-		if (move.useSourceDefensiveAsOffensive) {
-			attackStat = defenseStat;
-			// Body press really wants to use the def stat,
-			// so it switches stats to compensate for Wonder Room.
-			// Of course, the game thus miscalculates the boosts...
-			if ('wonderroom' in this.battle.field.pseudoWeather) {
-				if (attackStat === 'def') {
-					attackStat = 'spd';
-				} else if (attackStat === 'spd') {
-					attackStat = 'def';
-				}
-				if (attacker.boosts['def'] || attacker.boosts['spd']) {
-					this.battle.hint("Body Press uses Sp. Def boosts when Wonder Room is active.");
-				}
-			}
-		}
+		const attacker = move.overrideOffensivePokemon === 'target' ? target : source;
+		const defender = move.overrideDefensivePokemon === 'source' ? source : target;
+
+		const isPhysical = move.category === 'Physical';
+		let attackStat: StatIDExceptHP = move.overrideOffensiveStat || (isPhysical ? 'atk' : 'spa');
+		const defenseStat: StatIDExceptHP = move.overrideDefensiveStat || (isPhysical ? 'def' : 'spd');
 
 		const statTable = {atk: 'Atk', def: 'Def', spa: 'SpA', spd: 'SpD', spe: 'Spe'};
-		let attack;
-		let defense;
 
-		let atkBoosts = move.useTargetOffensive ? defender.boosts[attackStat] : attacker.boosts[attackStat];
+		let atkBoosts = attacker.boosts[attackStat];
 		let defBoosts = defender.boosts[defenseStat];
 
 		let ignoreNegativeOffensive = !!move.ignoreNegativeOffensive;
@@ -1626,18 +1609,14 @@ export class BattleActions {
 			defBoosts = 0;
 		}
 
-		if (move.useTargetOffensive) {
-			attack = defender.calculateStat(attackStat, atkBoosts);
-		} else {
-			attack = attacker.calculateStat(attackStat, atkBoosts);
-		}
+		let attack = attacker.calculateStat(attackStat, atkBoosts);
+		let defense = defender.calculateStat(defenseStat, defBoosts);
 
 		attackStat = (category === 'Physical' ? 'atk' : 'spa');
-		defense = defender.calculateStat(defenseStat, defBoosts);
 
 		// Apply Stat Modifiers
-		attack = this.battle.runEvent('Modify' + statTable[attackStat], attacker, defender, move, attack);
-		defense = this.battle.runEvent('Modify' + statTable[defenseStat], defender, attacker, move, defense);
+		attack = this.battle.runEvent('Modify' + statTable[attackStat], source, target, move, attack);
+		defense = this.battle.runEvent('Modify' + statTable[defenseStat], target, source, move, defense);
 
 		if (this.battle.gen <= 4 && ['explosion', 'selfdestruct'].includes(move.id) && defenseStat === 'def') {
 			defense = this.battle.clampIntRange(Math.floor(defense / 2), 1);
@@ -1649,7 +1628,7 @@ export class BattleActions {
 		const baseDamage = tr(tr(tr(tr(2 * level / 5 + 2) * basePower * attack) / defense) / 50);
 
 		// Calculate damage modifiers separately (order differs between generations)
-		return this.modifyDamage(baseDamage, pokemon, target, move, suppressMessages);
+		return this.modifyDamage(baseDamage, source, target, move, suppressMessages);
 	}
 
 	modifyDamage(

package/sim/battle.ts

@@ -2102,6 +2102,12 @@ export class Battle {
 		return stats;
 	}
 
+	finalModify(relayVar: number) {
+		relayVar = this.modify(relayVar, this.event.modifier);
+		this.event.modifier = 1;
+		return relayVar;
+	}
+
 	getCategory(move: string | Move): Move['category'] {
 		return this.dex.moves.get(move).category || 'Physical';
 	}

package/sim/dex-moves.ts

@@ -11,6 +11,7 @@ import {
 	Pokemon,
 	Side,
 	SparseBoostsTable,
+	StatIDExceptHP,
 } from './exported-global-types';
 
 import {Utils} from '../lib';
@@ -218,7 +219,22 @@ export interface MoveData extends EffectData, MoveEventMethods, HitEffect {
 	basePowerModifier?: number;
 	critModifier?: number;
 	critRatio?: number;
-	defensiveCategory?: 'Physical' | 'Special' | 'Status';
+	/**
+	 * Pokemon for the attack stat. Ability and Item damage modifiers still come from the real attacker.
+	 */
+	overrideOffensivePokemon?: 'target' | 'source';
+	/**
+	 * Physical moves use attack stat modifiers, special moves use special attack stat modifiers.
+	 */
+	overrideOffensiveStat?: StatIDExceptHP;
+	/**
+	 * Pokemon for the defense stat. Ability and Item damage modifiers still come from the real defender.
+	 */
+	overrideDefensivePokemon?: 'target' | 'source';
+	/**
+	 * uses modifiers that match the new stat
+	 */
+	overrideDefensiveStat?: StatIDExceptHP;
 	forceSTAB?: boolean;
 	ignoreAbility?: boolean;
 	ignoreAccuracy?: boolean;
@@ -246,8 +262,6 @@ export interface MoveData extends EffectData, MoveEventMethods, HitEffect {
 	 * situations, rather than just targeting a slot. (Stalwart, Snipe Shot)
 	 */
 	tracksTarget?: boolean;
-	useTargetOffensive?: boolean;
-	useSourceDefensiveAsOffensive?: boolean;
 	willCrit?: boolean;
 
 	// Mechanics flags
@@ -375,14 +389,21 @@ export class DataMove extends BasicEffect implements Readonly<BasicEffect & Move
 	/** Move category. */
 	readonly category: MoveCategory;
 	/**
-	 * Category that changes which defense to use when calculating
-	 * move damage.
+	 * Pokemon for the attack stat. Ability and Item damage modifiers still come from the real attacker.
+	 */
+	 readonly overrideOffensivePokemon?: 'target' | 'source';
+	/**
+	 * Physical moves use attack stat modifiers, special moves use special attack stat modifiers.
+	 */
+	 readonly overrideOffensiveStat?: StatIDExceptHP;
+	/**
+	 * Pokemon for the defense stat. Ability and Item damage modifiers still come from the real defender.
+	 */
+	 readonly overrideDefensivePokemon?: 'target' | 'source';
+	/**
+	 * uses modifiers that match the new stat
 	 */
-	readonly defensiveCategory?: MoveCategory;
-	/** Uses the target's Atk/SpA as the attacking stat, instead of the user's. */
-	readonly useTargetOffensive: boolean;
-	/** Use the user's Def/SpD as the attacking stat, instead of Atk/SpA. */
-	readonly useSourceDefensiveAsOffensive: boolean;
+	 readonly overrideDefensiveStat?: StatIDExceptHP;
 	/** Whether or not this move ignores negative attack boosts. */
 	readonly ignoreNegativeOffensive: boolean;
 	/** Whether or not this move ignores positive defense boosts. */
@@ -463,9 +484,10 @@ export class DataMove extends BasicEffect implements Readonly<BasicEffect & Move
 		this.secondaries = data.secondaries || (this.secondary && [this.secondary]) || null;
 		this.priority = Number(data.priority) || 0;
 		this.category = data.category!;
-		this.defensiveCategory = data.defensiveCategory || undefined;
-		this.useTargetOffensive = !!data.useTargetOffensive;
-		this.useSourceDefensiveAsOffensive = !!data.useSourceDefensiveAsOffensive;
+		this.overrideOffensiveStat = data.overrideOffensiveStat || undefined;
+		this.overrideOffensivePokemon = data.overrideOffensivePokemon || undefined;
+		this.overrideDefensiveStat = data.overrideDefensiveStat || undefined;
+		this.overrideDefensivePokemon = data.overrideDefensivePokemon || undefined;
 		this.ignoreNegativeOffensive = !!data.ignoreNegativeOffensive;
 		this.ignorePositiveDefensive = !!data.ignorePositiveDefensive;
 		this.ignoreOffensive = !!data.ignoreOffensive;

package/sim/dex-species.ts

@@ -479,15 +479,24 @@ export class DexSpecies {
 			if (this.dex.currentMod === 'gen7letsgo' && !species.isNonstandard) {
 				const isLetsGo = (
 					(species.num <= 151 || ['Meltan', 'Melmetal'].includes(species.name)) &&
-					(!species.forme || ['Alola', 'Mega', 'Mega-X', 'Mega-Y', 'Starter'].includes(species.forme))
+					(!species.forme || ['Alola', 'Mega', 'Mega-X', 'Mega-Y', 'Starter'].includes(species.forme) &&
+					species.name !== 'Pikachu-Alola')
 				);
 				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.tier = species.doublesTier = 'Illegal';
+				}
+			}
 			species.nfe = !!(species.evos.length && this.get(species.evos[0]).gen <= this.dex.gen);
 			species.canHatch = species.canHatch ||
 				(!['Ditto', 'Undiscovered'].includes(species.eggGroups[0]) && !species.prevo && species.name !== 'Manaphy');
 			if (this.dex.gen === 1) species.bst -= species.baseStats.spd;
 			if (this.dex.gen < 5) delete species.abilities['H'];
+			if (this.dex.gen === 3 && this.dex.abilities.get(species.abilities['1']).gen === 4) delete species.abilities['1'];
 		} else {
 			species = new Species({
 				id, name: id,

package/sim/exported-global-types.ts

@@ -301,6 +301,7 @@ export interface ModdedBattleActions {
 }
 
 export interface ModdedBattleSide {
+	canDynamaxNow?: (this: Side) => boolean;
 	getRequestData?: (this: Side, forAlly?: boolean) => {name: string, id: ID, pokemon: AnyObject[]};
 }
 

package/sim/global-types.ts

@@ -301,6 +301,7 @@ interface ModdedBattleActions {
 }
 
 interface ModdedBattleSide {
+	canDynamaxNow?: (this: Side) => boolean;
 	getRequestData?: (this: Side, forAlly?: boolean) => {name: string, id: ID, pokemon: AnyObject[]};
 }
 

package/sim/side.ts

@@ -255,14 +255,14 @@ export class Side {
 	allies(all?: boolean) {
 		// called during the first switch-in, so `active` can still contain nulls at this point
 		let allies = this.activeTeam().filter(ally => ally);
-		if (!all) allies = allies.filter(ally => !ally.fainted);
+		if (!all) allies = allies.filter(ally => !!ally.hp);
 
 		return allies;
 	}
 	foes(all?: boolean) {
 		if (this.battle.gameType === 'freeforall') {
 			return this.battle.sides.map(side => side.active[0])
-				.filter(pokemon => pokemon && pokemon.side !== this && (all || !pokemon.fainted));
+				.filter(pokemon => pokemon && pokemon.side !== this && (all || !!pokemon.hp));
 		}
 		return this.foe.allies(all);
 	}

package/sim/team-validator.ts

@@ -1910,7 +1910,7 @@ export class TeamValidator {
 		/**
 		 * The format allows Sketch to copy moves in Gen 8
 		 */
-		const canSketchGen8Moves = ruleTable.has('sketchgen8moves');
+		const canSketchGen8Moves = ruleTable.has('sketchgen8moves') || this.dex.currentMod === 'gen8bdsp';
 
 		let tradebackEligible = false;
 		while (species?.name && !alreadyChecked[species.id]) {

package/sim/tools/runner.ts

@@ -1,3 +1,5 @@
+import {PokemonSet} from '../exported-global-types';
+
 /**
  * Battle Simulator runner.
  * Pokemon Showdown - http://pokemonshowdown.com/