From 4b27cfb0c63ad6d085b5a11d06401eb4af2af847 Mon Sep 17 00:00:00 2001 From: Zhorken Date: Mon, 29 Nov 2010 20:41:34 -0500 Subject: [PATCH] =?utf8?q?Pokedex:=20Update=20for=20the=20new=20Pok=C3=A9m?= =?utf8?q?on=20form=20schema.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- plugins/Pokedex/plugin.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py index a1ebccb..e57d517 100644 --- a/plugins/Pokedex/plugin.py +++ b/plugins/Pokedex/plugin.py @@ -129,28 +129,25 @@ class Pokedex(callbacks.Plugin): # If we got here, there's an exact match; hurrah! result = results[0] obj = result.object + + # Deal with Pokémon form matches + if isinstance(obj, tables.PokemonForm): + obj = obj.unique_pokemon or obj.form_base_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_base_form: # 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')), + form=urllib.quote(obj.form_name.lower().encode('utf8')), ) else: link_name = urllib.quote(obj.name.lower().encode('utf8')) @@ -175,8 +172,8 @@ class Pokedex(callbacks.Plugin): 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.normal_form.id, + name=obj.full_name or obj.name, type='/'.join(_.name for _ in obj.types), abilities=' or '.join(_.name for _ in obj.abilities), stats=stats, -- 2.7.4