veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-07-01 10:35:48 +00:00
Code Issues Projects Releases Wiki Activity

Support null PP for Struggle and Shadow moves. #190

Browse source
This commit is contained in:
Lynn "Zhorken" Vaughan 2011-02-10 21:00:53 -05:00
parent d6a96f5ee9
commit 92084b28b3
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,7 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
162,Super Fang,1,1,1,10,90,0,10,2,41,,5,14,5
163,Slash,1,1,70,20,100,0,10,2,44,,1,2,5
164,Substitute,1,1,0,10,,0,7,1,80,,4,16,23
165,Struggle,1,1,50,1,,0,10,2,255,,1,1,5
165,Struggle,1,1,50,,,0,10,2,255,,1,1,5
166,Sketch,2,1,0,1,,0,10,1,96,,4,19,23
167,Triple Kick,2,2,10,10,90,0,10,2,105,,1,1,7
168,Thief,2,17,40,10,100,0,10,2,106,,5,20,12
@ -558,21 +558,21 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
557,v-generate,5,10,180,5,95,0,10,2,335,,,,
558,cross flame,5,10,100,5,100,0,10,3,336,,,,
559,cross thunder,5,13,100,5,100,0,10,2,337,,,,
10001,Shadow Rush,3,10002,55,1,100,0,2,2,10001,,,,
10002,Shadow Blast,3,10002,80,1,100,0,2,3,44,,,,
10003,Shadow Blitz,3,10002,40,1,100,0,2,2,1,,,,
10004,Shadow Bolt,3,10002,75,1,100,0,2,3,7,10,,,
10005,Shadow Break,3,10002,75,1,100,0,2,2,1,,,,
10006,Shadow Chill,3,10002,75,1,100,0,2,3,6,10,,,
10007,Shadow End,3,10002,120,1,60,0,2,2,10002,,,,
10008,Shadow Fire,3,10002,75,1,100,0,2,3,5,10,,,
10009,Shadow Rave,3,10002,70,1,100,0,6,3,1,,,,
10010,Shadow Storm,3,10002,95,1,100,0,6,3,1,,,,
10011,Shadow Wave,3,10002,50,1,100,0,6,3,1,,,,
10012,Shadow Down,3,10002,0,1,100,0,6,1,60,,,,
10013,Shadow Half,3,10002,1,1,100,0,12,3,10003,,,,
10014,Shadow Hold,3,10002,0,1,,0,6,1,107,,,,
10015,Shadow Mist,3,10002,0,1,100,0,6,1,10004,,,,
10016,Shadow Panic,3,10002,0,1,90,0,6,1,50,,,,
10017,Shadow Shed,3,10002,0,1,,0,12,1,10005,,,,
10018,Shadow Sky,3,10002,0,1,,0,12,1,10006,,,,
10001,Shadow Rush,3,10002,55,,100,0,2,2,10001,,,,
10002,Shadow Blast,3,10002,80,,100,0,2,3,44,,,,
10003,Shadow Blitz,3,10002,40,,100,0,2,2,1,,,,
10004,Shadow Bolt,3,10002,75,,100,0,2,3,7,10,,,
10005,Shadow Break,3,10002,75,,100,0,2,2,1,,,,
10006,Shadow Chill,3,10002,75,,100,0,2,3,6,10,,,
10007,Shadow End,3,10002,120,,60,0,2,2,10002,,,,
10008,Shadow Fire,3,10002,75,,100,0,2,3,5,10,,,
10009,Shadow Rave,3,10002,70,,100,0,6,3,1,,,,
10010,Shadow Storm,3,10002,95,,100,0,6,3,1,,,,
10011,Shadow Wave,3,10002,50,,100,0,6,3,1,,,,
10012,Shadow Down,3,10002,0,,100,0,6,1,60,,,,
10013,Shadow Half,3,10002,1,,100,0,12,3,10003,,,,
10014,Shadow Hold,3,10002,0,,,0,6,1,107,,,,
10015,Shadow Mist,3,10002,0,,100,0,6,1,10004,,,,
10016,Shadow Panic,3,10002,0,,90,0,6,1,50,,,,
10017,Shadow Shed,3,10002,0,,,0,12,1,10005,,,,
10018,Shadow Sky,3,10002,0,,,0,12,1,10006,,,,

1 id name 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
163 162 Super Fang 1 1 1 10 90 0 10 2 41 5 14 5
164 163 Slash 1 1 70 20 100 0 10 2 44 1 2 5
165 164 Substitute 1 1 0 10 0 7 1 80 4 16 23
166 165 Struggle 1 1 50 1 0 10 2 255 1 1 5
167 166 Sketch 2 1 0 1 0 10 1 96 4 19 23
168 167 Triple Kick 2 2 10 10 90 0 10 2 105 1 1 7
169 168 Thief 2 17 40 10 100 0 10 2 106 5 20 12
558 557 v-generate 5 10 180 5 95 0 10 2 335
559 558 cross flame 5 10 100 5 100 0 10 3 336
560 559 cross thunder 5 13 100 5 100 0 10 2 337
561 10001 Shadow Rush 3 10002 55 1 100 0 2 2 10001
562 10002 Shadow Blast 3 10002 80 1 100 0 2 3 44
563 10003 Shadow Blitz 3 10002 40 1 100 0 2 2 1
564 10004 Shadow Bolt 3 10002 75 1 100 0 2 3 7 10
565 10005 Shadow Break 3 10002 75 1 100 0 2 2 1
566 10006 Shadow Chill 3 10002 75 1 100 0 2 3 6 10
567 10007 Shadow End 3 10002 120 1 60 0 2 2 10002
568 10008 Shadow Fire 3 10002 75 1 100 0 2 3 5 10
569 10009 Shadow Rave 3 10002 70 1 100 0 6 3 1
570 10010 Shadow Storm 3 10002 95 1 100 0 6 3 1
571 10011 Shadow Wave 3 10002 50 1 100 0 6 3 1
572 10012 Shadow Down 3 10002 0 1 100 0 6 1 60
573 10013 Shadow Half 3 10002 1 1 100 0 12 3 10003
574 10014 Shadow Hold 3 10002 0 1 0 6 1 107
575 10015 Shadow Mist 3 10002 0 1 100 0 6 1 10004
576 10016 Shadow Panic 3 10002 0 1 90 0 6 1 50
577 10017 Shadow Shed 3 10002 0 1 0 12 1 10005
578 10018 Shadow Sky 3 10002 0 1 0 12 1 10006

4
pokedex/db/tables.py
View file

@ -665,8 +665,8 @@ class Move(TableBase):
info=dict(description="ID of the move's elemental type"))
power = Column(SmallInteger, nullable=False,
info=dict(description="Base power of the move"))
pp = Column(SmallInteger, nullable=False,
info=dict(description="Base PP (Power Points) of the move"))
pp = Column(SmallInteger, nullable=True,
info=dict(description="Base PP (Power Points) of the move, nullable if not applicable (e.g. Struggle and Shadow moves)."))
accuracy = Column(SmallInteger, nullable=True,
info=dict(description="Accuracy of the move; NULL means it never misses"))
priority = Column(SmallInteger, nullable=False,