diff --git a/package.json b/package.json index c0228f8..147a561 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pogo-data-generator", - "version": "2.0.0", + "version": "2.0.1", "description": "Pokemon GO project data generator", "author": "TurtIeSocks", "license": "Apache-2.0", diff --git a/src/classes/PokeApi.ts b/src/classes/PokeApi.ts index b65a2c6..73aa3e9 100644 --- a/src/classes/PokeApi.ts +++ b/src/classes/PokeApi.ts @@ -113,7 +113,9 @@ export default class PokeApi extends Masterfile { return url } - private buildStatMap(stats: PokeApiStats['stats']): { [stat: string]: number } { + private buildStatMap(stats: PokeApiStats['stats']): { + [stat: string]: number + } { const baseStats: { [stat: string]: number } = {} stats.forEach((stat) => { baseStats[stat.stat.name] = stat.base_stat @@ -122,7 +124,9 @@ export default class PokeApi extends Masterfile { } private typeNameToTypeId(typeName: string): number { - return Rpc.HoloPokemonType[`POKEMON_TYPE_${typeName.toUpperCase()}` as TypeProto] + return Rpc.HoloPokemonType[ + `POKEMON_TYPE_${typeName.toUpperCase()}` as TypeProto + ] } private mapTypeIds(types: PokeApiStats['types']): number[] { @@ -234,7 +238,7 @@ export default class PokeApi extends Masterfile { !parsedPokemon[id].defense || !parsedPokemon[id].stamina || parsedPokemon[id].types.length === 0 || - (pokeApiIds?.includes(+id)) + pokeApiIds?.includes(+id) ) { await this.pokemonApi(id) } @@ -267,7 +271,8 @@ export default class PokeApi extends Masterfile { 0.79030001, ) - const nerfCheck = cp > 4000 ? this.calculatePogoStats(baseStats, true) : initial + const nerfCheck = + cp > 4000 ? this.calculatePogoStats(baseStats, true) : initial this.baseStats[id] = { pokemonName: this.capitalize(statsData.name), quickMoves: statsData.moves @@ -364,9 +369,9 @@ export default class PokeApi extends Masterfile { async tempEvoApi(parsedPokemon: AllPokemon) { const discoveredMega = ( - (await this.fetch( - this.buildUrl('pokemon?limit=100000&offset=0'), - )) as { results?: BasePokeApiStruct[] } + (await this.fetch(this.buildUrl('pokemon?limit=100000&offset=0'))) as { + results?: BasePokeApiStruct[] + } )?.results ?.map((pokemon) => pokemon.name) ?.filter((name) => /-mega(?:-[xyz])?$/.test(name)) || [] @@ -406,10 +411,13 @@ export default class PokeApi extends Masterfile { attack: computedStats.attack, defense: computedStats.defense, stamina: computedStats.stamina, - types: baseTypes && this.compare(types, baseTypes) ? undefined : types, + types: + baseTypes && this.compare(types, baseTypes) ? undefined : types, unreleased: true, } - const alreadyExistsInGame = parsedPokemon[pokemonId]?.tempEvolutions?.some( + const alreadyExistsInGame = parsedPokemon[ + pokemonId + ]?.tempEvolutions?.some( (temp) => temp.tempEvoId === newTheoretical.tempEvoId, ) if (alreadyExistsInGame) return @@ -423,7 +431,9 @@ export default class PokeApi extends Masterfile { const existingTempEvolution = this.tempEvos[type][ pokemonId - ].tempEvolutions.find((temp) => temp.tempEvoId === newTheoretical.tempEvoId) + ].tempEvolutions.find( + (temp) => temp.tempEvoId === newTheoretical.tempEvoId, + ) if (existingTempEvolution) { const typesEqual = (!existingTempEvolution.types && !newTheoretical.types) || diff --git a/src/classes/Pokemon.ts b/src/classes/Pokemon.ts index 4c8d44f..2bb2f4c 100644 --- a/src/classes/Pokemon.ts +++ b/src/classes/Pokemon.ts @@ -26,7 +26,10 @@ import type { QuestTypeProto, TypeProto, } from '../typings/protos' -import { mergeTempEvolutions, sortTempEvolutions } from '../utils/tempEvolutions' +import { + mergeTempEvolutions, + sortTempEvolutions, +} from '../utils/tempEvolutions' import Masterfile from './Masterfile' import PokeApi from './PokeApi' import PokemonOverrides from './PokemonOverrides' @@ -413,7 +416,7 @@ export default class Pokemon extends Masterfile { } const values = Object.entries( object.data.pokemonExtendedSettings.sizeSettings, - ).map(([name, value]) => ({ name, value: Number(value) })) + ).map(([name, value]) => ({ name, value })) const protoForm = object.data.pokemonExtendedSettings.form ? typeof object.data.pokemonExtendedSettings.form === 'number' @@ -653,9 +656,7 @@ export default class Pokemon extends Masterfile { if (family !== primaryForm.family) { form.family = family } - if ( - pokemonSettings.evolutionBranch?.some((evo) => evo.evolution) - ) { + if (pokemonSettings.evolutionBranch?.some((evo) => evo.evolution)) { if (!form.evolutions) { form.evolutions = [] } @@ -737,17 +738,13 @@ export default class Pokemon extends Masterfile { 'unexpected Smeargle quick moves', pokemonSettings.quickMoves, ) - if ( - pokemonSettings.cinematicMoves?.length - ) + if (pokemonSettings.cinematicMoves?.length) console.warn( 'unexpected Smeargle charged moves', pokemonSettings.cinematicMoves, ) } - if ( - pokemonSettings.evolutionBranch?.some((evo) => evo.evolution) - ) { + if (pokemonSettings.evolutionBranch?.some((evo) => evo.evolution)) { this.parsedPokemon[id].evolutions = this.compileEvos( pokemonSettings.evolutionBranch, ) diff --git a/src/typings/general.ts b/src/typings/general.ts index 9a8417f..ff14103 100644 --- a/src/typings/general.ts +++ b/src/typings/general.ts @@ -179,6 +179,7 @@ export interface PokemonSizeSettings { mUpperBound: number xlUpperBound: number xxlUpperBound: number + disablePokedexRecordDisplayForForms: boolean } export interface TempEvo { diff --git a/src/utils/tempEvolutions.ts b/src/utils/tempEvolutions.ts index faedfdd..357ab10 100644 --- a/src/utils/tempEvolutions.ts +++ b/src/utils/tempEvolutions.ts @@ -69,5 +69,7 @@ export const mergeTempEvolutions = ( const estimatedList = Array.isArray(estimated) ? estimated : [] const actualList = Array.isArray(actual) ? actual : [] - return dedupeTempEvolutions([...estimatedList, ...actualList], { prefer: 'last' }) + return dedupeTempEvolutions([...estimatedList, ...actualList], { + prefer: 'last', + }) }