From cb831793fabfdfc6b9cc685c3cfb8155254a7b68 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Sun, 16 Apr 2017 17:32:16 +0000 Subject: [PATCH] Improve Pokedex --- commands/search/pkdex.json | 504 ++++++++++++++++++------------------- commands/search/pokedex.js | 5 +- 2 files changed, 254 insertions(+), 255 deletions(-) diff --git a/commands/search/pkdex.json b/commands/search/pkdex.json index 67397dfd..2515d882 100644 --- a/commands/search/pkdex.json +++ b/commands/search/pkdex.json @@ -762,258 +762,258 @@ "grovyle": "The leaves growing out of Grovyle's body are convenient for camouflaging it from enemies in the forest. This Pokémon is a master at climbing trees in jungles." }, "species": { - "bulbasaur": "Seed Pokémon", - "ivysaur": "Seed Pokémon", - "venusaur": "Seed Pokémon", - "charmander": "Lizard Pokémon", - "charmeleon": "Flame Pokémon", - "charizard": "Flame Pokémon", - "squirtle": "Tiny Turtle Pokémon", - "wartortle": "Turtle Pokémon", - "blastoise": "Shellfish Pokémon", - "caterpie": "Worm Pokémon", - "metapod": "Cocoon Pokémon", - "butterfree": "Butterfly Pokémon", - "weedle": "Hairy Bug Pokémon", - "kakuna": "Cocoon Pokémon", - "beedrill": "Poison Bee Pokémon", - "pidgey": "Tiny Bird Pokémon", - "pidgeotto": "Bird Pokémon", - "pidgeot": "Bird Pokémon", - "rattata": "Mouse Pokémon", - "raticate": "Mouse Pokémon", - "spearow": "Tiny Bird Pokémon", - "fearow": "Beak Pokémon", - "ekans": "Snake Pokémon", - "arbok": "Cobra Pokémon", - "pikachu": "Mouse Pokémon", - "raichu": "Mouse Pokémon", - "sandshrew": "Mouse Pokémon", - "sandslash": "Mouse Pokémon", - "nidoranf": "Poison Pin Pokémon", - "nidorina": "Poison Pin Pokémon", - "nidoqueen": "Drill Pokémon", - "nidoranm": "Poison Pin Pokémon", - "nidorino": "Poison Pin Pokémon", - "nidoking": "Drill Pokémon", - "clefairy": "Fairy Pokémon", - "clefable": "Fairy Pokémon", - "vulpix": "Fox Pokémon", - "ninetales": "Fox Pokémon", - "jigglypuff": "Balloon Pokémon", - "wigglytuff": "Balloon Pokémon", - "zubat": "Bat Pokémon", - "golbat": "Bat Pokémon", - "oddish": "Weed Pokémon", - "gloom": "Weed Pokémon", - "vileplume": "Flower Pokémon", - "paras": "Mushroom Pokémon", - "parasect": "Mushroom Pokémon", - "venonat": "Insect Pokémon", - "venomoth": "Poison Moth Pokémon", - "diglett": "Mole Pokémon", - "dugtrio": "Mole Pokémon", - "meowth": "Scratch Cat Pokémon", - "persian": "Classy Cat Pokémon", - "psyduck": "Duck Pokémon", - "golduck": "Duck Pokémon", - "mankey": "Pig Monkey Pokémon", - "primeape": "Pig Monkey Pokémon", - "growlithe": "Puppy Pokémon", - "arcanine": "Legendary Pokémon", - "poliwag": "Tadpole Pokémon", - "poliwhirl": "Tadpole Pokémon", - "poliwrath": "Tadpole Pokémon", - "abra": "Psi Pokémon", - "kadabra": "Psi Pokémon", - "alakazam": "Psi Pokémon", - "machop": "Superpower Pokémon", - "machoke": "Superpower Pokémon", - "machamp": "Superpower Pokémon", - "bellsprout": "Flower Pokémon", - "weepinbell": "Flycatcher Pokémon", - "victreebel": "Flycatcher Pokémon", - "tentacool": "Jellyfish Pokémon", - "tentacruel": "Jellyfish Pokémon", - "geodude": "Rock Pokémon", - "graveler": "Rock Pokémon", - "golem": "Megaton Pokémon", - "ponyta": "Fire Horse Pokémon", - "rapidash": "Fire Horse Pokémon", - "slowpoke": "Dopey Pokémon", - "slowbro": "Hermit Crab Pokémon", - "magnemite": "Magnet Pokémon", - "magneton": "Magnet Pokémon", - "farfetch'd": "Wild Duck Pokémon", - "doduo": "Twin Bird Pokémon", - "dodrio": "Triple Bird Pokémon", - "seel": "Sea Lion Pokémon", - "dewgong": "Sea Lion Pokémon", - "grimer": "Sludge Pokémon", - "muk": "Sludge Pokémon", - "shellder": "Bivalve Pokémon", - "cloyster": "Bivalve Pokémon", - "gastly": "Gas Pokémon", - "haunter": "Gas Pokémon", - "gengar": "Shadow Pokémon", - "onix": "Rock Snake Pokémon", - "drowzee": "Hypnosis Pokémon", - "hypno": "Hypnosis Pokémon", - "krabby": "River Crab Pokémon", - "kingler": "Pincer Pokémon", - "voltorb": "Ball Pokémon", - "electrode": "Ball Pokémon", - "exeggcute": "Egg Pokémon", - "exeggutor": "Coconut Pokémon", - "cubone": "Lonely Pokémon", - "marowak": "Bone Keeper Pokémon", - "hitmonlee": "Kicking Pokémon", - "hitmonchan": "Punching Pokémon", - "lickitung": "Licking Pokémon", - "koffing": "Poison Gas Pokémon", - "weezing": "Poison Gas Pokémon", - "rhyhorn": "Spikes Pokémon", - "rhydon": "Drill Pokémon", - "chansey": "Egg Pokémon", - "tangela": "Vine Pokémon", - "kangaskhan": "Parent Pokémon", - "horsea": "Dragon Pokémon", - "seadra": "Dragon Pokémon", - "goldeen": "Goldfish Pokémon", - "seaking": "Goldfish Pokémon", - "staryu": "Star Shape Pokémon", - "starmie": "Mysterious Pokémon", - "mr. mime": "Barrier Pokémon", - "scyther": "Mantis Pokémon", - "jynx": "Human Shape Pokémon", - "electabuzz": "Electric Pokémon", - "magmar": "Spitfire Pokémon", - "pinsir": "Stag Beetle Pokémon", - "tauros": "Wild Bull Pokémon", - "magikarp": "Fish Pokémon", - "gyarados": "Atrocious Pokémon", - "lapras": "Transport Pokémon", - "ditto": "Transform Pokémon", - "eevee": "Evolution Pokémon", - "vaporeon": "Bubble Jet Pokémon", - "jolteon": "Lightning Pokémon", - "flareon": "Flame Pokémon", - "porygon": "Virtual Pokémon", - "omanyte": "Spiral Pokémon", - "omastar": "Spiral Pokémon", - "kabuto": "Shellfish Pokémon", - "kabutops": "Shellfish Pokémon", - "aerodactyl": "Fossil Pokémon", - "snorlax": "Sleeping Pokémon", - "articuno": "Freeze Pokémon", - "zapdos": "Electric Pokémon", - "moltres": "Flame Pokémon", - "dratini": "Dragon Pokémon", - "dragonair": "Dragon Pokémon", - "dragonite": "Dragon Pokémon", - "mewtwo": "Genetic Pokémon", - "mew": "New Species Pokémon", - "missingno.": " ??? Pokémon", - "chikorita": "Leaf Pokémon", - "bayleef": "Leaf Pokémon", - "meganium": "Herb Pokémon", - "cyndaquil": "Fire Mouse Pokémon", - "quilava": "Volcano Pokémon", - "typhlosion": "Volcano Pokémon", - "totodile": "Big Jaw Pokémon", - "croconaw": "Big Jaw Pokémon", - "feraligatr": "Big Jaw Pokémon", - "sentret": "Scout Pokémon", - "furret": "Long Body Pokémon", - "hoothoot": "Owl Pokémon", - "noctowl": "Owl Pokémon", - "ledyba": "Five Star Pokémon", - "ledian": "Five Star Pokémon", - "spinarak": "String Spit Pokémon", - "ariados": "Long Leg Pokémon", - "crobat": "Bat Pokémon", - "chinchou": "Angler Pokémon", - "lanturn": "Light Pokémon", - "pichu": "Tiny Mouse Pokémon", - "cleffa": "Star Shape Pokémon", - "igglybuff": "Balloon Pokémon", - "togepi": "Spike Ball Pokémon", - "togetic": "Happiness Pokémon", - "natu": "Tiny Bird Pokémon", - "xatu": "Mystic Pokémon", - "mareep": "Wool Pokémon", - "flaaffy": "Wool Pokémon", - "ampharos": "Light Pokémon", - "bellossom": "Flower Pokémon", - "marill": "Aqua Mouse Pokémon", - "azumarill": "Aqua Rabbit Pokémon", - "sudowoodo": "Imitation Pokémon", - "politoed": "Frog Pokémon", - "hoppip": "Cottonweed Pokémon", - "skiploom": "Cottonweed Pokémon", - "jumpluff": "Cottonweed Pokémon", - "aipom": "Long Tail Pokémon", - "sunkern": "Seed Pokémon", - "sunflora": "Sun Pokémon", - "yanma": "Clear Wing Pokémon", - "wooper": "Water Fish Pokémon", - "quagsire": "Water Fish Pokémon", - "espeon": "Sun Pokémon", - "umbreon": "Moonlight Pokémon", - "murkrow": "Darkness Pokémon", - "slowking": "Royal Pokémon", - "misdreavus": "Screech Pokémon", - "unown": "Symbol Pokémon", - "wobbuffet": "Patient Pokémon", - "girafarig": "Long Neck Pokémon", - "pineco": "Bagworm Pokémon", - "forretress": "Bagworm Pokémon", - "dunsparce": "Land Snake Pokémon", - "gligar": "Fly Scorpion Pokémon", - "steelix": "Iron Snake Pokémon", - "snubbull": "Fairy Pokémon", - "granbull": "Fairy Pokémon", - "qwilfish": "Balloon Pokémon", - "scizor": "Pincer Pokémon", - "shuckle": "Mold Pokémon", - "heracross": "Single Horn Pokémon", - "sneasel": "Sharp Claw Pokémon", - "teddiursa": "Little Bear Pokémon", - "ursaring": "Hibernator Pokémon", - "slugma": "Lava Pokémon", - "magcargo": "Lava Pokémon", - "swinub": "Pig Pokémon", - "piloswine": "Swine Pokémon", - "corsola": "Coral Pokémon", - "remoraid": "Jet Pokémon", - "octillery": "Jet Pokémon", - "delibird": "Delivery Pokémon", - "mantine": "Kite Pokémon", - "skarmory": "Armor Bird Pokémon", - "houndour": "Dark Pokémon", - "houndoom": "Dark Pokémon", - "kingdra": "Dragon Pokémon", - "phanpy": "Long Nose Pokémon", - "donphan": "Armor Pokémon", - "porygon2": "Virtual Pokémon", - "stantler": "Big Horn Pokémon", - "smeargle": "Painter Pokémon", - "tyrogue": "Scuffle Pokémon", - "hitmontop": "Handstand Pokémon", - "smoochum": "Kiss Pokémon", - "elekid": "Electric Pokémon", - "magby": "Live Coal Pokémon", - "miltank": "Milk Cow Pokémon", - "blissey": "Happiness Pokémon", - "raikou": "Thunder Pokémon", - "entei": "Volcano Pokémon", - "suicune": "Aurora Pokémon", - "larvitar": "Rock Skin Pokémon", - "pupitar": "Hard Shell Pokémon", - "tyranitar": "Armor Pokémon", - "lugia": "Diving Pokémon", - "ho-oh": "Rainbow Pokémon", - "celebi": "Time Travel Pokémon" + "bulbasaur": "Seed", + "ivysaur": "Seed", + "venusaur": "Seed", + "charmander": "Lizard", + "charmeleon": "Flame", + "charizard": "Flame", + "squirtle": "Tiny Turtle", + "wartortle": "Turtle", + "blastoise": "Shellfish", + "caterpie": "Worm", + "metapod": "Cocoon", + "butterfree": "Butterfly", + "weedle": "Hairy Bug", + "kakuna": "Cocoon", + "beedrill": "Poison Bee", + "pidgey": "Tiny Bird", + "pidgeotto": "Bird", + "pidgeot": "Bird", + "rattata": "Mouse", + "raticate": "Mouse", + "spearow": "Tiny Bird", + "fearow": "Beak", + "ekans": "Snake", + "arbok": "Cobra", + "pikachu": "Mouse", + "raichu": "Mouse", + "sandshrew": "Mouse", + "sandslash": "Mouse", + "nidoranf": "Poison Pin", + "nidorina": "Poison Pin", + "nidoqueen": "Drill", + "nidoranm": "Poison Pin", + "nidorino": "Poison Pin", + "nidoking": "Drill", + "clefairy": "Fairy", + "clefable": "Fairy", + "vulpix": "Fox", + "ninetales": "Fox", + "jigglypuff": "Balloon", + "wigglytuff": "Balloon", + "zubat": "Bat", + "golbat": "Bat", + "oddish": "Weed", + "gloom": "Weed", + "vileplume": "Flower", + "paras": "Mushroom", + "parasect": "Mushroom", + "venonat": "Insect", + "venomoth": "Poison Moth", + "diglett": "Mole", + "dugtrio": "Mole", + "meowth": "Scratch Cat", + "persian": "Classy Cat", + "psyduck": "Duck", + "golduck": "Duck", + "mankey": "Pig Monkey", + "primeape": "Pig Monkey", + "growlithe": "Puppy", + "arcanine": "Legendary", + "poliwag": "Tadpole", + "poliwhirl": "Tadpole", + "poliwrath": "Tadpole", + "abra": "Psi", + "kadabra": "Psi", + "alakazam": "Psi", + "machop": "Superpower", + "machoke": "Superpower", + "machamp": "Superpower", + "bellsprout": "Flower", + "weepinbell": "Flycatcher", + "victreebel": "Flycatcher", + "tentacool": "Jellyfish", + "tentacruel": "Jellyfish", + "geodude": "Rock", + "graveler": "Rock", + "golem": "Megaton", + "ponyta": "Fire Horse", + "rapidash": "Fire Horse", + "slowpoke": "Dopey", + "slowbro": "Hermit Crab", + "magnemite": "Magnet", + "magneton": "Magnet", + "farfetch'd": "Wild Duck", + "doduo": "Twin Bird", + "dodrio": "Triple Bird", + "seel": "Sea Lion", + "dewgong": "Sea Lion", + "grimer": "Sludge", + "muk": "Sludge", + "shellder": "Bivalve", + "cloyster": "Bivalve", + "gastly": "Gas", + "haunter": "Gas", + "gengar": "Shadow", + "onix": "Rock Snake", + "drowzee": "Hypnosis", + "hypno": "Hypnosis", + "krabby": "River Crab", + "kingler": "Pincer", + "voltorb": "Ball", + "electrode": "Ball", + "exeggcute": "Egg", + "exeggutor": "Coconut", + "cubone": "Lonely", + "marowak": "Bone Keeper", + "hitmonlee": "Kicking", + "hitmonchan": "Punching", + "lickitung": "Licking", + "koffing": "Poison Gas", + "weezing": "Poison Gas", + "rhyhorn": "Spikes", + "rhydon": "Drill", + "chansey": "Egg", + "tangela": "Vine", + "kangaskhan": "Parent", + "horsea": "Dragon", + "seadra": "Dragon", + "goldeen": "Goldfish", + "seaking": "Goldfish", + "staryu": "Star Shape", + "starmie": "Mysterious", + "mr. mime": "Barrier", + "scyther": "Mantis", + "jynx": "Human Shape", + "electabuzz": "Electric", + "magmar": "Spitfire", + "pinsir": "Stag Beetle", + "tauros": "Wild Bull", + "magikarp": "Fish", + "gyarados": "Atrocious", + "lapras": "Transport", + "ditto": "Transform", + "eevee": "Evolution", + "vaporeon": "Bubble Jet", + "jolteon": "Lightning", + "flareon": "Flame", + "porygon": "Virtual", + "omanyte": "Spiral", + "omastar": "Spiral", + "kabuto": "Shellfish", + "kabutops": "Shellfish", + "aerodactyl": "Fossil", + "snorlax": "Sleeping", + "articuno": "Freeze", + "zapdos": "Electric", + "moltres": "Flame", + "dratini": "Dragon", + "dragonair": "Dragon", + "dragonite": "Dragon", + "mewtwo": "Genetic", + "mew": "New Species", + "missingno.": " ???", + "chikorita": "Leaf", + "bayleef": "Leaf", + "meganium": "Herb", + "cyndaquil": "Fire Mouse", + "quilava": "Volcano", + "typhlosion": "Volcano", + "totodile": "Big Jaw", + "croconaw": "Big Jaw", + "feraligatr": "Big Jaw", + "sentret": "Scout", + "furret": "Long Body", + "hoothoot": "Owl", + "noctowl": "Owl", + "ledyba": "Five Star", + "ledian": "Five Star", + "spinarak": "String Spit", + "ariados": "Long Leg", + "crobat": "Bat", + "chinchou": "Angler", + "lanturn": "Light", + "pichu": "Tiny Mouse", + "cleffa": "Star Shape", + "igglybuff": "Balloon", + "togepi": "Spike Ball", + "togetic": "Happiness", + "natu": "Tiny Bird", + "xatu": "Mystic", + "mareep": "Wool", + "flaaffy": "Wool", + "ampharos": "Light", + "bellossom": "Flower", + "marill": "Aqua Mouse", + "azumarill": "Aqua Rabbit", + "sudowoodo": "Imitation", + "politoed": "Frog", + "hoppip": "Cottonweed", + "skiploom": "Cottonweed", + "jumpluff": "Cottonweed", + "aipom": "Long Tail", + "sunkern": "Seed", + "sunflora": "Sun", + "yanma": "Clear Wing", + "wooper": "Water Fish", + "quagsire": "Water Fish", + "espeon": "Sun", + "umbreon": "Moonlight", + "murkrow": "Darkness", + "slowking": "Royal", + "misdreavus": "Screech", + "unown": "Symbol", + "wobbuffet": "Patient", + "girafarig": "Long Neck", + "pineco": "Bagworm", + "forretress": "Bagworm", + "dunsparce": "Land Snake", + "gligar": "Fly Scorpion", + "steelix": "Iron Snake", + "snubbull": "Fairy", + "granbull": "Fairy", + "qwilfish": "Balloon", + "scizor": "Pincer", + "shuckle": "Mold", + "heracross": "Single Horn", + "sneasel": "Sharp Claw", + "teddiursa": "Little Bear", + "ursaring": "Hibernator", + "slugma": "Lava", + "magcargo": "Lava", + "swinub": "Pig", + "piloswine": "Swine", + "corsola": "Coral", + "remoraid": "Jet", + "octillery": "Jet", + "delibird": "Delivery", + "mantine": "Kite", + "skarmory": "Armor Bird", + "houndour": "Dark", + "houndoom": "Dark", + "kingdra": "Dragon", + "phanpy": "Long Nose", + "donphan": "Armor", + "porygon2": "Virtual", + "stantler": "Big Horn", + "smeargle": "Painter", + "tyrogue": "Scuffle", + "hitmontop": "Handstand", + "smoochum": "Kiss", + "elekid": "Electric", + "magby": "Live Coal", + "miltank": "Milk Cow", + "blissey": "Happiness", + "raikou": "Thunder", + "entei": "Volcano", + "suicune": "Aurora", + "larvitar": "Rock Skin", + "pupitar": "Hard Shell", + "tyranitar": "Armor", + "lugia": "Diving", + "ho-oh": "Rainbow", + "celebi": "Time Travel" }, "type": { "bulbasaur": "Grass/Poison", diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js index f58385fe..f0a2d153 100644 --- a/commands/search/pokedex.js +++ b/commands/search/pokedex.js @@ -34,11 +34,10 @@ module.exports = class PokedexCommand extends Command { } const pokemon = args.pokemon.toLowerCase(); const embed = new RichEmbed() - .setTitle('Information') .setAuthor(`#${pokedex.index[pokemon]} ${pokedex.name[pokemon]}`, `http://www.serebii.net/pokedex-sm/icon/${pokedex.index[pokemon]}.png`) .setColor(0xFF0000) - .setDescription(pokedex.species[pokemon]) - .setFooter('Pokédex', 'http://cdn.bulbagarden.net/upload/thumb/3/36/479Rotom-Pokédex.png/250px-479Rotom-Pokédex.png') + .setDescription(`pokedex.species[pokemon] Pokémon`) + .setFooter('Pokédex - 001-251 Implemented', 'http://cdn.bulbagarden.net/upload/thumb/3/36/479Rotom-Pokédex.png/250px-479Rotom-Pokédex.png') .setThumbnail(`http://www.serebii.net/sunmoon/pokemon/${pokedex.index[pokemon]}.png`) .addField('Entry', pokedex.entry[pokemon])