Overhaul the Pokémon form schema. #286 #179 #379

pokedex/data/csv/pokemon_dex_numbers.csv

@@ -2025,10 +2025,3 @@ pokemon_id,pokedex_id,pokedex_number
 648,8,154
 649,1,649
 649,8,155
-10001,4,202
-10002,4,202
-10003,4,202
-10004,5,46
-10004,6,46
-10005,5,46
-10005,6,46

pokedex/data/csv/pokemon_evolution.csv

@@ -319,6 +319,3 @@ from_pokemon_id,to_pokemon_id,evolution_trigger_id,trigger_item_id,minimum_level
 633,634,1,,50,,,,,,,,,
 634,635,1,,64,,,,,,,,,
 636,637,1,,59,,,,,,,,,
-412,10004,1,,20,female,,,,,,,,
-412,10005,1,,20,female,,,,,,,,
-554,10017,1,,35,,,,,,,,,

pokedex/data/csv/pokemon_form_groups.csv

@@ -1,20 +1,20 @@
-pokemon_id,is_battle_only,description
+pokemon_id,term,is_battle_only,description
-172,0,"Spiky-eared Pichu can only be received by taking the shiny Pichu from an official promotion to [Celebi]{pokemon}'s shrine in [Ilex Forest]{location}.  Spiky-eared Pichu is always female, cannot evolve, and cannot be taken into the Wi-Fi Club or the Union Room, but is otherwise a normal Pichu."
+172,,0,"Spiky-eared Pichu can only be received by taking the shiny Pichu from an official promotion to [Celebi]{pokemon}'s shrine in [Ilex Forest]{location}.  Spiky-eared Pichu is always female, cannot evolve, and cannot be taken into the Wi-Fi Club or the Union Room, but is otherwise a normal Pichu."
-201,0,Forms only affect appearance.  A form is determined at random before a wild encounter and cannot be changed.
+201,,0,Forms only affect appearance.  A form is determined at random before a wild encounter and cannot be changed.
-351,1,"Form changes along with type to match the [weather]{mechanic} in battle, due to [Forecast]{ability}.  Castform is always in its normal form outside of battle, regardless of weather."
+351,Form,1,"Form changes along with type to match the [weather]{mechanic} in battle, due to [Forecast]{ability}.  Castform is always in its normal form outside of battle, regardless of weather."
-386,0,"Forms have different stats and movepools.  In Generation III, Deoxys's form depends on the game: Normal Forme in Ruby and Sapphire, Attack Forme in FireRed, Defense Forme in LeafGreen, and Speed Forme in Emerald.  In Generation IV, every form exists: form is preserved when transferring via [Pal Park]{location}, and meteorites in the southeast corner of [Veilstone City]{location} or at the west end of [Route 3]{location} can be used to switch between forms."
+386,Forme,0,"Forms have different stats and movepools.  In Generation III, Deoxys's form depends on the game: Normal Forme in Ruby and Sapphire, Attack Forme in FireRed, Defense Forme in LeafGreen, and Speed Forme in Emerald.  In Generation IV, every form exists: form is preserved when transferring via [Pal Park]{location}, and meteorites in the southeast corner of [Veilstone City]{location} or at the west end of [Route 3]{location} can be used to switch between forms."
-412,0,"Forms only affect appearance, although they become permanent upon evolution.  Wild and newly-hatched Burmy are always in a Plant Cloak.  Burmy's cloak changes to match the terrain after a battle it participated in: Plant Cloak by default; Sandy Cloak in sandy or rocky areas, such as beaches, caves, and trails; and Trash Cloak in buildings."
+412,Cloak,0,"Forms only affect appearance, although they become permanent upon evolution.  Wild and newly-hatched Burmy are always in a Plant Cloak.  Burmy's cloak changes to match the terrain after a battle it participated in: Plant Cloak by default; Sandy Cloak in sandy or rocky areas, such as beaches, caves, and trails; and Trash Cloak in buildings."
-413,0,"Forms have different stats and movepools.  During evolution, Burmy's current cloak becomes Wormadam's form, and can no longer be changed."
+413,Cloak,0,"Forms have different stats and movepools.  During evolution, Burmy's current cloak becomes Wormadam's form, and can no longer be changed."
-421,1,"Sunshine form is active during [strong sunlight]{mechanic}.  Otherwise, Cherrim defaults to its Overcast form."
+421,Form,1,"Sunshine form is active during [strong sunlight]{mechanic}.  Otherwise, Cherrim defaults to its Overcast form."
-422,0,"Forms only affect appearance.  A form is determined before a wild encounter based on whether the battle is in western or eastern Sinnoh, or inherited from the mother when breeding, and cannot be changed."
+422,Sea,0,"Forms only affect appearance.  A form is determined before a wild encounter based on whether the battle is in western or eastern Sinnoh, or inherited from the mother when breeding, and cannot be changed."
-423,0,Forms only affect appearance.  A form is determined before a wild encounter based on whether the battle is in western or eastern Sinnoh and cannot be changed.
+423,Sea,0,Forms only affect appearance.  A form is determined before a wild encounter based on whether the battle is in western or eastern Sinnoh and cannot be changed.
-479,0,"Forms have different signature moves, and the appliance forms' stats are different from the normal form's.  When switching forms, the old signature move (if any) is removed and the new one must be learned, overwriting another move if need be, or the switch will be cancelled; however, it can be forgotten while in the new form.  There are appliances for switching forms in a secret room in the [Team Galactic Eterna Building]{location} or the [Silph Co.]{location} Office Building; the room in the Galactic Building requires a [Secret Key]{item}, but the room in Silph Co. is freely accessible when walking with Rotom.  Rotom can be returned to its normal form by checking the space its appliance occupied.  It also reverts to its normal form upon entering the Wi-Fi Club or the Union Room."
+479,Form,0,"Forms have different signature moves, and the appliance forms' stats are different from the normal form's.  When switching forms, the old signature move (if any) is removed and the new one must be learned, overwriting another move if need be, or the switch will be cancelled; however, it can be forgotten while in the new form.  There are appliances for switching forms in a secret room in the [Team Galactic Eterna Building]{location} or the [Silph Co.]{location} Office Building; the room in the Galactic Building requires a [Secret Key]{item}, but the room in Silph Co. is freely accessible when walking with Rotom.  Rotom can be returned to its normal form by checking the space its appliance occupied.  It also reverts to its normal form upon entering the Wi-Fi Club or the Union Room."
-487,0,"Forms have different stats.  Giratina transforms into Origin Forme in the [Distortion World]{location} or while holding a [Griseous Orb]{item}.  Otherwise, it assumes its Altered Forme.  The Griseous Orb returns to the bag upon entering the Wi-Fi Club or the Union Room."
+487,Forme,0,"Forms have different stats.  Giratina transforms into Origin Forme in the [Distortion World]{location} or while holding a [Griseous Orb]{item}.  Otherwise, it assumes its Altered Forme.  The Griseous Orb returns to the bag upon entering the Wi-Fi Club or the Union Room."
-492,0,"Forms have different stats and movepools.  Shaymin transforms into Sky Forme with the use of a [Gracidea]{item}.  It is limited to Land Forme at night, when [frozen]{mechanic}, in the storage system boxes, in the Wi-Fi Club, and in the Union Room; under these conditions, Sky Shaymin reverts to Land Forme, and the Gracidea has no effect.  The Gracidea must be used again to return to Sky Forme.  A Gracidea may be received by showing a woman in southwest [Floaroma Town]{location} or the [Goldenrod City]{location} flower shop a Shaymin met in a fateful encounter."
+492,Forme,0,"Forms have different stats and movepools.  Shaymin transforms into Sky Forme with the use of a [Gracidea]{item}.  It is limited to Land Forme at night, when [frozen]{mechanic}, in the storage system boxes, in the Wi-Fi Club, and in the Union Room; under these conditions, Sky Shaymin reverts to Land Forme, and the Gracidea has no effect.  The Gracidea must be used again to return to Sky Forme.  A Gracidea may be received by showing a woman in southwest [Floaroma Town]{location} or the [Goldenrod City]{location} flower shop a Shaymin met in a fateful encounter."
-493,0,"Form changes along with type to match a held Plate, due to [Multitype]{ability}."
+493,Type,0,"Form changes along with type to match a held Plate, due to [Multitype]{ability}."
-550,0,Not yet known
+550,,0,Not yet known
-555,0,Not yet known
+555,mode,0,Not yet known
-585,0,Not yet known
+585,form,0,Not yet known
-586,0,Not yet known
+586,form,0,Not yet known
-648,0,Not yet known
+648,forme,0,Not yet known
-649,0,Not yet known
+649,buster,0,Not yet known

pokedex/data/csv/pokemon_form_sprites.csv

@@ -1,98 +0,0 @@
-id,pokemon_id,introduced_in_version_group_id,name,is_default
-1,201,3,a,0
-2,201,3,b,0
-3,201,3,c,0
-4,201,3,d,0
-5,201,3,e,0
-6,201,3,f,0
-7,201,3,g,0
-8,201,3,h,0
-9,201,3,i,0
-10,201,3,j,1
-11,201,3,k,0
-12,201,3,l,0
-13,201,3,m,0
-14,201,3,n,0
-15,201,3,o,0
-16,201,3,p,0
-17,201,3,q,0
-18,201,3,r,0
-19,201,3,s,0
-20,201,3,t,0
-21,201,3,u,0
-22,201,3,v,0
-23,201,3,w,0
-24,201,3,x,0
-25,201,3,y,0
-26,201,3,z,0
-27,201,5,?,0
-28,201,5,!,0
-29,351,5,,1
-30,351,5,sunny,0
-31,351,5,rain,0
-32,351,5,snow-cloud,0
-33,386,5,normal,1
-34,386,7,attack,0
-35,386,7,defense,0
-36,386,6,speed,0
-37,412,8,plant,1
-38,412,8,sandy,0
-39,412,8,trash,0
-40,413,8,plant,1
-41,413,8,sandy,0
-42,413,8,trash,0
-43,421,8,overcast,1
-44,421,8,sunshine,0
-45,422,8,east,0
-46,422,8,west,1
-47,423,8,east,0
-48,423,8,west,1
-49,479,8,normal,1
-50,479,9,fan,0
-51,479,9,frost,0
-52,479,9,heat,0
-53,479,9,mow,0
-54,479,9,wash,0
-55,487,8,altered,1
-56,487,9,origin,0
-57,492,8,land,1
-58,492,9,sky,0
-59,493,8,bug,0
-60,493,8,dark,0
-61,493,8,dragon,0
-62,493,8,electric,0
-63,493,8,fighting,0
-64,493,8,fire,0
-65,493,8,flying,0
-66,493,8,ghost,0
-67,493,8,grass,0
-68,493,8,ground,0
-69,493,8,ice,0
-70,493,8,normal,1
-71,493,8,???,0
-72,493,8,poison,0
-73,493,8,psychic,0
-74,493,8,rock,0
-75,493,8,steel,0
-76,493,8,water,0
-77,172,3,,1
-78,172,10,spiky-eared,0
-79,550,11,red stripe,1
-80,550,11,blue stripe,0
-81,555,11,normal,1
-82,555,11,daruma,0
-83,585,11,spring,1
-84,585,11,summer,0
-85,585,11,autumn,0
-86,585,11,winter,0
-87,586,11,spring,1
-88,586,11,summer,0
-89,586,11,autumn,0
-90,586,11,winter,0
-91,648,11,voice,1
-92,648,11,step,0
-93,649,11,orange,1
-94,649,11,blue,0
-95,649,11,red,0
-96,649,11,yellow,0
-97,649,11,white,0

pokedex/data/csv/pokemon_forms.csv

@@ -0,0 +1,728 @@
+id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is_default,order
+1,,1,,1,1,1
+2,,2,,1,1,1
+3,,3,,1,1,1
+4,,4,,1,1,1
+5,,5,,1,1,1
+6,,6,,1,1,1
+7,,7,,1,1,1
+8,,8,,1,1,1
+9,,9,,1,1,1
+10,,10,,1,1,1
+11,,11,,1,1,1
+12,,12,,1,1,1
+13,,13,,1,1,1
+14,,14,,1,1,1
+15,,15,,1,1,1
+16,,16,,1,1,1
+17,,17,,1,1,1
+18,,18,,1,1,1
+19,,19,,1,1,1
+20,,20,,1,1,1
+21,,21,,1,1,1
+22,,22,,1,1,1
+23,,23,,1,1,1
+24,,24,,1,1,1
+25,,25,,1,1,1
+26,,26,,1,1,1
+27,,27,,1,1,1
+28,,28,,1,1,1
+29,,29,,1,1,1
+30,,30,,1,1,1
+31,,31,,1,1,1
+32,,32,,1,1,1
+33,,33,,1,1,1
+34,,34,,1,1,1
+35,,35,,1,1,1
+36,,36,,1,1,1
+37,,37,,1,1,1
+38,,38,,1,1,1
+39,,39,,1,1,1
+40,,40,,1,1,1
+41,,41,,1,1,1
+42,,42,,1,1,1
+43,,43,,1,1,1
+44,,44,,1,1,1
+45,,45,,1,1,1
+46,,46,,1,1,1
+47,,47,,1,1,1
+48,,48,,1,1,1
+49,,49,,1,1,1
+50,,50,,1,1,1
+51,,51,,1,1,1
+52,,52,,1,1,1
+53,,53,,1,1,1
+54,,54,,1,1,1
+55,,55,,1,1,1
+56,,56,,1,1,1
+57,,57,,1,1,1
+58,,58,,1,1,1
+59,,59,,1,1,1
+60,,60,,1,1,1
+61,,61,,1,1,1
+62,,62,,1,1,1
+63,,63,,1,1,1
+64,,64,,1,1,1
+65,,65,,1,1,1
+66,,66,,1,1,1
+67,,67,,1,1,1
+68,,68,,1,1,1
+69,,69,,1,1,1
+70,,70,,1,1,1
+71,,71,,1,1,1
+72,,72,,1,1,1
+73,,73,,1,1,1
+74,,74,,1,1,1
+75,,75,,1,1,1
+76,,76,,1,1,1
+77,,77,,1,1,1
+78,,78,,1,1,1
+79,,79,,1,1,1
+80,,80,,1,1,1
+81,,81,,1,1,1
+82,,82,,1,1,1
+83,,83,,1,1,1
+84,,84,,1,1,1
+85,,85,,1,1,1
+86,,86,,1,1,1
+87,,87,,1,1,1
+88,,88,,1,1,1
+89,,89,,1,1,1
+90,,90,,1,1,1
+91,,91,,1,1,1
+92,,92,,1,1,1
+93,,93,,1,1,1
+94,,94,,1,1,1
+95,,95,,1,1,1
+96,,96,,1,1,1
+97,,97,,1,1,1
+98,,98,,1,1,1
+99,,99,,1,1,1
+100,,100,,1,1,1
+101,,101,,1,1,1
+102,,102,,1,1,1
+103,,103,,1,1,1
+104,,104,,1,1,1
+105,,105,,1,1,1
+106,,106,,1,1,1
+107,,107,,1,1,1
+108,,108,,1,1,1
+109,,109,,1,1,1
+110,,110,,1,1,1
+111,,111,,1,1,1
+112,,112,,1,1,1
+113,,113,,1,1,1
+114,,114,,1,1,1
+115,,115,,1,1,1
+116,,116,,1,1,1
+117,,117,,1,1,1
+118,,118,,1,1,1
+119,,119,,1,1,1
+120,,120,,1,1,1
+121,,121,,1,1,1
+122,,122,,1,1,1
+123,,123,,1,1,1
+124,,124,,1,1,1
+125,,125,,1,1,1
+126,,126,,1,1,1
+127,,127,,1,1,1
+128,,128,,1,1,1
+129,,129,,1,1,1
+130,,130,,1,1,1
+131,,131,,1,1,1
+132,,132,,1,1,1
+133,,133,,1,1,1
+134,,134,,1,1,1
+135,,135,,1,1,1
+136,,136,,1,1,1
+137,,137,,1,1,1
+138,,138,,1,1,1
+139,,139,,1,1,1
+140,,140,,1,1,1
+141,,141,,1,1,1
+142,,142,,1,1,1
+143,,143,,1,1,1
+144,,144,,1,1,1
+145,,145,,1,1,1
+146,,146,,1,1,1
+147,,147,,1,1,1
+148,,148,,1,1,1
+149,,149,,1,1,1
+150,,150,,1,1,1
+151,,151,,1,1,1
+152,,152,,3,1,1
+153,,153,,3,1,1
+154,,154,,3,1,1
+155,,155,,3,1,1
+156,,156,,3,1,1
+157,,157,,3,1,1
+158,,158,,3,1,1
+159,,159,,3,1,1
+160,,160,,3,1,1
+161,,161,,3,1,1
+162,,162,,3,1,1
+163,,163,,3,1,1
+164,,164,,3,1,1
+165,,165,,3,1,1
+166,,166,,3,1,1
+167,,167,,3,1,1
+168,,168,,3,1,1
+169,,169,,3,1,1
+170,,170,,3,1,1
+171,,171,,3,1,1
+172,,172,,3,1,1
+173,,173,,3,1,1
+174,,174,,3,1,1
+175,,175,,3,1,1
+176,,176,,3,1,1
+177,,177,,3,1,1
+178,,178,,3,1,1
+179,,179,,3,1,1
+180,,180,,3,1,1
+181,,181,,3,1,1
+182,,182,,3,1,1
+183,,183,,3,1,1
+184,,184,,3,1,1
+185,,185,,3,1,1
+186,,186,,3,1,1
+187,,187,,3,1,1
+188,,188,,3,1,1
+189,,189,,3,1,1
+190,,190,,3,1,1
+191,,191,,3,1,1
+192,,192,,3,1,1
+193,,193,,3,1,1
+194,,194,,3,1,1
+195,,195,,3,1,1
+196,,196,,3,1,1
+197,,197,,3,1,1
+198,,198,,3,1,1
+199,,199,,3,1,1
+200,,200,,3,1,1
+201,A,201,,3,1,1
+202,,202,,3,1,1
+203,,203,,3,1,1
+204,,204,,3,1,1
+205,,205,,3,1,1
+206,,206,,3,1,1
+207,,207,,3,1,1
+208,,208,,3,1,1
+209,,209,,3,1,1
+210,,210,,3,1,1
+211,,211,,3,1,1
+212,,212,,3,1,1
+213,,213,,3,1,1
+214,,214,,3,1,1
+215,,215,,3,1,1
+216,,216,,3,1,1
+217,,217,,3,1,1
+218,,218,,3,1,1
+219,,219,,3,1,1
+220,,220,,3,1,1
+221,,221,,3,1,1
+222,,222,,3,1,1
+223,,223,,3,1,1
+224,,224,,3,1,1
+225,,225,,3,1,1
+226,,226,,3,1,1
+227,,227,,3,1,1
+228,,228,,3,1,1
+229,,229,,3,1,1
+230,,230,,3,1,1
+231,,231,,3,1,1
+232,,232,,3,1,1
+233,,233,,3,1,1
+234,,234,,3,1,1
+235,,235,,3,1,1
+236,,236,,3,1,1
+237,,237,,3,1,1
+238,,238,,3,1,1
+239,,239,,3,1,1
+240,,240,,3,1,1
+241,,241,,3,1,1
+242,,242,,3,1,1
+243,,243,,3,1,1
+244,,244,,3,1,1
+245,,245,,3,1,1
+246,,246,,3,1,1
+247,,247,,3,1,1
+248,,248,,3,1,1
+249,,249,,3,1,1
+250,,250,,3,1,1
+251,,251,,3,1,1
+252,,252,,5,1,1
+253,,253,,5,1,1
+254,,254,,5,1,1
+255,,255,,5,1,1
+256,,256,,5,1,1
+257,,257,,5,1,1
+258,,258,,5,1,1
+259,,259,,5,1,1
+260,,260,,5,1,1
+261,,261,,5,1,1
+262,,262,,5,1,1
+263,,263,,5,1,1
+264,,264,,5,1,1
+265,,265,,5,1,1
+266,,266,,5,1,1
+267,,267,,5,1,1
+268,,268,,5,1,1
+269,,269,,5,1,1
+270,,270,,5,1,1
+271,,271,,5,1,1
+272,,272,,5,1,1
+273,,273,,5,1,1
+274,,274,,5,1,1
+275,,275,,5,1,1
+276,,276,,5,1,1
+277,,277,,5,1,1
+278,,278,,5,1,1
+279,,279,,5,1,1
+280,,280,,5,1,1
+281,,281,,5,1,1
+282,,282,,5,1,1
+283,,283,,5,1,1
+284,,284,,5,1,1
+285,,285,,5,1,1
+286,,286,,5,1,1
+287,,287,,5,1,1
+288,,288,,5,1,1
+289,,289,,5,1,1
+290,,290,,5,1,1
+291,,291,,5,1,1
+292,,292,,5,1,1
+293,,293,,5,1,1
+294,,294,,5,1,1
+295,,295,,5,1,1
+296,,296,,5,1,1
+297,,297,,5,1,1
+298,,298,,5,1,1
+299,,299,,5,1,1
+300,,300,,5,1,1
+301,,301,,5,1,1
+302,,302,,5,1,1
+303,,303,,5,1,1
+304,,304,,5,1,1
+305,,305,,5,1,1
+306,,306,,5,1,1
+307,,307,,5,1,1
+308,,308,,5,1,1
+309,,309,,5,1,1
+310,,310,,5,1,1
+311,,311,,5,1,1
+312,,312,,5,1,1
+313,,313,,5,1,1
+314,,314,,5,1,1
+315,,315,,5,1,1
+316,,316,,5,1,1
+317,,317,,5,1,1
+318,,318,,5,1,1
+319,,319,,5,1,1
+320,,320,,5,1,1
+321,,321,,5,1,1
+322,,322,,5,1,1
+323,,323,,5,1,1
+324,,324,,5,1,1
+325,,325,,5,1,1
+326,,326,,5,1,1
+327,,327,,5,1,1
+328,,328,,5,1,1
+329,,329,,5,1,1
+330,,330,,5,1,1
+331,,331,,5,1,1
+332,,332,,5,1,1
+333,,333,,5,1,1
+334,,334,,5,1,1
+335,,335,,5,1,1
+336,,336,,5,1,1
+337,,337,,5,1,1
+338,,338,,5,1,1
+339,,339,,5,1,1
+340,,340,,5,1,1
+341,,341,,5,1,1
+342,,342,,5,1,1
+343,,343,,5,1,1
+344,,344,,5,1,1
+345,,345,,5,1,1
+346,,346,,5,1,1
+347,,347,,5,1,1
+348,,348,,5,1,1
+349,,349,,5,1,1
+350,,350,,5,1,1
+351,,351,351,5,1,1
+352,,352,,5,1,1
+353,,353,,5,1,1
+354,,354,,5,1,1
+355,,355,,5,1,1
+356,,356,,5,1,1
+357,,357,,5,1,1
+358,,358,,5,1,1
+359,,359,,5,1,1
+360,,360,,5,1,1
+361,,361,,5,1,1
+362,,362,,5,1,1
+363,,363,,5,1,1
+364,,364,,5,1,1
+365,,365,,5,1,1
+366,,366,,5,1,1
+367,,367,,5,1,1
+368,,368,,5,1,1
+369,,369,,5,1,1
+370,,370,,5,1,1
+371,,371,,5,1,1
+372,,372,,5,1,1
+373,,373,,5,1,1
+374,,374,,5,1,1
+375,,375,,5,1,1
+376,,376,,5,1,1
+377,,377,,5,1,1
+378,,378,,5,1,1
+379,,379,,5,1,1
+380,,380,,5,1,1
+381,,381,,5,1,1
+382,,382,,5,1,1
+383,,383,,5,1,1
+384,,384,,5,1,1
+385,,385,,5,1,1
+386,Normal,386,386,5,1,1
+387,,387,,8,1,1
+388,,388,,8,1,1
+389,,389,,8,1,1
+390,,390,,8,1,1
+391,,391,,8,1,1
+392,,392,,8,1,1
+393,,393,,8,1,1
+394,,394,,8,1,1
+395,,395,,8,1,1
+396,,396,,8,1,1
+397,,397,,8,1,1
+398,,398,,8,1,1
+399,,399,,8,1,1
+400,,400,,8,1,1
+401,,401,,8,1,1
+402,,402,,8,1,1
+403,,403,,8,1,1
+404,,404,,8,1,1
+405,,405,,8,1,1
+406,,406,,8,1,1
+407,,407,,8,1,1
+408,,408,,8,1,1
+409,,409,,8,1,1
+410,,410,,8,1,1
+411,,411,,8,1,1
+412,Plant,412,,8,1,1
+413,Plant,413,413,8,1,1
+414,,414,,8,1,1
+415,,415,,8,1,1
+416,,416,,8,1,1
+417,,417,,8,1,1
+418,,418,,8,1,1
+419,,419,,8,1,1
+420,,420,,8,1,1
+421,Overcast,421,,8,1,1
+422,West,422,,8,1,1
+423,West,423,,8,1,1
+424,,424,,8,1,1
+425,,425,,8,1,1
+426,,426,,8,1,1
+427,,427,,8,1,1
+428,,428,,8,1,1
+429,,429,,8,1,1
+430,,430,,8,1,1
+431,,431,,8,1,1
+432,,432,,8,1,1
+433,,433,,8,1,1
+434,,434,,8,1,1
+435,,435,,8,1,1
+436,,436,,8,1,1
+437,,437,,8,1,1
+438,,438,,8,1,1
+439,,439,,8,1,1
+440,,440,,8,1,1
+441,,441,,8,1,1
+442,,442,,8,1,1
+443,,443,,8,1,1
+444,,444,,8,1,1
+445,,445,,8,1,1
+446,,446,,8,1,1
+447,,447,,8,1,1
+448,,448,,8,1,1
+449,,449,,8,1,1
+450,,450,,8,1,1
+451,,451,,8,1,1
+452,,452,,8,1,1
+453,,453,,8,1,1
+454,,454,,8,1,1
+455,,455,,8,1,1
+456,,456,,8,1,1
+457,,457,,8,1,1
+458,,458,,8,1,1
+459,,459,,8,1,1
+460,,460,,8,1,1
+461,,461,,8,1,1
+462,,462,,8,1,1
+463,,463,,8,1,1
+464,,464,,8,1,1
+465,,465,,8,1,1
+466,,466,,8,1,1
+467,,467,,8,1,1
+468,,468,,8,1,1
+469,,469,,8,1,1
+470,,470,,8,1,1
+471,,471,,8,1,1
+472,,472,,8,1,1
+473,,473,,8,1,1
+474,,474,,8,1,1
+475,,475,,8,1,1
+476,,476,,8,1,1
+477,,477,,8,1,1
+478,,478,,8,1,1
+479,,479,479,8,1,1
+480,,480,,8,1,1
+481,,481,,8,1,1
+482,,482,,8,1,1
+483,,483,,8,1,1
+484,,484,,8,1,1
+485,,485,,8,1,1
+486,,486,,8,1,1
+487,Altered,487,487,8,1,1
+488,,488,,8,1,1
+489,,489,,8,1,1
+490,,490,,8,1,1
+491,,491,,8,1,1
+492,Land,492,492,8,1,1
+493,Normal,493,,8,1,1
+494,,494,,11,1,1
+495,,495,,11,1,1
+496,,496,,11,1,1
+497,,497,,11,1,1
+498,,498,,11,1,1
+499,,499,,11,1,1
+500,,500,,11,1,1
+501,,501,,11,1,1
+502,,502,,11,1,1
+503,,503,,11,1,1
+504,,504,,11,1,1
+505,,505,,11,1,1
+506,,506,,11,1,1
+507,,507,,11,1,1
+508,,508,,11,1,1
+509,,509,,11,1,1
+510,,510,,11,1,1
+511,,511,,11,1,1
+512,,512,,11,1,1
+513,,513,,11,1,1
+514,,514,,11,1,1
+515,,515,,11,1,1
+516,,516,,11,1,1
+517,,517,,11,1,1
+518,,518,,11,1,1
+519,,519,,11,1,1
+520,,520,,11,1,1
+521,,521,,11,1,1
+522,,522,,11,1,1
+523,,523,,11,1,1
+524,,524,,11,1,1
+525,,525,,11,1,1
+526,,526,,11,1,1
+527,,527,,11,1,1
+528,,528,,11,1,1
+529,,529,,11,1,1
+530,,530,,11,1,1
+531,,531,,11,1,1
+532,,532,,11,1,1
+533,,533,,11,1,1
+534,,534,,11,1,1
+535,,535,,11,1,1
+536,,536,,11,1,1
+537,,537,,11,1,1
+538,,538,,11,1,1
+539,,539,,11,1,1
+540,,540,,11,1,1
+541,,541,,11,1,1
+542,,542,,11,1,1
+543,,543,,11,1,1
+544,,544,,11,1,1
+545,,545,,11,1,1
+546,,546,,11,1,1
+547,,547,,11,1,1
+548,,548,,11,1,1
+549,,549,,11,1,1
+550,red stripe,550,550,11,1,1
+551,,551,,11,1,1
+552,,552,,11,1,1
+553,,553,,11,1,1
+554,,554,,11,1,1
+555,normal,555,555,11,1,1
+556,,556,,11,1,1
+557,,557,,11,1,1
+558,,558,,11,1,1
+559,,559,,11,1,1
+560,,560,,11,1,1
+561,,561,,11,1,1
+562,,562,,11,1,1
+563,,563,,11,1,1
+564,,564,,11,1,1
+565,,565,,11,1,1
+566,,566,,11,1,1
+567,,567,,11,1,1
+568,,568,,11,1,1
+569,,569,,11,1,1
+570,,570,,11,1,1
+571,,571,,11,1,1
+572,,572,,11,1,1
+573,,573,,11,1,1
+574,,574,,11,1,1
+575,,575,,11,1,1
+576,,576,,11,1,1
+577,,577,,11,1,1
+578,,578,,11,1,1
+579,,579,,11,1,1
+580,,580,,11,1,1
+581,,581,,11,1,1
+582,,582,,11,1,1
+583,,583,,11,1,1
+584,,584,,11,1,1
+585,spring,585,,11,1,1
+586,spring,586,,11,1,1
+587,,587,,11,1,1
+588,,588,,11,1,1
+589,,589,,11,1,1
+590,,590,,11,1,1
+591,,591,,11,1,1
+592,,592,,11,1,1
+593,,593,,11,1,1
+594,,594,,11,1,1
+595,,595,,11,1,1
+596,,596,,11,1,1
+597,,597,,11,1,1
+598,,598,,11,1,1
+599,,599,,11,1,1
+600,,600,,11,1,1
+601,,601,,11,1,1
+602,,602,,11,1,1
+603,,603,,11,1,1
+604,,604,,11,1,1
+605,,605,,11,1,1
+606,,606,,11,1,1
+607,,607,,11,1,1
+608,,608,,11,1,1
+609,,609,,11,1,1
+610,,610,,11,1,1
+611,,611,,11,1,1
+612,,612,,11,1,1
+613,,613,,11,1,1
+614,,614,,11,1,1
+615,,615,,11,1,1
+616,,616,,11,1,1
+617,,617,,11,1,1
+618,,618,,11,1,1
+619,,619,,11,1,1
+620,,620,,11,1,1
+621,,621,,11,1,1
+622,,622,,11,1,1
+623,,623,,11,1,1
+624,,624,,11,1,1
+625,,625,,11,1,1
+626,,626,,11,1,1
+627,,627,,11,1,1
+628,,628,,11,1,1
+629,,629,,11,1,1
+630,,630,,11,1,1
+631,,631,,11,1,1
+632,,632,,11,1,1
+633,,633,,11,1,1
+634,,634,,11,1,1
+635,,635,,11,1,1
+636,,636,,11,1,1
+637,,637,,11,1,1
+638,,638,,11,1,1
+639,,639,,11,1,1
+640,,640,,11,1,1
+641,,641,,11,1,1
+642,,642,,11,1,1
+643,,643,,11,1,1
+644,,644,,11,1,1
+645,,645,,11,1,1
+646,,646,,11,1,1
+647,,647,,11,1,1
+648,voice,648,648,11,1,1
+649,orange,649,,11,1,1
+10001,B,201,,3,0,2
+10002,C,201,,3,0,3
+10003,D,201,,3,0,4
+10004,E,201,,3,0,5
+10005,F,201,,3,0,6
+10006,G,201,,3,0,7
+10007,H,201,,3,0,8
+10008,I,201,,3,0,9
+10009,J,201,,3,0,10
+10010,K,201,,3,0,11
+10011,L,201,,3,0,12
+10012,M,201,,3,0,13
+10013,N,201,,3,0,14
+10014,O,201,,3,0,15
+10015,P,201,,3,0,16
+10016,Q,201,,3,0,17
+10017,R,201,,3,0,18
+10018,S,201,,3,0,19
+10019,T,201,,3,0,20
+10020,U,201,,3,0,21
+10021,V,201,,3,0,22
+10022,W,201,,3,0,23
+10023,X,201,,3,0,24
+10024,Y,201,,3,0,25
+10025,Z,201,,3,0,26
+10026,!,201,,5,0,27
+10027,?,201,,5,0,27
+10028,Sunny,351,10013,5,0,2
+10029,Rainy,351,10014,5,0,3
+10030,Snowy,351,10015,5,0,4
+10031,Attack,386,10001,7,0,2
+10032,Defense,386,10002,7,0,3
+10033,Speed,386,10003,6,0,4
+10034,Sandy,412,,8,0,2
+10035,Trash,412,,8,0,3
+10036,Sandy,413,10004,8,0,2
+10037,Trash,413,10005,8,0,3
+10038,Sunshine,421,,8,0,2
+10039,East,422,,8,0,2
+10040,East,423,,8,0,2
+10041,Bug,493,,8,0,2
+10042,Dark,493,,8,0,2
+10043,Dragon,493,,8,0,2
+10044,Electric,493,,8,0,2
+10045,Fighting,493,,8,0,2
+10046,Fire,493,,8,0,2
+10047,Flying,493,,8,0,2
+10048,Ghost,493,,8,0,2
+10049,Grass,493,,8,0,2
+10050,Ground,493,,8,0,2
+10051,Ice,493,,8,0,2
+10052,Poison,493,,8,0,2
+10053,Psychic,493,,8,0,2
+10054,Rock,493,,8,0,2
+10055,Steel,493,,8,0,2
+10056,Water,493,,8,0,2
+10057,???,493,,8,0,3
+10058,Heat,479,10008,9,0,2
+10059,Wash,479,10009,9,0,2
+10060,Frost,479,10010,9,0,2
+10061,Fan,479,10011,9,0,2
+10062,Mow,479,10012,9,0,2
+10063,Origin,487,10007,9,0,2
+10064,Sky,492,10006,9,0,2
+10065,Spiky-eared,172,,10,0,2
+10066,blue stripe,550,10016,11,0,2
+10067,daruma,555,10017,11,0,2
+10068,summer,585,,11,0,2
+10069,autumn,585,,11,0,3
+10070,winter,585,,11,0,4
+10071,summer,586,,11,0,2
+10072,autumn,586,,11,0,3
+10073,winter,586,,11,0,4
+10074,step,648,10018,11,0,2
+10075,blue,649,,11,0,2
+10076,yellow,649,,11,0,2
+10077,red,649,,11,0,2
+10078,white,649,,11,0,2

pokedex/db/tables.py

@@ -767,26 +767,14 @@ class PokedexVersionGroup(TableBase):
         info=dict(description=u"ID of the version group"))
 
 class Pokemon(TableBase):
-    u"""A species of pokémon. The core to this whole mess.
+    u"""A species of Pokémon.  The core to this whole mess.
-
-    Note that I use both 'forme' and 'form' in both code and the database.  I
-    only use 'forme' when specifically referring to Pokémon that have multiple
-    distinct species as forms—i.e., different stats or movesets.  'Form' is a
-    more general term referring to any variation within a species, including
-    purely cosmetic forms like Unown.
     """
-    # XXX: Refine the form-specific docs
-    # XXX: Update form/forme discussion when #179 is dealt with.
     __tablename__ = 'pokemon'
     __singlename__ = 'pokemon'
     id = Column(Integer, primary_key=True, nullable=False,
         info=dict(description=u"A numeric ID"))
     name = Column(Unicode(20), nullable=False,
-        info=dict(description=u"The English name of the pokémon", official=True, format='plaintext'))
+        info=dict(description=u"The English name of the Pokémon", official=True, format='plaintext'))
-    forme_name = Column(Unicode(16),
-        info=dict(description=u"The name of this form, if the species has forms", format='plaintext'))
-    forme_base_pokemon_id = Column(Integer, ForeignKey('pokemon.id'),
-        info=dict(description=u"ID for the base form, if this species has one"))  # XXX: ?
     generation_id = Column(Integer, ForeignKey('generations.id'),
         info=dict(description=u"ID of the generation this species first appeared in"))
     evolution_chain_id = Column(Integer, ForeignKey('evolution_chains.id'),
@@ -824,23 +812,32 @@ class Pokemon(TableBase):
     ### Stuff to handle alternate Pokémon forms
 
     @property
-    def national_id(self):
+    def is_base_form(self):
-        u"""Returns the National Pokédex number for this Pokémon.  Use this
+        u"""Returns True iff the Pokémon is the base form for its species,
-        instead of the id directly; alternate formes may make the id incorrect.
+        e.g. Land Shaymin.
         """
 
-        if self.forme_base_pokemon_id:
+        return self.unique_form is None or self.unique_form.is_default
-            return self.forme_base_pokemon_id
+
-        return self.id
+    @property
+    def form_name(self):
+        u"""Returns the Pokémon's form name if it represents a particular form
+        and that form has a name, or None otherwise.
+        """
+
+        # If self.unique_form is None, the short-circuit "and" will go ahead
+        # and return that.  Otherwise, it'll return the form's name, which may
+        # also be None.
+        return self.unique_form and self.unique_form.name
 
     @property
     def full_name(self):
-        u"""Returns the name of this Pokémon, including its Forme, if any.
+        u"""Returns the Pokémon's name, including its form if applicable."""
-        """
 
-        if self.forme_name:
+        if self.form_name:
-            return "%s %s" % (self.forme_name.title(), self.name)
+            return '{0} {1}'.format(self.form_name, self.name)
-        return self.name
+        else:
+            return self.name
 
     @property
     def normal_form(self):
@@ -848,9 +845,8 @@ class Pokemon(TableBase):
         regular Deoxys when called on any Deoxys form.
         """
 
-        if self.forme_base_pokemon:
+        if self.unique_form:
-            return self.forme_base_pokemon
+            return self.unique_form.form_base_pokemon
-
         return self
 
     ### Not forms!
@@ -978,30 +974,63 @@ class PokemonFlavorText(TableBase):
     flavor_text = Column(Unicode(255), nullable=False,
         info=dict(description=u"ID of the version that has this flavor text", official=True, format='gametext'))
 
+class PokemonForm(TableBase):
+    u"""An individual form of a Pokémon.
+
+    Pokémon that do not have separate forms are still given a single row to
+    represent their single form.
+    """
+    __tablename__ = 'pokemon_forms'
+    __singlename__ = 'pokemon_form'
+    id = Column(Integer, primary_key=True, nullable=False,
+        info=dict(description=u'A unique ID for this form.'))
+    name = Column(Unicode(16), nullable=True,
+        info=dict(description=u"This form's name, e.g. \"Plant\" for Plant Cloak Burmy.", official=True, format='plaintext'))
+    form_base_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False, autoincrement=False,
+        info=dict(description=u'The ID of the base Pokémon for this form.'))
+    unique_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), autoincrement=False,
+        info=dict(description=u'The ID of a Pokémon that represents specifically this form, for Pokémon with functionally-different forms like Wormadam.'))
+    introduced_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), autoincrement=False,
+        info=dict(description=u'The ID of the version group in which this form first appeared.'))
+    is_default = Column(Boolean, nullable=False,
+        info=dict(description=u'Set for exactly one form used as the default for each species.'))
+    order = Column(Integer, nullable=False, autoincrement=False,
+        info=dict(description=u'The order in which forms should be sorted.  Multiple forms may have equal order, in which case they should fall back on sorting by name.'))
+
+    @property
+    def full_name(self):
+        u"""Returns the full name of this form, e.g. "Plant Cloak"."""
+
+        if not self.name:
+            return None
+        elif self.form_group and self.form_group.term:
+            return '{0} {1}'.format(self.name, self.form_group.term)
+        else:
+            return self.name
+
+    @property
+    def pokemon_name(self):
+        u"""Returns the name of this Pokémon with this form, e.g. "Plant
+        Burmy".
+        """
+
+        if self.name:
+            return '{0} {1}'.format(self.name, self.form_base_pokemon.name)
+        else:
+            return self.form_base_pokemon.name
+
 class PokemonFormGroup(TableBase):
-    # XXX: Give the docstring here & check column descriptions
+    u"""Information about a Pokémon's forms as a group."""
     __tablename__ = 'pokemon_form_groups'
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description=u"ID of the base form pokémon"))
+        info=dict(description=u"ID of the base form Pokémon"))
+    term = Column(Unicode(16), nullable=True,
+        info=dict(description=u"The term for this Pokémon's forms, e.g. \"Cloak\" for Burmy or \"Forme\" for Deoxys.", official=True, format='plaintext'))
     is_battle_only = Column(Boolean, nullable=False,
         info=dict(description=u"Set iff the forms only change in battle"))
     description = Column(markdown.MarkdownColumn(1024), nullable=False,
         info=dict(description=u"English description of how the forms work", format='markdown'))
 
-class PokemonFormSprite(TableBase):
-    # XXX: Give the docstring here & check column descriptions
-    __tablename__ = 'pokemon_form_sprites'
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description=u"A numeric ID"))
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description=u"ID of the pokémon"))
-    introduced_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description=u"ID of version group the form was introduced in"))
-    name = Column(Unicode(16), nullable=True,
-        info=dict(description=u"English name of the form", format='plaintext'))
-    is_default = Column(Boolean, nullable=True,
-        info=dict(description=u'Set iff the form is the base, normal, usual, or otherwise default form'))
-
 class PokemonHabitat(TableBase):
     u"""The habitat of a pokémon, as given in the FireRed/LeafGreen version pokédex
     """
@@ -1382,18 +1411,9 @@ Pokemon.dream_ability = relation(Ability,
     ),
     uselist=False,
 )
-Pokemon.formes = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.forme_base_pokemon_id,
-                                               backref=backref('forme_base_pokemon',
-                                                               remote_side=[Pokemon.id]))
 Pokemon.pokemon_color = relation(PokemonColor, backref='pokemon')
 Pokemon.color = association_proxy('pokemon_color', 'name')
 Pokemon.dex_numbers = relation(PokemonDexNumber, order_by=PokemonDexNumber.pokedex_id.asc(), backref='pokemon')
-Pokemon.default_form_sprite = relation(PokemonFormSprite,
-                                       primaryjoin=and_(
-                                            Pokemon.id==PokemonFormSprite.pokemon_id,
-                                            PokemonFormSprite.is_default==True,
-                                       ),
-                                       uselist=False)
 Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__,
                                         order_by=PokemonEggGroup.egg_group_id,
                                         backref='pokemon')
@@ -1406,13 +1426,19 @@ Pokemon.child_pokemon = relation(Pokemon,
 )
 Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon')
 Pokemon.foreign_names = relation(PokemonName, backref='pokemon')
+Pokemon.forms = relation(PokemonForm, primaryjoin=Pokemon.id==PokemonForm.form_base_pokemon_id,
+                         order_by=(PokemonForm.order.asc(), PokemonForm.name.asc()))
+Pokemon.default_form = relation(PokemonForm,
+    primaryjoin=and_(Pokemon.id==PokemonForm.form_base_pokemon_id, PokemonForm.is_default==True),
+    uselist=False,
+)
 Pokemon.pokemon_habitat = relation(PokemonHabitat, backref='pokemon')
 Pokemon.habitat = association_proxy('pokemon_habitat', 'name')
 Pokemon.items = relation(PokemonItem, backref='pokemon')
 Pokemon.generation = relation(Generation, backref='pokemon')
 Pokemon.shape = relation(PokemonShape, backref='pokemon')
 Pokemon.stats = relation(PokemonStat, backref='pokemon', order_by=PokemonStat.stat_id.asc())
-Pokemon.types = relation(Type, secondary=PokemonType.__table__, order_by=PokemonType.slot.asc())
+Pokemon.types = relation(Type, secondary=PokemonType.__table__, order_by=PokemonType.slot.asc(), backref='pokemon')
 
 PokemonDexNumber.pokedex = relation(Pokedex)
 
@@ -1450,13 +1476,17 @@ PokemonEvolution.party_pokemon = relation(Pokemon,
 
 PokemonFlavorText.version = relation(Version)
 
-PokemonItem.item = relation(Item, backref='pokemon')
+PokemonForm.form_base_pokemon = relation(Pokemon, primaryjoin=PokemonForm.form_base_pokemon_id==Pokemon.id)
-PokemonItem.version = relation(Version)
+PokemonForm.unique_pokemon = relation(Pokemon, backref=backref('unique_form', uselist=False),
+                                      primaryjoin=PokemonForm.unique_pokemon_id==Pokemon.id)
+PokemonForm.version_group = relation(VersionGroup)
+PokemonForm.form_group = association_proxy('form_base_pokemon', 'form_group')
 
 PokemonFormGroup.pokemon = relation(Pokemon, backref=backref('form_group',
                                                              uselist=False))
-PokemonFormSprite.pokemon = relation(Pokemon, backref='form_sprites')
+
-PokemonFormSprite.introduced_in = relation(VersionGroup)
+PokemonItem.item = relation(Item, backref='pokemon')
+PokemonItem.version = relation(Version)
 
 PokemonMove.pokemon = relation(Pokemon, backref='pokemon_moves')
 PokemonMove.version_group = relation(VersionGroup)

pokedex/lookup.py

@@ -104,6 +104,7 @@ class PokedexLookup(object):
             tables.Move,
             tables.Nature,
             tables.Pokemon,
+            tables.PokemonForm,
             tables.Type,
         )
     )
@@ -212,16 +213,16 @@ class PokedexLookup(object):
 
                 # Add the basic English name to the index
                 if cls == tables.Pokemon:
-                    # Pokémon need their form name added
+                    # Don't re-add alternate forms of the same Pokémon; they'll
-                    # XXX kinda kludgy
+                    # be added as Pokémon forms instead
-                    add(row.full_name, None, u'en', u'us')
+                    if not row.is_base_form:
+                        continue
+                elif cls == tables.PokemonForm:
+                    if row.name:
+                        add(row.pokemon_name, None, u'en', u'us')
+                    continue
 
-                    # If this is a default form, ALSO add the unadorned name,
+                add(row.name, None, u'en', u'us')
-                    # so 'Deoxys' alone will still do the right thing
-                    if row.forme_name and not row.forme_base_pokemon_id:
-                        add(row.name, None, u'en', u'us')
-                else:
-                    add(row.name, None, u'en', u'us')
 
                 # Some things also have other languages' names
                 # XXX other language form names..?
@@ -550,8 +551,10 @@ class PokedexLookup(object):
         table_names = []
         for valid_type in valid_types:
             table_name = self._parse_table_name(valid_type)
-            # Skip anything not recognized.  Could be, say, a language code
+            # Skip anything not recognized.  Could be, say, a language code.
-            if table_name:
+            # XXX The vast majority of Pokémon forms are unnamed and unindexed,
+            #     which can produce blank results.  So skip them too for now.
+            if table_name and table_name != 'pokemon_forms':
                 table_names.append(table_name)
 
         if not table_names:
@@ -559,6 +562,7 @@ class PokedexLookup(object):
             # were valid, but this function is guaranteed to return
             # *something*, so it politely selects from the entire index instead
             table_names = self.indexed_tables.keys()
+            table_names.remove('pokemon_forms')
 
         # Rather than create an array of many hundred items and pick randomly
         # from it, just pick a number up to the total number of potential