X-Git-Url: http://git.veekun.com/zzz-dywypi.git/blobdiff_plain/5ba646238dc6ea0f2d56c84932e7947facaef035..9264e21405a439451eb8b2bcc37b38247ec69a06:/plugins/Pokedex/plugin.py?ds=sidebyside

diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py
index 512ff2b..fd728e2 100644
--- 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}.  """ \
-                """Is {stats}.  """ \
+                """Stats are {stats}, total {total}.  """ \
                 """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),
+                total=sum(_.base_stat for _ in obj.stats),
                 link_name=link_name,
                 )
             )
@@ -161,25 +162,61 @@ class Pokedex(callbacks.Plugin):
                 power=obj.power,
                 accuracy=obj.accuracy,
                 pp=obj.pp,
-                effect=unicode(obj.short_effect.as_html),
-                link_name=urllib.quote(obj.name.lower()),
+                effect=unicode(obj.short_effect.as_text),
+                link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
 
         elif isinstance(obj, tables.Type):
-            self._reply(irc, u"""{name}, a type.  http://beta.veekun.com/dex/types/{link_name}""".format(
-                name=obj.name,
-                link_name=urllib.quote(obj.name.lower()),
+            reply_template = u"""{name}, a type.  """
+
+            reply_factors = { 200: u'2', 50: u'½', 0: u'0' }
+
+            offensive_modifiers = {}
+            for matchup in obj.damage_efficacies:
+                if matchup.damage_factor != 100:
+                    offensive_modifiers.setdefault(matchup.damage_factor, []) \
+                        .append(matchup.target_type.name)
+            if offensive_modifiers:
+                reply_template += u"""{offensive_modifiers}.  """
+                for factor in offensive_modifiers:
+                    offensive_modifiers[factor] = u'{factor}× against {types}'.format(
+                        factor=reply_factors[factor],
+                        types=', '.join(sorted(offensive_modifiers[factor]))
+                    )
+
+            defensive_modifiers = {}
+            for matchup in obj.target_efficacies:
+                if matchup.damage_factor != 100:
+                    defensive_modifiers.setdefault(matchup.damage_factor, []) \
+                        .append(matchup.damage_type.name)
+            if defensive_modifiers:
+                reply_template += u"""{defensive_modifiers}.  """
+                for factor in defensive_modifiers:
+                    defensive_modifiers[factor] = u'{factor}× from {types}'.format(
+                        factor=reply_factors[factor],
+                        types=', '.join(sorted(defensive_modifiers[factor]))
+                    )
+
+            reply_template += u"""http://veekun.com/dex/types/{link_name}"""
+
+            self._reply(irc, reply_template.format(
+                name=obj.name.capitalize(),
+                offensive_modifiers='; '.join(offensive_modifiers[_]
+                                              for _ in sorted(offensive_modifiers)),
+                defensive_modifiers='; '.join(defensive_modifiers[_]
+                                              for _ in sorted(defensive_modifiers)),
+                link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
 
         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()),
+                link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
 
@@ -190,7 +227,7 @@ class Pokedex(callbacks.Plugin):
             self._reply(irc, reply_template.format(
                 name=obj.name,
                 effect=obj.effect,
-                link_name=urllib.quote(obj.name.lower()),
+                link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )