1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

Merge pull request from veekun/zhorken

Fixes some move data issues and form bugs.
This commit is contained in:
Eevee 2012-02-05 21:29:22 -08:00
commit 897c6f1de1
5 changed files with 753 additions and 7 deletions
pokedex/db

View file

@ -1082,7 +1082,13 @@ class Pokemon(TableBase):
@property
def name(self):
return self.default_form.pokemon_name or self.species.name
u"""Returns a name for this Pokémon, specifiying the form iff it
represents a specific PokemonForm.
"""
if any(not form.is_default for form in self.forms):
return self.species.name
else:
return self.default_form.pokemon_name or self.species.name
def stat(self, stat_identifier):
u"""Returns a PokemonStat record for the given stat name (or Stat row