Shapes for gen 5 Pokémon.

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 60d3f31..5fbe019 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -492,162 +492,162 @@ id,identifier,generation_id,evolution_chain_id,height,weight,color_id,pokemon_sh
 491,darkrai,4,252,15,505,1,12,,-1,3,210,0,0,120,0,505
 492,shaymin,4,253,2,21,5,8,,-1,45,64,100,0,120,0,506
 493,arceus,4,254,32,3200,4,8,,-1,3,255,0,0,120,0,508
 491,darkrai,4,252,15,505,1,12,,-1,3,210,0,0,120,0,505
 492,shaymin,4,253,2,21,5,8,,-1,45,64,100,0,120,0,506
 493,arceus,4,254,32,3200,4,8,,-1,3,255,0,0,120,0,508

-494,victini,5,255,4,40,10,,,-1,3,270,100,0,120,0,509
-495,snivy,5,256,6,81,5,,,1,45,28,70,0,20,0,510
-496,servine,5,256,8,160,5,,,1,45,145,70,0,20,0,511
-497,serperior,5,256,33,630,5,,,1,45,238,70,0,20,0,512
-498,tepig,5,257,5,99,8,,,1,45,28,70,0,20,0,513
-499,pignite,5,257,10,555,8,,,1,45,146,70,0,20,0,514
-500,emboar,5,257,16,1500,8,,,1,45,238,70,0,20,0,515
-501,oshawott,5,258,5,59,2,,,1,45,28,70,0,20,0,516
-502,dewott,5,258,8,245,2,,,1,45,145,70,0,20,0,517
-503,samurott,5,258,15,946,2,,,1,45,238,70,0,20,0,518
-504,patrat,5,259,5,116,3,,,4,255,51,70,0,15,0,519
-505,watchog,5,259,11,270,3,,,4,255,147,70,0,20,0,520
-506,lillipup,5,260,4,41,3,,,4,255,55,70,0,15,0,521
-507,herdier,5,260,9,147,4,,,4,120,130,70,0,15,0,522
-508,stoutland,5,260,12,610,4,,,4,45,221,70,0,15,0,523
-509,purrloin,5,261,4,101,7,,,4,255,56,70,0,20,0,524
-510,liepard,5,261,11,375,7,,,4,90,156,70,0,20,0,525
-511,pansage,5,262,6,105,5,,,1,190,63,70,0,20,0,526
-512,simisage,5,262,11,305,5,,,1,75,174,70,0,20,0,527
-513,pansear,5,263,6,110,8,,,1,190,63,70,0,20,0,528
-514,simisear,5,263,10,280,8,,,1,75,174,70,0,20,0,529
-515,panpour,5,264,6,135,2,,,1,190,63,70,0,20,0,530
-516,simipour,5,264,10,290,2,,,1,75,174,70,0,20,0,531
-517,munna,5,265,6,233,6,,,4,190,58,70,0,10,0,532
-518,musharna,5,265,11,605,6,,,4,75,170,70,0,10,0,533
-519,pidove,5,266,3,21,4,,,4,255,53,70,0,15,0,534
-520,tranquill,5,266,6,150,4,,,4,120,125,70,0,15,0,535
-521,unfezant,5,266,12,290,4,,,4,45,215,70,0,15,1,536
-522,blitzle,5,267,8,298,1,,,4,190,59,70,0,20,0,537
-523,zebstrika,5,267,16,795,1,,,4,75,174,70,0,20,0,538
-524,roggenrola,5,268,4,180,2,,,4,255,56,70,0,15,0,539
-525,boldore,5,268,9,1020,2,,,4,120,137,70,0,15,0,540
-526,gigalith,5,268,17,2600,2,,,4,45,227,70,0,15,0,541
-527,woobat,5,269,4,21,2,,,4,190,63,70,0,15,0,542
-528,swoobat,5,269,9,105,2,,,4,45,149,70,0,15,0,543
-529,drilbur,5,270,3,85,4,,,4,120,66,70,0,20,0,544
-530,excadrill,5,270,7,404,4,,,4,60,178,70,0,20,0,545
-531,audino,5,271,11,310,6,,,4,255,390,70,0,20,0,546
-532,timburr,5,272,6,125,4,,,2,180,61,70,0,20,0,547
-533,gurdurr,5,272,12,400,4,,,2,90,142,70,0,20,0,548
-534,conkeldurr,5,272,14,870,3,,,2,45,227,70,0,20,0,549
-535,tympole,5,273,5,45,2,,,4,255,59,70,0,20,0,550
-536,palpitoad,5,273,8,170,2,,,4,120,134,70,0,20,0,551
-537,seismitoad,5,273,15,620,2,,,4,45,225,70,0,20,0,552
-538,throh,5,274,13,555,8,,,0,45,163,70,0,20,0,553
-539,sawk,5,275,14,510,2,,,0,45,163,70,0,20,0,554
-540,sewaddle,5,276,3,25,10,,,4,255,62,70,0,15,0,555
-541,swadloon,5,276,5,73,5,,,4,120,133,70,0,15,0,556
-542,leavanny,5,276,12,205,10,,,4,45,221,70,0,15,0,557
-543,venipede,5,277,4,53,8,,,4,255,52,70,0,15,0,558
-544,whirlipede,5,277,12,585,4,,,4,120,126,70,0,15,0,559
-545,scolipede,5,277,25,2005,8,,,4,45,214,70,0,20,0,560
-546,cottonee,5,278,3,6,5,,,4,190,56,70,0,20,0,561
-547,whimsicott,5,278,7,66,5,,,4,75,168,70,0,20,0,562
-548,petilil,5,279,5,66,5,,,8,190,56,70,0,20,0,563
-549,lilligant,5,279,11,163,5,,,8,75,168,70,0,20,0,564
-550,basculin,5,280,10,180,5,,,4,25,161,70,0,40,0,565
-551,sandile,5,281,7,152,3,,,4,180,58,70,0,20,0,567
-552,krokorok,5,281,10,334,3,,,4,90,123,70,0,20,0,568
-553,krookodile,5,281,15,963,8,,,4,45,229,70,0,20,0,569
-554,darumaka,5,282,6,375,8,,,4,120,63,70,0,20,0,570
-555,darmanitan,5,282,13,929,8,,,4,60,168,70,0,20,0,571
-556,maractus,5,283,10,280,5,,,4,255,161,70,0,20,0,573
-557,dwebble,5,284,3,145,8,,,4,190,65,70,0,20,0,574
-558,crustle,5,284,14,2000,8,,,4,75,166,70,0,20,0,575
-559,scraggy,5,285,6,118,10,,,4,180,70,35,0,15,0,576
-560,scrafty,5,285,11,300,8,,,4,90,171,70,0,15,0,577
-561,sigilyph,5,286,14,140,1,,,4,45,172,70,0,20,0,578
-562,yamask,5,287,5,15,1,,,4,190,61,70,0,25,0,579
-563,cofagrigus,5,287,17,765,10,,,4,90,169,70,0,25,0,580
-564,tirtouga,5,288,7,165,2,,,1,45,71,70,0,30,0,581
-565,carracosta,5,288,12,810,2,,,1,45,173,70,0,30,0,582
-566,archen,5,289,5,95,10,,,1,45,71,70,0,30,0,583
-567,archeops,5,289,14,320,10,,,1,45,177,70,0,30,0,584
-568,trubbish,5,290,6,310,5,,,4,190,66,70,0,20,0,585
-569,garbodor,5,290,19,1073,5,,,4,60,166,70,0,20,0,586
-570,zorua,5,291,7,125,4,,,1,75,66,70,0,25,0,587
-571,zoroark,5,291,16,811,4,,,1,45,179,70,0,20,0,588
-572,minccino,5,292,4,58,4,,,6,255,60,70,0,15,0,589
-573,cinccino,5,292,5,75,4,,,6,60,165,70,0,15,0,590
-574,gothita,5,293,4,58,7,,,6,200,58,70,0,20,0,591
-575,gothorita,5,293,7,180,7,,,6,100,137,70,0,20,0,592
-576,gothitelle,5,293,15,440,7,,,6,50,221,70,0,20,0,593
-577,solosis,5,294,3,10,5,,,4,200,58,70,0,20,0,594
-578,duosion,5,294,6,80,5,,,4,100,130,70,0,20,0,595
-579,reuniclus,5,294,10,201,5,,,4,50,221,70,0,20,0,596
-580,ducklett,5,295,5,55,2,,,4,190,61,70,0,20,0,597
-581,swanna,5,295,13,242,9,,,4,45,166,70,0,20,0,598
-582,vanillite,5,296,4,57,9,,,4,255,61,70,0,20,0,599
-583,vanillish,5,296,11,410,9,,,4,120,138,70,0,20,0,600
-584,vanilluxe,5,296,13,575,9,,,4,45,241,70,0,20,0,601
-585,deerling,5,297,6,195,10,,,4,190,67,70,0,20,0,602
-586,sawsbuck,5,297,19,925,3,,,4,75,166,70,0,20,0,603
-587,emolga,5,298,4,50,9,,,4,200,150,70,0,20,0,604
-588,karrablast,5,299,5,59,2,,,4,200,63,70,0,15,0,605
-589,escavalier,5,299,10,330,4,,,4,75,173,70,0,15,0,606
-590,foongus,5,300,2,10,9,,,4,190,59,70,0,20,0,607
-591,amoonguss,5,300,6,105,9,,,4,75,162,70,0,20,0,608
-592,frillish,5,301,12,330,9,,,4,190,67,70,0,20,1,609
-593,jellicent,5,301,22,1350,9,,,4,60,168,70,0,20,1,610
-594,alomomola,5,302,12,316,6,,,4,75,165,70,0,40,0,611
-595,joltik,5,303,1,6,10,,,4,190,64,70,0,20,0,612
-596,galvantula,5,303,8,143,10,,,4,75,165,70,0,20,0,613
-597,ferroseed,5,304,6,188,4,,,4,255,61,70,0,20,0,614
-598,ferrothorn,5,304,10,1100,4,,,4,90,171,70,0,20,0,615
-599,klink,5,305,3,210,4,,,-1,130,60,70,0,20,0,616
-600,klang,5,305,6,510,4,,,-1,60,154,70,0,20,0,617
-601,klinklang,5,305,6,810,4,,,-1,30,234,70,0,20,0,618
-602,tynamo,5,306,2,3,9,,,4,190,55,70,0,20,0,619
-603,eelektrik,5,306,12,220,2,,,4,60,142,70,0,20,0,620
-604,eelektross,5,306,21,805,2,,,4,30,232,70,0,20,0,621
-605,elgyem,5,307,5,90,2,,,4,255,67,70,0,20,0,622
-606,beheeyem,5,307,10,345,3,,,4,90,170,70,0,20,0,623
-607,litwick,5,308,3,31,9,,,4,190,55,70,0,20,0,624
-608,lampent,5,308,6,130,1,,,4,90,130,70,0,20,0,625
-609,chandelure,5,308,10,343,1,,,4,45,234,70,0,20,0,626
-610,axew,5,309,6,180,5,,,4,75,64,35,0,40,0,627
-611,fraxure,5,309,10,360,5,,,4,60,144,35,0,40,0,628
-612,haxorus,5,309,18,1055,10,,,4,45,243,35,0,40,0,629
-613,cubchoo,5,310,5,85,9,,,4,120,61,70,0,20,0,630
-614,beartic,5,310,26,2600,9,,,4,60,170,70,0,20,0,631
-615,cryogonal,5,311,11,1480,2,,,-1,25,170,70,0,25,0,632
-616,shelmet,5,312,4,77,8,,,4,200,61,70,0,15,0,633
-617,accelgor,5,312,8,253,8,,,4,75,173,70,0,15,0,634
-618,stunfisk,5,313,7,110,3,,,4,75,165,70,0,20,0,635
-619,mienfoo,5,314,9,200,10,,,4,180,70,70,0,25,0,636
-620,mienshao,5,314,14,355,7,,,4,45,179,70,0,25,0,637
-621,druddigon,5,315,16,1390,8,,,4,45,170,70,0,30,0,638
-622,golett,5,316,10,920,5,,,-1,190,61,70,0,25,0,639
-623,golurk,5,316,28,3300,5,,,-1,90,169,70,0,25,0,640
-624,pawniard,5,317,5,102,8,,,4,120,68,35,0,20,0,641
-625,bisharp,5,317,16,700,8,,,4,45,172,35,0,20,0,642
-626,bouffalant,5,318,16,946,3,,,4,45,172,70,0,20,0,643
-627,rufflet,5,319,5,105,9,,,0,190,70,70,0,20,0,644
-628,braviary,5,319,15,410,8,,,0,60,179,70,0,20,0,645
-629,vullaby,5,320,5,90,3,,,8,190,74,35,0,20,0,646
-630,mandibuzz,5,320,12,395,3,,,8,60,179,35,0,20,0,647
-631,heatmor,5,321,14,580,8,,,4,90,169,70,0,20,0,648
-632,durant,5,322,3,330,4,,,4,90,169,70,0,20,0,649
-633,deino,5,323,8,173,2,,,4,45,60,35,0,40,0,650
-634,zweilous,5,323,14,500,2,,,4,45,147,35,0,40,0,651
-635,hydreigon,5,323,18,1600,2,,,4,45,270,35,0,40,0,652
-636,larvesta,5,324,11,288,9,,,4,45,72,70,0,40,0,653
-637,volcarona,5,324,16,460,9,,,4,15,248,70,0,40,0,654
-638,cobalion,5,325,21,2500,2,,,-1,3,261,35,0,80,0,655
-639,terrakion,5,326,19,2600,4,,,-1,3,261,35,0,80,0,656
-640,virizion,5,327,20,2000,5,,,-1,3,261,35,0,80,0,657
-641,tornadus,5,328,15,630,5,,,0,3,261,90,0,120,0,658
-642,thundurus,5,329,15,610,2,,,0,3,261,90,0,120,0,659
-643,reshiram,5,330,32,3300,9,,,-1,45,306,0,0,120,0,660
-644,zekrom,5,331,29,3450,1,,,-1,45,306,0,0,120,0,661
-645,landorus,5,332,15,680,3,,,0,3,270,90,0,120,0,662
-646,kyurem,5,333,30,3250,4,,,-1,3,297,0,0,120,0,663
-647,keldeo,5,334,14,485,10,,,-1,3,261,35,0,80,0,664
-648,meloetta,5,335,6,65,9,,,-1,3,270,100,0,120,0,665
-649,genesect,5,336,15,825,7,,,-1,3,270,0,0,120,0,667
+494,victini,5,255,4,40,10,12,,-1,3,270,100,0,120,0,509
+495,snivy,5,256,6,81,5,6,,1,45,28,70,0,20,0,510
+496,servine,5,256,8,160,5,6,,1,45,145,70,0,20,0,511
+497,serperior,5,256,33,630,5,2,,1,45,238,70,0,20,0,512
+498,tepig,5,257,5,99,8,8,,1,45,28,70,0,20,0,513
+499,pignite,5,257,10,555,8,6,,1,45,146,70,0,20,0,514
+500,emboar,5,257,16,1500,8,6,,1,45,238,70,0,20,0,515
+501,oshawott,5,258,5,59,2,6,,1,45,28,70,0,20,0,516
+502,dewott,5,258,8,245,2,6,,1,45,145,70,0,20,0,517
+503,samurott,5,258,15,946,2,8,,1,45,238,70,0,20,0,518
+504,patrat,5,259,5,116,3,8,,4,255,51,70,0,15,0,519
+505,watchog,5,259,11,270,3,6,,4,255,147,70,0,20,0,520
+506,lillipup,5,260,4,41,3,8,,4,255,55,70,0,15,0,521
+507,herdier,5,260,9,147,4,8,,4,120,130,70,0,15,0,522
+508,stoutland,5,260,12,610,4,8,,4,45,221,70,0,15,0,523
+509,purrloin,5,261,4,101,7,8,,4,255,56,70,0,20,0,524
+510,liepard,5,261,11,375,7,8,,4,90,156,70,0,20,0,525
+511,pansage,5,262,6,105,5,6,,1,190,63,70,0,20,0,526
+512,simisage,5,262,11,305,5,6,,1,75,174,70,0,20,0,527
+513,pansear,5,263,6,110,8,6,,1,190,63,70,0,20,0,528
+514,simisear,5,263,10,280,8,6,,1,75,174,70,0,20,0,529
+515,panpour,5,264,6,135,2,6,,1,190,63,70,0,20,0,530
+516,simipour,5,264,10,290,2,6,,1,75,174,70,0,20,0,531
+517,munna,5,265,6,233,6,8,,4,190,58,70,0,10,0,532
+518,musharna,5,265,11,605,6,12,,4,75,170,70,0,10,0,533
+519,pidove,5,266,3,21,4,9,,4,255,53,70,0,15,0,534
+520,tranquill,5,266,6,150,4,9,,4,120,125,70,0,15,0,535
+521,unfezant,5,266,12,290,4,9,,4,45,215,70,0,15,1,536
+522,blitzle,5,267,8,298,1,8,,4,190,59,70,0,20,0,537
+523,zebstrika,5,267,16,795,1,8,,4,75,174,70,0,20,0,538
+524,roggenrola,5,268,4,180,2,7,,4,255,56,70,0,15,0,539
+525,boldore,5,268,9,1020,2,10,,4,120,137,70,0,15,0,540
+526,gigalith,5,268,17,2600,2,10,,4,45,227,70,0,15,0,541
+527,woobat,5,269,4,21,2,9,,4,190,63,70,0,15,0,542
+528,swoobat,5,269,9,105,2,9,,4,45,149,70,0,15,0,543
+529,drilbur,5,270,3,85,4,6,,4,120,66,70,0,20,0,544
+530,excadrill,5,270,7,404,4,12,,4,60,178,70,0,20,0,545
+531,audino,5,271,11,310,6,6,,4,255,390,70,0,20,0,546
+532,timburr,5,272,6,125,4,12,,2,180,61,70,0,20,0,547
+533,gurdurr,5,272,12,400,4,12,,2,90,142,70,0,20,0,548
+534,conkeldurr,5,272,14,870,3,12,,2,45,227,70,0,20,0,549
+535,tympole,5,273,5,45,2,3,,4,255,59,70,0,20,0,550
+536,palpitoad,5,273,8,170,2,6,,4,120,134,70,0,20,0,551
+537,seismitoad,5,273,15,620,2,12,,4,45,225,70,0,20,0,552
+538,throh,5,274,13,555,8,12,,0,45,163,70,0,20,0,553
+539,sawk,5,275,14,510,2,12,,0,45,163,70,0,20,0,554
+540,sewaddle,5,276,3,25,10,14,,4,255,62,70,0,15,0,555
+541,swadloon,5,276,5,73,5,4,,4,120,133,70,0,15,0,556
+542,leavanny,5,276,12,205,10,12,,4,45,221,70,0,15,0,557
+543,venipede,5,277,4,53,8,14,,4,255,52,70,0,15,0,558
+544,whirlipede,5,277,12,585,4,1,,4,120,126,70,0,15,0,559
+545,scolipede,5,277,25,2005,8,14,,4,45,214,70,0,20,0,560
+546,cottonee,5,278,3,6,5,1,,4,190,56,70,0,20,0,561
+547,whimsicott,5,278,7,66,5,12,,4,75,168,70,0,20,0,562
+548,petilil,5,279,5,66,5,5,,8,190,56,70,0,20,0,563
+549,lilligant,5,279,11,163,5,5,,8,75,168,70,0,20,0,564
+550,basculin,5,280,10,180,5,3,,4,25,161,70,0,40,0,565
+551,sandile,5,281,7,152,3,8,,4,180,58,70,0,20,0,567
+552,krokorok,5,281,10,334,3,8,,4,90,123,70,0,20,0,568
+553,krookodile,5,281,15,963,8,6,,4,45,229,70,0,20,0,569
+554,darumaka,5,282,6,375,8,12,,4,120,63,70,0,20,0,570
+555,darmanitan,5,282,13,929,8,8,,4,60,168,70,0,20,0,571
+556,maractus,5,283,10,280,5,5,,4,255,161,70,0,20,0,573
+557,dwebble,5,284,3,145,8,14,,4,190,65,70,0,20,0,574
+558,crustle,5,284,14,2000,8,14,,4,75,166,70,0,20,0,575
+559,scraggy,5,285,6,118,10,6,,4,180,70,35,0,15,0,576
+560,scrafty,5,285,11,300,8,6,,4,90,171,70,0,15,0,577
+561,sigilyph,5,286,14,140,1,9,,4,45,172,70,0,20,0,578
+562,yamask,5,287,5,15,1,4,,4,190,61,70,0,25,0,579
+563,cofagrigus,5,287,17,765,10,5,,4,90,169,70,0,25,0,580
+564,tirtouga,5,288,7,165,2,8,,1,45,71,70,0,30,0,581
+565,carracosta,5,288,12,810,2,6,,1,45,173,70,0,30,0,582
+566,archen,5,289,5,95,10,9,,1,45,71,70,0,30,0,583
+567,archeops,5,289,14,320,10,9,,1,45,177,70,0,30,0,584
+568,trubbish,5,290,6,310,5,12,,4,190,66,70,0,20,0,585
+569,garbodor,5,290,19,1073,5,12,,4,60,166,70,0,20,0,586
+570,zorua,5,291,7,125,4,8,,1,75,66,70,0,25,0,587
+571,zoroark,5,291,16,811,4,6,,1,45,179,70,0,20,0,588
+572,minccino,5,292,4,58,4,8,,6,255,60,70,0,15,0,589
+573,cinccino,5,292,5,75,4,8,,6,60,165,70,0,15,0,590
+574,gothita,5,293,4,58,7,12,,6,200,58,70,0,20,0,591
+575,gothorita,5,293,7,180,7,12,,6,100,137,70,0,20,0,592
+576,gothitelle,5,293,15,440,7,12,,6,50,221,70,0,20,0,593
+577,solosis,5,294,3,10,5,1,,4,200,58,70,0,20,0,594
+578,duosion,5,294,6,80,5,1,,4,100,130,70,0,20,0,595
+579,reuniclus,5,294,10,201,5,4,,4,50,221,70,0,20,0,596
+580,ducklett,5,295,5,55,2,9,,4,190,61,70,0,20,0,597
+581,swanna,5,295,13,242,9,9,,4,45,166,70,0,20,0,598
+582,vanillite,5,296,4,57,9,5,,4,255,61,70,0,20,0,599
+583,vanillish,5,296,11,410,9,5,,4,120,138,70,0,20,0,600
+584,vanilluxe,5,296,13,575,9,11,,4,45,241,70,0,20,0,601
+585,deerling,5,297,6,195,10,8,,4,190,67,70,0,20,0,602
+586,sawsbuck,5,297,19,925,3,8,,4,75,166,70,0,20,0,603
+587,emolga,5,298,4,50,9,8,,4,200,150,70,0,20,0,604
+588,karrablast,5,299,5,59,2,12,,4,200,63,70,0,15,0,605
+589,escavalier,5,299,10,330,4,4,,4,75,173,70,0,15,0,606
+590,foongus,5,300,2,10,9,4,,4,190,59,70,0,20,0,607
+591,amoonguss,5,300,6,105,9,4,,4,75,162,70,0,20,0,608
+592,frillish,5,301,12,330,9,10,,4,190,67,70,0,20,1,609
+593,jellicent,5,301,22,1350,9,10,,4,60,168,70,0,20,1,610
+594,alomomola,5,302,12,316,6,3,,4,75,165,70,0,40,0,611
+595,joltik,5,303,1,6,10,14,,4,190,64,70,0,20,0,612
+596,galvantula,5,303,8,143,10,14,,4,75,165,70,0,20,0,613
+597,ferroseed,5,304,6,188,4,1,,4,255,61,70,0,20,0,614
+598,ferrothorn,5,304,10,1100,4,10,,4,90,171,70,0,20,0,615
+599,klink,5,305,3,210,4,11,,-1,130,60,70,0,20,0,616
+600,klang,5,305,6,510,4,11,,-1,60,154,70,0,20,0,617
+601,klinklang,5,305,6,810,4,11,,-1,30,234,70,0,20,0,618
+602,tynamo,5,306,2,3,9,3,,4,190,55,70,0,20,0,619
+603,eelektrik,5,306,12,220,2,3,,4,60,142,70,0,20,0,620
+604,eelektross,5,306,21,805,2,3,,4,30,232,70,0,20,0,621
+605,elgyem,5,307,5,90,2,6,,4,255,67,70,0,20,0,622
+606,beheeyem,5,307,10,345,3,12,,4,90,170,70,0,20,0,623
+607,litwick,5,308,3,31,9,5,,4,190,55,70,0,20,0,624
+608,lampent,5,308,6,130,1,4,,4,90,130,70,0,20,0,625
+609,chandelure,5,308,10,343,1,4,,4,45,234,70,0,20,0,626
+610,axew,5,309,6,180,5,6,,4,75,64,35,0,40,0,627
+611,fraxure,5,309,10,360,5,6,,4,60,144,35,0,40,0,628
+612,haxorus,5,309,18,1055,10,6,,4,45,243,35,0,40,0,629
+613,cubchoo,5,310,5,85,9,6,,4,120,61,70,0,20,0,630
+614,beartic,5,310,26,2600,9,8,,4,60,170,70,0,20,0,631
+615,cryogonal,5,311,11,1480,2,1,,-1,25,170,70,0,25,0,632
+616,shelmet,5,312,4,77,8,1,,4,200,61,70,0,15,0,633
+617,accelgor,5,312,8,253,8,4,,4,75,173,70,0,15,0,634
+618,stunfisk,5,313,7,110,3,3,,4,75,165,70,0,20,0,635
+619,mienfoo,5,314,9,200,10,6,,4,180,70,70,0,25,0,636
+620,mienshao,5,314,14,355,7,6,,4,45,179,70,0,25,0,637
+621,druddigon,5,315,16,1390,8,6,,4,45,170,70,0,30,0,638
+622,golett,5,316,10,920,5,12,,-1,190,61,70,0,25,0,639
+623,golurk,5,316,28,3300,5,12,,-1,90,169,70,0,25,0,640
+624,pawniard,5,317,5,102,8,12,,4,120,68,35,0,20,0,641
+625,bisharp,5,317,16,700,8,12,,4,45,172,35,0,20,0,642
+626,bouffalant,5,318,16,946,3,8,,4,45,172,70,0,20,0,643
+627,rufflet,5,319,5,105,9,9,,0,190,70,70,0,20,0,644
+628,braviary,5,319,15,410,8,9,,0,60,179,70,0,20,0,645
+629,vullaby,5,320,5,90,3,9,,8,190,74,35,0,20,0,646
+630,mandibuzz,5,320,12,395,3,9,,8,60,179,35,0,20,0,647
+631,heatmor,5,321,14,580,8,6,,4,90,169,70,0,20,0,648
+632,durant,5,322,3,330,4,14,,4,90,169,70,0,20,0,649
+633,deino,5,323,8,173,2,8,,4,45,60,35,0,40,0,650
+634,zweilous,5,323,14,500,2,8,,4,45,147,35,0,40,0,651
+635,hydreigon,5,323,18,1600,2,6,,4,45,270,35,0,40,0,652
+636,larvesta,5,324,11,288,9,14,,4,45,72,70,0,40,0,653
+637,volcarona,5,324,16,460,9,13,,4,15,248,70,0,40,0,654
+638,cobalion,5,325,21,2500,2,8,,-1,3,261,35,0,80,0,655
+639,terrakion,5,326,19,2600,4,8,,-1,3,261,35,0,80,0,656
+640,virizion,5,327,20,2000,5,8,,-1,3,261,35,0,80,0,657
+641,tornadus,5,328,15,630,5,4,,0,3,261,90,0,120,0,658
+642,thundurus,5,329,15,610,2,4,,0,3,261,90,0,120,0,659
+643,reshiram,5,330,32,3300,9,9,,-1,45,306,0,0,120,0,660
+644,zekrom,5,331,29,3450,1,6,,-1,45,306,0,0,120,0,661
+645,landorus,5,332,15,680,3,4,,0,3,270,90,0,120,0,662
+646,kyurem,5,333,30,3250,4,6,,-1,3,297,0,0,120,0,663
+647,keldeo,5,334,14,485,10,8,,-1,3,261,35,0,80,0,664
+648,meloetta,5,335,6,65,9,12,,-1,3,270,100,0,120,0,665
+649,genesect,5,336,15,825,7,12,,-1,3,270,0,0,120,0,667

 10001,deoxys,3,202,17,608,8,12,5,-1,3,215,0,0,120,0,419
 10002,deoxys,3,202,17,608,8,12,5,-1,3,215,0,0,120,0,420
 10003,deoxys,3,202,17,608,8,12,5,-1,3,215,0,0,120,0,421
 10001,deoxys,3,202,17,608,8,12,5,-1,3,215,0,0,120,0,419
 10002,deoxys,3,202,17,608,8,12,5,-1,3,215,0,0,120,0,420
 10003,deoxys,3,202,17,608,8,12,5,-1,3,215,0,0,120,0,421


@@ -663,6 +663,6 @@ id,identifier,generation_id,evolution_chain_id,height,weight,color_id,pokemon_sh
 10013,castform,3,179,3,8,9,1,3,4,45,147,70,0,25,0,379
 10014,castform,3,179,3,8,9,1,3,4,45,147,70,0,25,0,380
 10015,castform,3,179,3,8,9,1,3,4,45,147,70,0,25,0,381
 10013,castform,3,179,3,8,9,1,3,4,45,147,70,0,25,0,379
 10014,castform,3,179,3,8,9,1,3,4,45,147,70,0,25,0,380
 10015,castform,3,179,3,8,9,1,3,4,45,147,70,0,25,0,381

-10016,basculin,5,280,10,180,5,,,4,25,161,70,0,40,0,566
-10017,darmanitan,5,282,13,929,8,,,4,60,189,70,0,20,0,572
-10018,meloetta,5,335,6,65,9,,,-1,3,270,100,0,120,0,666
+10016,basculin,5,280,10,180,5,3,,4,25,161,70,0,40,0,566
+10017,darmanitan,5,282,13,929,8,8,,4,60,189,70,0,20,0,572
+10018,meloetta,5,335,6,65,9,12,,-1,3,270,100,0,120,0,666

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index c60c259..d1404ca 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -1078,7 +1078,7 @@ class Pokemon(TableBase):
         info=dict(description=u"The weight of the Pokémon, in tenths of a kilogram (decigrams)"))
     color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False,
         info=dict(description=u"ID of this Pokémon's Pokédex color, as used for a gimmick search function in the games."))
         info=dict(description=u"The weight of the Pokémon, in tenths of a kilogram (decigrams)"))
     color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False,
         info=dict(description=u"ID of this Pokémon's Pokédex color, as used for a gimmick search function in the games."))

-    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=True,
+    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False,

         info=dict(description=u"ID of this Pokémon's body shape, as used for a gimmick search function in the games."))
     habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True,
         info=dict(description=u"ID of this Pokémon's habitat, as used for a gimmick search function in the games."))
         info=dict(description=u"ID of this Pokémon's body shape, as used for a gimmick search function in the games."))
     habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True,
         info=dict(description=u"ID of this Pokémon's habitat, as used for a gimmick search function in the games."))