Add game_index to Nature

This commit is contained in:
Petr Viktorin 2012-06-09 21:08:36 +02:00
parent aee71712f9
commit 56d5c3e953
2 changed files with 28 additions and 26 deletions

View file

@ -1,26 +1,26 @@
id,identifier,decreased_stat_id,increased_stat_id,hates_flavor_id,likes_flavor_id id,identifier,decreased_stat_id,increased_stat_id,hates_flavor_id,likes_flavor_id,game_index
1,hardy,2,2,1,1 1,hardy,2,2,1,1,0
2,bold,2,3,1,5 2,bold,2,3,1,5,5
3,modest,2,4,1,2 3,modest,2,4,1,2,15
4,calm,2,5,1,4 4,calm,2,5,1,4,20
5,timid,2,6,1,3 5,timid,2,6,1,3,10
6,lonely,3,2,5,1 6,lonely,3,2,5,1,1
7,docile,3,3,5,5 7,docile,3,3,5,5,6
8,mild,3,4,5,2 8,mild,3,4,5,2,16
9,gentle,3,5,5,4 9,gentle,3,5,5,4,21
10,hasty,3,6,5,3 10,hasty,3,6,5,3,11
11,adamant,4,2,2,1 11,adamant,4,2,2,1,3
12,impish,4,3,2,5 12,impish,4,3,2,5,8
13,bashful,4,4,2,2 13,bashful,4,4,2,2,18
14,careful,4,5,2,4 14,careful,4,5,2,4,23
15,rash,5,4,4,2 15,rash,5,4,4,2,19
16,jolly,4,6,2,3 16,jolly,4,6,2,3,13
17,naughty,5,2,4,1 17,naughty,5,2,4,1,4
18,lax,5,3,4,5 18,lax,5,3,4,5,9
19,quirky,5,5,4,4 19,quirky,5,5,4,4,24
20,naive,5,6,4,3 20,naive,5,6,4,3,14
21,brave,6,2,3,1 21,brave,6,2,3,1,2
22,relaxed,6,3,3,5 22,relaxed,6,3,3,5,7
23,quiet,6,4,3,2 23,quiet,6,4,3,2,17
24,sassy,6,5,3,4 24,sassy,6,5,3,4,22
25,serious,6,6,3,3 25,serious,6,6,3,3,12

1 id identifier decreased_stat_id increased_stat_id hates_flavor_id likes_flavor_id game_index
2 1 hardy 2 2 1 1 0
3 2 bold 2 3 1 5 5
4 3 modest 2 4 1 2 15
5 4 calm 2 5 1 4 20
6 5 timid 2 6 1 3 10
7 6 lonely 3 2 5 1 1
8 7 docile 3 3 5 5 6
9 8 mild 3 4 5 2 16
10 9 gentle 3 5 5 4 21
11 10 hasty 3 6 5 3 11
12 11 adamant 4 2 2 1 3
13 12 impish 4 3 2 5 8
14 13 bashful 4 4 2 2 18
15 14 careful 4 5 2 4 23
16 15 rash 5 4 4 2 19
17 16 jolly 4 6 2 3 13
18 17 naughty 5 2 4 1 4
19 18 lax 5 3 4 5 9
20 19 quirky 5 5 4 4 24
21 20 naive 5 6 4 3 14
22 21 brave 6 2 3 1 2
23 22 relaxed 6 3 3 5 7
24 23 quiet 6 4 3 2 17
25 24 sassy 6 5 3 4 22
26 25 serious 6 6 3 3 12

View file

@ -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)")) 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, 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)")) 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 @property
def is_neutral(self): def is_neutral(self):