X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/b68404a726dd3381185d05cdbca5e397133a0269..6a49139f94f9dd48ebbb21dac3423fb79f7fe4ce:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index bf3959c..c2cf297 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -6,7 +6,6 @@ from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.orm import backref, relation from sqlalchemy.sql import and_ from sqlalchemy.types import * -from sqlalchemy.databases.mysql import * from pokedex.db import rst @@ -58,7 +57,7 @@ class Encounter(TableBase): A slot (20% walking in grass) and any appropriate world conditions (no swarm) are thus enough to define a specific encounter. - + Well, okay, almost: each slot actually appears twice. """ @@ -119,7 +118,8 @@ class EncounterSlot(TableBase): 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) + slot = Column(Integer, nullable=True) + rarity = Column(Integer, nullable=False) class EncounterSlotCondition(TableBase): """Lists all conditions that affect each slot.""" @@ -145,6 +145,7 @@ class Generation(TableBase): __tablename__ = 'generations' id = Column(Integer, primary_key=True, nullable=False) main_region_id = Column(Integer, ForeignKey('regions.id')) + canonical_pokedex_id = Column(Integer, ForeignKey('pokedexes.id')) name = Column(Unicode(16), nullable=False) class GrowthRate(TableBase): @@ -163,6 +164,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) @@ -183,7 +185,8 @@ class LocationArea(TableBase): class LocationAreaEncounterRate(TableBase): __tablename__ = 'location_area_encounter_rates' location_area_id = Column(Integer, ForeignKey('location_areas.id'), primary_key=True, nullable=False, autoincrement=False) - encounter_type_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) + encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) + version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, autoincrement=False) rate = Column(Integer, nullable=True) class Machine(TableBase): @@ -264,9 +267,18 @@ 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 Nature(TableBase): + __tablename__ = 'natures' + __singlename__ = 'nature' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(8), nullable=False) + decreased_stat_id = Column(Integer, ForeignKey('stats.id'), nullable=False) + increased_stat_id = Column(Integer, ForeignKey('stats.id'), nullable=False) + class Pokedex(TableBase): __tablename__ = 'pokedexes' id = Column(Integer, primary_key=True, nullable=False) + region_id = Column(Integer, ForeignKey('regions.id'), nullable=True) name = Column(Unicode(16), nullable=False) description = Column(Unicode(512)) @@ -300,7 +312,7 @@ class Pokemon(TableBase): species = Column(Unicode(16), 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) @@ -326,7 +338,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 @@ -340,6 +352,22 @@ class Pokemon(TableBase): return self + ### Not forms! + + def stat(self, stat_name): + """Returns a PokemonStat record for the given stat name (or Stat row + object). Uses the normal has-many machinery, so all the stats are + effectively cached. + """ + if isinstance(stat_name, Stat): + stat_name = stat_name.name + + for pokemon_stat in self.stats: + if pokemon_stat.stat.name == stat_name: + return pokemon_stat + + return None + class PokemonAbility(TableBase): __tablename__ = 'pokemon_abilities' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) @@ -371,6 +399,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): @@ -379,6 +408,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' @@ -508,6 +543,7 @@ EncounterSlotCondition.condition = relation(EncounterCondition, EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains') +Generation.canonical_pokedex = relation(Pokedex, backref='canonical_for_generation') Generation.versions = relation(Version, secondary=VersionGroup.__table__) Generation.main_region = relation(Region) @@ -548,7 +584,13 @@ MoveFlavorText.generation = relation(Generation) MoveName.language = relation(Language) -Pokedex.version_groups = relation(VersionGroup, secondary=PokedexVersionGroup.__table__) +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, + backref='increasing_natures') + +Pokedex.region = relation(Region, backref='pokedexes') +Pokedex.version_groups = relation(VersionGroup, secondary=PokedexVersionGroup.__table__, backref='pokedexes') Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__, order_by=PokemonAbility.slot, @@ -559,6 +601,12 @@ Pokemon.formes = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.forme_base_po 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') @@ -569,6 +617,8 @@ 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')