X-Git-Url: http://git.veekun.com/zzz-dywypi.git/blobdiff_plain/676c8532e3eee2e11f1e801d4453cfefb5e01d37..2e65d989581ac75a844d4ad02f1ec04e5d9cd551:/plugins/Pokedex/plugin.py

diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py
index 2fc8b53..a1ebccb 100644
--- a/plugins/Pokedex/plugin.py
+++ b/plugins/Pokedex/plugin.py
@@ -67,7 +67,7 @@ class Pokedex(callbacks.Plugin):
         self.__parent = super(Pokedex, self)
         self.__parent.__init__(irc)
         self.db = pokedex.db.connect(self.registryValue('databaseURL'))
-        self.indices = pokedex.lookup.open_index(
+        self.lookup = pokedex.lookup.PokedexLookup(
             directory=conf.supybot.directories.data.dirize('pokedex-index'),
             session=self.db,
         )
@@ -86,8 +86,7 @@ class Pokedex(callbacks.Plugin):
                 thing = ascii_thing.decode('latin1')
 
         # Similar logic to the site, here.
-        results = pokedex.lookup.lookup(thing, session=self.db,
-                indices=self.indices)
+        results = self.lookup.lookup(thing)
 
         # Nothing found
         if len(results) == 0:
@@ -173,7 +172,7 @@ 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,
@@ -206,7 +205,11 @@ class Pokedex(callbacks.Plugin):
         elif isinstance(obj, tables.Type):
             reply_template = u"""{name}, a type.  """
 
-            reply_factors = { 200: u'2', 50: u'½', 0: u'0' }
+            offensive_reply_factors = {
+                200: u'\x03092×\x0f',
+                50:  u'\x0304½×\x0f',
+                0:   u'\x03140×\x0f',
+            }
 
             offensive_modifiers = {}
             for matchup in obj.damage_efficacies:
@@ -216,11 +219,17 @@ class Pokedex(callbacks.Plugin):
             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],
+                    offensive_modifiers[factor] = u'{factor} against {types}'.format(
+                        factor=offensive_reply_factors[factor],
                         types=', '.join(sorted(offensive_modifiers[factor]))
                     )
 
+            defensive_reply_factors = {
+                200: u'\x03042×\x0f',
+                50:  u'\x0309½×\x0f',
+                0:   u'\x03110×\x0f',
+            }
+
             defensive_modifiers = {}
             for matchup in obj.target_efficacies:
                 if matchup.damage_factor != 100:
@@ -229,8 +238,8 @@ class Pokedex(callbacks.Plugin):
             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],
+                    defensive_modifiers[factor] = u'{factor} from {types}'.format(
+                        factor=defensive_reply_factors[factor],
                         types=', '.join(sorted(defensive_modifiers[factor]))
                     )
 
@@ -249,9 +258,10 @@ class Pokedex(callbacks.Plugin):
         elif isinstance(obj, tables.Item):
             reply_template = \
                 u"""{name}, an item.  """ \
-                """http://veekun.com/dex/items/{link_name}"""
+                """http://veekun.com/dex/items/{link_pocket}/{link_name}"""
             self._reply(irc, reply_template.format(
                 name=obj.name,
+                link_pocket=urllib.quote(obj.pocket.name.lower().encode('utf8')),
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )
@@ -262,7 +272,20 @@ class Pokedex(callbacks.Plugin):
                 """http://veekun.com/dex/abilities/{link_name}"""
             self._reply(irc, reply_template.format(
                 name=obj.name,
-                effect=obj.effect,
+                effect=obj.short_effect.as_text,
+                link_name=urllib.quote(obj.name.lower().encode('utf8')),
+                )
+            )
+
+        elif isinstance(obj, tables.Nature):
+            reply_template = \
+                u"""{name}, a nature.  """ \
+                u"""Raises \x0303{up}\x0f, lowers \x0304{down}\x0f.  """ \
+                u"""http://veekun.com/dex/natures/{link_name}"""
+            self._reply(irc, reply_template.format(
+                name=obj.name,
+                up=obj.increased_stat.name,
+                down=obj.decreased_stat.name,
                 link_name=urllib.quote(obj.name.lower().encode('utf8')),
                 )
             )