WWWJDIC: Fixed to match the abrupt change in result format.

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

diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py
index 4a1b6f3..158e509 100644 (file)
--- a/plugins/Pokedex/plugin.py
+++ b/plugins/Pokedex/plugin.py
@@ -115,15 +115,37 @@ class Pokedex(callbacks.Plugin):
         if isinstance(obj, tables.Pokemon):
             reply_template = \
                 u"""#{id} {name}, {type}-type Pokémon.  Has {abilities}.  """ \
-                """Is {stats}.  """ \
-                """http://beta.veekun.com/dex/pokemon/{link_name}"""
+                """Stats are {stats}, total {total}.  """ \
+                """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:
+                # 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')),
+                )
+            else:
+                link_name = urllib.quote(obj.name.lower().encode('utf8'))
+
             self._reply(irc, reply_template.format(
-                id=obj.id,
-                name=obj.name,
+                id=obj.national_id,
+                name=name,
                 type='/'.join(_.name for _ in obj.types),
                 abilities=' or '.join(_.name for _ in obj.abilities),
                 stats='/'.join(str(_.base_stat) for _ in obj.stats),
-                link_name=urllib.quote(obj.name.lower()),
+                total=sum(_.base_stat for _ in obj.stats),
+                link_name=link_name,
                 )
             )
 
@@ -132,7 +154,7 @@ class Pokedex(callbacks.Plugin):
                 u"""{name}, {type}-type {damage_class} move.  """ \
                 """{power} power; {accuracy}% accuracy; {pp} PP.  """ \
                 """{effect}  """ \
-                """http://beta.veekun.com/dex/moves/{link_name}"""
+                """http://veekun.com/dex/moves/{link_name}"""
             self._reply(irc, reply_template.format(
                 name=obj.name,
                 type=obj.type.name,
@@ -141,29 +163,71 @@ class Pokedex(callbacks.Plugin):
                 accuracy=obj.accuracy,
                 pp=obj.pp,
                 effect=unicode(obj.short_effect.as_html),
-                link_name=urllib.quote(obj.name.lower()),
+                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):
-            self._reply(irc, u"""{name}, an item.  http://beta.veekun.com/dex/items/{link_name}""".format(
+            reply_template = \
+                u"""{name}, an item.  """ \
+                """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')),
                 )
             )
 
         elif isinstance(obj, tables.Ability):
-            self._reply(irc, u"""{name}, an ability.  {effect}  http://beta.veekun.com/dex/abilities/{link_name}""".format(
+            reply_template = \
+                u"""{name}, an ability.  {effect}  """ \
+                """http://veekun.com/dex/abilities/{link_name}"""
+            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')),
                 )
             )