Use this when it's a Dex (#4152)

This commit is contained in:
urkerab 2017-11-16 22:57:08 +00:00 committed by Guangcong Luo
parent 643615f45b
commit e9303b1d1a
4 changed files with 6 additions and 6 deletions

View File

@ -2061,7 +2061,7 @@ exports.BattleAbilities = {
// this.add('-message', "" + curPoke + " skipped: Natural Cure already known");
continue;
}
let template = Dex.getTemplate(curPoke.species);
let template = this.getTemplate(curPoke.species);
// pokemon can't get Natural Cure
if (Object.values(template.abilities).indexOf('Natural Cure') < 0) {
// this.add('-message', "" + curPoke + " skipped: no Natural Cure");

View File

@ -10212,7 +10212,7 @@ exports.BattleMovedex = {
if (source.transformed || !target.lastMove || disallowedMoves[target.lastMove] || source.moves.indexOf(target.lastMove) >= 0) return false;
let moveslot = source.moves.indexOf('mimic');
if (moveslot < 0) return false;
let move = Dex.getMove(target.lastMove);
let move = this.getMove(target.lastMove);
source.moveset[moveslot] = {
move: move.name,
id: move.id,
@ -14594,7 +14594,7 @@ exports.BattleMovedex = {
if (source.transformed || !target.lastMove || disallowedMoves[target.lastMove] || source.moves.indexOf(target.lastMove) >= 0) return false;
let moveslot = source.moves.indexOf('sketch');
if (moveslot < 0) return false;
let move = Dex.getMove(target.lastMove);
let move = this.getMove(target.lastMove);
let sketchedMove = {
move: move.name,
id: move.id,

View File

@ -2443,7 +2443,7 @@ class RandomTeams extends Dex.ModdedDex {
// Every 10.34 BST adds a level from 70 up to 99. Results are floored. Uses the Mega's stats if holding a Mega Stone
let baseStats = template.baseStats;
// If Wishiwashi, use the school-forme's much higher stats
if (template.baseSpecies === 'Wishiwashi') baseStats = Dex.getTemplate('wishiwashischool').baseStats;
if (template.baseSpecies === 'Wishiwashi') baseStats = this.getTemplate('wishiwashischool').baseStats;
let bst = baseStats.hp + baseStats.atk + baseStats.def + baseStats.spa + baseStats.spd + baseStats.spe;
// Adjust levels of mons based on abilities (Pure Power, Sheer Force, etc.) and also Eviolite

View File

@ -829,7 +829,7 @@ exports.BattleMovedex = {
if (source.transformed || !target.lastMove || disallowedMoves[target.lastMove] || source.moves.indexOf(target.lastMove) !== -1 || target.volatiles['substitute']) return false;
let moveslot = source.moves.indexOf('mimic');
if (moveslot < 0) return false;
let move = Dex.getMove(target.lastMove);
let move = this.getMove(target.lastMove);
source.moveset[moveslot] = {
move: move.name,
id: move.id,
@ -1034,7 +1034,7 @@ exports.BattleMovedex = {
if (source.transformed || !target.lastMove || disallowedMoves[target.lastMove] || source.moves.indexOf(target.lastMove) >= 0 || target.volatiles['substitute']) return false;
let moveslot = source.moves.indexOf('sketch');
if (moveslot < 0) return false;
let move = Dex.getMove(target.lastMove);
let move = this.getMove(target.lastMove);
let sketchedMove = {
move: move.name,
id: move.id,