arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-03 23:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only fetch needed variety

Browse Source
This commit is contained in:
Dragon Fire
2021-02-01 17:40:10 -05:00
parent 6445275c2a
commit 8cc4296183
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games-sp/pokemon-advantage.js
+2 -2
View File
@@ -73,8 +73,8 @@ module.exports = class PokemonAdvantageCommand extends Command {
const pkmn1 = await this.client.pokemon.fetch(num1);
const num2 = Math.floor(Math.random() * (this.client.pokemon.pokemonCount + 1));
const pkmn2 = await this.client.pokemon.fetch(num2);
if (!pkmn1.gameDataCached) await pkmn1.fetchGameData();
if (!pkmn2.gameDataCached) await pkmn2.fetchGameData();
await pkmn1.fetchDefaultVariety();
await pkmn2.fetchDefaultVariety();
const attachment = await this.createImage(pkmn1, pkmn2, null);
const answer = this.calculateAdvantage(pkmn1, pkmn2);
const answerAttachment = await this.createImage(pkmn1, pkmn2, answer);
structures/pokemon/Pokemon.js
+6 -1
View File
@@ -42,7 +42,8 @@ module.exports = class Pokemon {
statsDiffer: data.missingno ? true : null,
default: variety.is_default,
types: data.missingno ? variety.types : [],
abilities: data.missingno ? variety.abilities : []
abilities: data.missingno ? variety.abilities : [],
gameDataCached: data.missingno || false
};
});
this.chain = {
@@ -176,6 +177,7 @@ module.exports = class Pokemon {
async fetchDefaultVariety() {
const defaultVariety = this.varieties.find(variety => variety.default);
if (defaultVariety.gameDataCached) return this;
const { body: defaultBody } = await request.get(`https://pokeapi.co/api/v2/pokemon/${defaultVariety.id}`);
defaultVariety.types.push(...defaultBody.types.map(type => firstUpperCase(type.type.name)));
for (const ability of defaultBody.abilities) {
@@ -191,6 +193,7 @@ module.exports = class Pokemon {
spd: defaultBody.stats.find(stat => stat.stat.name === 'speed').base_stat
};
defaultVariety.statsDiffer = true;
defaultVariety.gameDataCached = true;
const inSwordShield = defaultBody.moves
.some(move => move.version_group_details.some(mve => mve.version_group.name === 'sword-shield'));
this.moveSetVersion = inSwordShield ? 'sword-shield' : 'ultra-sun-ultra-moon';
@@ -206,6 +209,7 @@ module.exports = class Pokemon {
const defaultVariety = this.varieties.find(variety => variety.default);
for (const variety of this.varieties) {
if (variety.id === defaultVariety.id) continue;
if (variety.gameDataCached) continue;
const { body } = await request.get(`https://pokeapi.co/api/v2/pokemon/${variety.id}`);
const { body: formBody } = await request.get(`https://pokeapi.co/api/v2/pokemon-form/${variety.id}`);
variety.types.push(...body.types.map(type => firstUpperCase(type.type.name)));
@@ -229,6 +233,7 @@ module.exports = class Pokemon {
const abilityData = await this.store.abilities.fetch(ability.ability.name);
variety.abilities.push(abilityData);
}
variety.gameDataCached = true;
}
return this.varieties;
}