Merge remote-tracking branch 'veekun/master'

.travis.yml

@@ -0,0 +1,12 @@
+language: python
+python:
+    - "2.7"
+    - "pypy"
+
+    # Someday...
+    #- "3.4"
+
+install: pip install -e .
+before_script: pokedex setup -v
+script: py.test
+sudo: false

pokedex/data/csv/abilities.csv

@@ -187,6 +187,9 @@ id,identifier,generation_id,is_main_series
 186,dark-aura,6,1
 187,fairy-aura,6,1
 188,aura-break,6,1
+189,primordial-sea,6,1
+190,desolate-land,6,1
+191,delta-stream,6,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

pokedex/data/csv/ability_names.csv

@@ -1315,6 +1315,27 @@ ability_id,local_language_id,name
 188,7,Rompeaura
 188,8,Frangiaura
 188,9,Aura Break
+189,1,はじまりのうみ
+189,3,시작의바다
+189,5,Mer Primaire
+189,6,Urmeer
+189,7,Mar del Albor
+189,8,Mare Primordiale
+189,9,Primordial Sea
+190,1,おわりのだいち
+190,3,끝의대지
+190,5,Terre Finale
+190,6,Endland
+190,7,Tierra del Ocaso
+190,8,Terra Estrema
+190,9,Desolate Land
+191,1,デルタストリーム
+191,3,델타스트림
+191,5,Souffle Delta
+191,6,Delta-Wind
+191,7,Ráfaga Delta
+191,8,Flusso Delta
+191,9,Delta Stream
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

pokedex/data/csv/ability_prose.csv

@@ -567,3 +567,6 @@ The type change takes place just before the move is used."
 186,9,Strengthens []{type:dark} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:dark} moves for all friendly and opposing Pokémon.
 187,9,Strengthens []{type:fairy} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:fairy} moves for all friendly and opposing Pokémon.
 188,9,Makes []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types.,"While this Pokémon is on the field, []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types to 2/3 their power, rather than strengthening them."
+189,9,,
+190,9,,
+191,9,,

pokedex/data/csv/berry_firmness_names.csv

@@ -1,6 +1,11 @@
 berry_firmness_id,local_language_id,name
+1,5,Très tendre
 1,9,Very Soft
+2,5,Tendre
 2,9,Soft
+3,5,Ferme
 3,9,Hard
+4,5,Très ferme
 4,9,Very Hard
+5,5,Super ferme
 5,9,Super Hard

pokedex/data/csv/characteristic_text.csv

@@ -1,31 +1,61 @@
 characteristic_id,local_language_id,message
+1,5,Adore manger
 1,9,Loves to eat
+2,5,Est fier de sa puissance
 2,9,Proud of its power
+3,5,Corps robuste
 3,9,Sturdy body
+4,5,Extrêmement curieux
 4,9,Highly curious
+5,5,Très volontaire
 5,9,Strong willed
+6,5,Aime courir
 6,9,Likes to run
+7,5,S'assoupit souvent
 7,9,Takes plenty of siestas
+8,5,Aime se démener
 8,9,Likes to thrash about
+9,5,Sait encaisser les coups
 9,9,Capable of taking hits
+10,5,Coquin
 10,9,Mischievous
+11,5,Un peu vaniteux
 11,9,Somewhat vain
+12,5,Attentif aux sons
 12,9,Alert to sounds
+13,5,Dort beaucoup
 13,9,Nods off a lot
+14,5,Un peu coléreux
 14,9,A little quick tempered
+15,5,Très obstiné
 15,9,Highly persistent
+16,5,Très astucieux
 16,9,Thoroughly cunning
+17,5,Esprit rebelle
 17,9,Strongly defiant
+18,5,Bête et impulsif
 18,9,Impetuous and silly
+19,5,Éparpille des choses
 19,9,Scatters things often
+20,5,Aime combattre
 20,9,Likes to fight
+21,5,Bonne endurance
 21,9,Good endurance
+22,5,Souvent dans la lune
 22,9,Often lost in thought
+23,5,A horreur de perdre
 23,9,Hates to lose
+24,5,Aime faire le pitre
 24,9,Somewhat of a clown
+25,5,Aime se détendre
 25,9,Likes to relax
+26,5,S'emporte facilement
 26,9,Quick tempered
+27,5,Persévérant
 27,9,Good perseverance
+28,5,Très particulier
 28,9,Very finicky
+29,5,Assez entêté
 29,9,Somewhat stubborn
+30,5,Fuit rapidement
 30,9,Quick to flee

pokedex/data/csv/encounter_method_prose.csv

@@ -25,3 +25,7 @@ encounter_method_id,local_language_id,name
 12,9,Fishing in dark spots
 13,6,An dunklen stellen surfen
 13,9,Surfing in dark spots
+14,9,Walking in yellow flowers
+15,9,Walking in purple flowers
+16,9,Walking in red flowers
+17,9,Walking on rough terrain

pokedex/data/csv/encounter_methods.csv

@@ -1,14 +1,18 @@
 id,identifier,order
 1,walk,1
-2,old-rod,6
+2,old-rod,10
-3,good-rod,7
+3,good-rod,11
-4,super-rod,8
+4,super-rod,12
-5,surf,10
+5,surf,14
-6,rock-smash,12
+6,rock-smash,16
-7,headbutt,13
+7,headbutt,17
 8,dark-grass,5
 9,grass-spots,2
 10,cave-spots,3
 11,bridge-spots,4
-12,super-rod-spots,9
+12,super-rod-spots,13
-13,surf-spots,11
+13,surf-spots,15
+14,yellow-flowers,6
+15,purple-flowers,7
+16,red-flowers,8
+17,rough-terrain,9

pokedex/data/csv/encounter_slots.csv

@@ -409,3 +409,82 @@ id,version_group_id,encounter_method_id,slot,rarity
 408,14,11,10,4
 409,14,11,11,1
 410,14,11,12,1
+411,15,1,0,10
+412,15,1,1,10
+413,15,1,2,10
+414,15,1,3,10
+415,15,1,4,10
+416,15,1,5,10
+417,15,1,6,10
+418,15,1,7,10
+419,15,1,8,10
+420,15,1,9,5
+421,15,1,10,4
+422,15,1,11,1
+423,15,14,0,10
+424,15,14,1,10
+425,15,14,2,10
+426,15,14,3,10
+427,15,14,4,10
+428,15,14,5,10
+429,15,14,6,10
+430,15,14,7,10
+431,15,14,8,10
+432,15,14,9,5
+433,15,14,10,4
+434,15,14,11,1
+435,15,15,0,10
+436,15,15,1,10
+437,15,15,2,10
+438,15,15,3,10
+439,15,15,4,10
+440,15,15,5,10
+441,15,15,6,10
+442,15,15,7,10
+443,15,15,8,10
+444,15,15,9,5
+445,15,15,10,4
+446,15,15,11,1
+447,15,16,0,10
+448,15,16,1,10
+449,15,16,2,10
+450,15,16,3,10
+451,15,16,4,10
+452,15,16,5,10
+453,15,16,6,10
+454,15,16,7,10
+455,15,16,8,10
+456,15,16,9,5
+457,15,16,10,4
+458,15,16,11,1
+459,15,17,0,10
+460,15,17,1,10
+461,15,17,2,10
+462,15,17,3,10
+463,15,17,4,10
+464,15,17,5,10
+465,15,17,6,10
+466,15,17,7,10
+467,15,17,8,10
+468,15,17,9,5
+469,15,17,10,4
+470,15,17,11,1
+471,15,5,0,50
+472,15,5,1,30
+473,15,5,2,15
+474,15,5,3,4
+475,15,5,4,1
+476,15,6,0,50
+477,15,6,1,30
+478,15,6,2,15
+479,15,6,3,4
+480,15,6,4,1
+481,15,2,0,60
+482,15,2,1,35
+483,15,2,2,5
+484,15,3,0,60
+485,15,3,1,35
+486,15,3,2,5
+487,15,4,0,60
+488,15,4,1,35
+489,15,4,2,5

pokedex/data/csv/language_names.csv

@@ -1,31 +1,41 @@
 language_id,local_language_id,name
 1,1,日本語
+1,5,Japonais
 1,6,Japanisch
 1,9,Japanese
 2,1,正式ローマジ
+2,5,Romaji
 2,6,Rōmaji
 2,9,Official roomaji
 3,1,韓国語
+3,5,Coréen
 3,6,Koreanisch
 3,9,Korean
 4,1,中国語
+4,5,Chinois
 4,6,Chinesisch
 4,9,Chinese
 5,1,フランス語
+5,5,Français
 5,6,Französisch
 5,9,French
 6,1,ドイツ語
+6,5,Allemand
 6,6,Deutsch
 6,9,German
 7,1,西語
+7,5,Espagnol
 7,6,Spanisch
 7,9,Spanish
 8,1,伊語
+8,5,Italien
 8,6,Italienisch
 8,9,Italian
 9,1,英語
+9,5,Anglais
 9,6,Englisch
 9,9,English
 10,1,チェコ語
+10,5,Tchèque
 10,6,Tschechisch
 10,9,Czech

pokedex/data/csv/location_area_prose.csv

@@ -662,3 +662,24 @@ location_area_id,local_language_id,name
 705,9,
 706,9,
 707,9,
+736,9,Unknown Area 303
+737,9,Unknown Area 304
+738,9,Unknown Area 305
+739,9,Unknown Area 306
+740,9,Unknown Area 307
+741,9,Unknown Area 308
+742,9,Unknown Area 313
+743,9,Unknown Area 314
+744,9,Unknown Area 315
+745,9,Unknown Area 316
+746,9,Unknown Area 317
+748,9,Unknown Area 322
+749,9,Unknown Area 324
+750,9,Unknown Area 326
+751,9,Unknown Area 327
+752,9,Unknown Area 328
+754,9,Unknown Area 343
+755,9,Unknown Area 344
+756,9,Unknown Area 345
+757,9,Unknown Area 347
+758,9,Unknown Area 348

pokedex/data/csv/location_areas.csv

@@ -662,3 +662,56 @@ id,location_id,game_index,identifier
 705,541,130,
 706,542,131,
 707,540,134,
+708,646,0,
+709,614,0,
+710,611,0,
+711,624,0,
+712,633,0,
+713,591,0,
+714,594,0,
+715,597,0,
+716,602,0,
+717,606,0,
+718,609,0,
+719,612,0,
+720,615,0,
+721,618,0,
+722,621,0,
+723,626,0,
+724,629,0,
+725,631,0,
+726,635,0,
+727,638,0,
+728,641,0,
+729,644,0,
+730,647,0,
+731,650,0,
+732,653,0,
+733,655,0,
+734,593,0,
+735,608,0,
+736,671,0,unknown-area-303
+737,671,0,unknown-area-304
+738,623,0,unknown-area-305
+739,623,0,unknown-area-306
+740,623,0,unknown-area-307
+741,623,0,unknown-area-308
+742,640,0,unknown-area-313
+743,640,0,unknown-area-314
+744,640,0,unknown-area-315
+745,640,0,unknown-area-316
+746,640,0,unknown-area-317
+747,652,0,
+748,657,0,unknown-area-322
+749,657,0,unknown-area-324
+750,657,0,unknown-area-326
+751,657,0,unknown-area-327
+752,657,0,unknown-area-328
+753,672,0,
+754,676,0,unknown-area-343
+755,676,0,unknown-area-344
+756,676,0,unknown-area-345
+757,676,0,unknown-area-347
+758,676,0,unknown-area-348
+759,677,0,
+760,661,0,

pokedex/data/csv/location_game_indices.csv

@@ -245,9 +245,11 @@ location_id,generation_id,game_index
 262,4,2010
 263,4,2011
 264,4,2012
+264,6,2
 265,4,3000
 266,4,3001
 267,4,3002
+267,6,4
 268,4,3003
 269,4,3004
 270,4,3005
@@ -475,3 +477,107 @@ location_id,generation_id,game_index
 564,5,151
 565,5,152
 566,5,153
+587,6,6
+588,6,8
+589,6,9
+590,6,10
+591,6,12
+592,6,13
+593,6,14
+594,6,16
+595,6,17
+596,6,18
+597,6,20
+598,6,21
+599,6,22
+600,6,24
+601,6,26
+602,6,28
+603,6,29
+604,6,30
+605,6,32
+606,6,34
+607,6,35
+608,6,36
+609,6,38
+610,6,39
+611,6,40
+612,6,42
+613,6,43
+614,6,44
+615,6,46
+616,6,47
+617,6,48
+618,6,50
+619,6,51
+620,6,52
+621,6,54
+622,6,55
+623,6,56
+624,6,58
+625,6,60
+626,6,62
+627,6,63
+628,6,64
+629,6,66
+630,6,67
+631,6,68
+632,6,69
+633,6,70
+634,6,72
+635,6,74
+636,6,75
+637,6,76
+638,6,78
+639,6,79
+640,6,82
+641,6,84
+642,6,85
+643,6,86
+644,6,88
+645,6,89
+646,6,90
+647,6,92
+648,6,93
+649,6,94
+650,6,96
+651,6,97
+652,6,98
+653,6,100
+654,6,101
+655,6,102
+656,6,103
+657,6,104
+658,6,106
+659,6,108
+660,6,110
+661,6,112
+662,6,114
+663,6,116
+664,6,118
+665,6,120
+666,6,122
+667,6,124
+668,6,126
+669,6,128
+670,6,130
+671,6,132
+672,6,134
+673,6,135
+674,6,136
+675,6,138
+676,6,140
+677,6,142
+678,6,144
+679,6,146
+680,6,148
+681,6,150
+682,6,152
+683,6,154
+684,6,156
+685,6,158
+686,6,160
+687,6,162
+688,6,164
+689,6,166
+690,6,168

pokedex/data/csv/location_names.csv

@@ -694,60 +694,835 @@ location_id,local_language_id,name
 584,9,Inside of truck
 585,9,Secret Base
 586,9,Battle Tower
+587,1,アサメタウン
+587,3,조아마을
+587,5,Bourg Croquis
+587,6,Escissia
+587,7,Pueblo Boceto
+587,8,Borgo Bozzetto
 587,9,Vaniville Town
-588,9,Aquacorde Town
+587,11,アサメタウン
-589,9,Santalune Forest
+588,1,１ばんどうろ
-590,9,Santalune City
+588,3,1번도로
-591,9,Lumiose City
+588,5,Route 1
-592,9,Camphrier Town
+588,6,Route 1
-593,9,Parfum Palace
+588,7,Ruta 1
-594,9,Connecting Cave
+588,8,Percorso 1
-595,9,Cyllage City
+588,9,Route 1
-596,9,Ambrette Town
+588,11,１番道路
-597,9,Glittering Cave
+589,1,アサメのこみち
-598,9,Geosenge Town
+589,3,조아의 작은 길
-599,9,Reflection Cave
+589,5,Sentier Croquis
-600,9,Shalour City
+589,6,Escissia-Pfad
-601,9,Coumarine City
+589,7,Sendero Boceto
-602,9,Sea Spirit's Den
+589,8,Vicolo Bozzetto
-603,9,Kalos Power Plant
+589,9,Vaniville Pathway
-604,9,Laverre City
+589,11,アサメの小道
-605,9,Poke Ball Factory
+590,1,メイスイタウン
-606,9,Lost Hotel
+590,3,수미마을
-607,9,Dendemille Town
+590,5,Quarellis
-608,9,Frost Cavern
+590,6,Aquarellia
-609,9,Anistar City
+590,7,Pueblo Acuarela
-610,9,Couriway Town
+590,8,Rio Acquerello
-611,9,Terminus Cave
+590,9,Aquacorde Town
-612,9,Snowbelle City
+590,11,メイスイタウン
-613,9,Pokemon Village
+591,1,２ばんどうろ
-614,9,Victory Road
+591,3,2번도로
-615,9,Chamber of Emptiness
+591,5,Route 2
-616,9,Pokemon League
+591,6,Route 2
-617,9,Kiloude City
+591,7,Ruta 2
-618,9,Azure Bay
+591,8,Percorso 2
-619,9,Battle Chateau
+591,9,Route 2
-620,9,Battle Maison
+591,11,２番道路
-621,9,Tower of Mastery
+592,1,アバンセどおり
-622,9,Route 1
+592,3,아방쎄 도로
-623,9,Route 2
+592,5,Chemin Progrès
-624,9,Route 3
+592,6,Progrès-Weg
-625,9,Route 4
+592,7,Vía del Avance
-626,9,Route 5
+592,8,Via Progresso
-627,9,Route 6
+592,9,Avance Trail
-628,9,Route 7
+592,11,アバンセ通り
-629,9,Route 8
+593,1,ハクダンのもり
-630,9,Route 9
+593,3,백단숲
-631,9,Route 10
+593,5,Forêt de Neuvartault
-632,9,Route 11
+593,6,Nouvaria-Wald
-633,9,Route 12
+593,7,Bosque de Novarte
-634,9,Route 13
+593,8,Bosco Novartopoli
-635,9,Route 14
+593,9,Santalune Forest
-636,9,Route 15
+593,11,ハクダンの森
-637,9,Route 16
+594,1,３ばんどうろ
-638,9,Route 17
+594,3,3번도로
-639,9,Route 18
+594,5,Route 3
-640,9,Route 19
+594,6,Route 3
-641,9,Route 20
+594,7,Ruta 3
-642,9,Route 21
+594,8,Percorso 3
-643,9,Route 22
+594,9,Route 3
+594,11,３番道路
+595,1,ウベールどおり
+595,3,우베르 도로
+595,5,Chemin Ouvert
+595,6,Ouvert-Weg
+595,7,Senda Despejada
+595,8,Via Aperta
+595,9,Ouvert Way
+595,11,ウベール通り
+596,1,ハクダンシティ
+596,3,백단시티
+596,5,Neuvartault
+596,6,Nouvaria City
+596,7,Ciudad Novarte
+596,8,Novartopoli
+596,9,Santalune City
+596,11,ハクダンシティ
+597,1,４ばんどうろ
+597,3,4번도로
+597,5,Route 4
+597,6,Route 4
+597,7,Ruta 4
+597,8,Percorso 4
+597,9,Route 4
+597,11,４番道路
+598,1,パルテールかいどう
+598,3,파르테르 가도
+598,5,Route Fleurie
+598,6,Parterre-Weg
+598,7,Senda del Parterre
+598,8,Viale Parterre
+598,9,Parterre Way
+598,11,パルテール街道
+599,1,ミアレシティ
+599,3,미르시티
+599,5,Illumis
+599,6,Illumina City
+599,7,Ciudad Luminalia
+599,8,Luminopoli
+599,9,Lumiose City
+599,11,ミアレシティ
+600,1,プリズムタワー
+600,3,프리즘타워
+600,5,Tour Prismatique
+600,6,Prismaturm
+600,7,Torre Prisma
+600,8,Torre Prisma
+600,9,Prism Tower
+600,11,プリズムタワー
+601,1,フラダリラボ
+601,3,플라드리 래버러토리
+601,5,Labos Lysandre
+601,6,Labor von Flordelis
+601,7,Laboratorios Lysson
+601,8,Laboratori Elisio
+601,9,Lysandre Labs
+601,11,フラダリラボ
+602,1,５ばんどうろ
+602,3,5번도로
+602,5,Route 5
+602,6,Route 5
+602,7,Ruta 5
+602,8,Percorso 5
+602,9,Route 5
+602,11,５番道路
+603,1,ベルサンどおり
+603,3,베르성 도로
+603,5,Chemin du Versant
+603,6,Coteau-Weg
+603,7,Vía Repecho
+603,8,Via Versante
+603,9,Versant Road
+603,11,ベルサン通り
+604,1,コボクタウン
+604,3,고목내마을
+604,5,Fort-Vanitas
+604,6,Vanitéa
+604,7,Pueblo Vánitas
+604,8,Castel Vanità
+604,9,Camphrier Town
+604,11,コボクタウン
+605,1,ショボンヌじょう
+605,3,침울한 성
+605,5,Fort de Vanitas
+605,6,Château Tristesse
+605,7,Castillo Caduco
+605,8,Maniero Sottotono
+605,9,Shabboneau Castle
+605,11,ショボンヌ城
+606,1,６ばんどうろ
+606,3,6번도로
+606,5,Route 6
+606,6,Route 6
+606,7,Ruta 6
+606,8,Percorso 6
+606,9,Route 6
+606,11,６番道路
+607,1,パレのなみきみち
+607,3,팔레 가로수 길
+607,5,Allée du Palais
+607,6,Palais-Allee
+607,7,Alameda del Palacio
+607,8,Boulevard Palazzo
+607,9,Palais Lane
+607,11,パレの並木道
+608,1,パルファムきゅうでん
+608,3,파르팽 궁전
+608,5,Palais Chaydeuvre
+608,6,Magnum-Opus-Palast
+608,7,Palacio Cénit
+608,8,Reggia Aurea
+608,9,Parfum Palace
+608,11,パルファム宮殿
+609,1,７ばんどうろ
+609,3,7번도로
+609,5,Route 7
+609,6,Route 7
+609,7,Ruta 7
+609,8,Percorso 7
+609,9,Route 7
+609,11,７番道路
+610,1,リビエールライン
+610,3,리비에르 라인
+610,5,Chemin des Berges
+610,6,Rivière-Promenade
+610,7,Paseo de la Ribera
+610,8,Via Fiume
+610,9,Rivière Walk
+610,11,リビエールライン
+611,1,ショウヨウシティ
+611,3,삼채시티
+611,5,Relifac-le-Haut
+611,6,Relievera City
+611,7,Ciudad Relieve
+611,8,Altoripoli
+611,9,Cyllage City
+611,11,ショウヨウシティ
+612,1,８ばんどうろ
+612,3,8번도로
+612,5,Route 8
+612,6,Route 8
+612,7,Ruta 8
+612,8,Percorso 8
+612,9,Route 8
+612,11,８番道路
+613,1,ミュライユかいがん
+613,3,미라유 해안
+613,5,Falaise Muraille
+613,6,Muraille-Küstenpfad
+613,7,Muralla Costera
+613,8,Muraglia Costiera
+613,9,Muraille Coast
+613,11,ミュライユ海岸
+614,1,コウジンタウン
+614,3,가라마을
+614,5,Roche-sur-Gliffe
+614,6,Petrophia
+614,7,Pueblo Petroglifo
+614,8,Petroglifari
+614,9,Ambrette Town
+614,11,コウジンタウン
+615,1,９ばんどうろ
+615,3,9번도로
+615,5,Route 9
+615,6,Route 9
+615,7,Ruta 9
+615,8,Percorso 9
+615,9,Route 9
+615,11,９番道路
+616,1,トゲトゲさんどう
+616,3,뿔 산길
+616,5,Piste Piquante
+616,6,Rihorn-Pass
+616,7,Paso de Rhyhorn
+616,8,Sentiero Punzoni
+616,9,Spikes Passage
+616,11,トゲトゲ山道
+617,1,バトルシャトー
+617,3,배틀샤토
+617,5,Château de Combat
+617,6,Kampfschloss
+617,7,Bastión Batalla
+617,8,Castello Lotta
+617,9,Battle Chateau
+617,11,バトルシャトー
+618,1,１０ばんどうろ
+618,3,10번도로
+618,5,Route 10
+618,6,Route 10
+618,7,Ruta 10
+618,8,Percorso 10
+618,9,Route 10
+618,11,１０番道路
+619,1,メンヒルロード
+619,3,멘히르로드
+619,5,Route Menhir
+619,6,Menhir-Weg
+619,7,Camino Menhires
+619,8,Strada dei Menhir
+619,9,Menhir Trail
+619,11,メンヒルロード
+620,1,セキタイタウン
+620,3,옥유마을
+620,5,Cromlac’h
+620,6,Cromlexia
+620,7,Pueblo Crómlech
+620,8,Cromleburgo
+620,9,Geosenge Town
+620,11,セキタイタウン
+621,1,１１ばんどうろ
+621,3,11번도로
+621,5,Route 11
+621,6,Route 11
+621,7,Ruta 11
+621,8,Percorso 11
+621,9,Route 11
+621,11,１１番道路
+622,1,ミロワールどおり
+622,3,미르와르 도로
+622,5,Chemin Miroir
+622,6,Miroir-Weg
+622,7,Senda Reflejos
+622,8,Via dei Riflessi
+622,9,Miroir Way
+622,11,ミロワール通り
+623,1,うつしみのどうくつ
+623,3,비춤의 동굴
+623,5,Grotte Miroitante
+623,6,Spiegelhöhle
+623,7,Cueva Reflejos
+623,8,Grotta dei Riflessi
+623,9,Reflection Cave
+623,11,映し身の洞窟
+624,1,シャラシティ
+624,3,사라시티
+624,5,Yantreizh
+624,6,Yantara City
+624,7,Ciudad Yantra
+624,8,Yantaropoli
+624,9,Shalour City
+624,11,シャラシティ
+625,1,マスタータワー
+625,3,마스터타워
+625,5,Tour Maîtrise
+625,6,Turm der Erkenntnis
+625,7,Torre Maestra
+625,8,Torre Maestra
+625,9,Tower of Mastery
+625,11,マスタータワー
+626,1,１２ばんどうろ
+626,3,12번도로
+626,5,Route 12
+626,6,Route 12
+626,7,Ruta 12
+626,8,Percorso 12
+626,9,Route 12
+626,11,１２番道路
+627,1,フラージュどおり
+627,3,프라주 도로
+627,5,Chemin Fourrage
+627,6,Fourrage-Weg
+627,7,Vereda del Heno
+627,8,Via dei Pascoli
+627,9,Fourrage Road
+627,11,フラージュ通り
+628,1,ヒヨクシティ
+628,3,비익시티
+628,5,Port Tempères
+628,6,Tempera City
+628,7,Ciudad Témpera
+628,8,Temperopoli
+628,9,Coumarine City
+628,11,ヒヨクシティ
+629,1,１３ばんどうろ
+629,3,13번도로
+629,5,Route 13
+629,6,Route 13
+629,7,Ruta 13
+629,8,Percorso 13
+629,9,Route 13
+629,11,１３番道路
+630,1,ミアレのこうや
+630,3,미르 황야
+630,5,Steppe d’Illumis
+630,6,Illumina-Steppe
+630,7,Páramo de Luminalia
+630,8,Landa di Luminopoli
+630,9,Lumiose Badlands
+630,11,ミアレの荒野
+631,1,１４ばんどうろ
+631,3,14번도로
+631,5,Route 14
+631,6,Route 14
+631,7,Ruta 14
+631,8,Percorso 14
+631,9,Route 14
+631,11,１４番道路
+632,1,クノエのりんどう
+632,3,후늬 임도
+632,5,Laie Romant-ss-Bois
+632,6,Romantia-Waldweg
+632,7,Arboleda Romantis
+632,8,Sentiero Romantopoli
+632,9,Laverre Nature Trail
+632,11,クノエの林道
+633,1,クノエシティ
+633,3,후늬시티
+633,5,Romant-sous-Bois
+633,6,Romantia City
+633,7,Ciudad Romantis
+633,8,Romantopoli
+633,9,Laverre City
+633,11,クノエシティ
+634,1,ボールこうじょう
+634,3,볼 공장
+634,5,Usine de Poké Balls
+634,6,Pokéball-Fabrik
+634,7,Fábrica Poké Balls
+634,8,Fabbrica Poké Ball
+634,9,Poké Ball Factory
+634,11,ボール工場
+635,1,１５ばんどうろ
+635,3,15번도로
+635,5,Route 15
+635,6,Route 15
+635,7,Ruta 15
+635,8,Percorso 15
+635,9,Route 15
+635,11,１５番道路
+636,1,ブランどおり
+636,3,브렁 도로
+636,5,Chemin Brun
+636,6,Brun-Weg
+636,7,Sendero Hojarasca
+636,8,Via Fogliebrune
+636,9,Brun Way
+636,11,ブラン通り
+637,1,フウジョタウン
+637,3,버들비마을
+637,5,La Frescale
+637,6,Frescora
+637,7,Pueblo Fresco
+637,8,Frescovilla
+637,9,Dendemille Town
+637,11,フウジョタウン
+638,1,１６ばんどうろ
+638,3,16번도로
+638,5,Route 16
+638,6,Route 16
+638,7,Ruta 16
+638,8,Percorso 16
+638,9,Route 16
+638,11,１６番道路
+639,1,トリストどおり
+639,3,트리스트 도로
+639,5,Chemin Tristesse
+639,6,Tristesse-Weg
+639,7,Senda Melancolía
+639,8,Via Malinconia
+639,9,Mélancolie Path
+639,11,トリスト通り
+640,1,フロストケイブ
+640,3,프로스트케이브
+640,5,Caverne Gelée
+640,6,Frosthöhle
+640,7,Gruta Helada
+640,8,Caverna Gelata
+640,9,Frost Cavern
+640,11,フロストケイブ
+641,1,１７ばんどうろ
+641,3,17번도로
+641,5,Route 17
+641,6,Route 17
+641,7,Ruta 17
+641,8,Percorso 17
+641,9,Route 17
+641,11,１７番道路
+642,1,マンムーロード
+642,3,맘모꾸리로드
+642,5,Route Mammochon
+642,6,Mamutel-Weg
+642,7,Sendero Mamoswine
+642,8,Passo Mamoswine
+642,9,Mamoswine Road
+642,11,マンムーロード
+643,1,ヒャッコクシティ
+643,3,향전시티
+643,5,Flusselles
+643,6,Fluxia City
+643,7,Ciudad Fluxus
+643,8,Fluxopoli
+643,9,Anistar City
+643,11,ヒャッコクシティ
+644,1,１８ばんどうろ
+644,3,18번도로
+644,5,Route 18
+644,6,Route 18
+644,7,Ruta 18
+644,8,Percorso 18
+644,9,Route 18
+644,11,１８番道路
+645,1,エトロワ・バレどおり
+645,3,에뜨르와 발레 도로
+645,5,Chemin des Gorges
+645,6,Vallée-Étroite-Weg
+645,7,Senda Valle Angosto
+645,8,Via Valle Stretta
+645,9,Vallée Étroite Way
+645,11,エトロワ・バレ通り
+646,1,レンリタウン
+646,3,배롱마을
+646,5,Mozheim
+646,6,Mosaia
+646,7,Pueblo Mosaico
+646,8,Ponte Mosaico
+646,9,Couriway Town
+646,11,レンリタウン
+647,1,１９ばんどうろ
+647,3,19번도로
+647,5,Route 19
+647,6,Route 19
+647,7,Ruta 19
+647,8,Percorso 19
+647,9,Route 19
+647,11,１９番道路
+648,1,ラルジュ・バレどおり
+648,3,라주 발레 도로
+648,5,Chemin du Val
+648,6,Vallée-Large-Weg
+648,7,Senda del Gran Valle
+648,8,Via Valle Larga
+648,9,Grande Vallée Way
+648,11,ラルジュ・バレ通り
+649,1,エイセツシティ
+649,3,이설시티
+649,5,Auffrac-les-Congères
+649,6,Fractalia City
+649,7,Ciudad Fractal
+649,8,Fractalopoli
+649,9,Snowbelle City
+649,11,エイセツシティ
+650,1,２０ばんどうろ
+650,3,20번도로
+650,5,Route 20
+650,6,Route 20
+650,7,Ruta 20
+650,8,Percorso 20
+650,9,Route 20
+650,11,２０番道路
+651,1,まよいのもり
+651,3,미혹의 숲
+651,5,Bois du Dédale
+651,6,Irrwald
+651,7,Bosque Errantes
+651,8,Bosco Passoperso
+651,9,Winding Woods
+651,11,迷いの森
+652,1,ポケモンのむら
+652,3,포켓몬마을
+652,5,Village Pokémon
+652,6,Pokémon-Dorf
+652,7,Villa Pokémon
+652,8,Valle dei Pokémon
+652,9,Pokémon Village
+652,11,ポケモンの村
+653,1,２１ばんどうろ
+653,3,21번도로
+653,5,Route 21
+653,6,Route 21
+653,7,Ruta 21
+653,8,Percorso 21
+653,9,Route 21
+653,11,２１番道路
+654,1,デルニエどおり
+654,3,데르니에 도로
+654,5,Chemin Final
+654,6,Dernier-Weg
+654,7,Vía Ultimia
+654,8,Via Ultima
+654,9,Dernière Way
+654,11,デルニエ通り
+655,1,２２ばんどうろ
+655,3,22번도로
+655,5,Route 22
+655,6,Route 22
+655,7,Ruta 22
+655,8,Percorso 22
+655,9,Route 22
+655,11,２２番道路
+656,1,デトルネどおり
+656,3,데뚜르네 도로
+656,5,Chemin Détour
+656,6,Détourné-Weg
+656,7,Vía Desvío
+656,8,Via Detour
+656,9,Détourner Way
+656,11,デトルネ通り
+657,1,チャンピオンロード
+657,3,챔피언로드
+657,5,Route Victoire
+657,6,Siegesstraße
+657,7,Calle Victoria
+657,8,Via Vittoria
+657,9,Victory Road
+657,11,チャンピオンロード
+658,1,ポケモンリーグ
+658,3,포켓몬리그
+658,5,Ligue Pokémon
+658,6,Pokémon Liga
+658,7,Liga Pokémon
+658,8,Lega Pokémon
+658,9,Pokémon League
+658,11,ポケモンリーグ
+659,1,キナンシティ
+659,3,기남시티
+659,5,Batisques
+659,6,Batika City
+659,7,Ciudad Batik
+659,8,Batikopoli
+659,9,Kiloude City
+659,11,キナンシティ
+660,1,バトルハウス
+660,3,배틀하우스
+660,5,Maison de Combat
+660,6,Kampfhaus
+660,7,Mansión Batalla
+660,8,Villa Lotta
+660,9,Battle Maison
+660,11,バトルハウス
+661,1,アズールわん
+661,3,아쥐르만
+661,5,Baie Azur
+661,6,Azurbucht
+661,7,Bahía Azul
+661,8,Baia Azzurra
+661,9,Azure Bay
+661,11,アズール湾
+662,1,フウジョゲート
+662,3,버들비게이트
+662,5,Porte de La Frescale
+662,6,Frescora-Tor
+662,7,Acceso a Fresco
+662,8,Varco Frescovilla
+662,9,Dendemille Gate
+662,11,フウジョゲート
+663,1,レンリゲート
+663,3,배롱게이트
+663,5,Porte de Mozheim
+663,6,Mosaia-Tor
+663,7,Acceso a Mosaico
+663,8,Varco Ponte Mosaico
+663,9,Couriway Gate
+663,11,レンリゲート
+664,1,コウジンゲート
+664,3,가라게이트
+664,5,Porte de R. s/Gliffe
+664,6,Petrophia-Tor
+664,7,Acceso a Petroglifo
+664,8,Varco Petroglifari
+664,9,Ambrette Gate
+664,11,コウジンゲート
+665,1,ミアレゲート
+665,3,미르게이트
+665,5,Porte d’Illumis
+665,6,Illumina-Tor
+665,7,Acceso a Luminalia
+665,8,Varco Luminopoli
+665,9,Lumiose Gate
+665,11,ミアレゲート
+666,1,シャラゲート
+666,3,사라게이트
+666,5,Porte de Yantreizh
+666,6,Yantara-Tor
+666,7,Acceso a Yantra
+666,8,Varco Yantaropoli
+666,9,Shalour Gate
+666,11,シャラゲート
+667,1,ヒヨクゲート
+667,3,비익게이트
+667,5,Porte de P. Tempères
+667,6,Tempera-Tor
+667,7,Acceso a Témpera
+667,8,Varco Temperopoli
+667,9,Coumarine Gate
+667,11,ヒヨクゲート
+668,1,クノエゲート
+668,3,후늬게이트
+668,5,Porte de Romant
+668,6,Romantia-Tor
+668,7,Acceso a Romantis
+668,8,Varco Romantopoli
+668,9,Laverre Gate
+668,11,クノエゲート
+669,1,ヒャッコクゲート
+669,3,향전게이트
+669,5,Porte de Flusselles
+669,6,Fluxia-Tor
+669,7,Acceso a Fluxus
+669,8,Varco Fluxopoli
+669,9,Anistar Gate
+669,11,ヒャッコクゲート
+670,1,エイセツゲート
+670,3,이설게이트
+670,5,Porte d’Auffrac
+670,6,Fractalia-Tor
+670,7,Acceso a Fractal
+670,8,Varco Fractalopoli
+670,9,Snowbelle Gate
+670,11,エイセツゲート
+671,1,かがやきのどうくつ
+671,3,반짝임의 동굴
+671,5,Grotte Étincelante
+671,6,Leuchthöhle
+671,7,Cueva Brillante
+671,8,Grotta dei Bagliori
+671,9,Glittering Cave
+671,11,輝きの洞窟
+672,1,じつなぎのどうけつ
+672,3,땅이음의 동굴
+672,5,Cave Connecterre
+672,6,Geolinkhöhle
+672,7,Gruta Tierraunida
+672,8,Grotta Trait d’Union
+672,9,Connecting Cave
+672,11,地つなぎの洞穴
+673,1,ズバットたちのすみか
+673,3,주뱃들의 소굴
+673,5,Antre Nosferapti
+673,6,Zubat-Nest
+673,7,Escondrijo Zubat
+673,8,Tana degli Zubat
+673,9,Zubat Roost
+673,11,ズバットたちのすみか
+674,1,カロスはつでんしょ
+674,3,칼로스발전소
+674,5,Centrale de Kalos
+674,6,Kalos-Kraftwerk
+674,7,Central de Kalos
+674,8,Centrale di Kalos
+674,9,Kalos Power Plant
+674,11,カロス発電所
+675,1,フレアだんひみつきち
+675,3,플레어단 비밀기지
+675,5,Repaire Team Flare
+675,6,Flare-Geheimbasis
+675,7,Guarida Team Flare
+675,8,Covo del Team Flare
+675,9,Team Flare Secret HQ
+675,11,フレア団秘密基地
+676,1,ついのどうくつ
+676,3,끝의 동굴
+676,5,Grotte Coda
+676,6,Omega-Höhle
+676,7,Cueva Desenlace
+676,8,Grotta Climax
+676,9,Terminus Cave
+676,11,終の洞窟
+677,1,あれはてホテル
+677,3,황폐해진 호텔
+677,5,Hôtel Désolation
+677,6,Hotelruine
+677,7,Hotel Desolación
+677,8,Albergo Diroccato
+677,9,Lost Hotel
+677,11,荒れ果てホテル
+678,1,うつろのま
+678,3,공허의 방
+678,5,Chambre Néant
+678,6,Kammer der Leere
+678,7,Estancia Vacua
+678,8,Stanza Vacua
+678,9,Chamber of Emptiness
+678,11,空ろの間
+679,1,わだつみのあな
+679,3,해신의 굴
+679,5,Antre Néréen
+679,6,Meerestitanenhöhle
+679,7,Cueva Talasia
+679,8,Antro Talassico
+679,9,Sea Spirit’s Den
+679,11,海神の穴
+680,1,フレンドサファリ
+680,3,프렌드사파리
+680,5,Safari des Amis
+680,6,Kontaktsafari
+680,7,Safari Amistad
+680,8,Safari Amici
+680,9,Friend Safari
+680,11,フレンドサファリ
+681,1,かえんのま
+681,3,화염의 방
+681,5,Chambre du Brasier
+681,6,Flammen-Saal
+681,7,Sala de las Llamas
+681,8,Sala delle Fiamme
+681,9,Blazing Chamber
+681,11,火炎の間
+682,1,すいもんのま
+682,3,수문의 방
+682,5,Chambre du Barrage
+682,6,Schleusen-Saal
+682,7,Sala de la Esclusa
+682,8,Sala delle Chiuse
+682,9,Flood Chamber
+682,11,水門の間
+683,1,こうてつのま
+683,3,무쇠의 방
+683,5,Chambre de l’Alliage
+683,6,Rüstungs-Saal
+683,7,Sala del Metal
+683,8,Sala del Metallo
+683,9,Ironworks Chamber
+683,11,鋼鉄の間
+684,1,りゅうしょうのま
+684,3,용문양의 방
+684,5,Chambre de la Guivre
+684,6,Draco-Saal
+684,7,Sala del Draco
+684,8,Sala del Dragone
+684,9,Dragonmark Chamber
+684,11,竜章の間
+685,1,ひかりのま
+685,3,빛의 방
+685,5,Chambre de l’Éclat
+685,6,Licht-Saal
+685,7,Sala de la Luz
+685,8,Sala della Luce
+685,9,Radiant Chamber
+685,11,光の間
+686,1,ポケモンリーグゲート
+686,3,포켓몬리그 게이트
+686,5,Porte de la Ligue
+686,6,Tor zur Pokémon Liga
+686,7,Acceso Liga Pokémon
+686,8,Varco Lega Pokémon
+686,9,Pokémon League Gate
+686,11,ポケモンリーグゲート
+687,1,ミアレステーション
+687,3,미르 스테이션
+687,5,Gare d’Illumis
+687,6,Bahnhof von Illumina
+687,7,Estación Luminalia
+687,8,Stazione Luminopoli
+687,9,Lumiose Station
+687,11,ミアレステーション
+688,1,キナンステーション
+688,3,기남 스테이션
+688,5,Gare de Batisques
+688,6,Bahnhof von Batika
+688,7,Estación Batik
+688,8,Stazione Batikopoli
+688,9,Kiloude Station
+688,11,キナンステーション
+689,1,コウジンすいぞくかん
+689,3,가라 수족관
+689,5,Aquarium R. s/Gliffe
+689,6,Petrophia-Aquarium
+689,7,Acuario Petroglifo
+689,8,Acquario
+689,9,Ambrette Aquarium
+689,11,コウジン水族館
+690,1,ななしのどうくつ
+690,3,이름없는 동굴
+690,5,Grotte Inconnue
+690,6,Geheimdungeon
+690,7,Mazmorra Rara
+690,8,Grotta Ignota
+690,9,Unknown Dungeon
+690,11,ななしの洞窟

pokedex/data/csv/locations.csv

@@ -574,59 +574,106 @@ id,region_id,identifier
 585,3,secret-base
 586,3,hoenn-battle-tower
 587,6,vaniville-town
-588,6,aquacorde-town
+588,6,kalos-route-1
-589,6,santalune-forest
+589,6,vaniville-pathway
-590,6,santalune-city
+590,6,aquacorde-town
-591,6,lumiose-city
+591,6,kalos-route-2
-592,6,camphrier-town
+592,6,avance-trail
-593,6,parfum-palace
+593,6,santalune-forest
-594,6,connecting-cave
+594,6,kalos-route-3
-595,6,cyllage-city
+595,6,ouvert-way
-596,6,ambrette-town
+596,6,santalune-city
-597,6,glittering-cave
+597,6,kalos-route-4
-598,6,geosenge-town
+598,6,parterre-way
-599,6,reflection-cave
+599,6,lumiose-city
-600,6,shalour-city
+600,6,prism-tower
-601,6,coumarine-city
+601,6,lysandre-labs
-602,6,sea-spirits-den
+602,6,kalos-route-5
-603,6,kalos-power-plant
+603,6,versant-road
-604,6,laverre-city
+604,6,camphrier-town
-605,6,poke-ball-factory
+605,6,shabboneau-castle
-606,6,lost-hotel
+606,6,kalos-route-6
-607,6,dendemille-town
+607,6,palais-lane
-608,6,frost-cavern
+608,6,parfum-palace
-609,6,anistar-city
+609,6,kalos-route-7
-610,6,couriway-town
+610,6,rivière-walk
-611,6,terminus-cave
+611,6,cyllage-city
-612,6,snowbelle-city
+612,6,kalos-route-8
-613,6,pokemon-village
+613,6,muraille-coast
-614,6,kalos-victory-road
+614,6,ambrette-town
-615,6,chamber-of-emptiness
+615,6,kalos-route-9
-616,6,pokemon-league
+616,6,spikes-passage
-617,6,kiloude-city
+617,6,battle-chateau
-618,6,azure-bay
+618,6,kalos-route-10
-619,6,battle-chateau
+619,6,menhir-trail
-620,6,battle-maison
+620,6,geosenge-town
-621,6,tower-of-mastery
+621,6,kalos-route-11
-622,6,kalos-route-1
+622,6,miroir-way
-623,6,kalos-route-2
+623,6,reflection-cave
-624,6,kalos-route-3
+624,6,shalour-city
-625,6,kalos-route-4
+625,6,tower-of-mastery
-626,6,kalos-route-5
+626,6,kalos-route-12
-627,6,kalos-route-6
+627,6,fourrage-road
-628,6,kalos-route-7
+628,6,coumarine-city
-629,6,kalos-route-8
+629,6,kalos-route-13
-630,6,kalos-route-9
+630,6,lumiose-badlands
-631,6,kalos-route-10
+631,6,kalos-route-14
-632,6,kalos-route-11
+632,6,laverre-nature-trail
-633,6,kalos-route-12
+633,6,laverre-city
-634,6,kalos-route-13
+634,6,poke-ball-factory
-635,6,kalos-route-14
+635,6,kalos-route-15
-636,6,kalos-route-15
+636,6,brun-way
-637,6,kalos-route-16
+637,6,dendemille-town
-638,6,kalos-route-17
+638,6,kalos-route-16
-639,6,kalos-route-18
+639,6,melancolie-path
-640,6,kalos-route-19
+640,6,frost-cavern
-641,6,kalos-route-20
+641,6,kalos-route-17
-642,6,kalos-route-21
+642,6,mamoswine-road
-643,6,kalos-route-22
+643,6,anistar-city
+644,6,kalos-route-18
+645,6,vallee-etroite-way
+646,6,couriway-town
+647,6,kalos-route-19
+648,6,grande-vallee-way
+649,6,snowbelle-city
+650,6,kalos-route-20
+651,6,winding-woods
+652,6,pokemon-village
+653,6,kalos-route-21
+654,6,dernière-way
+655,6,kalos-route-22
+656,6,detourner-way
+657,6,victory-road
+658,6,pokemon-league
+659,6,kiloude-city
+660,6,battle-maison
+661,6,azure-bay
+662,6,dendemille-gate
+663,6,couriway-gate
+664,6,ambrette-gate
+665,6,lumiose-gate
+666,6,shalour-gate
+667,6,coumarine-gate
+668,6,laverre-gate
+669,6,anistar-gate
+670,6,snowbelle-gate
+671,6,glittering-cave
+672,6,connecting-cave
+673,6,zubat-roost
+674,6,kalos-power-plant
+675,6,team-flare-secret-hq
+676,6,terminus-cave
+677,6,lost-hotel
+678,6,chamber-of-emptiness
+679,6,sea-spirits-den
+680,6,friend-safari
+681,6,blazing-chamber
+682,6,flood-chamber
+683,6,ironworks-chamber
+684,6,dragonmark-chamber
+685,6,radiant-chamber
+686,6,pokemon-league-gate
+687,6,lumiose-station
+688,6,kiloude-station
+689,6,ambrette-aquarium
+690,6,unknown-dungeon

pokedex/data/csv/machines.csv

@@ -14,6 +14,7 @@ machine_number,version_group_id,item_id,move_id
 1,13,305,264
 1,14,305,468
 1,15,305,468
+1,16,305,468
 2,1,306,13
 2,2,306,13
 2,3,306,29
@@ -29,6 +30,7 @@ machine_number,version_group_id,item_id,move_id
 2,13,306,337
 2,14,306,337
 2,15,306,337
+2,16,306,337
 3,1,307,14
 3,2,307,14
 3,3,307,174
@@ -44,6 +46,7 @@ machine_number,version_group_id,item_id,move_id
 3,13,307,352
 3,14,307,473
 3,15,307,473
+3,16,307,473
 4,1,308,18
 4,2,308,18
 4,3,308,205
@@ -59,6 +62,7 @@ machine_number,version_group_id,item_id,move_id
 4,13,308,347
 4,14,308,347
 4,15,308,347
+4,16,308,347
 5,1,309,25
 5,2,309,25
 5,3,309,46
@@ -74,6 +78,7 @@ machine_number,version_group_id,item_id,move_id
 5,13,309,46
 5,14,309,46
 5,15,309,46
+5,16,309,46
 6,1,310,92
 6,2,310,92
 6,3,310,92
@@ -89,6 +94,7 @@ machine_number,version_group_id,item_id,move_id
 6,13,310,92
 6,14,310,92
 6,15,310,92
+6,16,310,92
 7,1,311,32
 7,2,311,32
 7,3,311,192
@@ -104,6 +110,7 @@ machine_number,version_group_id,item_id,move_id
 7,13,311,258
 7,14,311,258
 7,15,311,258
+7,16,311,258
 8,1,312,34
 8,2,312,34
 8,3,312,249
@@ -119,6 +126,7 @@ machine_number,version_group_id,item_id,move_id
 8,13,312,339
 8,14,312,339
 8,15,312,339
+8,16,312,339
 9,1,313,36
 9,2,313,36
 9,3,313,244
@@ -134,6 +142,7 @@ machine_number,version_group_id,item_id,move_id
 9,13,313,331
 9,14,313,474
 9,15,313,474
+9,16,313,474
 10,1,314,38
 10,2,314,38
 10,3,314,237
@@ -149,6 +158,7 @@ machine_number,version_group_id,item_id,move_id
 10,13,314,237
 10,14,314,237
 10,15,314,237
+10,16,314,237
 11,1,315,61
 11,2,315,61
 11,3,315,241
@@ -164,6 +174,7 @@ machine_number,version_group_id,item_id,move_id
 11,13,315,241
 11,14,315,241
 11,15,315,241
+11,16,315,241
 12,1,316,55
 12,2,316,55
 12,3,316,230
@@ -179,6 +190,7 @@ machine_number,version_group_id,item_id,move_id
 12,13,316,269
 12,14,316,269
 12,15,316,269
+12,16,316,269
 13,1,317,58
 13,2,317,58
 13,3,317,173
@@ -194,6 +206,7 @@ machine_number,version_group_id,item_id,move_id
 13,13,317,58
 13,14,317,58
 13,15,317,58
+13,16,317,58
 14,1,318,59
 14,2,318,59
 14,3,318,59
@@ -209,6 +222,7 @@ machine_number,version_group_id,item_id,move_id
 14,13,318,59
 14,14,318,59
 14,15,318,59
+14,16,318,59
 15,1,319,63
 15,2,319,63
 15,3,319,63
@@ -224,6 +238,7 @@ machine_number,version_group_id,item_id,move_id
 15,13,319,63
 15,14,319,63
 15,15,319,63
+15,16,319,63
 16,1,320,6
 16,2,320,6
 16,3,320,196
@@ -239,6 +254,7 @@ machine_number,version_group_id,item_id,move_id
 16,13,320,113
 16,14,320,113
 16,15,320,113
+16,16,320,113
 17,1,321,66
 17,2,321,66
 17,3,321,182
@@ -254,6 +270,7 @@ machine_number,version_group_id,item_id,move_id
 17,13,321,182
 17,14,321,182
 17,15,321,182
+17,16,321,182
 18,1,322,68
 18,2,322,68
 18,3,322,240
@@ -269,6 +286,7 @@ machine_number,version_group_id,item_id,move_id
 18,13,322,240
 18,14,322,240
 18,15,322,240
+18,16,322,240
 19,1,323,69
 19,2,323,69
 19,3,323,202
@@ -284,6 +302,7 @@ machine_number,version_group_id,item_id,move_id
 19,13,323,202
 19,14,323,477
 19,15,323,355
+19,16,323,355
 20,1,324,99
 20,2,324,99
 20,3,324,203
@@ -299,6 +318,7 @@ machine_number,version_group_id,item_id,move_id
 20,13,324,219
 20,14,324,219
 20,15,324,219
+20,16,324,219
 21,1,325,72
 21,2,325,72
 21,3,325,218
@@ -314,6 +334,7 @@ machine_number,version_group_id,item_id,move_id
 21,13,325,218
 21,14,325,218
 21,15,325,218
+21,16,325,218
 22,1,326,76
 22,2,326,76
 22,3,326,76
@@ -329,6 +350,7 @@ machine_number,version_group_id,item_id,move_id
 22,13,326,76
 22,14,326,76
 22,15,326,76
+22,16,326,76
 23,1,327,82
 23,2,327,82
 23,3,327,231
@@ -344,6 +366,7 @@ machine_number,version_group_id,item_id,move_id
 23,13,327,231
 23,14,327,479
 23,15,327,479
+23,16,327,479
 24,1,328,85
 24,2,328,85
 24,3,328,225
@@ -359,6 +382,7 @@ machine_number,version_group_id,item_id,move_id
 24,13,328,85
 24,14,328,85
 24,15,328,85
+24,16,328,85
 25,1,329,87
 25,2,329,87
 25,3,329,87
@@ -374,6 +398,7 @@ machine_number,version_group_id,item_id,move_id
 25,13,329,87
 25,14,329,87
 25,15,329,87
+25,16,329,87
 26,1,330,89
 26,2,330,89
 26,3,330,89
@@ -389,6 +414,7 @@ machine_number,version_group_id,item_id,move_id
 26,13,330,89
 26,14,330,89
 26,15,330,89
+26,16,330,89
 27,1,331,90
 27,2,331,90
 27,3,331,216
@@ -404,6 +430,7 @@ machine_number,version_group_id,item_id,move_id
 27,13,331,216
 27,14,331,216
 27,15,331,216
+27,16,331,216
 28,1,332,91
 28,2,332,91
 28,3,332,91
@@ -419,6 +446,7 @@ machine_number,version_group_id,item_id,move_id
 28,13,332,91
 28,14,332,91
 28,15,332,91
+28,16,332,91
 29,1,333,94
 29,2,333,94
 29,3,333,94
@@ -434,6 +462,7 @@ machine_number,version_group_id,item_id,move_id
 29,13,333,94
 29,14,333,94
 29,15,333,94
+29,16,333,94
 30,1,334,100
 30,2,334,100
 30,3,334,247
@@ -449,6 +478,7 @@ machine_number,version_group_id,item_id,move_id
 30,13,334,247
 30,14,334,247
 30,15,334,247
+30,16,334,247
 31,1,335,102
 31,2,335,102
 31,3,335,189
@@ -464,6 +494,7 @@ machine_number,version_group_id,item_id,move_id
 31,13,335,280
 31,14,335,280
 31,15,335,280
+31,16,335,280
 32,1,336,104
 32,2,336,104
 32,3,336,104
@@ -479,6 +510,7 @@ machine_number,version_group_id,item_id,move_id
 32,13,336,104
 32,14,336,104
 32,15,336,104
+32,16,336,104
 33,1,337,115
 33,2,337,115
 33,3,337,8
@@ -494,6 +526,7 @@ machine_number,version_group_id,item_id,move_id
 33,13,337,115
 33,14,337,115
 33,15,337,115
+33,16,337,115
 34,1,338,117
 34,2,338,117
 34,3,338,207
@@ -509,6 +542,7 @@ machine_number,version_group_id,item_id,move_id
 34,13,338,351
 34,14,338,482
 34,15,338,482
+34,16,338,482
 35,1,339,118
 35,2,339,118
 35,3,339,214
@@ -524,6 +558,7 @@ machine_number,version_group_id,item_id,move_id
 35,13,339,53
 35,14,339,53
 35,15,339,53
+35,16,339,53
 36,1,340,120
 36,2,340,120
 36,3,340,188
@@ -539,6 +574,7 @@ machine_number,version_group_id,item_id,move_id
 36,13,340,188
 36,14,340,188
 36,15,340,188
+36,16,340,188
 37,1,341,121
 37,2,341,121
 37,3,341,201
@@ -554,6 +590,7 @@ machine_number,version_group_id,item_id,move_id
 37,13,341,201
 37,14,341,201
 37,15,341,201
+37,16,341,201
 38,1,342,126
 38,2,342,126
 38,3,342,126
@@ -569,6 +606,7 @@ machine_number,version_group_id,item_id,move_id
 38,13,342,126
 38,14,342,126
 38,15,342,126
+38,16,342,126
 39,1,343,129
 39,2,343,129
 39,3,343,129
@@ -584,6 +622,7 @@ machine_number,version_group_id,item_id,move_id
 39,13,343,317
 39,14,343,317
 39,15,343,317
+39,16,343,317
 40,1,344,130
 40,2,344,130
 40,3,344,111
@@ -599,6 +638,7 @@ machine_number,version_group_id,item_id,move_id
 40,13,344,332
 40,14,344,332
 40,15,344,332
+40,16,344,332
 41,1,345,135
 41,2,345,135
 41,3,345,9
@@ -614,6 +654,7 @@ machine_number,version_group_id,item_id,move_id
 41,13,345,259
 41,14,345,259
 41,15,345,259
+41,16,345,259
 42,1,346,138
 42,2,346,138
 42,3,346,138
@@ -629,6 +670,7 @@ machine_number,version_group_id,item_id,move_id
 42,13,346,263
 42,14,346,263
 42,15,346,263
+42,16,346,263
 43,1,347,143
 43,2,347,143
 43,3,347,197
@@ -644,6 +686,7 @@ machine_number,version_group_id,item_id,move_id
 43,13,347,290
 43,14,347,488
 43,15,347,488
+43,16,347,488
 44,1,348,156
 44,2,348,156
 44,3,348,156
@@ -659,6 +702,7 @@ machine_number,version_group_id,item_id,move_id
 44,13,348,156
 44,14,348,156
 44,15,348,156
+44,16,348,156
 45,1,349,86
 45,2,349,86
 45,3,349,213
@@ -674,6 +718,7 @@ machine_number,version_group_id,item_id,move_id
 45,13,349,213
 45,14,349,213
 45,15,349,213
+45,16,349,213
 46,1,350,149
 46,2,350,149
 46,3,350,168
@@ -689,6 +734,7 @@ machine_number,version_group_id,item_id,move_id
 46,13,350,168
 46,14,350,168
 46,15,350,168
+46,16,350,168
 47,1,351,153
 47,2,351,153
 47,3,351,211
@@ -704,6 +750,7 @@ machine_number,version_group_id,item_id,move_id
 47,13,351,211
 47,14,351,490
 47,15,351,490
+47,16,351,490
 48,1,352,157
 48,2,352,157
 48,3,352,7
@@ -719,6 +766,7 @@ machine_number,version_group_id,item_id,move_id
 48,13,352,285
 48,14,352,496
 48,15,352,496
+48,16,352,496
 49,1,353,161
 49,2,353,161
 49,3,353,210
@@ -734,6 +782,7 @@ machine_number,version_group_id,item_id,move_id
 49,13,353,289
 49,14,353,497
 49,15,353,497
+49,16,353,497
 50,1,354,164
 50,2,354,164
 50,3,354,171
@@ -749,272 +798,323 @@ machine_number,version_group_id,item_id,move_id
 50,13,354,315
 50,14,354,315
 50,15,354,315
+50,16,354,315
 51,8,355,355
 51,9,355,355
 51,10,355,355
 51,11,355,502
 51,14,355,502
 51,15,355,211
+51,16,355,211
 52,8,356,411
 52,9,356,411
 52,10,356,411
 52,11,356,411
 52,14,356,411
 52,15,356,411
+52,16,356,411
 53,8,357,412
 53,9,357,412
 53,10,357,412
 53,11,357,412
 53,14,357,412
 53,15,357,412
+53,16,357,412
 54,8,358,206
 54,9,358,206
 54,10,358,206
 54,11,358,206
 54,14,358,206
 54,15,358,206
+54,16,358,206
 55,8,359,362
 55,9,359,362
 55,10,359,362
 55,11,359,503
 55,14,359,503
 55,15,359,503
+55,16,359,503
 56,8,360,374
 56,9,360,374
 56,10,360,374
 56,11,360,374
 56,14,360,374
 56,15,360,374
+56,16,360,374
 57,8,361,451
 57,9,361,451
 57,10,361,451
 57,11,361,451
 57,14,361,451
 57,15,361,451
+57,16,361,451
 58,8,362,203
 58,9,362,203
 58,10,362,203
 58,11,362,507
 58,14,362,507
 58,15,362,507
+58,16,362,507
 59,8,363,406
 59,9,363,406
 59,10,363,406
 59,11,363,510
 59,14,363,510
 59,15,363,510
+59,16,363,510
 60,8,364,409
 60,9,364,409
 60,10,364,409
 60,11,364,511
 60,14,364,511
 60,15,364,511
+60,16,364,511
 61,8,365,261
 61,9,365,261
 61,10,365,261
 61,11,365,261
 61,14,365,261
 61,15,365,261
+61,16,365,261
 62,8,366,318
 62,9,366,318
 62,10,366,318
 62,11,366,512
 62,14,366,512
 62,15,366,512
+62,16,366,512
 63,8,367,373
 63,9,367,373
 63,10,367,373
 63,11,367,373
 63,14,367,373
 63,15,367,373
+63,16,367,373
 64,8,368,153
 64,9,368,153
 64,10,368,153
 64,11,368,153
 64,14,368,153
 64,15,368,153
+64,16,368,153
 65,8,369,421
 65,9,369,421
 65,10,369,421
 65,11,369,421
 65,14,369,421
 65,15,369,421
+65,16,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
 66,11,370,371
 66,14,370,371
 66,15,370,371
+66,16,370,371
 67,8,371,278
 67,9,371,278
 67,10,371,278
 67,11,371,514
 67,14,371,514
 67,15,371,514
+67,16,371,514
 68,8,372,416
 68,9,372,416
 68,10,372,416
 68,11,372,416
 68,14,372,416
 68,15,372,416
+68,16,372,416
 69,8,373,397
 69,9,373,397
 69,10,373,397
 69,11,373,397
 69,14,373,397
 69,15,373,397
+69,16,373,397
 70,8,374,148
 70,9,374,148
 70,10,374,148
 70,11,374,148
 70,14,374,148
 70,15,374,148
+70,16,374,148
 71,8,375,444
 71,9,375,444
 71,10,375,444
 71,11,375,444
 71,14,375,444
 71,15,375,444
+71,16,375,444
 72,8,376,419
 72,9,376,419
 72,10,376,419
 72,11,376,521
 72,14,376,521
 72,15,376,521
+72,16,376,521
 73,8,377,86
 73,9,377,86
 73,10,377,86
 73,11,377,86
 73,14,377,86
 73,15,377,86
+73,16,377,86
 74,8,378,360
 74,9,378,360
 74,10,378,360
 74,11,378,360
 74,14,378,360
 74,15,378,360
+74,16,378,360
 75,8,379,14
 75,9,379,14
 75,10,379,14
 75,11,379,14
 75,14,379,14
 75,15,379,14
+75,16,379,14
 76,8,380,446
 76,9,380,446
 76,10,380,446
 76,11,380,522
 76,14,380,522
 76,15,380,522
+76,16,380,522
 77,8,381,244
 77,9,381,244
 77,10,381,244
 77,11,381,244
 77,14,381,244
 77,15,381,244
+77,16,381,244
 78,8,382,445
 78,9,382,445
 78,10,382,445
 78,11,382,523
 78,14,382,523
 78,15,382,523
+78,16,382,523
 79,8,383,399
 79,9,383,399
 79,10,383,399
 79,11,383,524
 79,14,383,524
 79,15,383,524
+79,16,383,524
 80,8,384,157
 80,9,384,157
 80,10,384,157
 80,11,384,157
 80,14,384,157
 80,15,384,157
+80,16,384,157
 81,8,385,404
 81,9,385,404
 81,10,385,404
 81,11,385,404
 81,14,385,404
 81,15,385,404
+81,16,385,404
 82,8,386,214
 82,9,386,214
 82,10,386,214
 82,11,386,525
 82,14,386,525
 82,15,386,525
+82,16,386,525
 83,8,387,363
 83,9,387,363
 83,10,387,363
 83,11,387,526
 83,14,387,526
 83,15,387,611
+83,16,387,611
 84,8,388,398
 84,9,388,398
 84,10,388,398
 84,11,388,398
 84,14,388,398
 84,15,388,398
+84,16,388,398
 85,8,389,138
 85,9,389,138
 85,10,389,138
 85,11,389,138
 85,14,389,138
 85,15,389,138
+85,16,389,138
 86,8,390,447
 86,9,390,447
 86,10,390,447
 86,11,390,447
 86,14,390,447
 86,15,390,447
+86,16,390,447
 87,8,391,207
 87,9,391,207
 87,10,391,207
 87,11,391,207
 87,14,391,207
 87,15,391,207
+87,16,391,207
 88,8,392,365
 88,9,392,365
 88,10,392,365
 88,11,392,365
 88,14,392,365
 88,15,392,214
+88,16,392,214
 89,8,393,369
 89,9,393,369
 89,10,393,369
 89,11,393,369
 89,14,393,369
 89,15,393,369
+89,16,393,369
 90,8,394,164
 90,9,394,164
 90,10,394,164
 90,11,394,164
 90,14,394,164
 90,15,394,164
+90,16,394,164
 91,8,395,430
 91,9,395,430
 91,10,395,430
 91,11,395,430
 91,14,395,430
 91,15,395,430
+91,16,395,430
 92,8,396,433
 92,9,396,433
 92,10,396,433
 92,11,396,433
 92,14,396,433
 92,15,396,433
+92,16,396,433
 93,11,659,528
 93,14,659,528
 93,15,659,528
+93,16,397,528
 94,11,660,249
 94,14,660,249
 94,15,660,249
+94,16,398,290
 95,11,661,555
 95,14,661,555
 95,15,661,555
+95,16,399,555
 96,15,745,267
+96,16,400,267
 97,15,746,399
+97,16,401,399
 98,15,747,612
+98,16,402,612
 99,15,748,605
+99,16,403,605
 100,15,749,590
+100,16,404,590
 101,1,397,15
 101,2,397,15
 101,3,397,15
@@ -1030,6 +1130,7 @@ machine_number,version_group_id,item_id,move_id
 101,13,397,15
 101,14,397,15
 101,15,397,15
+101,16,405,15
 102,1,398,19
 102,2,398,19
 102,3,398,19
@@ -1045,6 +1146,7 @@ machine_number,version_group_id,item_id,move_id
 102,13,398,19
 102,14,398,19
 102,15,398,19
+102,16,406,19
 103,1,399,57
 103,2,399,57
 103,3,399,57
@@ -1060,6 +1162,7 @@ machine_number,version_group_id,item_id,move_id
 103,13,399,57
 103,14,399,57
 103,15,399,57
+103,16,407,57
 104,1,400,70
 104,2,400,70
 104,3,400,70
@@ -1075,6 +1178,7 @@ machine_number,version_group_id,item_id,move_id
 104,13,400,70
 104,14,400,70
 104,15,400,70
+104,16,408,70
 105,1,401,148
 105,2,401,148
 105,3,401,148
@@ -1090,6 +1194,7 @@ machine_number,version_group_id,item_id,move_id
 105,13,401,148
 105,14,401,127
 105,15,401,127
+105,16,409,127
 106,3,402,250
 106,4,402,250
 106,5,402,249
@@ -1102,6 +1207,7 @@ machine_number,version_group_id,item_id,move_id
 106,12,402,249
 106,13,402,249
 106,14,402,291
+106,16,410,249
 107,3,403,127
 107,4,403,127
 107,5,403,127
@@ -1112,6 +1218,7 @@ machine_number,version_group_id,item_id,move_id
 107,10,403,127
 107,12,403,127
 107,13,403,127
+107,16,411,291
 108,5,404,291
 108,6,404,291
 108,7,404,291

pokedex/data/csv/move_effect_prose.csv

@@ -12,7 +12,7 @@ move_effect_id,local_language_id,short_effect,effect
 
 Moves that [fail]{mechanic:fail}ed, [miss]{mechanic:miss}ed, had [no effect]{mechanic:no-effect}, or were [block]{mechanic:block}ed are still copied.
 
-Assist moves, time-delayed moves, “meta” moves that operate on other moves/Pokémon/abilities, and some other special moves cannot be copied and are ignored; if the last move to hit the user was such a move, the previous move will be used instead.  The full list of ignored moves is: []{move:acupressure}, []{move:assist}, []{move:chatter}, []{move:copycat}, []{move:counter}, []{move:curse}, []{move:doom-desire}, []{move:feint}, []{move:focus-punch}, []{move:future-sight}, []{move:helping-hand}, []{move:magic-coat}, []{move:me-first}, []{move:metronome}, []{move:mimic}, []{move:mirror-coat}, []{move:mirror-move}, []{move:nature-power}, []{move:perish-song}, []{move:psych-up}, []{move:role-play}, []{move:sketch}, []{move:sleep-talk}, []{move:snatch}, []{move:spit-up}, []{move:struggle}, and []{move:transform}.
+Assist moves, time-delayed moves, “meta” moves that operate on other moves/Pokémon/abilities, and some other special moves cannot be copied and are ignored; if the last move to hit the user was such a move, the previous move will be used instead.  The full list of ignored moves is: []{move:acid-armor}, []{move:acupressure}, []{move:after-you}, []{move:agility}, []{move:ally-switch}, []{move:amnesia}, []{move:aqua-ring}, []{move:aromatherapy}, []{move:aromatic-mist}, []{move:assist}, []{move:autotomize}, []{move:barrier}, []{move:baton-pass}, []{move:belch}, []{move:belly-drum}, []{move:bide}, []{move:bulk-up}, []{move:calm-mind}, []{move:camouflage}, []{move:celebrate}, []{move:charge}, []{move:coil}, []{move:conversion}, []{move:conversion-2}, []{move:copycat}, []{move:cosmic-power}, []{move:cotton-guard}, []{move:counter}, []{move:crafty-shield}, []{move:curse}, []{move:defend-order}, []{move:defense-curl}, []{move:destiny-bond}, []{move:detect}, []{move:doom-desire}, []{move:double-team}, []{move:dragon-dance}, []{move:electric-terrain}, []{move:endure}, []{move:final-gambit}, []{move:flower-shield}, []{move:focus-energy}, []{move:focus-punch}, []{move:follow-me}, []{move:future-sight}, []{move:geomancy}, []{move:grassy-terrain}, []{move:gravity}, []{move:growth}, []{move:grudge}, []{move:guard-split}, []{move:hail}, []{move:happy-hour}, []{move:harden}, []{move:haze}, []{move:heal-bell}, []{move:heal-order}, []{move:heal-pulse}, []{move:healing-wish}, []{move:helping-hand}, []{move:hold-hands}, []{move:hone-claws}, []{move:howl}, []{move:imprison}, []{move:ingrain}, []{move:ion-deluge}, []{move:iron-defense}, []{move:kings-shield}, []{move:light-screen}, []{move:lucky-chant}, []{move:lunar-dance}, []{move:magic-coat}, []{move:magnet-rise}, []{move:magnetic-flux}, []{move:mat-block}, []{move:me-first}, []{move:meditate}, []{move:metronome}, []{move:milk-drink}, []{move:mimic}, []{move:minimize}, []{move:mirror-coat}, []{move:mirror-move}, []{move:mist}, []{move:misty-terrain}, []{move:moonlight}, []{move:morning-sun}, []{move:mud-sport}, []{move:nasty-plot}, []{move:nature-power}, []{move:perish-song}, []{move:power-split}, []{move:power-trick}, []{move:protect}, []{move:psych-up}, []{move:quick-guard}, []{move:quiver-dance}, []{move:rage-powder}, []{move:rain-dance}, []{move:recover}, []{move:recycle}, []{move:reflect}, []{move:reflect-type}, []{move:refresh}, []{move:rest}, []{move:rock-polish}, []{move:role-play}, []{move:roost}, []{move:rototiller}, []{move:safeguard}, []{move:sandstorm}, []{move:shadow-blast}, []{move:shadow-bolt}, []{move:shadow-half}, []{move:shadow-rush}, []{move:shadow-shed}, []{move:shadow-sky}, []{move:shadow-storm}, []{move:shadow-wave}, []{move:sharpen}, []{move:shell-smash}, []{move:shift-gear}, []{move:sketch}, []{move:slack-off}, []{move:sleep-talk}, []{move:snatch}, []{move:soft-boiled}, []{move:spikes}, []{move:spiky-shield}, []{move:spit-up}, []{move:splash}, []{move:stealth-rock}, []{move:sticky-web}, []{move:stockpile}, []{move:struggle}, []{move:substitute}, []{move:sunny-day}, []{move:swallow}, []{move:swords-dance}, []{move:synthesis}, []{move:tail-glow}, []{move:tailwind}, []{move:teleport}, []{move:toxic-spikes}, []{move:transform}, []{move:water-sport}, []{move:wide-guard}, []{move:wish}, []{move:withdraw} and []{move:work-up}.
 
 This move cannot be selected by []{move:assist}, []{move:metronome}, or []{move:sleep-talk}, nor forced by []{move:encore}."
 11,9,Raises the user's Attack by one stage.,Raises the user's [Attack]{mechanic:attack} by one [stage]{mechanic:stage}.

pokedex/data/csv/move_meta_ailment_names.csv

@@ -1,21 +1,41 @@
 move_meta_ailment_id,local_language_id,name
+-1,5,????
 -1,9,????
+0,5,Aucun
 0,9,none
+1,5,Paralysie
 1,9,Paralysis
+2,5,Sommeil
 2,9,Sleep
+3,5,Gel
 3,9,Freeze
+4,5,Brûlure
 4,9,Burn
+5,5,Empoisonnement
 5,9,Poison
+6,5,Confusion
 6,9,Confusion
+7,5,Attraction
 7,9,Infatuation
+8,5,Piège
 8,9,Trap
+9,5,Cauchemar
 9,9,Nightmare
+12,5,Tourmente
 12,9,Torment
+13,5,Entrave
 13,9,Disable
+14,5,Bâillement
 14,9,Yawn
+15,5,Anti-Soin
 15,9,Heal Block
+17,5,
 17,9,No type immunity
+18,5,Vampigraine
 18,9,Leech Seed
+19,5,Embargo
 19,9,Embargo
+20,5,Requiem
 20,9,Perish Song
+21,5,Racines
 21,9,Ingrain

pokedex/data/csv/move_names.csv

@@ -4318,6 +4318,30 @@ move_id,local_language_id,name
 617,7,Luz Aniquiladora
 617,8,Luce Nefasta
 617,9,Light of Ruin
+618,1,こんげんのはどう
+618,5,Onde Originelle
+618,6,Ursprungswoge
+618,7,Pulso Primigenio
+618,8,Primopulsar
+618,9,Origin Pulse
+619,1,だんがいのつるぎ
+619,5,Lame Pangéenne
+619,6,Abgrundsklinge
+619,7,Filo del Abismo
+619,8,Spade Telluriche
+619,9,Precipice Blades
+620,1,ガリョウテンセイ
+620,5,Draco Ascension
+620,6,Zenitstürmer
+620,7,Ascenso Draco
+620,8,Ascesa del Drago
+620,9,Dragon Ascent
+621,1,いじげんラッシュ
+621,5,Furie Dimension
+621,6,Dimensionswahn
+621,7,Cerco Dimensión
+621,8,Urtodimensionale
+621,9,Hyperspace Fury
 10001,1,ダークラッシュ
 10001,5,Charge Noire
 10001,6,Cryptoschlag

pokedex/data/csv/moves.csv

@@ -616,6 +616,10 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 615,thousand-waves,6,5,90,10,100,0,11,2,10007,,,,
 616,lands-wrath,6,5,90,10,100,0,11,2,1,,,,
 617,light-of-ruin,6,18,140,5,90,0,10,3,270,,,,
+618,origin-pulse,6,11,110,10,85,0,11,3,1,,,,
+619,precipice-blades,6,5,120,10,85,0,11,2,1,,,,
+620,dragon-ascent,6,3,120,5,100,0,10,2,230,,,,
+621,hyperspace-fury,6,17,100,5,,0,10,2,360,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,3,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

pokedex/data/csv/pal_park_area_names.csv

@@ -1,6 +1,11 @@
 pal_park_area_id,local_language_id,name
+1,5,Forêt
 1,9,Forest
+2,5,Plaine
 2,9,Field
+3,5,Montagne
 3,9,Mountain
+4,5,Étang
 4,9,Pond
+5,5,Mer
 5,9,Sea

pokedex/data/csv/pokeathlon_stat_names.csv

@@ -1,6 +1,11 @@
 pokeathlon_stat_id,local_language_id,name
+1,5,Vitesse
 1,9,Speed
+2,5,Force
 2,9,Power
+3,5,Habileté
 3,9,Skill
+4,5,Endurance
 4,9,Stamina
+5,5,Saut
 5,9,Jump

pokedex/data/csv/pokedex_prose.csv

@@ -1,27 +1,41 @@
 pokedex_id,local_language_id,name,description
+1,5,National,Pokédex National complet
 1,6,National,Komplette Nationale Dex
 1,9,National,Entire National dex
+2,5,Kanto,Pokédex régional de Kanto dans Rouge/Bleu/Jaune
 2,6,Kanto,Rot/Blau/Gelb Kanto Dex
 2,9,Kanto,Red/Blue/Yellow Kanto dex
+3,5,Johto initial,"Pokédex régional de Johto dans Or/Argent/Cristal, appellé ""Nouveau"" Pokédex dans le jeu"
 3,6,Original Johto,"Gold/Silber/Kristall Johto Dex — Auch der ""Neue"" Pokédex im Spiel genannt"
 3,9,Original Johto,"Gold/Silver/Crystal Johto dex—called the ""New"" Pokédex in-game"
-4,6,Hoenn,Rubin/Saphir/Smaragd Hoenn Dex
+4,6,Original Hoenn,Rubin/Saphir/Smaragd Hoenn Dex
-4,9,Hoenn,Ruby/Sapphire/Emerald Hoenn dex
+4,9,Original Hoenn,Ruby/Sapphire/Emerald Hoenn dex
+5,5,Sinnoh initial,Pokédex régional de Sinnoh dans Diamant/Perle
 5,6,Original Sinnoh,Diamant/Perl Sinnoh Dex
 5,9,Original Sinnoh,Diamond/Pearl Sinnoh dex
+6,5,Sinnoh étendu,Pokédex régional de Sinnoh dans Platine
 6,6,Erweitertes Sinnoh,Platin Sinnoh Dex — eine erweiterte Version von Diamant und Perl
 6,9,Extended Sinnoh,Platinum Sinnoh dex—an extended version of Diamond and Pearl's
+7,5,Johto amélioré,"Pokédex régional de Johto dans Or HeartGold/Argent SoulSilver, mis à jour pour la 4ème génération"
 7,6,Aktualisiertes Johto,HeartGold/SoulSilver Johto Dex — Dex aus Gold/Silber/Kristall um Fähigkeiten basierende Entwicklungen aus Generation IV erweitert
 7,9,Updated Johto,"HeartGold/SoulSilver Johto dex—Gold/Silver/Crystal's, extended to add move-based Generation IV evolutions"
+8,5,Unys initial,Pokédex régional d'Unys dans Noir/Blanc
 8,6,Original Einall,Schwarz/Weiß Einall Dex
 8,9,Original Unova,Black/White Unova dex
+9,5,Unys amélioré,Pokédex régional d'Unys dans Noir 2/Blanc 2
 9,6,Aktualisiertes Einall,Schwarz 2/Weiß 2 Einall Dex
 9,9,Updated Unova,Black 2/White 2 Unova dex
+11,5,Galerie,Ordre de la Galerie dans Pokémon Conquest
 11,6,Gallerie,Pokémon Conquest Galerie Reihenfolge
 11,9,Gallery,Pokémon Conquest gallery order
+12,5,Kalos : Centre,
 12,6,Kalos-Zentral,
 12,9,Central Kalos,
+13,5,Kalos : Côtes,
 13,6,Kalos-Küste,
 13,9,Coastal Kalos,
+14,5,Kalos : Monts,
 14,6,Kalos-Gebirge,
 14,9,Mountain Kalos,
+15,6,Neue Hoenn,Omega Rubin/Alpha Saphir Hoenn Dex — Dex aus Rubin/Saphir/Smaragd um Neue Entwicklungen erweitert
+15,9,New Hoenn,"Omega Ruby/Alpha Sapphire Hoenn Dex—Ruby/Sapphire/Emerald's, updated to add new evolutions"

pokedex/data/csv/pokedex_version_groups.csv

@@ -14,3 +14,4 @@ pokedex_id,version_group_id
 12,15
 13,15
 14,15
+15,16

pokedex/data/csv/pokedexes.csv

@@ -12,3 +12,4 @@ id,region_id,identifier,is_main_series
 12,6,kalos-central,1
 13,6,kalos-coastal,1
 14,6,kalos-mountain,1
+15,3,updated-hoenn,1

pokedex/data/csv/pokemon_abilities.csv

@@ -1833,3 +1833,36 @@ pokemon_id,ability_id,is_hidden,slot
 10061,180,1,3
 10062,26,0,1
 10063,26,0,1
+10064,33,0,1
+10065,31,0,1
+10066,156,0,1
+10067,182,0,1
+10068,39,0,1
+10069,131,0,1
+10070,173,0,1
+10071,75,0,1
+10072,159,0,1
+10073,99,0,1
+10074,174,0,1
+10075,156,0,1
+10076,181,0,1
+10077,189,0,1
+10078,190,0,1
+10079,191,0,1
+10080,9,0,1
+10080,31,1,3
+10081,9,0,1
+10081,31,1,3
+10082,9,0,1
+10082,31,1,3
+10083,9,0,1
+10083,31,1,3
+10084,9,0,1
+10084,31,1,3
+10085,9,0,1
+10085,31,1,3
+10086,170,0,1
+10087,125,0,1
+10088,113,0,1
+10089,184,0,1
+10090,91,0,1

pokedex/data/csv/pokemon_color_names.csv

@@ -1,41 +1,51 @@
 pokemon_color_id,local_language_id,name
 1,1,黒い
+1,5,Noir
 1,6,Schwarz
 1,8,Nero
 1,9,Black
 2,1,青い
+2,5,Bleu
 2,6,Blau
 2,8,Blu
 2,9,Blue
 3,1,茶色
+3,5,Brun
 3,6,Braun
 3,8,Marrone
 3,9,Brown
 4,1,灰色
+4,5,Gris
 4,6,Grau
 4,8,Grigio
 4,9,Gray
 5,1,緑
+5,5,Vert
 5,6,Grün
 5,8,Verde
 5,9,Green
 6,1,ピンク
+6,5,Rose
 6,6,Rosa
 6,8,Rosa
 6,9,Pink
 7,1,パーパル
+7,5,Violet
 7,6,Violett
 7,8,Viola
 7,9,Purple
 8,1,赤い
+8,5,Rouge
 8,6,Rot
 8,8,Rosso
 8,9,Red
 9,1,白い
+9,5,Blanc
 9,6,Weiß
 9,8,Bianco
 9,9,White
 10,1,黄色
+10,5,Jaune
 10,6,Gelb
 10,8,Giallo
 10,9,Yellow

pokedex/data/csv/pokemon_evolution.csv

@@ -359,7 +359,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 359,715,1,,48,,,,,,,,,,,,,,0,0
 360,678,1,,25,,,,,,,,,,,,,,0,0
 361,700,1,,,,,,,,18,,,2,,,,,0,0
-362,462,1,,,,634,,,,,,,,,,,,0,0
+362,462,1,,,,629,,,,,,,,,,,,0,0
-363,470,1,,,,641,,,,,,,,,,,,0,0
+363,470,1,,,,650,,,,,,,,,,,,0,0
-364,471,1,,,,608,,,,,,,,,,,,0,0
+364,471,1,,,,640,,,,,,,,,,,,0,0
-365,476,1,,,,634,,,,,,,,,,,,0,0
+365,476,1,,,,629,,,,,,,,,,,,0,0

pokedex/data/csv/pokemon_form_generations.csv

@@ -3010,3 +3010,30 @@ pokemon_form_id,generation_id,game_index
 10158,6,0
 10159,6,0
 10160,6,0
+10166,6,1
+10167,6,1
+10168,6,1
+10169,6,1
+10170,6,1
+10171,6,1
+10172,6,1
+10173,6,1
+10174,6,1
+10175,6,1
+10176,6,1
+10177,6,1
+10178,6,1
+10179,6,1
+10180,6,1
+10181,6,1
+10182,6,1
+10183,6,2
+10184,6,3
+10185,6,4
+10186,6,5
+10187,6,6
+10188,6,1
+10189,6,1
+10190,6,1
+10191,6,1
+10192,6,1

pokedex/data/csv/pokemon_form_names.csv

@@ -1333,3 +1333,30 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10165,7,Mega-Latios,
 10165,8,MegaLatios,
 10165,9,Mega Latios,Mega Latios
+10166,9,Mega Swampert,Mega Swampert
+10167,9,Mega Sceptile,Mega Sceptile
+10168,9,Mega Sableye,Mega Sableye
+10169,9,Mega Altaria,Mega Altaria
+10170,9,Mega Gallade,Mega Gallade
+10171,9,Mega Audino,Mega Audino
+10172,9,Mega Sharpedo,Mega Sharpedo
+10173,9,Mega Slowbro,Mega Slowbro
+10174,9,Mega Steelix,Mega Steelix
+10175,9,Mega Pidgeot,Mega Pidgeot
+10176,9,Mega Glalie,Mega Glalie
+10177,9,Mega Diancie,Mega Diancie
+10178,9,Mega Metagross,Mega Metagross
+10179,9,Primal Reversion,Primal Kyogre
+10180,9,Primal Reversion,Primal Groudon
+10181,9,Mega Rayquaza,Mega Rayquaza
+10182,9,Pikachu Rock Star,Pikachu Rock Star
+10183,9,Pikachu Belle,Pikachu Belle
+10184,9,Pikachu Pop Star,Pikachu Pop Star
+10185,9,"Pikachu, Ph.D.","Pikachu, Ph.D."
+10186,9,Pikachu Libre,Pikachu Libre
+10187,9,Cosplay Pikachu,Cosplay Pikachu
+10188,9,Hoopa Unbound,Hoopa Unbound
+10189,9,Mega Camerupt,Mega Camerupt
+10190,9,Mega Lopunny,Mega Lopunny
+10191,9,Mega Salamence,Mega Salamence
+10192,9,Mega Beedrill,Mega Beedrill

pokedex/data/csv/pokemon_game_indices.csv

@@ -8326,3 +8326,30 @@ pokemon_id,version_id,game_index
 10023,22,703
 10024,21,705
 10024,22,705
+10064,25,799
+10065,25,800
+10066,25,801
+10067,25,802
+10068,25,803
+10069,25,804
+10070,25,805
+10071,25,806
+10072,25,807
+10073,25,808
+10074,25,809
+10075,25,810
+10076,25,811
+10077,25,812
+10078,25,813
+10079,25,814
+10080,25,815
+10081,25,816
+10082,25,817
+10083,25,818
+10084,25,819
+10085,25,820
+10086,25,821
+10087,25,822
+10088,25,823
+10089,25,824
+10090,25,825

pokedex/data/csv/pokemon_habitat_names.csv

@@ -1,10 +1,19 @@
 pokemon_habitat_id,local_language_id,name
+1,5,grottes
 1,9,cave
+2,5,forêts
 2,9,forest
+3,5,champs
 3,9,grassland
+4,5,montagnes
 4,9,mountain
+5,5,rares
 5,9,rare
+6,5,milieux hostiles
 6,9,rough terrain
+7,5,mers
 7,9,sea
+8,5,urbains
 8,9,urban
+9,5,marécages
 9,9,water's edge

pokedex/data/csv/pokemon_stats.csv

@@ -4703,3 +4703,165 @@ pokemon_id,stat_id,base_stat,effort
 10063,4,160,3
 10063,5,120,0
 10063,6,110,0
+10064,1,100,0
+10064,2,150,3
+10064,3,110,0
+10064,4,95,0
+10064,5,110,0
+10064,6,70,0
+10065,1,70,0
+10065,2,110,0
+10065,3,75,0
+10065,4,145,0
+10065,5,85,0
+10065,6,145,3
+10066,1,50,0
+10066,2,85,1
+10066,3,125,1
+10066,4,85,0
+10066,5,115,0
+10066,6,20,0
+10067,1,75,0
+10067,2,110,0
+10067,3,110,0
+10067,4,110,0
+10067,5,105,2
+10067,6,80,0
+10068,1,68,0
+10068,2,165,3
+10068,3,95,0
+10068,4,65,0
+10068,5,115,0
+10068,6,110,0
+10069,1,103,2
+10069,2,60,0
+10069,3,126,0
+10069,4,80,0
+10069,5,126,0
+10069,6,50,0
+10070,1,70,0
+10070,2,140,2
+10070,3,70,0
+10070,4,110,0
+10070,5,65,0
+10070,6,105,0
+10071,1,95,0
+10071,2,75,0
+10071,3,180,2
+10071,4,130,0
+10071,5,80,0
+10071,6,30,0
+10072,1,75,0
+10072,2,125,0
+10072,3,230,2
+10072,4,55,0
+10072,5,95,0
+10072,6,30,0
+10073,1,83,0
+10073,2,80,0
+10073,3,80,0
+10073,4,135,0
+10073,5,80,0
+10073,6,121,3
+10074,1,80,2
+10074,2,120,0
+10074,3,80,0
+10074,4,120,0
+10074,5,80,0
+10074,6,100,0
+10075,1,50,0
+10075,2,160,0
+10075,3,110,1
+10075,4,160,0
+10075,5,110,2
+10075,6,110,0
+10076,1,80,0
+10076,2,145,0
+10076,3,150,3
+10076,4,105,0
+10076,5,110,0
+10076,6,110,0
+10077,1,100,0
+10077,2,150,0
+10077,3,90,0
+10077,4,180,3
+10077,5,160,0
+10077,6,90,0
+10078,1,100,0
+10078,2,180,3
+10078,3,160,0
+10078,4,150,0
+10078,5,90,0
+10078,6,90,0
+10079,1,105,0
+10079,2,180,2
+10079,3,100,0
+10079,4,180,1
+10079,5,100,0
+10079,6,115,0
+10080,1,35,0
+10080,2,55,0
+10080,3,40,0
+10080,4,50,0
+10080,5,50,0
+10080,6,90,2
+10081,1,35,0
+10081,2,55,0
+10081,3,40,0
+10081,4,50,0
+10081,5,50,0
+10081,6,90,2
+10082,1,35,0
+10082,2,55,0
+10082,3,40,0
+10082,4,50,0
+10082,5,50,0
+10082,6,90,2
+10083,1,35,0
+10083,2,55,0
+10083,3,40,0
+10083,4,50,0
+10083,5,50,0
+10083,6,90,2
+10084,1,35,0
+10084,2,55,0
+10084,3,40,0
+10084,4,50,0
+10084,5,50,0
+10084,6,90,2
+10085,1,35,0
+10085,2,55,0
+10085,3,40,0
+10085,4,50,0
+10085,5,50,0
+10085,6,90,2
+10086,1,80,0
+10086,2,160,0
+10086,3,60,0
+10086,4,170,3
+10086,5,130,0
+10086,6,80,0
+10087,1,70,0
+10087,2,120,1
+10087,3,100,0
+10087,4,145,1
+10087,5,105,0
+10087,6,20,0
+10088,1,65,0
+10088,2,136,0
+10088,3,94,0
+10088,4,54,0
+10088,5,96,0
+10088,6,135,2
+10089,1,95,0
+10089,2,145,3
+10089,3,130,0
+10089,4,120,0
+10089,5,90,0
+10089,6,120,0
+10090,1,65,0
+10090,2,150,2
+10090,3,40,0
+10090,4,15,0
+10090,5,80,1
+10090,6,145,0

pokedex/data/csv/pokemon_types.csv

@@ -1178,3 +1178,49 @@ pokemon_id,type_id,slot
 10062,14,2
 10063,16,1
 10063,14,2
+10064,11,1
+10064,5,2
+10065,12,1
+10065,16,2
+10066,17,1
+10066,8,2
+10067,16,1
+10067,18,2
+10068,14,1
+10068,2,2
+10069,1,1
+10069,18,2
+10070,11,1
+10070,17,2
+10071,11,1
+10071,14,2
+10072,9,1
+10072,5,2
+10073,1,1
+10073,3,2
+10074,15,1
+10075,6,1
+10075,18,2
+10076,9,1
+10076,14,2
+10077,11,1
+10078,5,1
+10078,10,2
+10079,16,1
+10079,3,2
+10080,13,1
+10081,13,1
+10082,13,1
+10083,13,1
+10084,13,1
+10085,13,1
+10086,14,1
+10086,17,2
+10087,10,1
+10087,5,2
+10088,1,1
+10088,2,2
+10089,16,1
+10089,3,2
+10090,7,1
+10090,4,2

pokedex/data/csv/region_names.csv

@@ -1,13 +1,19 @@
 region_id,local_language_id,name
+1,5,Kanto
 1,6,Kanto
 1,9,Kanto
+2,5,Johto
 2,6,Johto
 2,9,Johto
+3,5,Hoenn
 3,6,Hoenn
 3,9,Hoenn
+4,5,Sinnoh
 4,6,Sinnoh
 4,9,Sinnoh
+5,5,Unys
 5,6,Einall
 5,9,Unova
+6,5,Kalos
 6,6,Kalos
 6,9,Kalos

pokedex/data/csv/stat_names.csv

@@ -1,40 +1,48 @@
 stat_id,local_language_id,name
 1,1,HP
+1,5,PV
 1,6,KP
 1,7,PS
 1,8,PS
 1,9,HP
 2,1,こうげき
+2,5,Attaque
 2,6,Angriff
 2,7,Ataque
 2,8,Attacco
 2,9,Attack
 3,1,ぼうぎょ
+3,5,Défense
 3,6,Verteidigung
 3,7,Defensa
 3,8,Difesa
 3,9,Defense
 4,1,とくこう
+4,5,Attaque Spéciale
 4,6,Spezialangriff
 4,7,Ataque Especial
 4,8,Attacco Speciale
 4,9,Special Attack
 5,1,とくぼう
+5,5,Défense Spéciale
 5,6,Spezialverteidigung
 5,7,Defensa Especial
 5,8,Difesa Speciale
 5,9,Special Defense
 6,1,すばやさ
+6,5,Vitesse
 6,6,Initiative
 6,7,Velocidad
 6,8,Velocità
 6,9,Speed
 7,1,めいちゅう
+7,5,Précision
 7,6,Genauigkeit
 7,7,Precisión
 7,8,precisione
 7,9,accuracy
 8,1,かいひ
+8,5,Esquive
 8,6,Fluchtwert
 8,7,Evasión
 8,8,elusione

pokedex/data/csv/type_names.csv

@@ -132,5 +132,6 @@ type_id,local_language_id,name
 10001,8,???
 10001,9,???
 10002,1,ダーク
+10002,5,Obscur
 10002,8,Ombra
 10002,9,Shadow

pokedex/data/csv/version_group_pokemon_move_methods.csv

@@ -64,3 +64,9 @@ version_group_id,pokemon_move_method_id
 15,4
 15,6
 15,10
+16,1
+16,2
+16,3
+16,4
+16,6
+16,10

pokedex/data/csv/version_group_regions.csv

@@ -15,3 +15,4 @@ version_group_id,region_id
 11,5
 14,5
 15,6
+16,3

pokedex/data/csv/version_groups.csv

@@ -14,3 +14,4 @@ id,identifier,generation_id,order
 13,xd,3,8
 14,black-2-white-2,5,14
 15,x-y,6,15
+16,omega-ruby-alpha-sapphire,6,16

pokedex/data/csv/version_names.csv

@@ -1,49 +1,103 @@
 version_id,local_language_id,name
+1,1,赤
+1,5,Rouge
 1,6,Rot
 1,9,Red
+2,1,緑
+2,5,Bleu
 2,6,Blau
 2,9,Blue
+3,1,ピカチュウ
+3,5,Jaune
 3,6,Gelb
 3,9,Yellow
+4,1,金
+4,5,Or
 4,6,Gold
 4,9,Gold
+5,1,銀
+5,5,Argent
 5,6,Silber
 5,9,Silver
+6,1,クリスタル
+6,5,Cristal
 6,6,Kristall
 6,9,Crystal
+7,1,ルビー
+7,5,Rubis
 7,6,Rubin
 7,9,Ruby
+8,1,サファイア
+8,5,Saphir
 8,6,Saphir
 8,9,Sapphire
+9,1,エメラルド
+9,5,Émeraude
 9,6,Smaragd
 9,9,Emerald
+10,1,ファイアレッド
+10,5,Rouge Feu
 10,6,Feuerrot
 10,9,FireRed
+11,1,リーフグリーン
+11,5,Vert Feuille
 11,6,Blattgrün
 11,9,LeafGreen
+12,1,ダイヤモンド
+12,5,Diamant
 12,6,Diamant
 12,9,Diamond
+13,1,パール
+13,5,Perle
 13,6,Perl
 13,9,Pearl
+14,1,プラチナ
+14,5,Platine
 14,6,Platin
 14,9,Platinum
+15,1,ハートゴールド
+15,5,Or HeartGold
 15,6,HeartGold
 15,9,HeartGold
+16,1,ソウルシルバー
+16,5,Argent SoulSilver
 16,6,SoulSilver
 16,9,SoulSilver
+17,1,ブラック
+17,5,Noir
 17,6,Schwarz
 17,9,Black
+18,1,ホワイト
+18,5,Blanc
 18,6,Weiß
 18,9,White
+19,1,コロシアム
+19,5,Colosseum
 19,6,Colosseum
 19,9,Colosseum
+20,1,XD
+20,5,XD
 20,6,XD
 20,9,XD
+21,1,ブラック2
+21,5,Noir 2
 21,6,Schwarz 2
 21,9,Black 2
+22,1,ホワイト2
+22,5,Blanc 2
 22,6,Weiß 2
 22,9,White 2
+23,1,X
+23,5,X
 23,6,X
 23,9,X
+24,1,Y
+24,5,Y
 24,6,Y
 24,9,Y
+25,1,オメガルビー
+25,6,Omega Rubin
+25,9,Omega Ruby
+26,1,アルファサファイア
+26,6,Alpha Siphir
+26,9,Alpha Sapphire

pokedex/data/csv/versions.csv

@@ -23,3 +23,5 @@ id,version_group_id,identifier
 22,14,white-2
 23,15,x
 24,15,y
+25,16,omega-ruby
+26,16,alpha-sapphire

pokedex/db/load.py

@@ -144,22 +144,23 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
 
     table_objs = sqlalchemy.sql.util.sort_tables(table_objs)
 
+    engine = session.get_bind()
+
     # Limit table names to 30 characters for Oracle
-    oracle = (session.connection().dialect.name == 'oracle')
+    oracle = (engine.dialect.name == 'oracle')
     if oracle:
         rewrite_long_table_names()
 
     # SQLite speed tweaks
-    if not safe and session.connection().dialect.name == 'sqlite':
+    if not safe and engine.dialect.name == 'sqlite':
-        session.connection().execute("PRAGMA synchronous=OFF")
+        session.execute("PRAGMA synchronous=OFF")
-        session.connection().execute("PRAGMA journal_mode=OFF")
+        session.execute("PRAGMA journal_mode=OFF")
 
     # Drop all tables if requested
     if drop_tables:
-        bind = session.get_bind()
         print_start('Dropping tables')
         for n, table in enumerate(reversed(table_objs)):
-            table.drop(checkfirst=True)
+            table.drop(bind=engine, checkfirst=True)
 
             # Drop columns' types if appropriate; needed for enums in
             # postgresql
@@ -169,7 +170,7 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
                 except AttributeError:
                     pass
                 else:
-                    drop(bind=bind, checkfirst=True)
+                    drop(bind=engine, checkfirst=True)
 
             print_status('%s/%s' % (n, len(table_objs)))
         print_done()
@@ -179,7 +180,6 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         table.create()
         print_status('%s/%s' % (n, len(table_objs)))
     print_done()
-    connection = session.connection()
 
     # Okay, run through the tables and actually load the data now
     for table_obj in table_objs:
@@ -205,35 +205,34 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         reader = csv.reader(csvfile, lineterminator='\n')
         column_names = [unicode(column) for column in reader.next()]
 
-        if not safe and session.connection().dialect.name == 'postgresql':
+        if not safe and engine.dialect.name == 'postgresql':
-            """
+            # Postgres' CSV dialect works with our data, if we mark the not-null
-            Postgres' CSV dialect works with our data, if we mark the not-null
+            # columns with FORCE NOT NULL.
-            columns with FORCE NOT NULL.
-            COPY is only allowed for DB superusers. If you're not one, use safe
-            loading (pokedex load -S).
-            """
-            session.commit()
             not_null_cols = [c for c in column_names if not table_obj.c[c].nullable]
             if not_null_cols:
                 force_not_null = 'FORCE NOT NULL ' + ','.join('"%s"' % c for c in not_null_cols)
             else:
                 force_not_null = ''
-            command = "COPY %(table_name)s (%(columns)s) FROM '%(csvpath)s' CSV HEADER %(force_not_null)s"
+
-            session.connection().execute(
+            # Grab the underlying psycopg2 cursor so we can use COPY FROM STDIN
+            raw_conn = engine.raw_connection()
+            command = "COPY %(table_name)s (%(columns)s) FROM STDIN CSV HEADER %(force_not_null)s"
+            csvfile.seek(0)
+            raw_conn.cursor().copy_expert(
                 command % dict(
                     table_name=table_name,
-                    csvpath=csvpath,
                     columns=','.join('"%s"' % c for c in column_names),
                     force_not_null=force_not_null,
+                ),
+                csvfile,
             )
-            )
+            raw_conn.commit()
-            session.commit()
             print_done()
             continue
 
         # Self-referential tables may contain rows with foreign keys of other
-        # rows in the same table that do not yet exist.  Pull these out and add
+        # rows in the same table that do not yet exist.  Pull these out and
-        # them to the session last
+        # insert them last
         # ASSUMPTION: Self-referential tables have a single PK called "id"
         deferred_rows = []  # ( row referring to id, [foreign ids we need] )
         seen_ids = set()    # primary keys we've seen
@@ -248,7 +247,7 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         def insert_and_commit():
             if not new_rows:
                 return
-            session.connection().execute(insert_stmt, new_rows)
+            session.execute(insert_stmt, new_rows)
             session.commit()
             new_rows[:] = []
 
@@ -316,12 +315,12 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
                 raise ValueError("Too many levels of self-reference!  "
                                  "Row was: " + str(row))
 
-            session.connection().execute(
+            session.execute(
                 insert_stmt.values(**row_data)
             )
             seen_ids.add(row_data['id'])
-        session.commit()
 
+        session.commit()
         print_done()
 
 
@@ -333,18 +332,17 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         table_obj = translation_class.__table__
         if table_obj in table_objs:
             insert_stmt = table_obj.insert()
-            session.connection().execute(insert_stmt, rows)
+            session.execute(insert_stmt, rows)
             session.commit()
             # We don't have a total, but at least show some increasing number
             new_row_count += len(rows)
             print_status(str(new_row_count))
 
-    print_done()
-
     # SQLite check
-    if session.connection().dialect.name == 'sqlite':
+    if engine.dialect.name == 'sqlite':
-        session.connection().execute("PRAGMA integrity_check")
+        session.execute("PRAGMA integrity_check")
 
+    print_done()
 
 
 def dump(session, tables=[], directory=None, verbose=False, langs=None):

pokedex/db/multilang.py

@@ -210,7 +210,7 @@ def create_translation_table(_table_name, foreign_class, relation_name,
 
 class MultilangQuery(Query):
     def __iter__(self):
-        if '_default_language_id' not in self._params:
+        if '_default_language_id' not in self._params or self._params['_default_language_id'] == 'dummy':
             self._params = self._params.copy()
             self._params['_default_language_id'] = self.session.default_language_id
         return super(MultilangQuery, self).__iter__()

pokedex/db/tables.py

@@ -114,11 +114,14 @@ create_translation_table('language_names', Language, 'names',
 ### The actual tables
 
 class Ability(TableBase):
-    u"""An ability a Pokémon can have, such as Static or Pressure."""
+    u"""An ability a Pokémon can have, such as Static or Pressure.
+
+    IDs below 10000 match the internal ID in the games.
+    IDs above 10000 are reserved for Conquest-only abilities.
+    """
     __tablename__ = 'abilities'
     __singlename__ = 'ability'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"This ability's unique ID; matches the games' internal ID")
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",
         info=dict(format='identifier'))
@@ -176,10 +179,11 @@ class Berry(TableBase):
     u"""A Berry, consumable item that grows on trees.
 
     For data common to all items, such as the name, see the corresponding item entry.
+
+    ID matches the in-game berry number.
     """
     __tablename__ = 'berries'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"This Berry's in-game number")
     item_id = Column(Integer, ForeignKey('items.id'), nullable=False,
         doc=u"The ID of the item that represents this Berry")
     firmness_id = Column(Integer, ForeignKey('berry_firmness.id'), nullable=False,
@@ -713,12 +717,18 @@ create_translation_table('contest_type_names', ContestType, 'names',
 class EggGroup(TableBase):
     u"""An Egg group. Usually, two Pokémon can breed if they share an Egg Group.
 
-    (exceptions are the Ditto and No Eggs groups)
+    Exceptions:
+
+    Pokémon in the No Eggs group cannot breed.
+
+    Pokemon in the Ditto group can breed with any pokemon
+    except those in the Ditto or No Eggs groups.
+
+    ID matches to the internal ID used in the games.
     """
     __tablename__ = 'egg_groups'
     __singlename__ = 'egg_group'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"A unique ID for this group")
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier.",
         info=dict(format='identifier'))
@@ -937,11 +947,13 @@ create_translation_table('growth_rate_prose', GrowthRate, 'prose',
 )
 
 class Item(TableBase):
-    u"""An Item from the games, like "Poké Ball" or "Bicycle". """
+    u"""An Item from the games, like "Poké Ball" or "Bicycle".
+
+    IDs do not mean anything; see ItemGameIndex for the IDs used in the games.
+    """
     __tablename__ = 'items'
     __singlename__ = 'item'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"A numeric ID")
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",
         info=dict(format='identifier'))
@@ -999,7 +1011,7 @@ create_translation_table('item_category_prose', ItemCategory, 'prose',
 )
 
 class ItemFlag(TableBase):
-    u"""An item attribute such as "consumable" or "holdable". """
+    u"""An item attribute such as "consumable" or "holdable".  Not official. """
     __tablename__ = 'item_flags'
     __singlename__ = 'item_flag'
     id = Column(Integer, primary_key=True, nullable=False,
@@ -1064,7 +1076,7 @@ class ItemGameIndex(TableBase):
         doc=u"Internal ID of the item in the generation")
 
 class ItemPocket(TableBase):
-    u"""A pocket that categorizes items."""
+    u"""A pocket that categorizes items.  Semi-offical."""
     __tablename__ = 'item_pockets'
     __singlename__ = 'item_pocket'
     id = Column(Integer, primary_key=True, nullable=False,
@@ -1165,11 +1177,13 @@ class Machine(TableBase):
         return self.machine_number >= 100
 
 class Move(TableBase):
-    u"""A Move: technique or attack a Pokémon can learn to use."""
+    u"""A Move: technique or attack a Pokémon can learn to use.
+
+    IDs below 10000 match the internal IDs used in the games.
+    IDs above 10000 are reserved for Shadow moves from Colosseum and XD."""
     __tablename__ = 'moves'
     __singlename__ = 'move'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"A numeric ID")
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",
         info=dict(format='identifier'))
@@ -1603,11 +1617,13 @@ class Pokemon(TableBase):
     different types, moves, or other game-changing properties counts as a
     different Pokémon.  For example, this table contains four rows for Deoxys,
     but only one for Unown.
+
+    Non-default forms have IDs above 10000.
+    IDs below 10000 match the species_id column, for convenience.
     """
     __tablename__ = 'pokemon'
     __singlename__ = 'pokemon'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"A numeric ID")
     identifier = Column(Unicode(79), nullable=False,
         doc=u'An identifier, including form iff this row corresponds to a single, named form',
         info=dict(format='identifier'))
@@ -1789,11 +1805,15 @@ class PokemonForm(TableBase):
     color differences) of every Pokémon, regardless of how the games treat
     them.  Even Pokémon with no alternate forms have one row in this table, to
     represent their lone "normal" form.
+
+    Forms which are not the default for their species have IDs above 10000.
+    IDs below 10000 correspond to ID of the species for convenience,
+    but this should not be relied upon.
+    To get the species ID of a form, join with the pokemon table.
     """
     __tablename__ = 'pokemon_forms'
     __singlename__ = 'pokemon_form'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u'A unique ID for this form.')
     identifier = Column(Unicode(79), nullable=False,
         doc=u"A unique identifier for this form among all forms of all Pokémon",
         info=dict(format='identifier'))
@@ -1960,11 +1980,13 @@ create_translation_table('pokemon_shape_prose', PokemonShape, 'prose',
 )
 
 class PokemonSpecies(TableBase):
-    u"""A Pokémon species: the standard 1–151.  Or 649.  Whatever. """
+    u"""A Pokémon species: the standard 1–151.  Or 649.  Whatever.
+
+    ID matches the National Pokédex number of the species.
+    """
     __tablename__ = 'pokemon_species'
     __singlename__ = 'pokemon_species'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False)
-        doc=u"A numeric ID")
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",
         info=dict(format='identifier'))
@@ -2147,7 +2169,7 @@ class TypeEfficacy(TableBase):
     """
     __tablename__ = 'type_efficacy'
     damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
-        doc=u"The ID of the damaging type.")
+        doc=u"The ID of the damaging move's type.")
     target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
         doc=u"The ID of the defending Pokémon's type.")
     damage_factor = Column(Integer, nullable=False,
@@ -2846,10 +2868,12 @@ SuperContestCombo.second = relationship(Move,
 
 Type.damage_efficacies = relationship(TypeEfficacy,
     primaryjoin=Type.id==TypeEfficacy.damage_type_id,
-    backref=backref('damage_type', innerjoin=True, lazy='joined'))
+    backref=backref('damage_type', innerjoin=True, lazy='joined'),
+    doc=u"Efficacies with this type as the attacking type.")
 Type.target_efficacies = relationship(TypeEfficacy,
     primaryjoin=Type.id==TypeEfficacy.target_type_id,
-    backref=backref('target_type', innerjoin=True, lazy='joined'))
+    backref=backref('target_type', innerjoin=True, lazy='joined'),
+    doc=u"Efficacies with this type as the defending type.")
 
 Type.generation = relationship(Generation,
     innerjoin=True,

pokedex/lookup.py

@@ -195,7 +195,7 @@ class PokedexLookup(object):
         for cls in self.indexed_tables.values():
             q = self.session.query(cls).order_by(cls.id)
 
-            for row in q.yield_per(5):
+            for row in q:
                 row_key = dict(table=unicode(cls.__tablename__),
                                row_id=unicode(row.id))
 

pokedex/tests/test_schema.py

@@ -108,7 +108,7 @@ def test_i18n_table_creation():
     sess.commit()
 
     ### Test 1: re-fetch foo and check its attributes
-    foo = sess.query(Foo).params(_default_language='en').one()
+    foo = sess.query(Foo).params(_default_language_id=lang_en.id).one()
 
     # Dictionary of language identifiers => names
     assert foo.name_map[lang_en] == 'english'

pokedex/tests/test_util.py

@@ -38,7 +38,9 @@ def test_types_french_order(session):
     types = session.query(tables.Type).filter(tables.Type.id < 10000)
     types = list(util.order_by_name(types, tables.Type, language=french))
     assert types[0].name_map[french] == 'Acier', types[0].name_map[french]
-    assert types[-1].name_map[french] == 'Vol', types[-1].name_map[french]
+    # SQLite doesn't know how to sort unicode properly, so accented charaters come last.
+    # Postgres doesn't have this problem.
+    assert types[-1].name_map[french] in (u'Électrik', u'Vol'), types[-1].name_map[french]
 
 @parametrize('id', range(1, 10))
 def test_get_pokemon_id(session, id):

scripts/add-xy-locations.py

@@ -0,0 +1,67 @@
+# Adds locations to the database from the text dump.
+#
+# Usage: python add-xy-locations.py | psql pokedex
+
+import re
+
+def make_identifier(name):
+    """Make a string safe to use as an identifier.
+
+    Valid characters are lowercase alphanumerics and "-". This function may
+    raise ValueError if it can't come up with a suitable identifier.
+
+    This function is useful for scripts which add things with names.
+    """
+    if isinstance(name, bytes):
+        identifier = name.decode('utf-8')
+    else:
+        identifier = name
+    identifier = identifier.lower()
+    identifier = identifier.replace(u'+', u' plus ')
+    identifier = re.sub(u'[ _–]+', u'-', identifier)
+    identifier = re.sub(u"['./;’(),:]", u'', identifier)
+    identifier = identifier.replace(u'é', u'e')
+
+    if identifier.startswith('route-'):
+        identifier = 'kalos-' + identifier
+
+    if not identifier.replace(u"-", u"").isalnum():
+        raise ValueError(identifier)
+    return identifier
+
+en = open('rips/text/en/72')
+
+foreign = []
+foreign.append(('ja', open('rips/text/ja-kana/72')))
+for lang in 'ja-kanji', 'en', 'fr', 'it', 'de', 'es', 'ko':
+    f = open('rips/text/'+lang+'/72')
+    foreign.append((lang, f))
+
+print("BEGIN;")
+print("UPDATE pokemon_evolution SET location_id = NULL WHERE location_id in (SELECT id FROM locations WHERE region_id = 6);")
+print("DELETE FROM location_game_indices WHERE generation_id = 6;")
+print("DELETE FROM location_names WHERE location_id IN (SELECT id FROM locations WHERE region_id = 6);")
+print("DELETE FROM locations WHERE region_id=6;")
+print("SELECT setval('locations_id_seq', max(id)) FROM locations;")
+for i, name in enumerate(en):
+    foreign_names = [(lang, next(iter).strip()) for lang, iter in foreign]
+    if i == 0:
+        continue
+    if name == '\n':
+        continue
+    try:
+        ident = make_identifier(name.strip())
+    except ValueError:
+        continue
+
+    print("\echo '%s'" % ident)
+    if ident not in ('mystery-zone', 'faraway-place'):
+        print("""INSERT INTO locations (identifier, region_id) VALUES ('%s', %s) RETURNING id;""" % (ident, 6))
+        for lang, name in foreign_names:
+            print("""INSERT INTO location_names (location_id, local_language_id, name) SELECT loc.id, lang.id, '%s' FROM locations loc, languages lang WHERE loc.identifier = '%s' AND (loc.region_id is NULL OR loc.region_id = 6) AND lang.identifier = '%s';""" % (name, ident, lang))
+    print("""INSERT INTO location_game_indices (location_id, generation_id, game_index) SELECT id, %s, %s FROM locations WHERE identifier='%s' AND (region_id is NULL OR region_id = 6);""" % (6, i, ident))
+
+for pokemon_id, location_identifier in (462, 'kalos-route-13'), (470, 'kalos-route-20'), (471, 'frost-cavern'), (476, 'kalos-route-13'):
+    print("UPDATE pokemon_evolution SET location_id = (SELECT id FROM locations WHERE identifier = '%s') WHERE location_id is NULL AND evolved_species_id = %d;" % (location_identifier, pokemon_id))
+
+print("COMMIT;")

setup.py

@@ -9,7 +9,7 @@ setup(
     },
     install_requires=[
         'SQLAlchemy>=0.9.7',
-        'whoosh>=2.5',
+        'whoosh>=2.5,<2.7',
         'markdown',
         'construct',
     ],