1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

Reverted to previous commit 55c6fc0

Commit 22fdce0 was intended for a new branch for an application since
pull request is still open
This commit is contained in:
Ruben 2016-01-10 23:18:49 -06:00
parent 22fdce08c6
commit 0f2750c8e9
3 changed files with 24 additions and 26 deletions

View file

@ -1,12 +1,12 @@
id,iso639,iso3166,identifier,official,order,game_id
1,ja,jp,ja,1,1,1
2,ja,jp,roomaji,1,3,
3,ko,kr,ko,1,4,8
4,zh,cn,zh,1,5,
5,fr,fr,fr,1,7,3
6,de,de,de,1,8,5
7,es,es,es,1,9,7
8,it,it,it,1,10,4
9,en,us,en,1,6,2
10,cs,cz,cs,0,11,
11,ja,jp,ja-kanji,1,2,
id,iso639,iso3166,identifier,official,order
1,ja,jp,ja,1,1
2,ja,jp,roomaji,1,3
3,ko,kr,ko,1,4
4,zh,cn,zh,1,5
5,fr,fr,fr,1,7
6,de,de,de,1,8
7,es,es,es,1,9
8,it,it,it,1,10
9,en,us,en,1,6
10,cs,cz,cs,0,11
11,ja,jp,ja-kanji,1,2

1 id iso639 iso3166 identifier official order game_id
2 1 ja jp ja 1 1 1
3 2 ja jp roomaji 1 3
4 3 ko kr ko 1 4 8
5 4 zh cn zh 1 5
6 5 fr fr fr 1 7 3
7 6 de de de 1 8 5
8 7 es es es 1 9 7
9 8 it it it 1 10 4
10 9 en us en 1 6 2
11 10 cs cz cs 0 11
12 11 ja jp ja-kanji 1 2

View file

@ -837,12 +837,12 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10115,furfrou-heart,heart,676,15,0,0,0,2,830
10116,furfrou-star,star,676,15,0,0,0,3,831
10117,furfrou-diamond,diamond,676,15,0,0,0,4,832
10118,furfrou-debutante,debutante,676,15,0,0,0,5,836
10119,furfrou-matron,matron,676,15,0,0,0,6,837
10120,furfrou-dandy,dandy,676,15,0,0,0,7,838
10121,furfrou-la-reine,la-reine,676,15,0,0,0,8,833
10122,furfrou-kabuki,kabuki,676,15,0,0,0,9,834
10123,furfrou-pharaoh,pharaoh,676,15,0,0,0,10,835
10118,furfrou-debutante,debutante,676,15,0,0,0,8,836
10119,furfrou-matron,matron,676,15,0,0,0,9,837
10120,furfrou-dandy,dandy,676,15,0,0,0,10,838
10121,furfrou-la-reine,la-reine,676,15,0,0,0,5,833
10122,furfrou-kabuki,kabuki,676,15,0,0,0,6,834
10123,furfrou-pharaoh,pharaoh,676,15,0,0,0,7,835
10124,meowstic-female,female,10025,15,1,0,0,2,841
10125,aegislash-blade,blade,10026,15,1,1,0,2,845
10126,pumpkaboo-small,small,10027,15,1,0,0,1,873
@ -901,12 +901,12 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10179,kyogre-primal,primal,10077,16,1,0,0,2,490
10180,groudon-primal,primal,10078,16,1,0,0,2,492
10181,rayquaza-mega,mega,10079,16,1,1,1,2,494
10182,pikachu-rock-star,rock-star,10080,16,1,0,0,2,35
10183,pikachu-belle,belle,10081,16,1,0,0,3,36
10184,pikachu-pop-star,pop-star,10082,16,1,0,0,4,37
10185,pikachu-phd,phd,10083,16,1,0,0,5,38
10186,pikachu-libre,libre,10084,16,1,0,0,6,39
10187,pikachu-cosplay,cosplay,10085,16,1,0,0,7,34
10182,pikachu-rock-star,rock-star,10080,16,1,0,0,3,35
10183,pikachu-belle,belle,10081,16,1,0,0,4,36
10184,pikachu-pop-star,pop-star,10082,16,1,0,0,5,37
10185,pikachu-phd,phd,10083,16,1,0,0,6,38
10186,pikachu-libre,libre,10084,16,1,0,0,7,39
10187,pikachu-cosplay,cosplay,10085,16,1,0,0,2,34
10188,hoopa-unbound,unbound,10086,16,1,0,0,2,892
10189,camerupt-mega,mega,10087,16,1,1,1,2,417
10190,lopunny-mega,mega,10088,16,1,1,1,2,546

1 id identifier form_identifier pokemon_id introduced_in_version_group_id is_default is_battle_only is_mega form_order order
837 10115 furfrou-heart heart 676 15 0 0 0 2 830
838 10116 furfrou-star star 676 15 0 0 0 3 831
839 10117 furfrou-diamond diamond 676 15 0 0 0 4 832
840 10118 furfrou-debutante debutante 676 15 0 0 0 5 8 836
841 10119 furfrou-matron matron 676 15 0 0 0 6 9 837
842 10120 furfrou-dandy dandy 676 15 0 0 0 7 10 838
843 10121 furfrou-la-reine la-reine 676 15 0 0 0 8 5 833
844 10122 furfrou-kabuki kabuki 676 15 0 0 0 9 6 834
845 10123 furfrou-pharaoh pharaoh 676 15 0 0 0 10 7 835
846 10124 meowstic-female female 10025 15 1 0 0 2 841
847 10125 aegislash-blade blade 10026 15 1 1 0 2 845
848 10126 pumpkaboo-small small 10027 15 1 0 0 1 873
901 10179 kyogre-primal primal 10077 16 1 0 0 2 490
902 10180 groudon-primal primal 10078 16 1 0 0 2 492
903 10181 rayquaza-mega mega 10079 16 1 1 1 2 494
904 10182 pikachu-rock-star rock-star 10080 16 1 0 0 2 3 35
905 10183 pikachu-belle belle 10081 16 1 0 0 3 4 36
906 10184 pikachu-pop-star pop-star 10082 16 1 0 0 4 5 37
907 10185 pikachu-phd phd 10083 16 1 0 0 5 6 38
908 10186 pikachu-libre libre 10084 16 1 0 0 6 7 39
909 10187 pikachu-cosplay cosplay 10085 16 1 0 0 7 2 34
910 10188 hoopa-unbound unbound 10086 16 1 0 0 2 892
911 10189 camerupt-mega mega 10087 16 1 1 1 2 417
912 10190 lopunny-mega mega 10088 16 1 1 1 2 546

View file

@ -102,8 +102,6 @@ class Language(TableBase):
doc=u"True iff games are produced in the language.")
order = Column(Integer, nullable=True,
doc=u"Order for sorting in foreign name lists.")
game_id = Column(Integer, nullable=True,
doc=u"Numeric ID used in games.")
create_translation_table = partial(multilang.create_translation_table, language_class=Language)