@@ -173,7 +173,7 @@ class PSSearchResults extends preact.Component<{search: DexSearch}> {
renderMoveRow(id: ID, matchStart: number, matchEnd: number, errorMessage?: preact.ComponentChildren) {
const search = this.props.search;
- const move = search.dex.getMove(id);
+ const move = search.dex.moves.get(id);
if (!move) return Unrecognized move ;
const tagStart = (move.name.startsWith('Hidden Power') ? 12 : 0);
diff --git a/src/battle-tooltips.ts b/src/battle-tooltips.ts
index 705e535f5..c25fa046a 100644
--- a/src/battle-tooltips.ts
+++ b/src/battle-tooltips.ts
@@ -25,11 +25,11 @@ class ModifiableValue {
this.pokemon = pokemon;
this.serverPokemon = serverPokemon;
- this.itemName = Dex.getItem(serverPokemon.item).name;
+ this.itemName = Dex.items.get(serverPokemon.item).name;
const ability = serverPokemon.ability || pokemon?.ability || serverPokemon.baseAbility;
- this.abilityName = Dex.getAbility(ability).name;
- this.weatherName = Dex.getMove(battle.weather).exists ?
- Dex.getMove(battle.weather).name : Dex.getAbility(battle.weather).name;
+ this.abilityName = Dex.abilities.get(ability).name;
+ this.weatherName = Dex.moves.get(battle.weather).exists ?
+ Dex.moves.get(battle.weather).name : Dex.abilities.get(battle.weather).name;
}
reset(value = 0, isAccuracy?: boolean) {
this.value = value;
@@ -272,12 +272,12 @@ class BattleTooltips {
case 'move':
case 'zmove':
case 'maxmove': { // move|MOVE|ACTIVEPOKEMON|[GMAXMOVE]
- let move = this.battle.dex.getMove(args[1]);
+ let move = this.battle.dex.moves.get(args[1]);
let teamIndex = parseInt(args[2], 10);
let pokemon = this.battle.nearSide.active[
teamIndex + this.battle.pokemonControlled * Math.floor(this.battle.mySide.n / 2)
];
- let gmaxMove = args[3] ? this.battle.dex.getMove(args[3]) : undefined;
+ let gmaxMove = args[3] ? this.battle.dex.moves.get(args[3]) : undefined;
if (!pokemon) return false;
let serverPokemon = this.battle.myPokemon![teamIndex];
buf = this.showMoveTooltip(move, type, pokemon, serverPokemon, gmaxMove);
@@ -519,10 +519,10 @@ class BattleTooltips {
getMaxMoveFromType(type: TypeName, gmaxMove?: string | Move) {
if (gmaxMove) {
- gmaxMove = Dex.getMove(gmaxMove);
+ gmaxMove = Dex.moves.get(gmaxMove);
if (type === gmaxMove.type) return gmaxMove;
}
- return Dex.getMove(BattleTooltips.maxMoveTable[type]);
+ return Dex.moves.get(BattleTooltips.maxMoveTable[type]);
}
showMoveTooltip(move: Move, isZOrMax: string, pokemon: Pokemon, serverPokemon: ServerPokemon, gmaxMove?: Move) {
@@ -533,14 +533,14 @@ class BattleTooltips {
// TODO: move this somewhere it makes more sense
if (pokemon.ability === '(suppressed)') serverPokemon.ability = '(suppressed)';
let ability = toID(serverPokemon.ability || pokemon.ability || serverPokemon.baseAbility);
- let item = this.battle.dex.getItem(serverPokemon.item);
+ let item = this.battle.dex.items.get(serverPokemon.item);
let value = new ModifiableValue(this.battle, pokemon, serverPokemon);
let [moveType, category] = this.getMoveType(move, value, gmaxMove || isZOrMax === 'maxmove');
if (isZOrMax === 'zmove') {
if (item.zMoveFrom === move.name) {
- move = this.battle.dex.getMove(item.zMove as string);
+ move = this.battle.dex.moves.get(item.zMove as string);
} else if (move.category === 'Status') {
move = new Move(move.id, "", {
...move,
@@ -549,27 +549,27 @@ class BattleTooltips {
zEffect = this.getStatusZMoveEffect(move);
} else {
let moveName = BattleTooltips.zMoveTable[item.zMoveType as TypeName];
- let zMove = this.battle.dex.getMove(moveName);
+ let zMove = this.battle.dex.moves.get(moveName);
let movePower = move.zMove!.basePower;
// the different Hidden Power types don't have a Z power set, fall back on base move
if (!movePower && move.id.startsWith('hiddenpower')) {
- movePower = this.battle.dex.getMove('hiddenpower').zMove!.basePower;
+ movePower = this.battle.dex.moves.get('hiddenpower').zMove!.basePower;
}
if (move.id === 'weatherball') {
switch (this.battle.weather) {
case 'sunnyday':
case 'desolateland':
- zMove = this.battle.dex.getMove(BattleTooltips.zMoveTable['Fire']);
+ zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Fire']);
break;
case 'raindance':
case 'primordialsea':
- zMove = this.battle.dex.getMove(BattleTooltips.zMoveTable['Water']);
+ zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Water']);
break;
case 'sandstorm':
- zMove = this.battle.dex.getMove(BattleTooltips.zMoveTable['Rock']);
+ zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Rock']);
break;
case 'hail':
- zMove = this.battle.dex.getMove(BattleTooltips.zMoveTable['Ice']);
+ zMove = this.battle.dex.moves.get(BattleTooltips.zMoveTable['Ice']);
break;
}
}
@@ -581,7 +581,7 @@ class BattleTooltips {
}
} else if (isZOrMax === 'maxmove') {
if (move.category === 'Status') {
- move = this.battle.dex.getMove('Max Guard');
+ move = this.battle.dex.moves.get('Max Guard');
} else {
let maxMove = this.getMaxMoveFromType(moveType, gmaxMove);
const basePower = ['gmaxdrumsolo', 'gmaxfireball', 'gmaxhydrosnipe'].includes(maxMove.id) ?
@@ -653,7 +653,7 @@ class BattleTooltips {
// In gen 3 it calls Swift, so it retains its normal typing.
calls = 'Swift';
}
- let calledMove = this.battle.dex.getMove(calls);
+ let calledMove = this.battle.dex.moves.get(calls);
text += 'Calls ' + Dex.getTypeIcon(this.getMoveType(calledMove, value)[0]) + ' ' + calledMove.name;
}
@@ -833,10 +833,10 @@ class BattleTooltips {
let itemEffect = '';
if (clientPokemon?.prevItem) {
item = 'None';
- let prevItem = Dex.getItem(clientPokemon.prevItem).name;
+ let prevItem = Dex.items.get(clientPokemon.prevItem).name;
itemEffect += clientPokemon.prevItemEffect ? prevItem + ' was ' + clientPokemon.prevItemEffect : 'was ' + prevItem;
}
- if (serverPokemon.item) item = Dex.getItem(serverPokemon.item).name;
+ if (serverPokemon.item) item = Dex.items.get(serverPokemon.item).name;
if (itemEffect) itemEffect = ' (' + itemEffect + ')';
if (item) itemText = 'Item: ' + item + itemEffect;
} else if (clientPokemon) {
@@ -845,10 +845,10 @@ class BattleTooltips {
if (clientPokemon.prevItem) {
item = 'None';
if (itemEffect) itemEffect += '; ';
- let prevItem = Dex.getItem(clientPokemon.prevItem).name;
+ let prevItem = Dex.items.get(clientPokemon.prevItem).name;
itemEffect += clientPokemon.prevItemEffect ? prevItem + ' was ' + clientPokemon.prevItemEffect : 'was ' + prevItem;
}
- if (pokemon.item) item = Dex.getItem(pokemon.item).name;
+ if (pokemon.item) item = Dex.items.get(pokemon.item).name;
if (itemEffect) itemEffect = ' (' + itemEffect + ')';
if (item) itemText = 'Item: ' + item + itemEffect;
}
@@ -869,7 +869,7 @@ class BattleTooltips {
text += ``;
const battlePokemon = clientPokemon || this.battle.findCorrespondingPokemon(pokemon);
for (const moveid of serverPokemon.moves) {
- const move = Dex.getMove(moveid);
+ const move = Dex.moves.get(moveid);
let moveName = `• ${move.name}`;
if (battlePokemon?.moveTrack) {
for (const row of battlePokemon.moveTrack) {
@@ -890,7 +890,7 @@ class BattleTooltips {
}
if (clientPokemon.moveTrack.filter(([moveName]) => {
if (moveName.charAt(0) === '*') return false;
- const move = this.battle.dex.getMove(moveName);
+ const move = this.battle.dex.moves.get(moveName);
return !move.isZ && !move.isMax;
}).length > 4) {
text += `(More than 4 moves is usually a sign of Illusion Zoroark/Zorua.) `;
@@ -1007,7 +1007,7 @@ class BattleTooltips {
let speedHalvingEVItems = ['machobrace', 'poweranklet', 'powerband', 'powerbelt', 'powerbracer', 'powerlens', 'powerweight'];
if (ability === 'klutz' && !speedHalvingEVItems.includes(item)) item = '' as ID;
const speciesForme = clientPokemon ? clientPokemon.getSpeciesForme() : serverPokemon.speciesForme;
- let species = Dex.getSpecies(speciesForme).baseSpecies;
+ let species = Dex.species.get(speciesForme).baseSpecies;
let speedModifiers = [];
@@ -1117,7 +1117,7 @@ class BattleTooltips {
if (ability === 'marvelscale' && pokemon.status) {
stats.def = Math.floor(stats.def * 1.5);
}
- if (item === 'eviolite' && Dex.getSpecies(pokemon.speciesForme).evos) {
+ if (item === 'eviolite' && Dex.species.get(pokemon.speciesForme).evos) {
stats.def = Math.floor(stats.def * 1.5);
stats.spd = Math.floor(stats.spd * 1.5);
}
@@ -1246,10 +1246,10 @@ class BattleTooltips {
let maxpp;
if (moveName.charAt(0) === '*') {
// Transformed move
- move = this.battle.dex.getMove(moveName.substr(1));
+ move = this.battle.dex.moves.get(moveName.substr(1));
maxpp = 5;
} else {
- move = this.battle.dex.getMove(moveName);
+ move = this.battle.dex.moves.get(moveName);
maxpp = move.noPPBoosts ? move.pp : Math.floor(move.pp * 8 / 5);
}
const bullet = moveName.charAt(0) === '*' || move.isZ ? '• ' : '•';
@@ -1317,7 +1317,7 @@ class BattleTooltips {
moveType = pokemonTypes[0];
}
// Moves that require an item to change their type.
- let item = Dex.getItem(value.itemName);
+ let item = Dex.items.get(value.itemName);
if (move.id === 'multiattack' && item.onMemory) {
if (value.itemModify(0)) moveType = item.onMemory;
}
@@ -1384,7 +1384,11 @@ class BattleTooltips {
if (value.abilityModify(0, 'Normalize')) moveType = 'Normal';
}
// There aren't any max moves with the sound flag, but if there were, Liquid Voice would make them water type
- const isSound = !!(forMaxMove ? this.getMaxMoveFromType(moveType, forMaxMove !== true && forMaxMove || undefined) : move).flags['sound'];
+ const isSound = !!(
+ forMaxMove ?
+ this.getMaxMoveFromType(moveType, forMaxMove !== true && forMaxMove || undefined) : move
+ ).flags['sound'];
+
if (allowTypeOverride && isSound && value.abilityModify(0, 'Liquid Voice')) {
moveType = 'Water';
}
@@ -1605,7 +1609,7 @@ class BattleTooltips {
}
// Moves which have base power changed due to items
if (serverPokemon.item) {
- let item = Dex.getItem(serverPokemon.item);
+ let item = Dex.items.get(serverPokemon.item);
if (move.id === 'fling' && item.fling) {
value.itemModify(item.fling.basePower);
}
@@ -1836,7 +1840,7 @@ class BattleTooltips {
'Water Pledge',
];
getItemBoost(move: Move, value: ModifiableValue, moveType: TypeName) {
- let item = this.battle.dex.getItem(value.serverPokemon.item);
+ let item = this.battle.dex.items.get(value.serverPokemon.item);
let itemName = item.name;
let moveName = move.name;
@@ -1860,7 +1864,7 @@ class BattleTooltips {
// Pokemon-specific items
if (item.name === 'Soul Dew' && this.battle.gen < 7) return value;
- if (BattleTooltips.orbUsers[Dex.getSpecies(value.serverPokemon.speciesForme).baseSpecies] === item.name &&
+ if (BattleTooltips.orbUsers[Dex.species.get(value.serverPokemon.speciesForme).baseSpecies] === item.name &&
[BattleTooltips.orbTypes[item.name], 'Dragon'].includes(moveType)) {
value.itemModify(1.2);
return value;
@@ -1877,7 +1881,7 @@ class BattleTooltips {
}
getPokemonTypes(pokemon: Pokemon | ServerPokemon): ReadonlyArray {
if (!(pokemon as Pokemon).getTypes) {
- return this.battle.dex.getSpecies(pokemon.speciesForme).types;
+ return this.battle.dex.species.get(pokemon.speciesForme).types;
}
return (pokemon as Pokemon).getTypeList();
@@ -1891,10 +1895,10 @@ class BattleTooltips {
}
getAllyAbility(ally: Pokemon) {
// this will only be available if the ability announced itself in some way
- let allyAbility = Dex.getAbility(ally.ability).name;
+ let allyAbility = Dex.abilities.get(ally.ability).name;
// otherwise fall back on the original set data sent from the server
if (!allyAbility && this.battle.myAllyPokemon) {
- allyAbility = Dex.getAbility(this.battle.myAllyPokemon[ally.slot].ability).name;
+ allyAbility = Dex.abilities.get(this.battle.myAllyPokemon[ally.slot].ability).name;
}
return allyAbility;
}
@@ -1910,7 +1914,7 @@ class BattleTooltips {
}
} else {
const speciesForme = clientPokemon.getSpeciesForme() || serverPokemon?.speciesForme || '';
- const species = this.battle.dex.getSpecies(speciesForme);
+ const species = this.battle.dex.species.get(speciesForme);
if (species.exists && species.abilities) {
abilityData.possibilities = [species.abilities['0']];
if (species.abilities['1']) abilityData.possibilities.push(species.abilities['1']);
@@ -1938,12 +1942,12 @@ class BattleTooltips {
if (!isActive) {
// for switch tooltips, only show the original ability
const ability = abilityData.baseAbility || abilityData.ability;
- if (ability) text = 'Ability: ' + Dex.getAbility(ability).name;
+ if (ability) text = 'Ability: ' + Dex.abilities.get(ability).name;
} else {
if (abilityData.ability) {
- const abilityName = Dex.getAbility(abilityData.ability).name;
+ const abilityName = Dex.abilities.get(abilityData.ability).name;
text = 'Ability: ' + abilityName;
- const baseAbilityName = Dex.getAbility(abilityData.baseAbility).name;
+ const baseAbilityName = Dex.abilities.get(abilityData.baseAbility).name;
if (baseAbilityName && baseAbilityName !== abilityName) text += ' (base: ' + baseAbilityName + ')';
}
}
@@ -2051,11 +2055,11 @@ class BattleStatGuesser {
};
let hasMove: {[moveid: string]: 1} = {};
let itemid = toID(set.item);
- let item = this.dex.getItem(itemid);
+ let item = this.dex.items.get(itemid);
let abilityid = toID(set.ability);
- let species = this.dex.getSpecies(set.species || set.name!);
- if (item.megaEvolves === species.name) species = this.dex.getSpecies(item.megaStone);
+ let species = this.dex.species.get(set.species || set.name!);
+ if (item.megaEvolves === species.name) species = this.dex.species.get(item.megaStone);
if (!species.exists) return '?';
let stats = species.baseStats;
@@ -2068,7 +2072,7 @@ class BattleStatGuesser {
}
for (let i = 0, len = set.moves.length; i < len; i++) {
- let move = Dex.getMove(set.moves[i]);
+ let move = Dex.moves.get(set.moves[i]);
hasMove[move.id] = 1;
if (move.category === 'Status') {
if (['batonpass', 'healingwish', 'lunardance'].includes(move.id)) {
@@ -2337,7 +2341,7 @@ class BattleStatGuesser {
guessEVs(set: PokemonSet, role: string): Partial & {plusStat?: StatName | '', minusStat?: StatName | ''} {
if (!set) return {};
if (role === '?') return {};
- let species = this.dex.getSpecies(set.species || set.name!);
+ let species = this.dex.species.get(set.species || set.name!);
let stats = species.baseStats;
let hasMove = this.hasMove;
@@ -2555,7 +2559,7 @@ class BattleStatGuesser {
}
getStat(stat: StatName, set: PokemonSet, evOverride?: number, natureOverride?: number) {
- let species = this.dex.getSpecies(set.species);
+ let species = this.dex.species.get(set.species);
if (!species.exists) return 0;
let level = set.level || 100;
diff --git a/src/battle.ts b/src/battle.ts
index 6022389f2..6c64675ab 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -329,7 +329,7 @@ class Pokemon implements PokemonDetails, PokemonHealth {
}
rememberMove(moveName: string, pp = 1, recursionSource?: string) {
if (recursionSource === this.ident) return;
- moveName = Dex.getMove(moveName).name;
+ moveName = Dex.moves.get(moveName).name;
if (moveName.charAt(0) === '*') return;
if (moveName === 'Struggle') return;
if (this.volatiles.transform) {
@@ -348,7 +348,7 @@ class Pokemon implements PokemonDetails, PokemonHealth {
this.moveTrack.push([moveName, pp]);
}
rememberAbility(ability: string, isNotBase?: boolean) {
- ability = Dex.getAbility(ability).name;
+ ability = Dex.abilities.get(ability).name;
this.ability = ability;
if (!this.baseAbility && !isNotBase) {
this.baseAbility = ability;
@@ -521,10 +521,10 @@ class Pokemon implements PokemonDetails, PokemonHealth {
(serverPokemon ? serverPokemon.speciesForme : this.speciesForme);
}
getSpecies(serverPokemon?: ServerPokemon) {
- return this.side.battle.dex.getSpecies(this.getSpeciesForme(serverPokemon));
+ return this.side.battle.dex.species.get(this.getSpeciesForme(serverPokemon));
}
getBaseSpecies() {
- return this.side.battle.dex.getSpecies(this.speciesForme);
+ return this.side.battle.dex.species.get(this.speciesForme);
}
reset() {
this.clearVolatile();
@@ -1343,11 +1343,11 @@ class Battle {
let moveName = move.name;
if (move.isZ) {
pokemon.item = move.isZ;
- let item = Dex.getItem(move.isZ);
+ let item = Dex.items.get(move.isZ);
if (item.zMoveFrom) moveName = item.zMoveFrom;
} else if (move.name.slice(0, 2) === 'Z-') {
moveName = moveName.slice(2);
- move = Dex.getMove(moveName);
+ move = Dex.moves.get(moveName);
if (window.BattleItems) {
for (let item in BattleItems) {
if (BattleItems[item].zMoveType === move.type) pokemon.item = item;
@@ -1390,7 +1390,7 @@ class Battle {
return;
}
- let usedMove = kwArgs.anim ? Dex.getMove(kwArgs.anim) : move;
+ let usedMove = kwArgs.anim ? Dex.moves.get(kwArgs.anim) : move;
if (!kwArgs.spread) {
this.scene.runMoveAnim(usedMove.id, [pokemon, target]);
return;
@@ -2034,7 +2034,7 @@ class Battle {
}
case '-item': {
let poke = this.getPokemon(args[1])!;
- let item = Dex.getItem(args[2]);
+ let item = Dex.items.get(args[2]);
let effect = Dex.getEffect(kwArgs.from);
let ofpoke = this.getPokemon(kwArgs.of);
poke.item = item.name;
@@ -2102,7 +2102,7 @@ class Battle {
}
case '-enditem': {
let poke = this.getPokemon(args[1])!;
- let item = Dex.getItem(args[2]);
+ let item = Dex.items.get(args[2]);
let effect = Dex.getEffect(kwArgs.from);
poke.item = '';
poke.itemEffect = '';
@@ -2164,7 +2164,7 @@ class Battle {
}
case '-ability': {
let poke = this.getPokemon(args[1])!;
- let ability = Dex.getAbility(args[2]);
+ let ability = Dex.abilities.get(args[2]);
let effect = Dex.getEffect(kwArgs.from);
let ofpoke = this.getPokemon(kwArgs.of);
poke.rememberAbility(ability.name, effect.id && !kwArgs.fail);
@@ -2211,7 +2211,7 @@ class Battle {
// deprecated; use |-start| for Gastro Acid
// and the third arg of |-ability| for Entrainment et al
let poke = this.getPokemon(args[1])!;
- let ability = Dex.getAbility(args[2]);
+ let ability = Dex.abilities.get(args[2]);
poke.ability = '(suppressed)';
if (ability.id) {
@@ -2235,7 +2235,7 @@ class Battle {
}
newSpeciesForme = args[2].substr(0, commaIndex);
}
- let species = this.dex.getSpecies(newSpeciesForme);
+ let species = this.dex.species.get(newSpeciesForme);
poke.speciesForme = newSpeciesForme;
poke.ability = poke.baseAbility = (species.abilities ? species.abilities['0'] : '');
@@ -2276,7 +2276,7 @@ class Battle {
}
case '-formechange': {
let poke = this.getPokemon(args[1])!;
- let species = Dex.getSpecies(args[2]);
+ let species = Dex.species.get(args[2]);
let fromeffect = Dex.getEffect(kwArgs.from);
let isCustomAnim = false;
poke.removeVolatile('typeadd' as ID);
@@ -2293,7 +2293,7 @@ class Battle {
}
case '-mega': {
let poke = this.getPokemon(args[1])!;
- let item = Dex.getItem(args[3]);
+ let item = Dex.items.get(args[3]);
if (args[3]) {
poke.item = item.name;
}
@@ -2673,7 +2673,7 @@ class Battle {
case 'eeriespell':
case 'gmaxdepletion':
case 'spite':
- let move = Dex.getMove(kwArgs.move).name;
+ let move = Dex.moves.get(kwArgs.move).name;
let pp = Number(kwArgs.number);
if (isNaN(pp)) pp = 4;
poke.rememberMove(move, pp);
@@ -2717,7 +2717,7 @@ class Battle {
break;
case 'mummy':
if (!kwArgs.ability) break; // if Mummy activated but failed, no ability will have been sent
- let ability = Dex.getAbility(kwArgs.ability);
+ let ability = Dex.abilities.get(kwArgs.ability);
this.activateAbility(target, ability.name);
this.activateAbility(poke, "Mummy");
this.scene.wait(700);
@@ -2835,7 +2835,7 @@ class Battle {
}
case '-anim': {
let poke = this.getPokemon(args[1])!;
- let move = Dex.getMove(args[2]);
+ let move = Dex.moves.get(args[2]);
if (this.checkActive(poke)) return;
let poke2 = this.getPokemon(args[3]);
this.scene.beforeMove(poke);
@@ -2879,7 +2879,7 @@ class Battle {
}
if (foe) siden = (siden ? 0 : 1);
- let data = Dex.getSpecies(name);
+ let data = Dex.species.get(name);
return data.spriteData[siden];
}
*/
@@ -3338,7 +3338,7 @@ class Battle {
this.endLastTurn();
this.resetTurnsSinceMoved();
let poke = this.getPokemon(args[1])!;
- let move = Dex.getMove(args[2]);
+ let move = Dex.moves.get(args[2]);
if (this.checkActive(poke)) return;
let poke2 = this.getPokemon(args[3]);
this.scene.beforeMove(poke);
@@ -3353,7 +3353,7 @@ class Battle {
this.resetTurnsSinceMoved();
let poke = this.getPokemon(args[1])!;
let effect = Dex.getEffect(args[2]);
- let move = Dex.getMove(args[3]);
+ let move = Dex.moves.get(args[3]);
this.cantUseMove(poke, effect, move, kwArgs);
this.log(args, kwArgs);
break;
diff --git a/src/panel-battle.tsx b/src/panel-battle.tsx
index a7bc99d11..7a5d60fa3 100644
--- a/src/panel-battle.tsx
+++ b/src/panel-battle.tsx
@@ -349,7 +349,7 @@ class BattlePanel extends PSRoomPanel {
return Maxed with no max moves
;
}
return active.moves.map((moveData, i) => {
- const move = dex.getMove(moveData.name);
+ const move = dex.moves.get(moveData.name);
const maxMoveData = active.maxMoves![i];
const gmaxTooltip = maxMoveData.id.startsWith('gmax') ? `|${maxMoveData.id}` : ``;
const tooltip = `maxmove|${moveData.name}|${pokemonIndex}${gmaxTooltip}`;
@@ -364,7 +364,7 @@ class BattlePanel extends PSRoomPanel {
return No Z moves
;
}
return active.moves.map((moveData, i) => {
- const move = dex.getMove(moveData.name);
+ const move = dex.moves.get(moveData.name);
const zMoveData = active.zMoves![i];
if (!zMoveData) {
return ;
@@ -377,7 +377,7 @@ class BattlePanel extends PSRoomPanel {
}
return active.moves.map((moveData, i) => {
- const move = dex.getMove(moveData.name);
+ const move = dex.moves.get(moveData.name);
const tooltip = `move|${moveData.name}|${pokemonIndex}`;
return
{move.name}
diff --git a/src/panel-teamdropdown.tsx b/src/panel-teamdropdown.tsx
index 10b82ea96..ce8733dd2 100644
--- a/src/panel-teamdropdown.tsx
+++ b/src/panel-teamdropdown.tsx
@@ -121,24 +121,24 @@ class PSTeambuilder {
set.name = parts[0];
// species
- set.species = Dex.getSpecies(parts[1]).name || set.name;
+ set.species = Dex.species.get(parts[1]).name || set.name;
// item
- set.item = Dex.getItem(parts[2]).name;
+ set.item = Dex.items.get(parts[2]).name;
// ability
- const species = Dex.getSpecies(set.species);
+ const species = Dex.species.get(set.species);
set.ability = parts[3] === '-' ?
'' :
(species.baseSpecies === 'Zygarde' && parts[3] === 'H') ?
'Power Construct' :
['', '0', '1', 'H', 'S'].includes(parts[3]) ?
species.abilities[parts[3] as '0' || '0'] || (parts[3] === '' ? '' : '!!!ERROR!!!') :
- Dex.getAbility(parts[3]).name;
+ Dex.abilities.get(parts[3]).name;
// moves
set.moves = parts[4].split(',').map(moveid =>
- Dex.getMove(moveid).name
+ Dex.moves.get(moveid).name
);
// nature
@@ -321,10 +321,10 @@ class PSTeambuilder {
}
let parenIndex = line.lastIndexOf(' (');
if (line.charAt(line.length - 1) === ')' && parenIndex !== -1) {
- set.species = Dex.getSpecies(line.slice(parenIndex + 2, -1)).name;
+ set.species = Dex.species.get(line.slice(parenIndex + 2, -1)).name;
set.name = line.slice(0, parenIndex);
} else {
- set.species = Dex.getSpecies(line).name;
+ set.species = Dex.species.get(line).name;
set.name = '';
}
} else if (line.startsWith('Trait: ')) {
@@ -389,7 +389,7 @@ class PSTeambuilder {
line = 'Hidden Power ' + hpType;
if (!set.ivs && window.BattleTypeChart && window.BattleTypeChart[hpType]) {
set.ivs = {hp: 31, atk: 31, def: 31, spa: 31, spd: 31, spe: 31};
- const hpIVs = Dex.getType(hpType).HPivs || {};
+ const hpIVs = Dex.types.get(hpType).HPivs || {};
for (let stat in hpIVs) {
set.ivs[stat as StatName] = hpIVs[stat as StatName]!;
}