X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/edf1bde339e37bcac39aac9bdd28c0e02ec29ab8..8cef4a568ff2e082ff96830596c392885b1dd513:/pokedex/db/tables.py?ds=inline diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index d57efed..84db548 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -8,7 +8,7 @@ from sqlalchemy.orm.session import Session from sqlalchemy.sql import and_ from sqlalchemy.types import * -from pokedex.db import rst +from pokedex.db import markdown metadata = MetaData() TableBase = declarative_base(metadata=metadata) @@ -19,8 +19,8 @@ class Ability(TableBase): id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(24), nullable=False) generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) - effect = Column(rst.RstTextColumn(5120), nullable=False) - short_effect = Column(rst.RstTextColumn(255), nullable=False) + effect = Column(markdown.MarkdownColumn(5120), nullable=False) + short_effect = Column(markdown.MarkdownColumn(255), nullable=False) class AbilityFlavorText(TableBase): __tablename__ = 'ability_flavor_text' @@ -28,6 +28,12 @@ class AbilityFlavorText(TableBase): version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) flavor_text = Column(Unicode(64), nullable=False) +class AbilityName(TableBase): + __tablename__ = 'ability_names' + ability_id = Column(Integer, ForeignKey('abilities.id'), primary_key=True, nullable=False, autoincrement=False) + language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False) + name = Column(Unicode(16), nullable=False) + class Berry(TableBase): __tablename__ = 'berries' id = Column(Integer, primary_key=True, nullable=False) @@ -208,7 +214,7 @@ class Item(TableBase): cost = Column(Integer, nullable=False) fling_power = Column(Integer, nullable=True) fling_effect_id = Column(Integer, ForeignKey('item_fling_effects.id'), nullable=True) - effect = Column(rst.RstTextColumn(5120), nullable=False) + effect = Column(markdown.MarkdownColumn(5120), nullable=False) @property def appears_underground(self): @@ -332,7 +338,7 @@ class MoveFlagType(TableBase): __tablename__ = 'move_flag_types' id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(32), nullable=False) - description = Column(rst.RstTextColumn(128), nullable=False) + description = Column(markdown.MarkdownColumn(128), nullable=False) class MoveFlavorText(TableBase): __tablename__ = 'move_flavor_text' @@ -486,7 +492,27 @@ class Pokemon(TableBase): if pokemon_stat.stat.name == stat_name: return pokemon_stat - return None + raise KeyError(u'No stat named %s' % stat_name) + + @property + def better_damage_class(self): + u"""Returns the MoveDamageClass that this Pokémon is best suited for, + based on its attack stats. + + If the attack stats are about equal (within 5), returns None. The + value None, not the damage class called 'None'. + """ + phys = self.stat(u'Attack') + spec = self.stat(u'Special Attack') + + diff = phys.base_stat - spec.base_stat + + if diff > 5: + return phys.stat.damage_class + elif diff < -5: + return spec.stat.damage_class + else: + return None class PokemonAbility(TableBase): __tablename__ = 'pokemon_abilities' @@ -537,7 +563,7 @@ class PokemonFormGroup(TableBase): __tablename__ = 'pokemon_form_groups' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) is_battle_only = Column(Boolean, nullable=False) - description = Column(Unicode(512), nullable=False) + description = Column(markdown.MarkdownColumn(1024), nullable=False) class PokemonFormSprite(TableBase): __tablename__ = 'pokemon_form_sprites' @@ -565,8 +591,8 @@ class PokemonMove(TableBase): version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False, index=True) pokemon_move_method_id = Column(Integer, ForeignKey('pokemon_move_methods.id'), primary_key=True, nullable=False, autoincrement=False) - level = Column(Integer, primary_key=True, nullable=True, autoincrement=False) - order = Column(Integer, nullable=True) + level = Column(Integer, primary_key=True, nullable=True, autoincrement=False, index=True) + order = Column(Integer, nullable=True, index=True) class PokemonMoveMethod(TableBase): __tablename__ = 'pokemon_move_methods' @@ -608,6 +634,7 @@ class Region(TableBase): class Stat(TableBase): __tablename__ = 'stats' id = Column(Integer, primary_key=True, nullable=False) + damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=True) name = Column(Unicode(16), nullable=False) class SuperContestCombo(TableBase): @@ -654,11 +681,14 @@ class Version(TableBase): ### Relations down here, to avoid ordering problems -Ability.flavor_text = relation(AbilityFlavorText, order_by=AbilityFlavorText.version_group_id, backref='abilities') +Ability.flavor_text = relation(AbilityFlavorText, order_by=AbilityFlavorText.version_group_id, backref='ability') +Ability.foreign_names = relation(AbilityName, backref='ability') Ability.generation = relation(Generation, backref='abilities') AbilityFlavorText.version_group = relation(VersionGroup) +AbilityName.language = relation(Language) + Berry.berry_firmness = relation(BerryFirmness, backref='berries') Berry.firmness = association_proxy('berry_firmness', 'name') Berry.flavors = relation(BerryFlavor, order_by=BerryFlavor.contest_type_id, backref='berry') @@ -730,7 +760,7 @@ Move.contest_type = relation(ContestType, backref='moves') Move.damage_class = relation(MoveDamageClass, backref='moves') Move.flags = association_proxy('move_flags', 'flag') Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.version_group_id, backref='move') -Move.foreign_names = relation(MoveName, backref='pokemon') +Move.foreign_names = relation(MoveName, backref='move') Move.generation = relation(Generation, backref='moves') Move.machines = relation(Machine, backref='move') Move.move_effect = relation(MoveEffect, backref='moves') @@ -741,9 +771,9 @@ Move.super_contest_combo_prev = association_proxy('super_contest_combo_second', Move.target = relation(MoveTarget, backref='moves') Move.type = relation(Type, backref='moves') -Move.effect = rst.MoveEffectProperty('effect') +Move.effect = markdown.MoveEffectProperty('effect') Move.priority = association_proxy('move_effect', 'priority') -Move.short_effect = rst.MoveEffectProperty('short_effect') +Move.short_effect = markdown.MoveEffectProperty('short_effect') MoveEffect.category_map = relation(MoveEffectCategoryMap) MoveEffect.categories = association_proxy('category_map', 'category') @@ -794,14 +824,11 @@ Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__, order_by=PokemonEggGroup.egg_group_id, backref='pokemon') Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon') -Pokemon.evolution_children = relation(Pokemon, - secondary=PokemonEvolution.__table__, +Pokemon.child_pokemon = relation(Pokemon, primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id, + secondary=PokemonEvolution.__table__, secondaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id, - backref=backref('evolution_parent', - remote_side=[Pokemon.id], - uselist=False, - ), + backref=backref('parent_pokemon', uselist=False), ) Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') @@ -877,6 +904,8 @@ Region.version_group_regions = relation(VersionGroupRegion, backref='region', order_by='VersionGroupRegion.version_group_id') Region.version_groups = association_proxy('version_group_regions', 'version_group') +Stat.damage_class = relation(MoveDamageClass, backref='stats') + SuperContestCombo.first = relation(Move, primaryjoin=SuperContestCombo.first_move_id==Move.id, backref='super_contest_combo_first') SuperContestCombo.second = relation(Move, primaryjoin=SuperContestCombo.second_move_id==Move.id,