diff --git a/fuzzy-pokedex b/fuzzy-pokedex index 9eb17b9..d4916ca 100755 --- a/fuzzy-pokedex +++ b/fuzzy-pokedex @@ -6,7 +6,7 @@ help() { echo -e "Can optionally search by name" echo -e "EXAMPLE\n\tfuzzy-pokedex [pokemon name]\n" echo -e "OPTIONS" - echo -e "\t-u, --update\n\t\tScrape web for updated Pokemon stats\n\t\tWARNING: update function is resource heavy\n\t-h, --help\n\t\tPrint this help screen" + echo -e "\t-u, --update N/+N/-N/N%\n\t\tScrape web for updated Pokemon stats\n\t\tWARNING: update function is resource heavy\n\t\tSee Parallel job control (-j) for options\n\t\tDefault is 200%\n\t-h, --help\n\t\tPrint this help screen" echo -e "KEYBINDS" echo -e "\tctrl-n\tShows small sprite version\n\tctrl-b\tShows large sprite version\n\tctrl-s\tShows shiny sprite version\n\tctrl-h\tShows this help screen in preview window\n" } @@ -43,7 +43,11 @@ update_pokeData() { POKEINFO="/home/ez/Git/fuzzy-pokedex/pokeinfo" POKEDATA="/home/ez/Git/fuzzy-pokedex/pokeData/" echo -e "\n\t\tWARNING!!!\n\tThis WILL take a long time\n" + if [[ -n "$1" ]]; then + pokemon-colorscripts -l | sort | parallel --bar --color --retry-failed -j "$1" "$POKEINFO" {} ">" "$POKEDATA"{} + else pokemon-colorscripts -l | sort | parallel --bar --color --retry-failed -j 200% "$POKEINFO" {} ">" "$POKEDATA"{} + fi } if [[ ! "$1" =~ ^- ]]; then @@ -52,7 +56,7 @@ else for opt in "$@"; do case $opt in -u|--update) - update_pokeData + update_pokeData "$2" ;; -h|--help) help diff --git a/pokeData/drampa b/pokeData/drampa index e69de29..2f7690a 100644 --- a/pokeData/drampa +++ b/pokeData/drampa @@ -0,0 +1,15 @@ + +Name: Drampa +Pokedex Number: 780 +Gender Ratio:  ♂:50.2% ♀:49.8% +Abilities: Berserk - Sap Sipper - Cloud Nine (Hidden Ability) + +Base Stats +---------------------- +Total: 485 +Hp: 78 +Attack: 60 +Defence: 85 +Special Attack: 135 +Special Defence: 91 +Speed: 36 diff --git a/pokeData/necrozma b/pokeData/necrozma index e69de29..e5fe139 100644 --- a/pokeData/necrozma +++ b/pokeData/necrozma @@ -0,0 +1,15 @@ + +Name: Necrozma +Pokedex Number: 800 +Gender Ratio: Genderless +Abilities: Prism Armor + +Base Stats +---------------------- +Total: 600 +Hp: 97 +Attack: 113 +Defence: 109 +Special Attack: 157 +Special Defence: 127 +Speed: 77 diff --git a/pokeData/nidoran-m b/pokeData/nidoran-m index e69de29..c8f722b 100644 --- a/pokeData/nidoran-m +++ b/pokeData/nidoran-m @@ -0,0 +1,15 @@ + +Name: Nidoran-M +Pokedex Number: 032 +Gender Ratio:  ♂:100% ♀:0% +Abilities: Poison Point - Rivalry - Hustle (Hidden Ability) + +Base Stats +---------------------- +Total: 273 +Hp: 46 +Attack: 57 +Defence: 40 +Special Attack: 40 +Special Defence: 40 +Speed: 50 diff --git a/pokeData/popplio b/pokeData/popplio index e69de29..8713cc1 100644 --- a/pokeData/popplio +++ b/pokeData/popplio @@ -0,0 +1,15 @@ + +Name: Popplio +Pokedex Number: 728 +Gender Ratio:  ♂:88.14% ♀:11.86% +Abilities: Torrent - Liquid Voice (Hidden Ability) + +Base Stats +---------------------- +Total: 320 +Hp: 50 +Attack: 54 +Defence: 54 +Special Attack: 66 +Special Defence: 56 +Speed: 40 diff --git a/pokeData/porygon2 b/pokeData/porygon2 index e69de29..069cf6d 100644 --- a/pokeData/porygon2 +++ b/pokeData/porygon2 @@ -0,0 +1 @@ + Stats currently unavailable :(