Fix some OMotM crashes

config/formats.js

@@ -530,7 +530,7 @@ let Formats = [
 		mod: 'gen7',
 		ruleset: ['[Gen 7] OU'],
 		onModifyTemplate: function (template, pokemon) {
-			if (template.types.includes(pokemon.hpType)) return;
+			if (!pokemon || template.types.includes(pokemon.hpType)) return;
 			let dex = this && this.deepClone ? this : Dex;
 			let newTemplate = dex.deepClone(template);
 			newTemplate.addedType = pokemon.hpType;

dev-tools/globals.ts

@@ -757,6 +757,7 @@ interface ModdedBattlePokemon {
 	getActionSpeed?: (this: Pokemon) => number
 	getStat?: (this: Pokemon, statName: string, unboosted?: boolean, unmodified?: boolean) => number
 	getWeight?: (this: Pokemon) => number
+	hasAbility?: (this: Pokemon, ability: string | string[]) => boolean
 	isGrounded?: (this: Pokemon, negateImmunity: boolean | undefined) => boolean | null
 	modifyStat?: (this: Pokemon, statName: string, modifier: number) => void
 	moveUsed?: (this: Pokemon, move: Move, targetLoc?: number) => void
@@ -772,11 +773,13 @@ interface ModdedBattleScriptsData extends Partial<BattleScriptsData> {
 	boost?: (this: Battle, boost: SparseBoostsTable, target: Pokemon, source?: Pokemon | null, effect?: Effect | string | null, isSecondary?: boolean, isSelf?: boolean) => boolean | null | 0
 	debug?: (this: Battle, activity: string) => void
 	getDamage?: (this: Battle, pokemon: Pokemon, target: Pokemon, move: string | number | ActiveMove, suppressMessages: boolean) => number
+	getEffect?: (this: Battle, name: string | Effect | null) => Effect
 	init?: (this: Battle) => void
 	modifyDamage?: (this: Battle, baseDamage: number, pokemon: Pokemon, target: Pokemon, move: ActiveMove, suppressMessages?: boolean) => void
 	natureModify?: (this: Battle, stats: StatsTable, set: PokemonSet) => StatsTable
 	setTerrain?: (this: Battle, status: string | Effect, source: Pokemon | null | 'debug', sourceEffect: Effect | null) => boolean
 	spreadModify?: (this: Battle, baseStats: StatsTable, set: PokemonSet) => StatsTable
+	suppressingWeather?: (this: Battle) => boolean
 
 	// oms
 	doGetMixedTemplate?: (this: Battle, template: Template, deltas: AnyObject) => Template

mods/pokebilities/abilities.js

@@ -1,5 +1,6 @@
 'use strict';
 
+/**@type {{[k: string]: ModdedAbilityData}} */
 exports.BattleAbilities = {
 	trace: {
 		inherit: true,
@@ -10,7 +11,7 @@ exports.BattleAbilities = {
 			let possibleTargets = [];
 			for (let i = 0; i < pokemon.side.foe.active.length; i++) {
 				let target = pokemon.side.foe.active[i];
-				if (target && !target.fainted) {
+				if (target && !target.fainted && target.innates) {
 					possibleInnates = possibleInnates.concat(target.innates);
 					possibleTargets = possibleTargets.concat(target.innates.map(innate => target));
 				}

mods/pokebilities/scripts.js

@@ -1,5 +1,6 @@
 'use strict';
 
+/**@type {ModdedBattleScriptsData} */
 exports.BattleScripts = {
 	getEffect: function (name) {
 		if (name && typeof name !== 'string') {
@@ -70,16 +71,17 @@ exports.BattleScripts = {
 				});
 			}
 			for (let j in pokemon.boosts) {
+				// @ts-ignore
 				this.boosts[j] = pokemon.boosts[j];
 			}
 			if (effect) {
 				this.battle.add('-transform', this, pokemon, '[from] ' + effect.fullname);
 			} else {
 				this.battle.add('-transform', this, pokemon);
 			}
-			this.setAbility(pokemon.ability, this, {id: 'transform'});
-			this.innates.forEach(innate => this.removeVolatile('ability' + innate, this));
-			pokemon.innates.forEach(innate => this.addVolatile('ability' + innate, this));
+			this.setAbility(pokemon.ability, this, true);
+			if (this.innates) this.innates.forEach(innate => this.removeVolatile('ability' + innate));
+			if (pokemon.innates) pokemon.innates.forEach(innate => this.addVolatile('ability' + innate, this));
 			return true;
 		},
 	},

tsconfig.json

@@ -12,8 +12,7 @@
     "types": ["node"],
     "exclude": [
         "./mods/gen1/pokedex.js",
-        "./mods/pic/*.js",
-        "./mods/pokebilities/*.js"
+        "./mods/pic/*.js"
     ],
     "include": [
         "./config/formats.js",