X-Git-Url: http://git.veekun.com/zzz-dywypi.git/blobdiff_plain/676c8532e3eee2e11f1e801d4453cfefb5e01d37..f1eb5fe1371c768cf47db0efee7ec0254af57e2d:/plugins/Pokedex/plugin.py diff --git a/plugins/Pokedex/plugin.py b/plugins/Pokedex/plugin.py index 2fc8b53..a19b677 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: @@ -130,31 +129,30 @@ class Pokedex(callbacks.Plugin): # If we got here, there's an exact match; hurrah! result = results[0] obj = result.object + + # Deal with Pokémon shenanigans + if isinstance(obj, tables.PokemonForm): + obj = obj.pokemon + elif isinstance(obj, tables.PokemonSpecies): + obj = obj.default_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_default: # 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')), + name=urllib.quote(obj.species.name.lower().encode('utf8')), + form=urllib.quote(obj.default_form.form_identifier.lower().encode('utf8')), ) else: - link_name = urllib.quote(obj.name.lower().encode('utf8')) + link_name = urllib.quote(obj.species.name.lower().encode('utf8')) # a/b/c/d/e/f sucks. Put stats in a more readable format. # Also, color-code them by good-osity. @@ -173,11 +171,11 @@ 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, - name=name, + id=obj.species.id, + name=obj.name, type='/'.join(_.name for _ in obj.types), abilities=' or '.join(_.name for _ in obj.abilities), stats=stats, @@ -198,7 +196,7 @@ class Pokedex(callbacks.Plugin): power=obj.power, accuracy=obj.accuracy, pp=obj.pp, - effect=unicode(obj.short_effect.as_text), + effect=unicode(obj.short_effect.as_text()), link_name=urllib.quote(obj.name.lower().encode('utf8')), ) ) @@ -206,7 +204,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 +218,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 +237,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])) ) @@ -248,10 +256,19 @@ class Pokedex(callbacks.Plugin): elif isinstance(obj, tables.Item): reply_template = \ - u"""{name}, an item. """ \ - """http://veekun.com/dex/items/{link_name}""" + u"""{name}, an item. {effect} """ \ + """http://veekun.com/dex/items/{link_pocket}/{link_name}""" + + effect = obj.short_effect + if effect is None: + effect = 'No short effect, sorry. :(' + else: + effect = unicode(effect.as_text()) + self._reply(irc, reply_template.format( name=obj.name, + effect=effect, + link_pocket=urllib.quote(obj.pocket.name.lower().encode('utf8')), link_name=urllib.quote(obj.name.lower().encode('utf8')), ) ) @@ -262,7 +279,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')), ) )