veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix natures.game_index

Browse source
This commit is contained in:
Andrew Ekstedt 2014-07-03 17:25:26 -07:00
parent 341f6bbc83
commit 16c1d2c278
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
pokedex/data/csv/natures.csv
View file

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

2
pokedex/db/tables.py
View file

@ -1393,7 +1393,7 @@ class Nature(TableBase):
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, game_index = Column(Integer, unique=True, nullable=False,
info=dict(description=u"This nature's internal order in the games (starting from 1, not 0).")) info=dict(description=u"This nature's internal ID in the games"))
@property @property
def is_neutral(self): def is_neutral(self):