@pkmn/sim 0.5.5 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/sim",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "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.1.4"
+    "mocha": "^9.2.0"
   },
   "scripts": {
     "compile": "tsc -p .",

package/sim/battle.ts

@@ -1553,29 +1553,8 @@ export class Battle {
 	maybeTriggerEndlessBattleClause(
 		trappedBySide: boolean[], stalenessBySide: ('internal' | 'external' | undefined)[]
 	) {
-		if (this.turn <= 100) return;
-
-		// the turn limit is not a part of Endless Battle Clause
-		if (this.turn >= 1000) {
-			this.add('message', `It is turn 1000. You have hit the turn limit!`);
-			this.tie();
-			return true;
-		}
-		if (
-			(this.turn >= 500 && this.turn % 100 === 0) || // every 100 turns past turn 500,
-			(this.turn >= 900 && this.turn % 10 === 0) || // every 10 turns past turn 900,
-			this.turn >= 990 // every turn past turn 990
-		) {
-			const turnsLeft = 1000 - this.turn;
-			const turnsLeftText = (turnsLeft === 1 ? `1 turn` : `${turnsLeft} turns`);
-			this.add('bigerror', `You will auto-tie if the battle doesn't end in ${turnsLeftText} (on turn 1000).`);
-		}
-
-		if (!this.ruleTable.has('endlessbattleclause')) return;
-		// for now, FFA doesn't support Endless Battle Clause
-		if (this.format.gameType === 'freeforall') return;
-
 		// Gen 1 Endless Battle Clause triggers
+		// 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'));
@@ -1593,7 +1572,7 @@ export class Battle {
 					// a pokemon can't lose PP if it Transforms into a pokemon with only Transform
 					(pokemon.moves.every(moveid => moveid === 'transform') && foeAllTransform) ||
 					// Struggle can't damage yourself if every foe is a Ghost
-					pokemon.moveSlots.every(slot => slot.pp === 0) && foeAllGhosts
+					(pokemon.moveSlots.every(slot => slot.pp === 0) && foeAllGhosts)
 				));
 			});
 			if (noProgressPossible) {
@@ -1602,6 +1581,28 @@ export class Battle {
 			}
 		}
 
+		if (this.turn <= 100) return;
+
+		// the turn limit is not a part of Endless Battle Clause
+		if (this.turn >= 1000) {
+			this.add('message', `It is turn 1000. You have hit the turn limit!`);
+			this.tie();
+			return true;
+		}
+		if (
+			(this.turn >= 500 && this.turn % 100 === 0) || // every 100 turns past turn 500,
+			(this.turn >= 900 && this.turn % 10 === 0) || // every 10 turns past turn 900,
+			this.turn >= 990 // every turn past turn 990
+		) {
+			const turnsLeft = 1000 - this.turn;
+			const turnsLeftText = (turnsLeft === 1 ? `1 turn` : `${turnsLeft} turns`);
+			this.add('bigerror', `You will auto-tie if the battle doesn't end in ${turnsLeftText} (on turn 1000).`);
+		}
+
+		if (!this.ruleTable.has('endlessbattleclause')) return;
+		// for now, FFA doesn't support Endless Battle Clause
+		if (this.format.gameType === 'freeforall') return;
+
 		// Are all Pokemon on every side stale, with at least one side containing an externally stale Pokemon?
 		if (!stalenessBySide.every(s => !!s) || !stalenessBySide.some(s => s === 'external')) return;
 

package/sim/dex-species.ts

@@ -295,7 +295,7 @@ export class Species extends BasicEffect implements Readonly<BasicEffect & Speci
 		if (Array.isArray(data.changesFrom)) this.changesFrom = data.changesFrom[0];
 
 		if (!this.gen && this.num >= 1) {
-			if (this.num >= 810 || ['Gmax', 'Galar', 'Galar-Zen'].includes(this.forme)) {
+			if (this.num >= 810 || ['Gmax', 'Galar', 'Galar-Zen', 'Hisui'].includes(this.forme)) {
 				this.gen = 8;
 			} else if (this.num >= 722 || this.forme.startsWith('Alola') || this.forme === 'Starter') {
 				this.gen = 7;
@@ -492,7 +492,10 @@ export class DexSpecies {
 					species.tier = species.doublesTier = 'Illegal';
 				}
 			}
-			species.nfe = !!(species.evos.length && this.get(species.evos[0]).gen <= this.dex.gen);
+			species.nfe = species.evos.some(evo => {
+				const evoSpecies = this.get(evo);
+				return !evoSpecies.isNonstandard || evoSpecies.isNonstandard === species?.isNonstandard;
+			});
 			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;

package/sim/exported-global-types.ts

@@ -373,6 +373,7 @@ export interface ModdedBattleScriptsData extends Partial<BattleScriptsData> {
 	init?: (this: ModdedDex) => void;
 	natureModify?: (this: Battle, stats: StatsTable, set: PokemonSet) => StatsTable;
 	nextTurn?: (this: Battle) => void;
+	runAction?: (this: Battle, action: Action) => void;
 	spreadModify?: (this: Battle, baseStats: StatsTable, set: PokemonSet) => StatsTable;
 	suppressingWeather?: (this: Battle) => boolean;
 	trunc?: (n: number) => number;

package/sim/global-types.ts

@@ -373,6 +373,7 @@ interface ModdedBattleScriptsData extends Partial<BattleScriptsData> {
 	init?: (this: ModdedDex) => void;
 	natureModify?: (this: Battle, stats: StatsTable, set: PokemonSet) => StatsTable;
 	nextTurn?: (this: Battle) => void;
+	runAction?: (this: Battle, action: Action) => void;
 	spreadModify?: (this: Battle, baseStats: StatsTable, set: PokemonSet) => StatsTable;
 	suppressingWeather?: (this: Battle) => boolean;
 	trunc?: (n: number) => number;