as_html -> as_text

[zzz-dywypi.git] / plugins / Pokedex / plugin.py

diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py
index 435e3b1..fd728e2 100644 (file)
--- a/plugins/Pokedex/plugin.py
+++ b/plugins/Pokedex/plugin.py
@@ -115,7 +115,7 @@ class Pokedex(callbacks.Plugin):
         if isinstance(obj, tables.Pokemon):
             reply_template = \
                 u"""#{id} {name}, {type}-type Pokémon.  Has {abilities}.  """ \
         if isinstance(obj, tables.Pokemon):
             reply_template = \
                 u"""#{id} {name}, {type}-type Pokémon.  Has {abilities}.  """ \

-                """Is {stats}.  """ \
+                """Stats are {stats}, total {total}.  """ \

                 """http://veekun.com/dex/pokemon/{link_name}"""
 
             if obj.forme_name:
                 """http://veekun.com/dex/pokemon/{link_name}"""
 
             if obj.forme_name:


@@ -144,6 +144,7 @@ class Pokedex(callbacks.Plugin):
                 type='/'.join(_.name for _ in obj.types),
                 abilities=' or '.join(_.name for _ in obj.abilities),
                 stats='/'.join(str(_.base_stat) for _ in obj.stats),
                 type='/'.join(_.name for _ in obj.types),
                 abilities=' or '.join(_.name for _ in obj.abilities),
                 stats='/'.join(str(_.base_stat) for _ in obj.stats),

+                total=sum(_.base_stat for _ in obj.stats),

                 link_name=link_name,
                 )
             )
                 link_name=link_name,
                 )
             )


@@ -161,7 +162,7 @@ class Pokedex(callbacks.Plugin):
                 power=obj.power,
                 accuracy=obj.accuracy,
                 pp=obj.pp,
                 power=obj.power,
                 accuracy=obj.accuracy,
                 pp=obj.pp,

-                effect=unicode(obj.short_effect.as_html),
+                effect=unicode(obj.short_effect.as_text),

                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )


@@ -212,7 +213,7 @@ class Pokedex(callbacks.Plugin):
         elif isinstance(obj, tables.Item):
             reply_template = \
                 u"""{name}, an item.  """ \
         elif isinstance(obj, tables.Item):
             reply_template = \
                 u"""{name}, an item.  """ \

-                """http://veekun.com/dex/abilities/{link_name}"""
+                """http://veekun.com/dex/items/{link_name}"""

             self._reply(irc, reply_template.format(
                 name=obj.name,
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
             self._reply(irc, reply_template.format(
                 name=obj.name,
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),