X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/3e6c6948aa5387b965d55dc48d58a425124bd2a0..fa4fa75486e2e2e3cd1db1a918a5c281f7972fad:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 2f43601..a123231 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -89,6 +89,7 @@ class EncounterConditionValue(TableBase): id = Column(Integer, primary_key=True, nullable=False) encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), primary_key=False, nullable=False, autoincrement=False) name = Column(Unicode(64), nullable=False) + is_default = Column(Boolean, nullable=False) class EncounterConditionValueMap(TableBase): """Maps encounters to the specific conditions under which they occur.""" @@ -116,6 +117,7 @@ class EncounterSlot(TableBase): __tablename__ = 'encounter_slots' id = Column(Integer, primary_key=True, nullable=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False, autoincrement=False) encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=False, nullable=False, autoincrement=False) rarity = Column(Integer, nullable=False, autoincrement=False) @@ -142,8 +144,8 @@ class EvolutionMethod(TableBase): class Generation(TableBase): __tablename__ = 'generations' id = Column(Integer, primary_key=True, nullable=False) + main_region_id = Column(Integer, ForeignKey('regions.id')) name = Column(Unicode(16), nullable=False) - main_region = Column(Unicode(16), nullable=False) class GrowthRate(TableBase): """`formula` is written in LaTeX math notation.""" @@ -161,6 +163,7 @@ class Item(TableBase): class Language(TableBase): __tablename__ = 'languages' id = Column(Integer, primary_key=True, nullable=False) + iso639 = Column(Unicode(2), nullable=False) iso3166 = Column(Unicode(2), nullable=False) name = Column(Unicode(16), nullable=False) @@ -168,7 +171,7 @@ class Location(TableBase): __tablename__ = 'locations' __singlename__ = 'location' id = Column(Integer, primary_key=True, nullable=False) - generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) + region_id = Column(Integer, ForeignKey('regions.id')) name = Column(Unicode(64), nullable=False) class LocationArea(TableBase): @@ -262,6 +265,17 @@ class Move(TableBase): contest_effect_id = Column(Integer, ForeignKey('contest_effects.id'), nullable=True) super_contest_effect_id = Column(Integer, ForeignKey('super_contest_effects.id'), nullable=False) +class Pokedex(TableBase): + __tablename__ = 'pokedexes' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(16), nullable=False) + description = Column(Unicode(512)) + +class PokedexVersionGroup(TableBase): + __tablename__ = 'pokedex_version_groups' + pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, nullable=False, autoincrement=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) + class Pokemon(TableBase): """The core to this whole mess. @@ -285,14 +299,13 @@ class Pokemon(TableBase): height = Column(Integer, nullable=False) weight = Column(Integer, nullable=False) species = Column(Unicode(16), nullable=False) - color = Column(Unicode(6), nullable=False) + color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False) pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False) - habitat = Column(Unicode(16), nullable=False) + habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True) gender_rate = Column(Integer, nullable=False) capture_rate = Column(Integer, nullable=False) base_experience = Column(Integer, nullable=False) base_happiness = Column(Integer, nullable=False) - gen1_internal_id = Column(Integer) is_baby = Column(Boolean, nullable=False) has_gen4_fem_sprite = Column(Boolean, nullable=False) has_gen4_fem_back_sprite = Column(Boolean, nullable=False) @@ -314,7 +327,7 @@ class Pokemon(TableBase): """Returns the name of this Pokémon, including its Forme, if any.""" if self.forme_name: - return "%s %s" % (self.forme_name.capitalize(), self.name) + return "%s %s" % (self.forme_name.title(), self.name) return self.name @property @@ -334,10 +347,15 @@ class PokemonAbility(TableBase): ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False) slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False) +class PokemonColor(TableBase): + __tablename__ = 'pokemon_colors' + id = Column(Integer, primary_key=True, nullable=False, autoincrement=False) + name = Column(Unicode(6), nullable=False) + class PokemonDexNumber(TableBase): __tablename__ = 'pokemon_dex_numbers' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) - generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False) + pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, nullable=False, autoincrement=False) pokedex_number = Column(Integer, nullable=False) class PokemonEggGroup(TableBase): @@ -354,6 +372,7 @@ class PokemonFlavorText(TableBase): 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) class PokemonFormSprite(TableBase): @@ -362,6 +381,12 @@ class PokemonFormSprite(TableBase): pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) introduced_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) name = Column(Unicode(16), nullable=True) + is_default = Column(Boolean, nullable=True) + +class PokemonHabitat(TableBase): + __tablename__ = 'pokemon_habitats' + id = Column(Integer, primary_key=True, nullable=False, autoincrement=False) + name = Column(Unicode(16), nullable=False) class PokemonItem(TableBase): __tablename__ = 'pokemon_items' @@ -410,6 +435,12 @@ class PokemonType(TableBase): type_id = Column(Integer, ForeignKey('types.id'), nullable=False) slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False) +class Region(TableBase): + """Major areas of the world: Kanto, Johto, etc.""" + __tablename__ = 'regions' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(16), nullable=False) + class Stat(TableBase): __tablename__ = 'stats' id = Column(Integer, primary_key=True, nullable=False) @@ -446,6 +477,11 @@ class VersionGroup(TableBase): id = Column(Integer, primary_key=True, nullable=False) generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) +class VersionGroupRegion(TableBase): + __tablename__ = 'version_group_regions' + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False) + region_id = Column(Integer, ForeignKey('regions.id'), primary_key=True, nullable=False) + class Version(TableBase): __tablename__ = 'versions' id = Column(Integer, primary_key=True, nullable=False) @@ -481,6 +517,9 @@ EncounterSlotCondition.condition = relation(EncounterCondition, EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains') Generation.versions = relation(Version, secondary=VersionGroup.__table__) +Generation.main_region = relation(Region) + +Location.region = relation(Region, backref='locations') LocationArea.location = relation(Location, backref='areas') @@ -517,13 +556,23 @@ MoveFlavorText.generation = relation(Generation) MoveName.language = relation(Language) +Pokedex.version_groups = relation(VersionGroup, secondary=PokedexVersionGroup.__table__) + Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__, order_by=PokemonAbility.slot, backref='pokemon') Pokemon.formes = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.forme_base_pokemon_id, backref=backref('forme_base_pokemon', 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.default_form_sprite = relation(PokemonFormSprite, + primaryjoin=and_( + Pokemon.id==PokemonFormSprite.pokemon_id, + PokemonFormSprite.is_default==True, + ), + uselist=False) Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__, order_by=PokemonEggGroup.egg_group_id, backref='pokemon') @@ -534,13 +583,15 @@ Pokemon.evolution_children = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.e remote_side=[Pokemon.id])) Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.pokemon_id, backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') +Pokemon.pokemon_habitat = relation(PokemonHabitat, backref='pokemon') +Pokemon.habitat = association_proxy('pokemon_habitat', 'name') Pokemon.items = relation(PokemonItem) Pokemon.generation = relation(Generation, backref='pokemon') Pokemon.shape = relation(PokemonShape, backref='pokemon') Pokemon.stats = relation(PokemonStat, backref='pokemon') Pokemon.types = relation(Type, secondary=PokemonType.__table__) -PokemonDexNumber.generation = relation(Generation) +PokemonDexNumber.pokedex = relation(Pokedex) PokemonFlavorText.version = relation(Version) @@ -566,6 +617,12 @@ PokemonName.language = relation(Language) PokemonStat.stat = relation(Stat) +# This is technically a has-many; Generation.main_region_id -> Region.id +Region.generation = relation(Generation, uselist=False) +Region.version_group_regions = relation(VersionGroupRegion, backref='region', + order_by='VersionGroupRegion.version_group_id') +Region.version_groups = association_proxy('version_group_regions', 'version_group') + 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, @@ -587,3 +644,5 @@ Version.version_group = relation(VersionGroup, backref='versions') Version.generation = association_proxy('version_group', 'generation') VersionGroup.generation = relation(Generation, backref='version_groups') +VersionGroup.version_group_regions = relation(VersionGroupRegion, backref='version_group') +VersionGroup.regions = association_proxy('version_group_regions', 'region')