X-Git-Url: http://git.veekun.com/zzz-dywypi.git/blobdiff_plain/26a61c922cf86919eb7e3af2aa59a0d4662fcbb7..HEAD:/plugins/Pokedex/plugin.py

diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py
index 62f11b6..a19b677 100644
--- a/plugins/Pokedex/plugin.py
+++ b/plugins/Pokedex/plugin.py
@@ -129,31 +129,30 @@ class Pokedex(callbacks.Plugin):
         # If we got here, there's an exact match; hurrah!
         result = results[0]
         obj = result.object
+
+        # Deal with Pokémon shenanigans
+        if isinstance(obj, tables.PokemonForm):
+            obj = obj.pokemon
+        elif isinstance(obj, tables.PokemonSpecies):
+            obj = obj.default_pokemon
+
         if isinstance(obj, tables.Pokemon):
             reply_template = \
                 u"""#{id} {name}, {type}-type Pokémon.  Has {abilities}.  """ \
                 """{stats}.  """ \
                 """http://veekun.com/dex/pokemon/{link_name}"""
 
-            if obj.forme_name:
-                name = '{form} {name}'.format(
-                    form=obj.forme_name.title(),
-                    name=obj.name
-                )
-            else:
-                name = obj.name
-
-            if obj.forme_base_pokemon:
+            if not obj.is_default:
                 # Can't use urllib.quote() on the whole thing or it'll
                 # catch "?" and "=" where it shouldn't.
                 # XXX Also we need to pass urllib.quote() things explicitly
                 #     encoded as utf8 or else we get a UnicodeEncodeError.
                 link_name = '{name}?form={form}'.format(
-                    name=urllib.quote(obj.name.lower().encode('utf8')),
-                    form=urllib.quote(obj.forme_name.lower().encode('utf8')),
+                    name=urllib.quote(obj.species.name.lower().encode('utf8')),
+                    form=urllib.quote(obj.default_form.form_identifier.lower().encode('utf8')),
                 )
             else:
-                link_name = urllib.quote(obj.name.lower().encode('utf8'))
+                link_name = urllib.quote(obj.species.name.lower().encode('utf8'))
 
             # a/b/c/d/e/f sucks.  Put stats in a more readable format.
             # Also, color-code them by good-osity.
@@ -172,11 +171,11 @@ class Pokedex(callbacks.Plugin):
                 get_stat_color(stat_total / 6),
                 stat_total,
             )
-            stats = """{0} HP, {1}/{2} phys, {3}/{4} spec, {5} speed, {total} total""" \
+            stats = """{0} HP, {1}/{2} phys, {3}/{4} spec, {5} speed; {total} total""" \
                 .format(*colored_stats, total=colored_stat_total)
             self._reply(irc, reply_template.format(
-                id=obj.national_id,
-                name=name,
+                id=obj.species.id,
+                name=obj.name,
                 type='/'.join(_.name for _ in obj.types),
                 abilities=' or '.join(_.name for _ in obj.abilities),
                 stats=stats,
@@ -197,7 +196,7 @@ class Pokedex(callbacks.Plugin):
                 power=obj.power,
                 accuracy=obj.accuracy,
                 pp=obj.pp,
-                effect=unicode(obj.short_effect.as_text),
+                effect=unicode(obj.short_effect.as_text()),
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
@@ -257,10 +256,19 @@ class Pokedex(callbacks.Plugin):
 
         elif isinstance(obj, tables.Item):
             reply_template = \
-                u"""{name}, an item.  """ \
-                """http://veekun.com/dex/items/{link_name}"""
+                u"""{name}, an item.  {effect}  """ \
+                """http://veekun.com/dex/items/{link_pocket}/{link_name}"""
+
+            effect = obj.short_effect
+            if effect is None:
+                effect = 'No short effect, sorry.  :('
+            else:
+                effect = unicode(effect.as_text())
+
             self._reply(irc, reply_template.format(
                 name=obj.name,
+                effect=effect,
+                link_pocket=urllib.quote(obj.pocket.name.lower().encode('utf8')),
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
@@ -271,7 +279,7 @@ class Pokedex(callbacks.Plugin):
                 """http://veekun.com/dex/abilities/{link_name}"""
             self._reply(irc, reply_template.format(
                 name=obj.name,
-                effect=obj.short_effect.as_text,
+                effect=obj.short_effect.as_text(),
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )