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

Moved priority out of the move_effects table.

Browse source
This commit is contained in:
Eevee 2010-09-29 22:12:48 -07:00
parent 3f03e31be3
commit d56cc97b8c
3 changed files with 879 additions and 880 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

636
pokedex/data/csv/move_effects.csv
View file

File diff suppressed because it is too large Load diff

1120
pokedex/data/csv/moves.csv
View file

File diff suppressed because it is too large Load diff

3
pokedex/db/tables.py
View file

@ -336,7 +336,6 @@ class MoveDamageClass(TableBase):
class MoveEffect(TableBase): class MoveEffect(TableBase):
__tablename__ = 'move_effects' __tablename__ = 'move_effects'
id = Column(Integer, primary_key=True, nullable=False) id = Column(Integer, primary_key=True, nullable=False)
priority = Column(SmallInteger, nullable=False)
short_effect = Column(Unicode(256), nullable=False) short_effect = Column(Unicode(256), nullable=False)
effect = Column(Unicode(5120), nullable=False) effect = Column(Unicode(5120), nullable=False)
@ -380,6 +379,7 @@ class Move(TableBase):
power = Column(SmallInteger, nullable=False) power = Column(SmallInteger, nullable=False)
pp = Column(SmallInteger, nullable=False) pp = Column(SmallInteger, nullable=False)
accuracy = Column(SmallInteger, nullable=True) accuracy = Column(SmallInteger, nullable=True)
priority = Column(SmallInteger, nullable=False)
target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=False) target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=False)
damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False) damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False)
effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False) effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False)
@ -825,7 +825,6 @@ Move.target = relation(MoveTarget, backref='moves')
Move.type = relation(Type, backref='moves') Move.type = relation(Type, backref='moves')
Move.effect = markdown.MoveEffectProperty('effect') Move.effect = markdown.MoveEffectProperty('effect')
Move.priority = association_proxy('move_effect', 'priority')
Move.short_effect = markdown.MoveEffectProperty('short_effect') Move.short_effect = markdown.MoveEffectProperty('short_effect')
MoveEffect.category_map = relation(MoveEffectCategoryMap) MoveEffect.category_map = relation(MoveEffectCategoryMap)