Merge branch 'master' of git@veekun.com:pokedex

This commit is contained in:
Zhorken 2010-04-24 03:01:42 -04:00
commit 984b1372a9
2 changed files with 1847 additions and 752 deletions

File diff suppressed because it is too large Load diff

View file

@ -185,7 +185,8 @@ class LocationArea(TableBase):
class LocationAreaEncounterRate(TableBase): class LocationAreaEncounterRate(TableBase):
__tablename__ = 'location_area_encounter_rates' __tablename__ = 'location_area_encounter_rates'
location_area_id = Column(Integer, ForeignKey('location_areas.id'), primary_key=True, nullable=False, autoincrement=False) 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) rate = Column(Integer, nullable=True)
class Machine(TableBase): class Machine(TableBase):