veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Change "dream ability" to "hidden ability".

Browse source
This commit is contained in:
Lynn "Zhorken" Vaughan 2012-11-04 18:27:16 -05:00
parent 76a4666cc9
commit 7f781db1d7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pokedex/db/tables.py
View file

@ -1583,8 +1583,8 @@ class PokemonAbility(TableBase):
# XXX having both a method and a slot is kind of gross. "slot" is a # XXX having both a method and a slot is kind of gross. "slot" is a
# misnomer, anyway: duplicate abilities don't appear in slot 2. # misnomer, anyway: duplicate abilities don't appear in slot 2.
# Probably should replace that with "order". # Probably should replace that with "order".
is_dream = Column(Boolean, nullable=False, index=True, is_hidden = Column(Boolean, nullable=False, index=True,
info=dict(description=u"Whether this is a Dream World ability")) info=dict(description=u"Whether this is a hidden ability"))
slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False, slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
info=dict(description=u"The ability slot, i.e. 1 or 2 for gen. IV")) info=dict(description=u"The ability slot, i.e. 1 or 2 for gen. IV"))
@ -2487,20 +2487,20 @@ Pokemon.abilities = relationship(Ability,
secondary=PokemonAbility.__table__, secondary=PokemonAbility.__table__,
primaryjoin=and_( primaryjoin=and_(
Pokemon.id == PokemonAbility.pokemon_id, Pokemon.id == PokemonAbility.pokemon_id,
PokemonAbility.is_dream == False, PokemonAbility.is_hidden == False,
), ),
innerjoin=True, innerjoin=True,
order_by=PokemonAbility.slot.asc(), order_by=PokemonAbility.slot.asc(),
backref=backref('pokemon', order_by=Pokemon.order.asc()), backref=backref('pokemon', order_by=Pokemon.order.asc()),
doc=u"Abilities the Pokémon can have in the wild") doc=u"Abilities the Pokémon can have in the wild")
Pokemon.dream_ability = relationship(Ability, Pokemon.hidden_ability = relationship(Ability,
secondary=PokemonAbility.__table__, secondary=PokemonAbility.__table__,
primaryjoin=and_( primaryjoin=and_(
Pokemon.id == PokemonAbility.pokemon_id, Pokemon.id == PokemonAbility.pokemon_id,
PokemonAbility.is_dream == True, PokemonAbility.is_hidden == True,
), ),
uselist=False, uselist=False,
backref=backref('dream_pokemon', order_by=Pokemon.order), backref=backref('hidden_pokemon', order_by=Pokemon.order),
doc=u"The Pokémon's Hidden Ability") doc=u"The Pokémon's Hidden Ability")
Pokemon.forms = relationship(PokemonForm, Pokemon.forms = relationship(PokemonForm,
primaryjoin=Pokemon.id==PokemonForm.pokemon_id, primaryjoin=Pokemon.id==PokemonForm.pokemon_id,