From ad73c9d43b094277dc9ec80b91a78f85ba0e684f Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Sun, 25 Sep 2016 11:04:21 -0700 Subject: [PATCH] Add priority and target columns to the move changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for adding Gen V→VI changelog entries. No data changes. --- pokedex/data/csv/move_changelog.csv | 166 ++++++++++++++-------------- pokedex/db/tables.py | 6 + 2 files changed, 89 insertions(+), 83 deletions(-) diff --git a/pokedex/data/csv/move_changelog.csv b/pokedex/data/csv/move_changelog.csv index 27716e1..10301d3 100644 --- a/pokedex/data/csv/move_changelog.csv +++ b/pokedex/data/csv/move_changelog.csv @@ -1,83 +1,83 @@ -move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_chance -2,3,1,,,,, -13,5,,,,75,, -16,3,1,,,,1, -17,3,,35,,,, -18,3,,,,85,, -19,8,,70,,,, -20,11,,,,75,, -22,8,,,10,,, -26,8,,70,,,, -26,11,,85,25,,, -28,3,1,,,,, -33,11,,35,,95,, -35,11,,,,85,, -37,11,,90,20,,, -38,3,,100,,,49, -40,3,,,,,,20 -44,3,1,,,,,10 -50,8,,,,55,, -50,11,,,,80,, -59,3,,,,90,, -67,5,,50,,90,32,30 -71,8,,,20,,, -72,8,,,10,,, -74,11,,,,,14, -80,8,,70,,,, -80,11,,90,20,,, -83,11,,15,,70,, -87,3,,,,,,10 -88,3,,,,65,, -91,3,,100,,,, -91,8,,60,,,, -92,11,,,,85,, -94,3,,,,,,30 -95,8,,,,60,, -95,9,,,,70,, -105,8,,,20,,, -120,3,,130,,,, -126,3,,,,,,30 -128,11,,,10,75,, -136,8,,85,,,, -136,11,,100,20,,, -137,11,,,,75,, -139,11,,,,55,, -143,3,,,,,,10 -146,3,,,,,1,0 -148,8,,,,70,, -152,11,,,,85,, -153,3,,170,,,, -157,3,,,,,1,0 -161,3,,,,,1,0 -170,11,,,40,,, -174,11,10001,,,,, -178,11,,,,85,, -184,11,,,,90,, -192,8,,100,,,, -198,11,,,,80,, -200,8,,90,,,, -200,11,,,15,,, -202,8,,,5,,, -202,11,,60,,,, -210,11,,10,,,, -248,11,,80,15,90,, -249,8,,20,,,, -250,11,,15,,70,, -251,11,,10,,,, -253,11,,50,,,, -254,8,,,10,,, -291,8,,60,,,, -294,11,,,,,54, -328,11,,15,,70,, -331,11,,10,,,, -333,11,,10,,,, -343,11,,40,,,, -348,8,,70,,,, -350,11,,,,80,, -353,11,,120,,85,, -364,11,,50,,,, -382,11,,0,,,, -386,11,,60,,,, -387,11,,130,,,, -409,11,,60,5,,, -463,11,,,,70,, +move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id,effect_id,effect_chance +2,3,1,,,,,,, +13,5,,,,75,,,, +16,3,1,,,,,,1, +17,3,,35,,,,,, +18,3,,,,85,,,, +19,8,,70,,,,,, +20,11,,,,75,,,, +22,8,,,10,,,,, +26,8,,70,,,,,, +26,11,,85,25,,,,, +28,3,1,,,,,,, +33,11,,35,,95,,,, +35,11,,,,85,,,, +37,11,,90,20,,,,, +38,3,,100,,,,,49, +40,3,,,,,,,,20 +44,3,1,,,,,,,10 +50,8,,,,55,,,, +50,11,,,,80,,,, +59,3,,,,90,,,, +67,5,,50,,90,,,32,30 +71,8,,,20,,,,, +72,8,,,10,,,,, +74,11,,,,,,,14, +80,8,,70,,,,,, +80,11,,90,20,,,,, +83,11,,15,,70,,,, +87,3,,,,,,,,10 +88,3,,,,65,,,, +91,3,,100,,,,,, +91,8,,60,,,,,, +92,11,,,,85,,,, +94,3,,,,,,,,30 +95,8,,,,60,,,, +95,9,,,,70,,,, +105,8,,,20,,,,, +120,3,,130,,,,,, +126,3,,,,,,,,30 +128,11,,,10,75,,,, +136,8,,85,,,,,, +136,11,,100,20,,,,, +137,11,,,,75,,,, +139,11,,,,55,,,, +143,3,,,,,,,,10 +146,3,,,,,,,1,0 +148,8,,,,70,,,, +152,11,,,,85,,,, +153,3,,170,,,,,, +157,3,,,,,,,1,0 +161,3,,,,,,,1,0 +170,11,,,40,,,,, +174,11,10001,,,,,,, +178,11,,,,85,,,, +184,11,,,,90,,,, +192,8,,100,,,,,, +198,11,,,,80,,,, +200,8,,90,,,,,, +200,11,,,15,,,,, +202,8,,,5,,,,, +202,11,,60,,,,,, +210,11,,10,,,,,, +248,11,,80,15,90,,,, +249,8,,20,,,,,, +250,11,,15,,70,,,, +251,11,,10,,,,,, +253,11,,50,,,,,, +254,8,,,10,,,,, +291,8,,60,,,,,, +294,11,,,,,,,54, +328,11,,15,,70,,,, +331,11,,10,,,,,, +333,11,,10,,,,,, +343,11,,40,,,,,, +348,8,,70,,,,,, +350,11,,,,80,,,, +353,11,,120,,85,,,, +364,11,,50,,,,,, +382,11,,0,,,,,, +386,11,,60,,,,,, +387,11,,130,,,,,, +409,11,,60,5,,,,, +463,11,,,,70,,,, diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 4652838..f02edd5 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1262,6 +1262,10 @@ class MoveChangelog(TableBase): doc=u"Prior base PP of the move, or NULL if unchanged") accuracy = Column(SmallInteger, nullable=True, doc=u"Prior accuracy of the move, or NULL if unchanged") + priority = Column(SmallInteger, nullable=True, + doc=u"Prior priority of the move, or NULL if unchanged") + target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=True, + doc=u"Prior ID of the target, or NULL if unchanged") effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=True, doc=u"Prior ID of the effect, or NULL if unchanged") effect_chance = Column(Integer, nullable=True, @@ -2560,6 +2564,8 @@ MoveChangelog.changed_in = relationship(VersionGroup, backref='move_changelog') MoveChangelog.move_effect = relationship(MoveEffect, backref='move_changelog') +MoveChangelog.target = relationship(MoveTarget, + backref='move_changelog') MoveChangelog.type = relationship(Type, backref='move_changelog')