diff --git a/pokedex/data/csv/pokemon_form_sprites.csv b/pokedex/data/csv/pokemon_form_sprites.csv index 3222d55..a89a41e 100644 --- a/pokedex/data/csv/pokemon_form_sprites.csv +++ b/pokedex/data/csv/pokemon_form_sprites.csv @@ -1,77 +1,79 @@ -id,pokemon_id,name -1,201,a -2,201,b -3,201,c -4,201,d -5,201,e -6,201,f -7,201,g -8,201,h -9,201,i -10,201,j -11,201,k -12,201,l -13,201,m -14,201,n -15,201,o -16,201,p -17,201,q -18,201,r -19,201,s -20,201,t -21,201,u -22,201,v -23,201,w -24,201,x -25,201,y -26,201,z -27,201,? -28,201,! -29,351, -30,351,sun -31,351,rain -32,351,hail -33,386, -34,386,attack -35,386,defense -36,386,speed -37,412,plant -38,412,sandy -39,412,trash -40,413,plant -41,413,sandy -42,413,trash -43,421, -44,421,sunshine -45,422,east -46,422,west -47,423,east -48,423,west -49,479, -50,479,fan -51,479,frost -52,479,heat -53,479,mow -54,479,wash -55,487, -56,487,origin -57,492, -58,492,sky -59,493,bug -60,493,dark -61,493,dragon -62,493,electric -63,493,fighting -64,493,fire -65,493,flying -66,493,ghost -67,493,grass -68,493,ground -69,493,ice -70,493,normal -71,493,????? -72,493,poison -73,493,psychic -74,493,rock -75,493,steel -76,493,water +id,pokemon_id,introduced_in_version_group_id,name +1,201,3,a +2,201,3,b +3,201,3,c +4,201,3,d +5,201,3,e +6,201,3,f +7,201,3,g +8,201,3,h +9,201,3,i +10,201,3,j +11,201,3,k +12,201,3,l +13,201,3,m +14,201,3,n +15,201,3,o +16,201,3,p +17,201,3,q +18,201,3,r +19,201,3,s +20,201,3,t +21,201,3,u +22,201,3,v +23,201,3,w +24,201,3,x +25,201,3,y +26,201,3,z +27,201,5,? +28,201,5,! +29,351,5, +30,351,5,sun +31,351,5,rain +32,351,5,hail +33,386,5, +34,386,7,attack +35,386,7,defense +36,386,6,speed +37,412,8,plant +38,412,8,sandy +39,412,8,trash +40,413,8,plant +41,413,8,sandy +42,413,8,trash +43,421,8, +44,421,8,sunshine +45,422,8,east +46,422,8,west +47,423,8,east +48,423,8,west +49,479,8, +50,479,9,fan +51,479,9,frost +52,479,9,heat +53,479,9,mow +54,479,9,wash +55,487,8, +56,487,9,origin +57,492,8, +58,492,9,sky +59,493,8,bug +60,493,8,dark +61,493,8,dragon +62,493,8,electric +63,493,8,fighting +64,493,8,fire +65,493,8,flying +66,493,8,ghost +67,493,8,grass +68,493,8,ground +69,493,8,ice +70,493,8,normal +71,493,8,????? +72,493,8,poison +73,493,8,psychic +74,493,8,rock +75,493,8,steel +76,493,8,water +77,172,3, +78,172,10,gizamimi diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 3cde670..3e8f988 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -332,6 +332,7 @@ class PokemonFormSprite(TableBase): __tablename__ = 'pokemon_form_sprites' id = Column(Integer, primary_key=True, nullable=False) pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) + introduced_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) name = Column(Unicode(16), nullable=True) class PokemonItem(TableBase): @@ -493,6 +494,7 @@ PokemonItem.version = relation(Version) PokemonFormGroup.pokemon = relation(Pokemon, backref=backref('form_group', uselist=False)) PokemonFormSprite.pokemon = relation(Pokemon, backref='form_sprites') +PokemonFormSprite.introduced_in = relation(VersionGroup) PokemonMove.pokemon = relation(Pokemon, backref='pokemon_moves') PokemonMove.version_group = relation(VersionGroup)