diff --git a/public/audio/bgm/abyss.mp3 b/public/audio/bgm/abyss.mp3 new file mode 100644 index 000000000..fadb0a5bf Binary files /dev/null and b/public/audio/bgm/abyss.mp3 differ diff --git a/public/audio/bgm/battle.mp3 b/public/audio/bgm/battle.mp3 deleted file mode 100644 index 9c6607b47..000000000 Binary files a/public/audio/bgm/battle.mp3 and /dev/null differ diff --git a/public/audio/bgm/cave.mp3 b/public/audio/bgm/cave.mp3 index 915da7ed2..836229ef2 100644 Binary files a/public/audio/bgm/cave.mp3 and b/public/audio/bgm/cave.mp3 differ diff --git a/public/audio/bgm/desert.mp3 b/public/audio/bgm/desert.mp3 index 131dcb3e3..a8224309c 100644 Binary files a/public/audio/bgm/desert.mp3 and b/public/audio/bgm/desert.mp3 differ diff --git a/public/audio/bgm/dojo.mp3 b/public/audio/bgm/dojo.mp3 new file mode 100644 index 000000000..33faffde2 Binary files /dev/null and b/public/audio/bgm/dojo.mp3 differ diff --git a/public/audio/bgm/elite_2.mp3 b/public/audio/bgm/elite_2.mp3 deleted file mode 100644 index 2aa072749..000000000 Binary files a/public/audio/bgm/elite_2.mp3 and /dev/null differ diff --git a/public/audio/bgm/elite_3.mp3 b/public/audio/bgm/elite_3.mp3 deleted file mode 100644 index 6dc1b3fd1..000000000 Binary files a/public/audio/bgm/elite_3.mp3 and /dev/null differ diff --git a/public/audio/bgm/elite_4.mp3 b/public/audio/bgm/elite_4.mp3 deleted file mode 100644 index c2c304f0b..000000000 Binary files a/public/audio/bgm/elite_4.mp3 and /dev/null differ diff --git a/public/audio/bgm/forest.mp3 b/public/audio/bgm/forest.mp3 index 001e814ec..5beb948ab 100644 Binary files a/public/audio/bgm/forest.mp3 and b/public/audio/bgm/forest.mp3 differ diff --git a/public/audio/bgm/grass.mp3 b/public/audio/bgm/grass.mp3 index d35a64454..079eb3635 100644 Binary files a/public/audio/bgm/grass.mp3 and b/public/audio/bgm/grass.mp3 differ diff --git a/public/audio/bgm/graveyard.mp3 b/public/audio/bgm/graveyard.mp3 new file mode 100644 index 000000000..648d3ffd2 Binary files /dev/null and b/public/audio/bgm/graveyard.mp3 differ diff --git a/public/audio/bgm/ice_cave.mp3 b/public/audio/bgm/ice_cave.mp3 new file mode 100644 index 000000000..8d63b2377 Binary files /dev/null and b/public/audio/bgm/ice_cave.mp3 differ diff --git a/public/audio/bgm/land.mp3 b/public/audio/bgm/land.mp3 index 1a68f57de..14f01b30e 100644 Binary files a/public/audio/bgm/land.mp3 and b/public/audio/bgm/land.mp3 differ diff --git a/public/audio/bgm/meadow.mp3 b/public/audio/bgm/meadow.mp3 new file mode 100644 index 000000000..85534407a Binary files /dev/null and b/public/audio/bgm/meadow.mp3 differ diff --git a/public/audio/bgm/mountain.mp3 b/public/audio/bgm/mountain.mp3 index fc913e4cf..555e68a9f 100644 Binary files a/public/audio/bgm/mountain.mp3 and b/public/audio/bgm/mountain.mp3 differ diff --git a/public/audio/bgm/elite_5.mp3 b/public/audio/bgm/mountain_peak.mp3 similarity index 100% rename from public/audio/bgm/elite_5.mp3 rename to public/audio/bgm/mountain_peak.mp3 diff --git a/public/audio/bgm/plains.mp3 b/public/audio/bgm/plains.mp3 new file mode 100644 index 000000000..1a15c9957 Binary files /dev/null and b/public/audio/bgm/plains.mp3 differ diff --git a/public/audio/bgm/power_plant.mp3 b/public/audio/bgm/power_plant.mp3 new file mode 100644 index 000000000..51d7183e9 Binary files /dev/null and b/public/audio/bgm/power_plant.mp3 differ diff --git a/public/audio/bgm/ruins.mp3 b/public/audio/bgm/ruins.mp3 new file mode 100644 index 000000000..6cc26a69b Binary files /dev/null and b/public/audio/bgm/ruins.mp3 differ diff --git a/public/audio/bgm/sea.mp3 b/public/audio/bgm/sea.mp3 index a46b1094b..df95b4ff5 100644 Binary files a/public/audio/bgm/sea.mp3 and b/public/audio/bgm/sea.mp3 differ diff --git a/public/audio/bgm/space.mp3 b/public/audio/bgm/space.mp3 index eed480c8d..66907bebe 100644 Binary files a/public/audio/bgm/space.mp3 and b/public/audio/bgm/space.mp3 differ diff --git a/public/audio/bgm/swamp.mp3 b/public/audio/bgm/swamp.mp3 index fd6f21dbd..ea6e985c0 100644 Binary files a/public/audio/bgm/swamp.mp3 and b/public/audio/bgm/swamp.mp3 differ diff --git a/public/audio/bgm/elite_1.mp3 b/public/audio/bgm/volcano.mp3 similarity index 53% rename from public/audio/bgm/elite_1.mp3 rename to public/audio/bgm/volcano.mp3 index 78e3ac8f3..8f0ba65d1 100644 Binary files a/public/audio/bgm/elite_1.mp3 and b/public/audio/bgm/volcano.mp3 differ diff --git a/public/audio/bgm/water.mp3 b/public/audio/bgm/water.mp3 index 404029ecf..aab924c79 100644 Binary files a/public/audio/bgm/water.mp3 and b/public/audio/bgm/water.mp3 differ diff --git a/public/images/arenas/13a.png b/public/images/arenas/arena_blue_a.png similarity index 100% rename from public/images/arenas/13a.png rename to public/images/arenas/arena_blue_a.png diff --git a/public/images/arenas/13b.png b/public/images/arenas/arena_blue_b.png similarity index 100% rename from public/images/arenas/13b.png rename to public/images/arenas/arena_blue_b.png diff --git a/public/images/arenas/11.png b/public/images/arenas/arena_blue_bg.png similarity index 100% rename from public/images/arenas/11.png rename to public/images/arenas/arena_blue_bg.png diff --git a/public/images/arenas/11a.png b/public/images/arenas/arena_brown_a.png similarity index 100% rename from public/images/arenas/11a.png rename to public/images/arenas/arena_brown_a.png diff --git a/public/images/arenas/11b.png b/public/images/arenas/arena_brown_b.png similarity index 100% rename from public/images/arenas/11b.png rename to public/images/arenas/arena_brown_b.png diff --git a/public/images/arenas/12.png b/public/images/arenas/arena_brown_bg.png similarity index 100% rename from public/images/arenas/12.png rename to public/images/arenas/arena_brown_bg.png diff --git a/public/images/arenas/14a.png b/public/images/arenas/arena_orange_a.png similarity index 100% rename from public/images/arenas/14a.png rename to public/images/arenas/arena_orange_a.png diff --git a/public/images/arenas/14b.png b/public/images/arenas/arena_orange_b.png similarity index 100% rename from public/images/arenas/14b.png rename to public/images/arenas/arena_orange_b.png diff --git a/public/images/arenas/13.png b/public/images/arenas/arena_orange_bg.png similarity index 100% rename from public/images/arenas/13.png rename to public/images/arenas/arena_orange_bg.png diff --git a/public/images/arenas/15a.png b/public/images/arenas/arena_pink_a.png similarity index 100% rename from public/images/arenas/15a.png rename to public/images/arenas/arena_pink_a.png diff --git a/public/images/arenas/15b.png b/public/images/arenas/arena_pink_b.png similarity index 100% rename from public/images/arenas/15b.png rename to public/images/arenas/arena_pink_b.png diff --git a/public/images/arenas/15.png b/public/images/arenas/arena_pink_bg.png similarity index 100% rename from public/images/arenas/15.png rename to public/images/arenas/arena_pink_bg.png diff --git a/public/images/arenas/12a.png b/public/images/arenas/arena_purple_a.png similarity index 100% rename from public/images/arenas/12a.png rename to public/images/arenas/arena_purple_a.png diff --git a/public/images/arenas/12b.png b/public/images/arenas/arena_purple_b.png similarity index 100% rename from public/images/arenas/12b.png rename to public/images/arenas/arena_purple_b.png diff --git a/public/images/arenas/14.png b/public/images/arenas/arena_purple_bg.png similarity index 100% rename from public/images/arenas/14.png rename to public/images/arenas/arena_purple_bg.png diff --git a/public/images/arenas/09a.png b/public/images/arenas/cave_a.png similarity index 100% rename from public/images/arenas/09a.png rename to public/images/arenas/cave_a.png diff --git a/public/images/arenas/09b.png b/public/images/arenas/cave_b.png similarity index 100% rename from public/images/arenas/09b.png rename to public/images/arenas/cave_b.png diff --git a/public/images/arenas/09.png b/public/images/arenas/cave_bg.png similarity index 100% rename from public/images/arenas/09.png rename to public/images/arenas/cave_bg.png diff --git a/public/images/arenas/10a.png b/public/images/arenas/desert_a.png similarity index 100% rename from public/images/arenas/10a.png rename to public/images/arenas/desert_a.png diff --git a/public/images/arenas/10b.png b/public/images/arenas/desert_b.png similarity index 100% rename from public/images/arenas/10b.png rename to public/images/arenas/desert_b.png diff --git a/public/images/arenas/10.png b/public/images/arenas/desert_bg.png similarity index 100% rename from public/images/arenas/10.png rename to public/images/arenas/desert_bg.png diff --git a/public/images/arenas/03a.png b/public/images/arenas/forest_a.png similarity index 100% rename from public/images/arenas/03a.png rename to public/images/arenas/forest_a.png diff --git a/public/images/arenas/03b.png b/public/images/arenas/forest_b.png similarity index 100% rename from public/images/arenas/03b.png rename to public/images/arenas/forest_b.png diff --git a/public/images/arenas/03.png b/public/images/arenas/forest_bg.png similarity index 100% rename from public/images/arenas/03.png rename to public/images/arenas/forest_bg.png diff --git a/public/images/arenas/02a.png b/public/images/arenas/grass_a.png similarity index 100% rename from public/images/arenas/02a.png rename to public/images/arenas/grass_a.png diff --git a/public/images/arenas/02b.png b/public/images/arenas/grass_b.png similarity index 100% rename from public/images/arenas/02b.png rename to public/images/arenas/grass_b.png diff --git a/public/images/arenas/02.png b/public/images/arenas/grass_bg.png similarity index 100% rename from public/images/arenas/02.png rename to public/images/arenas/grass_bg.png diff --git a/public/images/arenas/ice_cave_a.png b/public/images/arenas/ice_cave_a.png new file mode 100644 index 000000000..cc4e44693 Binary files /dev/null and b/public/images/arenas/ice_cave_a.png differ diff --git a/public/images/arenas/ice_cave_b.png b/public/images/arenas/ice_cave_b.png new file mode 100644 index 000000000..6e8964da0 Binary files /dev/null and b/public/images/arenas/ice_cave_b.png differ diff --git a/public/images/arenas/ice_cave_bg.png b/public/images/arenas/ice_cave_bg.png new file mode 100644 index 000000000..898856961 Binary files /dev/null and b/public/images/arenas/ice_cave_bg.png differ diff --git a/public/images/arenas/08a.png b/public/images/arenas/land_a.png similarity index 100% rename from public/images/arenas/08a.png rename to public/images/arenas/land_a.png diff --git a/public/images/arenas/08b.png b/public/images/arenas/land_b.png similarity index 100% rename from public/images/arenas/08b.png rename to public/images/arenas/land_b.png diff --git a/public/images/arenas/08.png b/public/images/arenas/land_bg.png similarity index 100% rename from public/images/arenas/08.png rename to public/images/arenas/land_bg.png diff --git a/public/images/arenas/07a.png b/public/images/arenas/mountain_a.png similarity index 100% rename from public/images/arenas/07a.png rename to public/images/arenas/mountain_a.png diff --git a/public/images/arenas/07b.png b/public/images/arenas/mountain_b.png similarity index 100% rename from public/images/arenas/07b.png rename to public/images/arenas/mountain_b.png diff --git a/public/images/arenas/05.png b/public/images/arenas/mountain_bg.png similarity index 100% rename from public/images/arenas/05.png rename to public/images/arenas/mountain_bg.png diff --git a/public/images/arenas/01a.png b/public/images/arenas/plains_a.png similarity index 100% rename from public/images/arenas/01a.png rename to public/images/arenas/plains_a.png diff --git a/public/images/arenas/01b.png b/public/images/arenas/plains_b.png similarity index 100% rename from public/images/arenas/01b.png rename to public/images/arenas/plains_b.png diff --git a/public/images/arenas/01.png b/public/images/arenas/plains_bg.png similarity index 100% rename from public/images/arenas/01.png rename to public/images/arenas/plains_bg.png diff --git a/public/images/arenas/06a.png b/public/images/arenas/sea_a.png similarity index 100% rename from public/images/arenas/06a.png rename to public/images/arenas/sea_a.png diff --git a/public/images/arenas/06b.png b/public/images/arenas/sea_b.png similarity index 100% rename from public/images/arenas/06b.png rename to public/images/arenas/sea_b.png diff --git a/public/images/arenas/06.png b/public/images/arenas/sea_bg.png similarity index 100% rename from public/images/arenas/06.png rename to public/images/arenas/sea_bg.png diff --git a/public/images/arenas/05a.png b/public/images/arenas/swamp_a.png similarity index 100% rename from public/images/arenas/05a.png rename to public/images/arenas/swamp_a.png diff --git a/public/images/arenas/05b.png b/public/images/arenas/swamp_b.png similarity index 100% rename from public/images/arenas/05b.png rename to public/images/arenas/swamp_b.png diff --git a/public/images/arenas/07.png b/public/images/arenas/swamp_bg.png similarity index 100% rename from public/images/arenas/07.png rename to public/images/arenas/swamp_bg.png diff --git a/public/images/arenas/04a.png b/public/images/arenas/water_a.png similarity index 100% rename from public/images/arenas/04a.png rename to public/images/arenas/water_a.png diff --git a/public/images/arenas/04b.png b/public/images/arenas/water_b.png similarity index 100% rename from public/images/arenas/04b.png rename to public/images/arenas/water_b.png diff --git a/public/images/arenas/04.png b/public/images/arenas/water_bg.png similarity index 100% rename from public/images/arenas/04.png rename to public/images/arenas/water_bg.png diff --git a/src/arena.ts b/src/arena.ts index 6c4a61c77..d5820cafd 100644 --- a/src/arena.ts +++ b/src/arena.ts @@ -16,11 +16,15 @@ export enum ArenaType { LAND, CAVE, DESERT, - ARENA_BROWN, - ARENA_PURPLE, - ARENA_BLUE, - ARENA_ORANGE, - ARENA_PINK + ICE_CAVE, + MEADOW, + POWER_PLANT, + VOLCANO, + GRAVEYARD, + DOJO, + RUINS, + ABYSS, + SPACE }; enum PoolTier { @@ -77,10 +81,18 @@ export class Arena { const arenaPools = { [ArenaType.PLAINS]: { - [PoolTier.COMMON]: [ Species.CATERPIE, Species.METAPOD, Species.WEEDLE, Species.KAKUNA, Species.PIDGEY, Species.RATTATA, Species.SPEAROW, Species.SENTRET, Species.HOOTHOOT, Species.HOPPIP, Species.SUNKERN, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.SILCOON, Species.CASCOON, Species.TAILLOW, Species.STARLY, Species.BIDOOF, Species.KRICKETOT, Species.PATRAT, Species.LILLIPUP, Species.PIDOVE, Species.COTTONEE, Species.PETILIL, Species.MINCCINO, Species.FOONGUS ], - [PoolTier.UNCOMMON]: [ Species.EKANS, Species.NIDORAN_F, Species.NIDORAN_M, Species.PARAS, Species.VENONAT, Species.MEOWTH, Species.BELLSPROUT, Species.LEDYBA, Species.SPINARAK, Species.PINECO, Species.LOTAD, Species.SEEDOT, Species.SHROOMISH, Species.NINCADA, Species.AZURILL, Species.WHISMUR, Species.SKITTY, Species.GULPIN, Species.BUDEW, Species.BURMY, Species.COMBEE, Species.CHERUBI, Species.VENIPEDE ], - [PoolTier.RARE]: [ Species.PICHU, Species.CLEFFA, Species.IGGLYBUFF, Species.WOOPER, Species.RALTS, Species.SURSKIT, Species.SLAKOTH, Species.BARBOACH, Species.DUCKLETT ], - [PoolTier.ULTRA_RARE]: [ Species.EEVEE, Species.TOGEPI, Species.TYROGUE ], + [PoolTier.COMMON]: [ + Species.CATERPIE, Species.METAPOD, Species.WEEDLE, Species.KAKUNA, Species.PIDGEY, Species.RATTATA, Species.SPEAROW, Species.SENTRET, Species.HOOTHOOT, Species.LEDYBA, + Species.HOPPIP, Species.SUNKERN, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.SILCOON, Species.CASCOON, Species.TAILLOW, Species.STARLY, Species.BIDOOF, + Species.KRICKETOT, Species.PATRAT, Species.LILLIPUP, Species.PIDOVE, Species.COTTONEE, Species.PETILIL, Species.MINCCINO, Species.FOONGUS + ], + [PoolTier.UNCOMMON]: [ + Species.EKANS, Species.NIDORAN_F, Species.NIDORAN_M, Species.ODDISH, Species.PARAS, Species.VENONAT, Species.MEOWTH, Species.BELLSPROUT, Species.PICHU, Species.IGGLYBUFF, + Species.LOTAD, Species.SEEDOT, Species.SHROOMISH, Species.NINCADA, Species.AZURILL, Species.WHISMUR, Species.SKITTY, Species.BUDEW, Species.COMBEE, Species.CHERUBI, + Species.VENIPEDE + ], + [PoolTier.RARE]: [ Species.ABRA, Species.CLEFFA, Species.WOOPER, Species.RALTS, Species.SURSKIT, Species.SLAKOTH, Species.DUCKLETT ], + [PoolTier.ULTRA_RARE]: [ Species.EEVEE, Species.TOGEPI, Species.SMEARGLE, Species.TYROGUE, Species.WYNAUT ], [PoolTier.LEGENDARY]: [ Species.DITTO ] } }; @@ -172,7 +184,28 @@ const arenaPoolPredicates = { [ArenaType.DESERT]: (p, t) => { return p.isOfType(Type.GROUND) || p.isOfType(Type.ROCK); }, - [ArenaType.ARENA_PINK]: (p, t) => { - return p.legendary || p.mythical; + [ArenaType.ICE_CAVE]: (p, t) => { + return p.isOfType(Type.ICE); + }, + [ArenaType.MEADOW]: (p, t) => { + return p.isOfType(Type.FAIRY); + }, + [ArenaType.POWER_PLANT]: (p, t) => { + return p.isOfType(Type.ELECTRIC); + }, + [ArenaType.VOLCANO]: (p, t) => { + return p.isOfType(Type.FIRE); + }, + [ArenaType.GRAVEYARD]: (p, t) => { + return p.isOfType(Type.GHOST); + }, + [ArenaType.DOJO]: (p, t) => { + return p.isOfType(Type.FIGHTING); + }, + [ArenaType.RUINS]: (p, t) => { + return p.isOfType(Type.PSYCHIC); + }, + [ArenaType.ABYSS]: (p, t) => { + return p.isOfType(Type.DARK); } }; \ No newline at end of file diff --git a/src/battle-phase.ts b/src/battle-phase.ts index d50ee8701..91737c2c2 100644 --- a/src/battle-phase.ts +++ b/src/battle-phase.ts @@ -757,7 +757,7 @@ export class SelectModifierPhase extends BattlePhase { super.start(); regenerateModifierPoolThresholds(this.scene.getParty()); - const types = [ getNewModifierType(), getNewModifierType(), getNewModifierType(), getNewModifierType(), getNewModifierType(), getNewModifierType() ]; + const types = [ getNewModifierType(), getNewModifierType(), getNewModifierType() ]; this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, (cursor: integer) => { if (cursor < 0) { diff --git a/src/battle-scene.ts b/src/battle-scene.ts index a6a95de66..5a22d7739 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -117,12 +117,12 @@ export default class BattleScene extends Phaser.Scene { this.loadAtlas('party_cancel', 'ui'); // Load arena images - for (let a = 1; a <= 15; a++) { - const arenaId = Utils.padInt(a, 2); - this.loadImage(`arena_${arenaId}`, 'arenas', `${arenaId}.png`); - this.loadImage(`arena_${arenaId}a`, 'arenas', `${arenaId}a.png`); - this.loadImage(`arena_${arenaId}b`, 'arenas', `${arenaId}b.png`); - } + Utils.getEnumValues(ArenaType).map(at => { + const atKey = ArenaType[at].toLowerCase(); + this.loadImage(`${atKey}_bg`, 'arenas', `${atKey}_bg.png`); + this.loadImage(`${atKey}_a`, 'arenas', `${atKey}_a.png`); + this.loadImage(`${atKey}_b`, 'arenas', `${atKey}_b.png`); + }); // Load trainer images this.loadImage('trainer_m', 'trainer'); @@ -177,31 +177,15 @@ export default class BattleScene extends Phaser.Scene { this.field = field; // Init arena - const arenas = [ - new Arena(this, ArenaType.PLAINS, 'battle'), - new Arena(this, ArenaType.GRASS, 'grass'), - new Arena(this, ArenaType.FOREST, 'forest'), - new Arena(this, ArenaType.WATER, 'water'), - new Arena(this, ArenaType.SWAMP, 'swamp'), - new Arena(this, ArenaType.SEA, 'sea'), - new Arena(this, ArenaType.MOUNTAIN, 'mountain'), - new Arena(this, ArenaType.LAND, 'land'), - new Arena(this, ArenaType.CAVE, 'cave'), - new Arena(this, ArenaType.DESERT, 'desert'), - new Arena(this, ArenaType.ARENA_BROWN, 'elite_1'), - new Arena(this, ArenaType.ARENA_BLUE, 'elite_2'), - new Arena(this, ArenaType.ARENA_PURPLE, 'elite_3'), - new Arena(this, ArenaType.ARENA_PINK, 'elite_4'), - new Arena(this, ArenaType.ARENA_ORANGE, 'elite_5') - ]; - const arena = arenas[0];//arenas[Utils.randInt(15)]; + const arenas = Utils.getEnumValues(ArenaType).map(at => new Arena(this, at, ArenaType[at].toLowerCase())); + const arena = arenas[Utils.randInt(11)]; this.arena = arena; - this.arenaBg = this.add.image(0, 0, `arena_${Utils.padInt(arena.arenaType, 2)}`); - this.arenaPlayer = this.add.image(340, 20, `arena_${Utils.padInt(arena.arenaType, 2)}a`); - this.arenaEnemy = this.add.image(-240, 13, `arena_${Utils.padInt(arena.arenaType, 2)}b`); - this.arenaEnemy2 = this.add.image(-240, 13, `arena_${Utils.padInt(arena.arenaType, 2)}b`); + this.arenaBg = this.add.image(0, 0, `${ArenaType[arena.arenaType].toLowerCase()}_bg`); + this.arenaPlayer = this.add.image(340, 20, `${ArenaType[arena.arenaType].toLowerCase()}_a`); + this.arenaEnemy = this.add.image(-240, 13, `${ArenaType[arena.arenaType].toLowerCase()}_b`); + this.arenaEnemy2 = this.add.image(-240, 13, `${ArenaType[arena.arenaType].toLowerCase()}_b`); [this.arenaBg, this.arenaPlayer, this.arenaEnemy, this.arenaEnemy2].forEach(a => { a.setOrigin(0, 0); diff --git a/src/pokemon-species.ts b/src/pokemon-species.ts index e0f956ff0..141d059f1 100644 --- a/src/pokemon-species.ts +++ b/src/pokemon-species.ts @@ -920,13 +920,4 @@ export const allSpecies = [ ].map(p => { let i = 0; return new PokemonSpecies(p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++], p[i++]); -}); - -console.log( - Species[getPokemonSpecies(Species.PICHU).getSpeciesForLevel(5)], - Species[getPokemonSpecies(Species.PICHU).getSpeciesForLevel(20)], - Species[getPokemonSpecies(Species.PICHU).getSpeciesForLevel(50)], - Species[getPokemonSpecies(Species.EXEGGUTOR).getSpeciesForLevel(5)], - Species[getPokemonSpecies(Species.EXEGGUTOR).getSpeciesForLevel(20)], - Species[getPokemonSpecies(Species.EXEGGUTOR).getSpeciesForLevel(50)] -); \ No newline at end of file +}); \ No newline at end of file