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

Merge pull request #64 from veekun/zhorken

Browse source 
Fixes some move data issues and form bugs.
This commit is contained in:
Eevee 2012-02-05 21:29:22 -08:00
commit 897c6f1de1
5 changed files with 753 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pokedex/data/csv/move_changelog.csv
View file

@ -37,7 +37,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c
105,8,,,20,,,
120,3,,130,,,,
126,3,,,,,,30
128,11,,,,75,,
128,11,,,10,75,,
136,8,,85,,,,
136,11,,100,20,,,
137,11,,,,75,,
@ -54,7 +54,9 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c
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,,,,
@ -73,6 +75,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c
348,8,,70,,,,
350,11,,,,80,,
353,11,,120,,85,,
364,11,,50,,,,
382,11,,0,,,,
386,11,,60,,,,
387,11,,130,,,,

1 move_id changed_in_version_group_id type_id power pp accuracy effect_id effect_chance
37 105 8 20
38 120 3 130
39 126 3 30
40 128 11 10 75
41 136 8 85
42 136 11 100 20
43 137 11 75
54 178 11 85
55 184 11 90
56 192 8 100
57 198 11 80
58 200 8 90
59 200 11 15
60 202 8 5
61 202 11 60
62 210 11 10
75 348 8 70
76 350 11 80
77 353 11 120 85
78 364 11 50
79 382 11 0
80 386 11 60
81 387 11 130

10
pokedex/data/csv/moves.csv
View file

@ -126,7 +126,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
125,bone-club,1,5,65,20,85,0,10,2,32,10,5,10,5
126,fire-blast,1,10,120,5,85,0,10,3,5,10,2,1,17
127,waterfall,1,11,80,15,100,0,10,2,32,20,5,28,5
128,clamp,1,11,35,10,85,0,10,2,43,100,5,24,5
128,clamp,1,11,35,15,85,0,10,2,43,100,5,24,5
129,swift,1,1,60,20,,0,11,3,18,,1,27,17
130,skull-bash,1,1,100,15,100,0,10,2,146,100,5,4,6
131,spike-cannon,1,1,20,15,100,0,10,2,30,,1,10,7
@ -137,7 +137,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
136,hi-jump-kick,1,2,130,10,90,0,10,2,46,,1,3,5
137,glare,1,1,0,30,90,0,10,1,68,,5,5,19
138,dream-eater,1,14,100,15,100,0,10,3,9,,4,8,20
139,poison-gas,1,4,0,40,90,0,11,1,67,,4,33,5
139,poison-gas,1,4,0,40,80,0,11,1,67,,4,33,5
140,barrage,1,1,15,20,85,0,10,2,30,,5,12,7
141,leech-life,1,7,20,15,100,0,10,2,4,,4,9,20
142,lovely-kiss,1,1,0,10,75,0,10,1,2,,2,5,19
@ -196,9 +196,9 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
195,perish-song,2,1,0,5,,0,12,1,115,,2,14,10
196,icy-wind,2,15,55,15,95,0,11,3,71,100,2,5,2
197,detect,2,2,0,5,,4,7,1,112,,1,16,16
198,bone-rush,2,5,25,10,80,0,10,2,30,,5,1,7
198,bone-rush,2,5,25,10,90,0,10,2,30,,5,1,7
199,lock-on,2,1,0,5,,0,10,1,95,,4,24,20
200,outrage,2,16,120,15,100,0,8,2,28,,1,6,7
200,outrage,2,16,120,10,100,0,8,2,28,,1,6,7
201,sandstorm,2,6,0,10,,0,12,1,116,,5,21,13
202,giga-drain,2,12,75,10,100,0,10,3,4,,4,10,20
203,endure,2,1,0,10,,4,7,1,117,,5,16,13
@ -362,7 +362,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
361,healing-wish,4,14,0,10,,0,7,1,221,,3,,8
362,brine,4,11,65,10,100,0,10,3,222,,4,,4
363,natural-gift,4,1,1,15,100,0,10,2,223,,1,,18
364,feint,4,1,50,10,100,2,10,2,224,,2,,16
364,feint,4,1,30,10,100,2,10,2,224,,2,,16
365,pluck,4,3,60,20,100,0,10,2,225,,3,,12
366,tailwind,4,3,0,30,,0,4,1,226,,4,,1
367,acupressure,4,1,0,30,,0,5,1,227,,1,,11

1 id identifier generation_id type_id power pp accuracy priority target_id damage_class_id effect_id effect_chance contest_type_id contest_effect_id super_contest_effect_id
126 125 bone-club 1 5 65 20 85 0 10 2 32 10 5 10 5
127 126 fire-blast 1 10 120 5 85 0 10 3 5 10 2 1 17
128 127 waterfall 1 11 80 15 100 0 10 2 32 20 5 28 5
129 128 clamp 1 11 35 10 15 85 0 10 2 43 100 5 24 5
130 129 swift 1 1 60 20 0 11 3 18 1 27 17
131 130 skull-bash 1 1 100 15 100 0 10 2 146 100 5 4 6
132 131 spike-cannon 1 1 20 15 100 0 10 2 30 1 10 7
137 136 hi-jump-kick 1 2 130 10 90 0 10 2 46 1 3 5
138 137 glare 1 1 0 30 90 0 10 1 68 5 5 19
139 138 dream-eater 1 14 100 15 100 0 10 3 9 4 8 20
140 139 poison-gas 1 4 0 40 90 80 0 11 1 67 4 33 5
141 140 barrage 1 1 15 20 85 0 10 2 30 5 12 7
142 141 leech-life 1 7 20 15 100 0 10 2 4 4 9 20
143 142 lovely-kiss 1 1 0 10 75 0 10 1 2 2 5 19
196 195 perish-song 2 1 0 5 0 12 1 115 2 14 10
197 196 icy-wind 2 15 55 15 95 0 11 3 71 100 2 5 2
198 197 detect 2 2 0 5 4 7 1 112 1 16 16
199 198 bone-rush 2 5 25 10 80 90 0 10 2 30 5 1 7
200 199 lock-on 2 1 0 5 0 10 1 95 4 24 20
201 200 outrage 2 16 120 15 10 100 0 8 2 28 1 6 7
202 201 sandstorm 2 6 0 10 0 12 1 116 5 21 13
203 202 giga-drain 2 12 75 10 100 0 10 3 4 4 10 20
204 203 endure 2 1 0 10 4 7 1 117 5 16 13
362 361 healing-wish 4 14 0 10 0 7 1 221 3 8
363 362 brine 4 11 65 10 100 0 10 3 222 4 4
364 363 natural-gift 4 1 1 15 100 0 10 2 223 1 18
365 364 feint 4 1 50 30 10 100 2 10 2 224 2 16
366 365 pluck 4 3 60 20 100 0 10 2 225 3 12
367 366 tailwind 4 3 0 30 0 4 1 226 4 1
368 367 acupressure 4 1 0 30 0 5 1 227 1 11

727
pokedex/data/csv/pokemon_form_names.csv
View file

File diff suppressed because it is too large Load diff

10
pokedex/data/csv/pokemon_moves.csv
View file

@ -205787,6 +205787,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
647,11,526,1,61,
647,11,526,4,0,
647,11,533,1,43,
647,11,548,3,0,
648,11,47,1,16,
648,11,60,1,31,
648,11,63,4,0,
@ -208615,9 +208616,13 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
665,11,55,1,1,2
665,11,57,4,0,
665,11,58,4,0,
665,11,61,2,0,
665,11,92,4,0,
665,11,97,2,0,
665,11,99,2,0,
665,11,104,4,0,
665,11,127,4,0,
665,11,129,2,0,
665,11,156,4,0,
665,11,164,4,0,
665,11,175,1,46,
@ -208630,11 +208635,16 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
665,11,237,4,0,
665,11,240,4,0,
665,11,242,1,24,
665,11,250,2,0,
665,11,253,1,4,
665,11,258,4,0,
665,11,263,4,0,
665,11,269,4,0,
665,11,279,2,0,
665,11,291,4,0,
665,11,330,2,0,
665,11,341,2,0,
665,11,362,2,0,
665,11,401,1,28,
665,11,453,1,13,
665,11,487,1,32,

Can't render this file because it is too large.

8
pokedex/db/tables.py
View file

@ -1082,7 +1082,13 @@ class Pokemon(TableBase):
@property
def name(self):
return self.default_form.pokemon_name or self.species.name
u"""Returns a name for this Pokémon, specifiying the form iff it
represents a specific PokemonForm.
"""
if any(not form.is_default for form in self.forms):
return self.species.name
else:
return self.default_form.pokemon_name or self.species.name
def stat(self, stat_identifier):
u"""Returns a PokemonStat record for the given stat name (or Stat row