From: Eevee Date: Sun, 6 Mar 2011 00:04:05 +0000 (-0800) Subject: Add a SaveFilePokemon accessor to get the form. X-Git-Tag: veekun-promotions/2011041101~45 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/f62751207c84763865acbf31b2d07a5cf59a8ff6?hp=64c7edc1bbf7c5a35c75ebb5cc01fa55b8de6cdf Add a SaveFilePokemon accessor to get the form. --- diff --git a/pokedex/struct/__init__.py b/pokedex/struct/__init__.py index 54a81f2..962377f 100644 --- a/pokedex/struct/__init__.py +++ b/pokedex/struct/__init__.py @@ -105,6 +105,10 @@ class SaveFilePokemon(object): st = self.structure self._pokemon = session.query(tables.Pokemon).get(st.national_id) + self._pokemon_form = session.query(tables.PokemonForm) \ + .with_parent(self._pokemon) \ + .filter_by(name=st.alternate_form) \ + .one() self._ability = self._session.query(tables.Ability).get(st.ability_id) growth_rate = self._pokemon.evolution_chain.growth_rate @@ -189,6 +193,10 @@ class SaveFilePokemon(object): return self._pokemon @property + def species_form(self): + return self._pokemon_form + + @property def pokeball(self): return self._pokeball