diff --git a/pokeData/arceus b/pokeData/arceus index 9c2334b..e69de29 100644 --- a/pokeData/arceus +++ b/pokeData/arceus @@ -1,15 +0,0 @@ - -Name: Arceus -Pokedex Number: 493 -Gender Ratio: Genderless -Abilities: Multitype - -Base Stats ----------------------- -Total: 720 -Hp: 120 -Attack: 120 -Defence: 120 -Special Attack: 120 -Special Defence: 120 -Speed: 120 diff --git a/pokeData/dottler b/pokeData/dottler index e69de29..773da94 100644 --- a/pokeData/dottler +++ b/pokeData/dottler @@ -0,0 +1,15 @@ + +Name: Dottler +Pokedex Number: 825 +Gender Ratio:  ♂:50.2% ♀:49.8% +Abilities: Swarm - Compoundeyes - Telepathy (Hidden Ability) + +Base Stats +---------------------- +Total: 335 +Hp: 50 +Attack: 35 +Defence: 80 +Special Attack: 50 +Special Defence: 90 +Speed: 30 diff --git a/pokeData/dracovish b/pokeData/dracovish index e69de29..db61aaf 100644 --- a/pokeData/dracovish +++ b/pokeData/dracovish @@ -0,0 +1,15 @@ + +Name: Dracovish +Pokedex Number: 882 +Gender Ratio: Genderless +Abilities: Water Absorb - Strong Jaw - Sand Rush (Hidden Ability) + +Base Stats +---------------------- +Total: 505 +Hp: 90 +Attack: 90 +Defence: 100 +Special Attack: 70 +Special Defence: 80 +Speed: 75 diff --git a/pokeData/dragonair b/pokeData/dragonair index e69de29..2243b86 100644 --- a/pokeData/dragonair +++ b/pokeData/dragonair @@ -0,0 +1,15 @@ + +Name: Dragonair +Pokedex Number: 148 +Gender Ratio:  ♂:50% ♀:50% +Abilities: Shed Skin - Marvel Scale (Hidden Ability) + +Base Stats +---------------------- +Total: 420 +Hp: 61 +Attack: 84 +Defence: 65 +Special Attack: 70 +Special Defence: 70 +Speed: 70 diff --git a/pokeData/dragonite b/pokeData/dragonite index e69de29..29d7cd4 100644 --- a/pokeData/dragonite +++ b/pokeData/dragonite @@ -0,0 +1,15 @@ + +Name: Dragonite +Pokedex Number: 149 +Gender Ratio:  ♂:50% ♀:50% +Abilities: Inner Focus - Multiscale (Hidden Ability) + +Base Stats +---------------------- +Total: 600 +Hp: 91 +Attack: 134 +Defence: 95 +Special Attack: 100 +Special Defence: 100 +Speed: 80 diff --git a/pokeData/drakloak b/pokeData/drakloak index e69de29..64fbb92 100644 --- a/pokeData/drakloak +++ b/pokeData/drakloak @@ -0,0 +1,15 @@ + +Name: Drakloak +Pokedex Number: 886 +Gender Ratio:  ♂:50% ♀:50% +Abilities: Clear Body - Infiltrator - Cursed Body (Hidden Ability) + +Base Stats +---------------------- +Total: 410 +Hp: 68 +Attack: 80 +Defence: 50 +Special Attack: 60 +Special Defence: 50 +Speed: 102 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/drapion b/pokeData/drapion index e69de29..02d0482 100644 --- a/pokeData/drapion +++ b/pokeData/drapion @@ -0,0 +1,15 @@ + +Name: Drapion +Pokedex Number: 452 +Gender Ratio:  ♂:50% ♀:50% +Abilities: Battle Armor - Sniper - Keen Eye (Hidden Ability) + +Base Stats +---------------------- +Total: 500 +Hp: 70 +Attack: 90 +Defence: 110 +Special Attack: 60 +Special Defence: 75 +Speed: 95 diff --git a/pokeData/drednaw b/pokeData/drednaw index e69de29..45a0cc0 100644 --- a/pokeData/drednaw +++ b/pokeData/drednaw @@ -0,0 +1,15 @@ + +Name: Drednaw +Pokedex Number: 834 +Gender Ratio:  ♂:50% ♀:50% +Abilities: Strong Jaw - Shell Armor - Swift Swim (Hidden Ability) + +Base Stats +---------------------- +Total: 485 +Hp: 90 +Attack: 115 +Defence: 90 +Special Attack: 48 +Special Defence: 68 +Speed: 74 diff --git a/pokeData/drifblim b/pokeData/drifblim index e69de29..e71ce59 100644 --- a/pokeData/drifblim +++ b/pokeData/drifblim @@ -0,0 +1,15 @@ + +Name: Drifblim +Pokedex Number: 426 +Gender Ratio:  ♂:50% ♀:50% +Abilities: Aftermath - Unburden - Flare Boost (Hidden Ability) + +Base Stats +---------------------- +Total: 498 +Hp: 150 +Attack: 80 +Defence: 44 +Special Attack: 90 +Special Defence: 54 +Speed: 80 diff --git a/pokeData/oshawott b/pokeData/oshawott index e69de29..225630a 100644 --- a/pokeData/oshawott +++ b/pokeData/oshawott @@ -0,0 +1,15 @@ + +Name: Oshawott +Pokedex Number: 501 +Gender Ratio:  ♂:87.5% ♀:12.5% +Abilities: Torrent - Shell Armor (Hidden Ability) + +Base Stats +---------------------- +Total: 308 +Hp: 55 +Attack: 55 +Defence: 45 +Special Attack: 63 +Special Defence: 45 +Speed: 45 diff --git a/pokeData/tapu-lele b/pokeData/tapu-lele index e69de29..befedc4 100644 --- a/pokeData/tapu-lele +++ b/pokeData/tapu-lele @@ -0,0 +1 @@ +You didn't enter a valid pokemon! diff --git a/pokedex b/pokedex index b7b4b9c..fb80c0b 100755 --- a/pokedex +++ b/pokedex @@ -34,19 +34,19 @@ pokedex() { --border-label="╢ Fuzzy-Pokedex ╟" \ --margin=4% \ --padding=4% \ - --header="Choose Pokemon to view info" \ + --header="$(echo -e 'Choose a Pokemon to view info \n ctrl+h to for help')" \ --info=inline:' 󰨉 ' \ --color='fg+:15,fg:42,preview-fg:15,label:9,preview-label:15,hl+:134,hl:123,query:134,gutter:0,border:9,prompt:15,pointer:15,marker:15' \ --tiebreak=begin,chunk,length \ - --preview="echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}" \ + --preview="printf '\n\t\t\t\t\t%s\n\t\t\t\t\t %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA{1}" \ --preview-window=68%:wrap:border-rounded \ --bind=focus:transform-preview-label:'echo [ {1} ] ' \ --bind=ctrl-h:preview:"cat $KBINDS" \ - --bind=space:preview:"echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}; espeak-ng -f $POKEDATA/{1} -g 2 -p 45 -s 160 -l 150 -ven+m3 &" \ + --bind=space:preview:"printf '\n\t\t\t\t\t%s\n\t\t\t\t\t %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1}; espeak-ng -f $POKEDATA/{1} -g 4 -p 50 -s 145 -l 250 -ven+m3 &" \ --bind=ctrl-space:preview:"echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" \ --bind=ctrl-b:preview:"echo; pokemon-colorscripts -b -n {1} --no-title; cat $POKEDATA/{1};" \ --bind=ctrl-s:preview:"echo; pokemon-colorscripts -s -n {1} --no-title; cat $POKEDATA/{1};" \ - --bind=ctrl-n:preview:"echo; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" | + --bind=ctrl-n:preview:"printf '\n\t\t\t\t\t%s\n\t\t\t\t\t %s\n' 'Press space to hear entry' 'ctrl+space to stop'; pokemon-colorscripts -n {1} --no-title; cat $POKEDATA/{1};" | parallel pokemon-colorscripts --no-title -n {} "&&" cat "$POKEDATA/{}" } @@ -58,7 +58,7 @@ quick_view() { ### Update Pokemon stats file set update_pokeData() { printf "\n\t\t%s\n\t%s\n\n" "WARNING!!!" "This WILL take a long time" - pokemon-colorscripts -l | sort | parallel --bar --color --retry-failed -j "${1:-200%}" pokeInfo {} ">" "$POKEDATA/{}" 2>&1 + pokemon-colorscripts -l | sort | parallel --progress --bar --color --retry-failed -j "${1:-200%}" pokeInfo {} ">" "$POKEDATA/{}" 2>&1 } ### Arg parsing loop