Added super contest effects.

diff --git a/pokedex/data/csv/contest_effects.csv b/pokedex/data/csv/contest_effects.csv
index d4c0798..436d851 100644 (file)
--- a/pokedex/data/csv/contest_effects.csv
+++ b/pokedex/data/csv/contest_effects.csv
@@ -1,4 +1,4 @@
-id,appeal,jam,flavor,effect
+id,appeal,jam,flavor_text,effect

 1,4,0,A highly appealing move.,Gives a high number of appeal points wth no other effects.
 2,3,0,Affected by how well the appeal in front goes.,"If the Pokemon that appealed before the user earned less than three appeal points, user earns six; if three, user earns three; if more than three, user earns none."
 3,6,0,"After this move, the user is more easily startled.","If the user is jammed this turn after using this move, it will receive twice as many jam points."
 1,4,0,A highly appealing move.,Gives a high number of appeal points wth no other effects.
 2,3,0,Affected by how well the appeal in front goes.,"If the Pokemon that appealed before the user earned less than three appeal points, user earns six; if three, user earns three; if more than three, user earns none."
 3,6,0,"After this move, the user is more easily startled.","If the user is jammed this turn after using this move, it will receive twice as many jam points."

diff --git a/pokedex/data/csv/super_contest_effects.csv b/pokedex/data/csv/super_contest_effects.csv
new file mode 100644 (file)
index 0000000..0f9f1dd
--- /dev/null
+++ b/pokedex/data/csv/super_contest_effects.csv
@@ -0,0 +1,23 @@
+id,appeal,flavor_text
+1,2,Enables the user to perform first in the next turn.
+2,2,Enables the user to perform last in the next turn.
+4,2,Earn +2 if the Judge's Voltage goes up.
+5,3,A basic performance using a move known by the Pokémon.
+6,1,Earn +3 if no other Pokémon has chosen the same Judge.
+7,2,Allows performance of the same move twice in a row.
+8,0,Increased Voltage is added to the performance score.
+9,0,Earn +15 if all the Pokémon choose the same Judge.
+10,2,Lowers the Voltage of all Judges by one each.
+11,0,Earn double the score in the next turn.
+12,0,Steals the Voltage of the Pokémon that just went.
+13,2,Prevents the Voltage from going up in the same turn.
+14,2,Makes the order of contestants random in the next turn.
+15,2,Earns double the score on the final performance.
+16,0,Raises the score if the Voltage is low.
+17,2,Earn +2 if the Pokémon performs first in the turn.
+18,2,Earn +2 if the Pokémon performs last in the turn.
+19,2,Prevents the Voltage from going down in the same turn.
+20,1,Earn +3 if two Pokémon raise the Voltage in a row.
+21,0,Earn a higher score the later the Pokémon performs.
+22,2,Earn +3 if the Pokémon that just went hit max Voltage.
+23,1,Earn +3 if the Pokémon gets the lowest score.

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index eb521e1..bb8826d 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -25,7 +25,7 @@ class ContestEffect(TableBase):
     id = Column(Integer, primary_key=True, nullable=False)
     appeal = Column(SmallInteger, nullable=False)
     jam = Column(SmallInteger, nullable=False)
     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):
     effect = Column(Unicode(255), nullable=False)
 
 class EggGroup(TableBase):


@@ -226,7 +226,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)
     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.
 
 class Pokemon(TableBase):
     """The core to this whole mess.


@@ -380,6 +380,12 @@ class Stat(TableBase):
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(16), nullable=False)
 
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(16), nullable=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)
 class TypeEfficacy(TableBase):
     __tablename__ = 'type_efficacy'
     damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False)


@@ -425,6 +431,7 @@ LocationArea.location = relation(Location, backref='areas')
 
 Machine.generation = relation(Generation)
 
 
 Machine.generation = relation(Generation)
 

+Move.contest_effect = relation(ContestEffect, backref='moves')

 Move.damage_class = relation(MoveDamageClass, backref='moves')
 Move.flags = association_proxy('move_flags', 'flag')
 Move.foreign_names = relation(MoveName, backref='pokemon')
 Move.damage_class = relation(MoveDamageClass, backref='moves')
 Move.flags = association_proxy('move_flags', 'flag')
 Move.foreign_names = relation(MoveName, backref='pokemon')


@@ -432,6 +439,7 @@ 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.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.target = relation(MoveTarget, backref='moves')
 Move.type = relation(Type, backref='moves')
 
 Move.target = relation(MoveTarget, backref='moves')
 Move.type = relation(Type, backref='moves')