From 56d5c3e9536131f24b60b764753bb18d3c3b7a02 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Sat, 9 Jun 2012 21:08:36 +0200 Subject: [PATCH] Add game_index to Nature --- pokedex/data/csv/natures.csv | 52 ++++++++++++++++++------------------ pokedex/db/tables.py | 2 ++ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/pokedex/data/csv/natures.csv b/pokedex/data/csv/natures.csv index d5864af..81a27fe 100644 --- a/pokedex/data/csv/natures.csv +++ b/pokedex/data/csv/natures.csv @@ -1,26 +1,26 @@ -id,identifier,decreased_stat_id,increased_stat_id,hates_flavor_id,likes_flavor_id -1,hardy,2,2,1,1 -2,bold,2,3,1,5 -3,modest,2,4,1,2 -4,calm,2,5,1,4 -5,timid,2,6,1,3 -6,lonely,3,2,5,1 -7,docile,3,3,5,5 -8,mild,3,4,5,2 -9,gentle,3,5,5,4 -10,hasty,3,6,5,3 -11,adamant,4,2,2,1 -12,impish,4,3,2,5 -13,bashful,4,4,2,2 -14,careful,4,5,2,4 -15,rash,5,4,4,2 -16,jolly,4,6,2,3 -17,naughty,5,2,4,1 -18,lax,5,3,4,5 -19,quirky,5,5,4,4 -20,naive,5,6,4,3 -21,brave,6,2,3,1 -22,relaxed,6,3,3,5 -23,quiet,6,4,3,2 -24,sassy,6,5,3,4 -25,serious,6,6,3,3 +id,identifier,decreased_stat_id,increased_stat_id,hates_flavor_id,likes_flavor_id,game_index +1,hardy,2,2,1,1,0 +2,bold,2,3,1,5,5 +3,modest,2,4,1,2,15 +4,calm,2,5,1,4,20 +5,timid,2,6,1,3,10 +6,lonely,3,2,5,1,1 +7,docile,3,3,5,5,6 +8,mild,3,4,5,2,16 +9,gentle,3,5,5,4,21 +10,hasty,3,6,5,3,11 +11,adamant,4,2,2,1,3 +12,impish,4,3,2,5,8 +13,bashful,4,4,2,2,18 +14,careful,4,5,2,4,23 +15,rash,5,4,4,2,19 +16,jolly,4,6,2,3,13 +17,naughty,5,2,4,1,4 +18,lax,5,3,4,5,9 +19,quirky,5,5,4,4,24 +20,naive,5,6,4,3,14 +21,brave,6,2,3,1,2 +22,relaxed,6,3,3,5,7 +23,quiet,6,4,3,2,17 +24,sassy,6,5,3,4,22 +25,serious,6,6,3,3,12 diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index ad02a4b..043bfac 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1392,6 +1392,8 @@ class Nature(TableBase): info=dict(description=u"ID of the Berry flavor the Pokémon hates (if likes_flavor_id is the same, the effects cancel out)")) likes_flavor_id = Column(Integer, ForeignKey('contest_types.id'), nullable=False, info=dict(description=u"ID of the Berry flavor the Pokémon likes (if hates_flavor_id is the same, the effects cancel out)")) + game_index = Column(Integer, unique=True, nullable=False, + info=dict(description=u"Internal game ID of the nature")) @property def is_neutral(self):