diff --git a/commands/pokemon.js b/commands/pokemon.js index 7f2d2db..fc6556b 100644 --- a/commands/pokemon.js +++ b/commands/pokemon.js @@ -23,7 +23,7 @@ function pokemonNumber(number) { const game = pokemon_games.find(game => game.id === pokemonNumber.first_appeared); const fact = null; //pokemonNumber.some_facts[Math.floor(Math.random() * pokemonNumber.some_facts.length)]; const types = pokemonNumber.type.join(', '); - return `**${pokemonNumber.name}**\nTypes: ${types}\nHeight: ${pokemonNumber.height}\nWeight: ${pokemonNumber.weight}\nFirst appeared in: ${game.name} (${game.year})\n${fact}`; + return `**${pokemonNumber.name}**\nTypes: ${types}\nHeight: ${pokemonNumber.height}\nWeight: ${pokemonNumber.weight}\nFirst appeared in: ${game.name} (${game.year})\n${pokemonNumber.img}`; } function pokemonName(name) { @@ -34,7 +34,7 @@ function pokemonName(name) { const game = pokemon_games.find(game => game.id === pokemonName.first_appeared); const fact = null;//pokemonName.some_facts[Math.floor(Math.random() * pokemonName.some_facts.length)]; const types = pokemonName.type.join(', '); - return `**${pokemonName.name}**\nTypes: ${types}\nHeight: ${pokemonName.height}\nWeight: ${pokemonName.weight}\nFirst appeared in: ${game.name} (${game.year})\n${fact}`; + return `**${pokemonName.name}**\nTypes: ${types}\nHeight: ${pokemonName.height}\nWeight: ${pokemonName.weight}\nFirst appeared in: ${game.name} (${game.year})\n${pokemonName.img}`; } module.exports = { diff --git a/databases/pokemon.json b/databases/pokemon.json index 494c4fa..95da335 100644 --- a/databases/pokemon.json +++ b/databases/pokemon.json @@ -818,6 +818,62 @@ "Mankey is the first Fighting-type Pokémon in the National Pokédex." ], "img": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/official-artwork/56.png" + }, + { + "number": 57, + "name": "Primeape", + "type": [ + "Fighting" + ], + "height": "1.0 m", + "weight": "32.0 kg", + "first_appeared": 1, + "some_facts": [ + "Primeape is the evolved form of Mankey." + ], + "img": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/official-artwork/57.png" + }, + { + "number": 58, + "name": "Growlithe", + "type": [ + "Fire" + ], + "height": "0.7 m", + "weight": "19.0 kg", + "first_appeared": 1, + "some_facts": [ + "Growlithe is the first Fire-type Pokémon in the National Pokédex." + ], + "img": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/official-artwork/58.png" + }, + { + "number": 59, + "name": "Arcanine", + "type": [ + "Fire" + ], + "height": "1.9 m", + "weight": "155.0 kg", + "first_appeared": 1, + "some_facts": [ + "Arcanine is the evolved form of Growlithe." + ], + "img": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/official-artwork/59.png" + }, + { + "number": 60, + "name": "Poliwag", + "type": [ + "Water" + ], + "height": "0.6 m", + "weight": "12.4 kg", + "first_appeared": 1, + "some_facts": [ + "Poliwag is the first Water-type Pokémon in the National Pokédex." + ], + "img": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/other/official-artwork/60.png" } ] \ No newline at end of file diff --git a/databases/pokemon_games.json b/databases/pokemon_games.json index c05cf85..18748ae 100644 --- a/databases/pokemon_games.json +++ b/databases/pokemon_games.json @@ -13,5 +13,95 @@ "id": 3, "name": "Pokémon Gold and Silver", "year": 1999 + }, + { + "id": 4, + "name": "Pokémon Crystal", + "year": 2000 + }, + { + "id": 5, + "name": "Pokémon Ruby and Sapphire", + "year": 2002 + }, + { + "id": 6, + "name": "Pokémon FireRed and LeafGreen", + "year": 2004 + }, + { + "id": 7, + "name": "Pokémon Emerald", + "year": 2004 + }, + { + "id": 8, + "name": "Pokémon Diamond and Pearl", + "year": 2006 + }, + { + "id": 9, + "name": "Pokémon Platinum", + "year": 2008 + }, + { + "id": 10, + "name": "Pokémon HeartGold and SoulSilver", + "year": 2009 + }, + { + "id": 11, + "name": "Pokémon Black and White", + "year": 2010 + }, + { + "id": 12, + "name": "Pokémon Black 2 and White 2", + "year": 2012 + }, + { + "id": 13, + "name": "Pokémon X and Y", + "year": 2013 + }, + { + "id": 14, + "name": "Pokémon Omega Ruby and Alpha Sapphire", + "year": 2014 + }, + { + "id": 15, + "name": "Pokémon Sun and Moon", + "year": 2016 + }, + { + "id": 16, + "name": "Pokémon Ultra Sun and Ultra Moon", + "year": 2017 + }, + { + "id": 17, + "name": "Pokémon Let's Go, Pikachu! and Let's Go, Eevee!", + "year": 2018 + }, + { + "id": 18, + "name": "Pokémon Sword and Shield", + "year": 2019 + }, + { + "id": 19, + "name": "Pokémon Brilliant Diamond and Shining Pearl", + "year": 2021 + }, + { + "id": 20, + "name": "Pokémon Legends: Arceus", + "year": 2022 + }, + { + "id": 21, + "name": "Pokémon Scarlet and Violet", + "year": 2022 } ] \ No newline at end of file