JEP fairy type, handle missing learnset data as error

scoopapa · Dec 19, 2023 · 3c24d78 · 3c24d78
1 parent 7b5d9c4
commit 3c24d78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/play.pokemonshowdown.com/src/battle-dex-search.ts b/play.pokemonshowdown.com/src/battle-dex-search.ts
@@ -895,9 +895,14 @@ abstract class BattleTypedSearch<T extends SearchType> {
 					for (const learnedMove in overrideLearnsets[learnsetid]) learnset[learnedMove] = overrideLearnsets[learnsetid][learnedMove];
 				}
 			}
-			if (!Object.keys(learnset).length) { //Doesn't have learnset but one is loaded; some other mod gave it one
-				learnsetid = toID(this.dex.species.get(learnsetid).baseSpecies);
+			try {
+				if (!Object.keys(learnset).length) { //Doesn't have learnset but one is loaded; some other mod gave it one
+					learnsetid = toID(this.dex.species.get(learnsetid).baseSpecies);
+				}
+			} catch (e) {
+				console.log("Error: Unable to load learnset data for " + learnsetid + " in " + this.mod);
 			}
+
 			// Modified this function to account for pet mods with tradebacks enabled
 			const tradebacksMod = ['gen1expansionpack', 'gen1burgundy'];
 			if (learnset && (moveid in learnset) && (!(this.format.startsWith('tradebacks') || tradebacksMod.includes(this.mod)) ? learnset[moveid].includes(genChar) :

diff --git a/play.pokemonshowdown.com/src/battle-dex.ts b/play.pokemonshowdown.com/src/battle-dex.ts
@@ -963,6 +963,7 @@ class ModdedDex {
 			if (this.gen <= 3 && data.category !== 'Status') {
 				switch(this.modid) {
 					case 'gen1expansionpack':
+					case 'gen2expansionpack':
 						data.category = Dex.getKEPCategory(data.type);
 						break;
 					case 'gen2crystalseviiislands':