X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/897d971a6f82bfebd3581ee8d3bffad0c9e3cc09..fa4655b23c2327ad480a3ada53237ed23985ddb9:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index ea6df63..4271efd 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -177,7 +177,6 @@ class EvolutionChain(TableBase): __tablename__ = 'evolution_chains' id = Column(Integer, primary_key=True, nullable=False) growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), nullable=False) - steps_to_hatch = Column(Integer, nullable=False) baby_trigger_item = Column(Unicode(12)) class EvolutionTrigger(TableBase): @@ -254,6 +253,12 @@ class ItemInternalID(TableBase): generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, autoincrement=False, nullable=False) internal_id = Column(Integer, nullable=False) +class ItemName(TableBase): + __tablename__ = 'item_names' + item_id = Column(Integer, ForeignKey('items.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 ItemPocket(TableBase): __tablename__ = 'item_pockets' id = Column(Integer, primary_key=True, nullable=False) @@ -288,6 +293,12 @@ class LocationAreaEncounterRate(TableBase): version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, autoincrement=False) rate = Column(Integer, nullable=True) +class LocationInternalID(TableBase): + __tablename__ = 'location_internal_ids' + location_id = Column(Integer, ForeignKey('locations.id'), nullable=False, primary_key=True) + generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True) + internal_id = Column(Integer, nullable=False) + class Machine(TableBase): __tablename__ = 'machines' machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False) @@ -337,6 +348,7 @@ class MoveFlag(TableBase): class MoveFlagType(TableBase): __tablename__ = 'move_flag_types' id = Column(Integer, primary_key=True, nullable=False) + identifier = Column(Unicode(16), nullable=False) name = Column(Unicode(32), nullable=False) description = Column(markdown.MarkdownColumn(128), nullable=False) @@ -393,6 +405,12 @@ class NatureBattleStylePreference(TableBase): low_hp_preference = Column(Integer, nullable=False) high_hp_preference = Column(Integer, nullable=False) +class NatureName(TableBase): + __tablename__ = 'nature_names' + nature_id = Column(Integer, ForeignKey('natures.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(8), nullable=False) + class NaturePokeathlonStat(TableBase): __tablename__ = 'nature_pokeathlon_stats' nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False) @@ -444,6 +462,7 @@ class Pokemon(TableBase): base_experience = Column(Integer, nullable=False) base_happiness = Column(Integer, nullable=False) is_baby = Column(Boolean, nullable=False) + hatch_counter = Column(Integer, nullable=False) has_gen4_fem_sprite = Column(Boolean, nullable=False) has_gen4_fem_back_sprite = Column(Boolean, nullable=False) @@ -563,7 +582,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(rst.RstTextColumn(1024), nullable=False) + description = Column(markdown.MarkdownColumn(1024), nullable=False) class PokemonFormSprite(TableBase): __tablename__ = 'pokemon_form_sprites' @@ -578,6 +597,12 @@ class PokemonHabitat(TableBase): id = Column(Integer, primary_key=True, nullable=False, autoincrement=False) name = Column(Unicode(16), nullable=False) +class PokemonInternalID(TableBase): + __tablename__ = 'pokemon_internal_ids' + pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, autoincrement=False, nullable=False) + generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, autoincrement=False, nullable=False) + internal_id = Column(Integer, nullable=False) + class PokemonItem(TableBase): __tablename__ = 'pokemon_items' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) @@ -663,6 +688,12 @@ class Type(TableBase): generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False) ## ??? is none; everything else is physical or special +class TypeName(TableBase): + __tablename__ = 'type_names' + type_id = Column(Integer, ForeignKey('types.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 VersionGroup(TableBase): __tablename__ = 'version_groups' id = Column(Integer, primary_key=True, nullable=False) @@ -735,6 +766,7 @@ Item.berry = relation(Berry, uselist=False, backref='item') Item.flags = relation(ItemFlag, secondary=ItemFlagMap.__table__) Item.flavor_text = relation(ItemFlavorText, order_by=ItemFlavorText.version_group_id.asc(), backref='item') Item.fling_effect = relation(ItemFlingEffect, backref='items') +Item.foreign_names = relation(ItemName, backref='item') Item.machines = relation(Machine, order_by=Machine.version_group_id.asc()) Item.category = relation(ItemCategory) Item.pocket = association_proxy('category', 'pocket') @@ -744,12 +776,20 @@ ItemCategory.pocket = relation(ItemPocket) ItemFlavorText.version_group = relation(VersionGroup) +ItemInternalID.item = relation(Item, backref='internal_ids') +ItemInternalID.generation = relation(Generation) + +ItemName.language = relation(Language) + ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.name) Location.region = relation(Region, backref='locations') LocationArea.location = relation(Location, backref='areas') +LocationInternalID.location = relation(Location, backref='internal_ids') +LocationInternalID.generation = relation(Generation) + Machine.item = relation(Item) Machine.version_group = relation(VersionGroup) @@ -785,6 +825,7 @@ MoveFlavorText.version_group = relation(VersionGroup) MoveName.language = relation(Language) +Nature.foreign_names = relation(NatureName, backref='nature') Nature.decreased_stat = relation(Stat, primaryjoin=Nature.decreased_stat_id==Stat.id, backref='decreasing_natures') Nature.increased_stat = relation(Stat, primaryjoin=Nature.increased_stat_id==Stat.id, @@ -800,6 +841,8 @@ Nature.pokeathlon_effects = relation(NaturePokeathlonStat, order_by=NaturePokeat NatureBattleStylePreference.battle_style = relation(MoveBattleStyle, backref='nature_preferences') +NatureName.language = relation(Language) + NaturePokeathlonStat.pokeathlon_stat = relation(PokeathlonStat, backref='nature_effects') Pokedex.region = relation(Region, backref='pokedexes') @@ -813,7 +856,7 @@ Pokemon.formes = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.forme_base_po remote_side=[Pokemon.id])) Pokemon.pokemon_color = relation(PokemonColor, backref='pokemon') Pokemon.color = association_proxy('pokemon_color', 'name') -Pokemon.dex_numbers = relation(PokemonDexNumber, backref='pokemon') +Pokemon.dex_numbers = relation(PokemonDexNumber, order_by=PokemonDexNumber.pokedex_id.asc(), backref='pokemon') Pokemon.default_form_sprite = relation(PokemonFormSprite, primaryjoin=and_( Pokemon.id==PokemonFormSprite.pokemon_id, @@ -922,6 +965,9 @@ Type.target_efficacies = relation(TypeEfficacy, Type.generation = relation(Generation, backref='types') Type.damage_class = relation(MoveDamageClass, backref='types') +Type.foreign_names = relation(TypeName, backref='type') + +TypeName.language = relation(Language) Version.version_group = relation(VersionGroup, backref='versions') Version.generation = association_proxy('version_group', 'generation')