X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/fe8bf85948addbd41a20b1752343a749df22dc16..583c05848d31fb94a14f3ba8aaede3e31106aabf:/pokedex/db/tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 57207dd..19289c1 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -7,11 +7,14 @@ from sqlalchemy.orm import backref, relation
 from sqlalchemy.types import *
 from sqlalchemy.databases.mysql import *
 
+from pokedex.db import rst
+
 metadata = MetaData()
 TableBase = declarative_base(metadata=metadata)
 
 class Ability(TableBase):
     __tablename__ = 'abilities'
+    __singlename__ = 'ability'
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(24), nullable=False)
     flavor_text = Column(Unicode(64), nullable=False)
@@ -136,6 +139,7 @@ class GrowthRate(TableBase):
 
 class Item(TableBase):
     __tablename__ = 'items'
+    __singlename__ = 'item'
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(16), nullable=False)
 
@@ -146,6 +150,7 @@ class Language(TableBase):
 
 class Location(TableBase):
     __tablename__ = 'locations'
+    __singlename__ = 'location'
     id = Column(Integer, primary_key=True, nullable=False)
     generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False)
     name = Column(Unicode(64), nullable=False)
@@ -163,12 +168,18 @@ class Machine(TableBase):
     generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False)
     move_id = Column(Integer, ForeignKey('moves.id'), nullable=False)
 
+class MoveDamageClass(TableBase):
+    __tablename__ = 'move_damage_classes'
+    id = Column(Integer, primary_key=True, nullable=False)
+    name = Column(Unicode(8), nullable=False)
+    description = Column(Unicode(64), nullable=False)
+
 class MoveEffect(TableBase):
     __tablename__ = 'move_effects'
     id = Column(Integer, primary_key=True, nullable=False)
     priority = Column(SmallInteger, nullable=False)
-    short_effect = Column(Unicode(128), nullable=False)
-    effect = Column(Unicode(255), nullable=False)
+    short_effect = Column(Unicode(256), nullable=False)
+    effect = Column(Unicode(5120), nullable=False)
 
 class MoveTarget(TableBase):
     __tablename__ = 'move_targets'
@@ -178,6 +189,7 @@ class MoveTarget(TableBase):
 
 class Move(TableBase):
     __tablename__ = 'moves'
+    __singlename__ = 'move'
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(12), nullable=False)
     generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False)
@@ -186,7 +198,7 @@ class Move(TableBase):
     pp = Column(SmallInteger, nullable=False)
     accuracy = Column(SmallInteger)
     target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=False)
-    category = Column(Unicode(8), nullable=False)
+    damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False)
     effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False)
     effect_chance = Column(Integer)
     contest_type = Column(Unicode(8), nullable=False)
@@ -203,6 +215,7 @@ class Pokemon(TableBase):
     purely cosmetic forms like Unown.
     """
     __tablename__ = 'pokemon'
+    __singlename__ = 'pokemon'
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(20), nullable=False)
     forme_name = Column(Unicode(16))
@@ -352,6 +365,7 @@ class TypeEfficacy(TableBase):
 
 class Type(TableBase):
     __tablename__ = 'types'
+    __singlename__ = 'type'
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(8), nullable=False)
     abbreviation = Column(Unicode(3), nullable=False)
@@ -367,8 +381,6 @@ class Version(TableBase):
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False)
     name = Column(Unicode(32), nullable=False)
 
-    generation = association_proxy('version_group', 'generation')
-
 
 ### Relations down here, to avoid ordering problems
 Encounter.pokemon = relation(Pokemon, backref='encounters')
@@ -390,11 +402,16 @@ LocationArea.location = relation(Location, backref='areas')
 
 Machine.generation = relation(Generation)
 
-Move.type = relation(Type, backref='moves')
+Move.damage_class = relation(MoveDamageClass, backref='moves')
+Move.move_effect = relation(MoveEffect, backref='moves')
 Move.generation = relation(Generation, backref='moves')
-Move.target = relation(MoveTarget, backref='moves')
-Move.effect = relation(MoveEffect, backref='moves')
 Move.machines = relation(Machine, backref='move')
+Move.target = relation(MoveTarget, backref='moves')
+Move.type = relation(Type, backref='moves')
+
+Move.effect = rst.MoveEffectProperty('effect')
+Move.priority = association_proxy('move_effect', 'priority')
+Move.short_effect = rst.MoveEffectProperty('short_effect')
 
 Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__,
                                       order_by=PokemonAbility.slot,
@@ -449,5 +466,6 @@ Type.target_efficacies = relation(TypeEfficacy,
                                   backref='target_type')
 
 Version.version_group = relation(VersionGroup, backref='versions')
+Version.generation = association_proxy('version_group', 'generation')
 
 VersionGroup.generation = relation(Generation, backref='version_groups')