some doc fixes

Author: phi-line

Diff for: globals.py

@@ -8,6 +8,7 @@ class Globals():
     GIF_URL = 'http://www.pokestadium.com/sprites/xy/'
     S_GIF_URL = 'http://www.pokestadium.com/sprites/xy/shiny/'
     DEX_URL = 'http://cdn.bulbagarden.net/upload/thumb/3/36/479Rotom-Pok%C3%A9dex.png/160px-479Rotom-Pok%C3%A9dex.png'
+    S_ICON = '<:i_shiny:309407527001522177>'
 
 
     TYPE_DICT = {'bug':     '<:t_bug:308684134585335808>',     'dark':     '<:t_dark:308684134677610496>',

Diff for: pokedex.py

@@ -17,8 +17,12 @@ def __init__(self, bot):
         self.lock = False
 
     DEX_USAGE = "Pokémon must be from Gen I - VI\n" \
-                "```Usage: !dex [pkmn # or name]\n" \
-                "e.g:   !dex 151 / !dex mew```"
+                "```Args :\n" \
+                "Random Pokémon -r / -random\n" \
+                "Shiny  Pokémon -s / -shiny\n\n" \
+                "Usage: !dex [p1] / '-r' ('-s')\n" \
+                "e.g:   !dex 151 / !dex mew\n" \
+                "       !dex -random -shiny```"
 
     @commands.command(pass_context=True)
     async def dex(self, ctx, *args):
@@ -70,18 +74,11 @@ async def dex(self, ctx, *args):
                     pkmn_type = {i['type']['name'] for i in pt}
                     print("Displaying Pokemon {0} #{1}".format(pkmn_name, pkmn_id))
 
-                    # if '-s' not in args[1:] and '-shiny' not in args[1:]:
-                    #     try:
-                    #         s = str(pkmn_name)
-                    #         trans = str.maketrans('', '', punctuation)
-                    #         filename = ''.join((g.GIF_URL, s.translate(trans), '.gif'))
-                    #         a = urlopen(filename)
-                    #     except HTTPError:
-                    #         filename = ''.join((g.IMG_URL, str(pkmn_id), '.png'))
-                    # else: filename = ''.join((g.IMG_URL, 'shiny/' ,str(pkmn_id), '.png'))
-
                     filename = self.get_thumbnail(pkmn_id, pkmn_name, shiny=shiny)
+
                     type_emojis = '  '.join({g.TYPE_DICT[t] for t in pkmn_type if t in g.TYPE_DICT})
+                    if shiny: type_emojis += g.S_ICON
+
                     title = "{0} #{1} {2}".format(pkmn_name.capitalize(), pkmn_id, type_emojis)
                     sub_title = "the {0} Pokémon".format(pkmn_genus)