X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/5e9fd8f005f10a2c71f6fab672d9f781aa80065e..86164d3b4df0d8a1854ee0db85a9f2b718ddc6f6:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index eb521e1..afdbe10 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -4,6 +4,7 @@ from sqlalchemy import Column, ForeignKey, MetaData, Table from sqlalchemy.ext.declarative import declarative_base 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 * @@ -20,12 +21,17 @@ class Ability(TableBase): flavor_text = Column(Unicode(64), nullable=False) effect = Column(Unicode(255), nullable=False) +class ContestCombo(TableBase): + __tablename__ = 'contest_combos' + first_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) + second_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) + class ContestEffect(TableBase): __tablename__ = 'contest_effects' id = Column(Integer, primary_key=True, nullable=False) appeal = Column(SmallInteger, nullable=False) jam = Column(SmallInteger, nullable=False) - flavor = Column(Unicode(255), nullable=False) + flavor_text = Column(Unicode(64), nullable=False) effect = Column(Unicode(255), nullable=False) class EggGroup(TableBase): @@ -34,23 +40,23 @@ class EggGroup(TableBase): name = Column(Unicode(16), nullable=False) class Encounter(TableBase): - """Rows in this table represent encounters with wild Pokémon. + """Rows in this table represent encounters with wild Pokémon. Bear with + me, here. Within a given area in a given game, encounters are differentiated by the - slot they are in and a world condition. + "slot" they are in and the state of the game world. - Groups of slots belong to encounter types; these are what the player is - doing to get an encounter, such as surfing or walking through tall grass. + What the player is doing to get an encounter, such as surfing or walking + through tall grass, is called terrain. Each terrain has its own set of + encounter slots. - Within an encounter type, slots are defined primarily by rarity. Each slot - can also be affected by a world condition; for example, the 20% slot for - walking in tall grass is affected by whether a swarm is in effect in the - areas. "There is a swarm" and "there is not a swarm" are conditions, and - together they make a condition group. However, since "not a swarm" is a - base state rather than any sort of new state, it is omitted and instead - referred to by a NULL. + Within a terrain, slots are defined primarily by rarity. Each slot can + also be affected by world conditions; for example, the 20% slot for walking + in tall grass is affected by whether a swarm is in effect in that area. + "Is there a swarm?" is a condition; "there is a swarm" and "there is not a + swarm" are the possible values of this condition. - A slot (20% walking in grass) and single world condition (NULL, i.e. no + 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. @@ -60,57 +66,66 @@ class Encounter(TableBase): id = Column(Integer, primary_key=True, nullable=False) version_id = Column(Integer, ForeignKey('versions.id'), nullable=False, autoincrement=False) location_area_id = Column(Integer, ForeignKey('location_areas.id'), nullable=False, autoincrement=False) - encounter_type_slot_id = Column(Integer, ForeignKey('encounter_type_slots.id'), nullable=False, autoincrement=False) - encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), nullable=True, autoincrement=False) + encounter_slot_id = Column(Integer, ForeignKey('encounter_slots.id'), nullable=False, autoincrement=False) pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False, autoincrement=False) min_level = Column(Integer, nullable=False, autoincrement=False) max_level = Column(Integer, nullable=False, autoincrement=False) class EncounterCondition(TableBase): - """Rows in this table represent something different about the world that - can affect what Pokémon are encountered. + """Rows in this table represent varying conditions in the game world, such + as time of day. """ __tablename__ = 'encounter_conditions' id = Column(Integer, primary_key=True, nullable=False) - encounter_condition_group_id = Column(Integer, ForeignKey('encounter_condition_groups.id'), primary_key=False, nullable=False, autoincrement=False) name = Column(Unicode(64), nullable=False) -class EncounterConditionGroup(TableBase): - """Rows in this table represent a group of mutually exclusive conditions, - such as morning/day/night. "Conditions" that are part of the default state - of the world, such as "not during a swarm" or "not using the PokéRadar", - are not included in this table and are referred to by NULLs in other - tables. +class EncounterConditionValue(TableBase): + """Rows in this table represent possible states for a condition; for + example, the state of 'swarm' could be 'swarm' or 'no swarm'. """ - __tablename__ = 'encounter_condition_groups' + __tablename__ = 'encounter_condition_values' 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) -class EncounterType(TableBase): - """Rows in this table represent ways the player can enter a wild encounter; - i.e. surfing, fishing, or walking through tall grass. +class EncounterConditionValueMap(TableBase): + """Maps encounters to the specific conditions under which they occur.""" + + __tablename__ = 'encounter_condition_value_map' + encounter_id = Column(Integer, ForeignKey('encounters.id'), primary_key=True, nullable=False, autoincrement=False) + encounter_condition_value_id = Column(Integer, ForeignKey('encounter_condition_values.id'), primary_key=True, nullable=False, autoincrement=False) + +class EncounterTerrain(TableBase): + """Rows in this table represent ways the player can enter a wild encounter, + e.g., surfing, fishing, or walking through tall grass. """ - __tablename__ = 'encounter_types' + __tablename__ = 'encounter_terrain' id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(64), nullable=False) -class EncounterTypeSlot(TableBase): - """Rows in this table represent an abstract "slot" within an encounter - type, associated with both a condition group and a rarity. +class EncounterSlot(TableBase): + """Rows in this table represent an abstract "slot" within a terrain, + associated with both some set of conditions and a rarity. Note that there are two encounters per slot, so the rarities will only add up to 50. """ - __tablename__ = 'encounter_type_slots' + __tablename__ = 'encounter_slots' id = Column(Integer, primary_key=True, nullable=False) - encounter_type_id = Column(Integer, ForeignKey('encounter_types.id'), primary_key=False, nullable=False, autoincrement=False) - encounter_condition_group_id = Column(Integer, ForeignKey('encounter_condition_groups.id'), primary_key=False, nullable=True, 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) +class EncounterSlotCondition(TableBase): + """Lists all conditions that affect each slot.""" + + __tablename__ = 'encounter_slot_conditions' + encounter_slot_id = Column(Integer, ForeignKey('encounter_slots.id'), primary_key=True, nullable=False, autoincrement=False) + encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), primary_key=True, nullable=False, autoincrement=False) + class EvolutionChain(TableBase): __tablename__ = 'evolution_chains' id = Column(Integer, primary_key=True, nullable=False) @@ -146,6 +161,7 @@ class Item(TableBase): class Language(TableBase): __tablename__ = 'languages' id = Column(Integer, primary_key=True, nullable=False) + iso3166 = Column(Unicode(2), nullable=False) name = Column(Unicode(16), nullable=False) class Location(TableBase): @@ -165,15 +181,27 @@ 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_types.id'), primary_key=True, nullable=False, autoincrement=False) + encounter_type_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) rate = Column(Integer, nullable=True) class Machine(TableBase): __tablename__ = 'machines' machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False) - generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) move_id = Column(Integer, ForeignKey('moves.id'), nullable=False) +class MoveEffectCategory(TableBase): + __tablename__ = 'move_effect_categories' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(64), nullable=False) + can_affect_user = Column(Boolean, nullable=False) + +class MoveEffectCategoryMap(TableBase): + __tablename__ = 'move_effect_category_map' + move_effect_id = Column(Integer, ForeignKey('move_effects.id'), primary_key=True, nullable=False) + move_effect_category_id = Column(Integer, ForeignKey('move_effect_categories.id'), primary_key=True, nullable=False) + affects_user = Column(Boolean, primary_key=True, nullable=False) + class MoveDamageClass(TableBase): __tablename__ = 'move_damage_classes' id = Column(Integer, primary_key=True, nullable=False) @@ -198,6 +226,12 @@ class MoveFlagType(TableBase): name = Column(Unicode(32), nullable=False) description = Column(rst.RstTextColumn(128), nullable=False) +class MoveFlavorText(TableBase): + __tablename__ = 'move_flavor_text' + move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) + generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False) + flavor_text = Column(Unicode(255), nullable=False) + class MoveName(TableBase): __tablename__ = 'move_names' move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) @@ -226,7 +260,7 @@ class Move(TableBase): effect_chance = Column(Integer) contest_type = Column(Unicode(8), nullable=False) contest_effect_id = Column(Integer, ForeignKey('contest_effects.id'), nullable=True) - super_contest_effect_id = Column(Integer, nullable=False) + super_contest_effect_id = Column(Integer, ForeignKey('super_contest_effects.id'), nullable=False) class Pokemon(TableBase): """The core to this whole mess. @@ -326,6 +360,7 @@ class PokemonFormSprite(TableBase): __tablename__ = 'pokemon_form_sprites' id = Column(Integer, primary_key=True, nullable=False) 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) class PokemonItem(TableBase): @@ -380,6 +415,17 @@ class Stat(TableBase): id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(16), nullable=False) +class SuperContestCombo(TableBase): + __tablename__ = 'super_contest_combos' + first_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) + second_move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) + +class SuperContestEffect(TableBase): + __tablename__ = 'super_contest_effects' + id = Column(Integer, primary_key=True, nullable=False) + appeal = Column(SmallInteger, nullable=False) + flavor_text = Column(Unicode(64), nullable=False) + class TypeEfficacy(TableBase): __tablename__ = 'type_efficacy' damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False) @@ -406,16 +452,29 @@ class Version(TableBase): ### Relations down here, to avoid ordering problems +ContestCombo.first = relation(Move, primaryjoin=ContestCombo.first_move_id==Move.id, + backref='contest_combo_first') +ContestCombo.second = relation(Move, primaryjoin=ContestCombo.second_move_id==Move.id, + backref='contest_combo_second') + +Encounter.location_area = relation(LocationArea, backref='encounters') Encounter.pokemon = relation(Pokemon, backref='encounters') Encounter.version = relation(Version, backref='encounters') -Encounter.location_area = relation(LocationArea, backref='encounters') -Encounter.slot = relation(EncounterTypeSlot, backref='encounters') -Encounter.condition = relation(EncounterCondition, backref='encounters') +Encounter.slot = relation(EncounterSlot, backref='encounters') + +EncounterConditionValue.condition = relation(EncounterCondition, backref='values') + +Encounter.condition_value_map = relation(EncounterConditionValueMap, backref='encounter') +Encounter.condition_values = association_proxy('condition_value_map', 'condition_value') +EncounterConditionValueMap.condition_value = relation(EncounterConditionValue, + backref='encounter_map') -EncounterCondition.group = relation(EncounterConditionGroup, - backref='conditions') +EncounterSlot.terrain = relation(EncounterTerrain, backref='slots') -EncounterTypeSlot.type = relation(EncounterType, backref='slots') +EncounterSlot.condition_map = relation(EncounterSlotCondition, backref='slot') +EncounterSlot.conditions = association_proxy('condition_map', 'condition') +EncounterSlotCondition.condition = relation(EncounterCondition, + backref='slot_map') EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains') @@ -423,15 +482,22 @@ Generation.versions = relation(Version, secondary=VersionGroup.__table__) LocationArea.location = relation(Location, backref='areas') -Machine.generation = relation(Generation) +Machine.version_group = relation(VersionGroup) +Move.contest_effect = relation(ContestEffect, backref='moves') +Move.contest_combo_next = association_proxy('contest_combo_first', 'second') +Move.contest_combo_prev = association_proxy('contest_combo_second', 'first') Move.damage_class = relation(MoveDamageClass, backref='moves') Move.flags = association_proxy('move_flags', 'flag') +Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.generation_id, backref='move') Move.foreign_names = relation(MoveName, backref='pokemon') Move.generation = relation(Generation, backref='moves') Move.machines = relation(Machine, backref='move') Move.move_effect = relation(MoveEffect, backref='moves') Move.move_flags = relation(MoveFlag, backref='move') +Move.super_contest_effect = relation(SuperContestEffect, backref='moves') +Move.super_contest_combo_next = association_proxy('super_contest_combo_first', 'second') +Move.super_contest_combo_prev = association_proxy('super_contest_combo_second', 'first') Move.target = relation(MoveTarget, backref='moves') Move.type = relation(Type, backref='moves') @@ -439,8 +505,14 @@ Move.effect = rst.MoveEffectProperty('effect') Move.priority = association_proxy('move_effect', 'priority') Move.short_effect = rst.MoveEffectProperty('short_effect') +MoveEffect.category_map = relation(MoveEffectCategoryMap) +MoveEffect.categories = association_proxy('category_map', 'category') +MoveEffectCategoryMap.category = relation(MoveEffectCategory) + MoveFlag.flag = relation(MoveFlagType) +MoveFlavorText.generation = relation(Generation) + MoveName.language = relation(Language) Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__, @@ -458,7 +530,7 @@ Pokemon.evolution_method = relation(EvolutionMethod) Pokemon.evolution_children = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.evolution_parent_pokemon_id, backref=backref('evolution_parent', remote_side=[Pokemon.id])) -Pokemon.flavor_text = relation(PokemonFlavorText, backref='pokemon') +Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.pokemon_id, backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') Pokemon.items = relation(PokemonItem) Pokemon.generation = relation(Generation, backref='pokemon') @@ -476,9 +548,15 @@ PokemonItem.version = relation(Version) PokemonFormGroup.pokemon = relation(Pokemon, backref=backref('form_group', uselist=False)) PokemonFormSprite.pokemon = relation(Pokemon, backref='form_sprites') +PokemonFormSprite.introduced_in = relation(VersionGroup) PokemonMove.pokemon = relation(Pokemon, backref='pokemon_moves') PokemonMove.version_group = relation(VersionGroup) +PokemonMove.machine = relation(Machine, backref='pokemon_moves', + primaryjoin=and_(Machine.version_group_id==PokemonMove.version_group_id, + Machine.move_id==PokemonMove.move_id), + foreign_keys=[Machine.version_group_id, Machine.move_id], + uselist=False) PokemonMove.move = relation(Move, backref='pokemon_moves') PokemonMove.method = relation(PokemonMoveMethod) @@ -486,6 +564,11 @@ PokemonName.language = relation(Language) PokemonStat.stat = relation(Stat) +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, + backref='super_contest_combo_second') + Type.damage_efficacies = relation(TypeEfficacy, primaryjoin=Type.id ==TypeEfficacy.damage_type_id,