Merge branch 'master' into fix_japanese_1st_gen

pokedex/data/csv/ability_changelog_prose.csv

@@ -1,53 +1,105 @@
 ability_changelog_id,local_language_id,effect
+1,6,Hat im Kampf keinen Effekt.
 1,9,Has no effect in battle.
+2,6,Verhindert keine regulären K.O. bei vollen []{mechanic:hp}.
 2,9,Does not prevent regular KOs from full [HP]{mechanic:hp}.
+3,6,Hat außerhalb vom Kampf keinen Effekt.
 3,9,Has no overworld effect.
+4,6,"[]{type:electric}-Attacken die keinen Schaden anrichten, wie []{move:thunder-wave}, werden nicht absorbiert."
 4,9,"Does not absorb non-damaging []{type:electric} moves, i.e. []{move:thunder-wave}."
+5,6,Löst bei Attacken die mehrmals Treffen bei jedem Treffer aus.
 5,9,Triggers on every hit of multiple-hit moves.
+6,6,[]{move:will-o-wisp} triggert die Fähigkeit nicht bei Pokémon die immun gegen []{mechanic:burn} sind.
 6,9,[]{move:will-o-wisp} does not trigger this ability for Pokémon immune to [burns]{mechanic:burn}.
+7,6,Hat außerhalb vom Kampf keinen Effekt.
 7,9,Has no overworld effect.
+8,6,Hat außerhalb vom Kampf keinen Effekt.
 8,9,Has no overworld effect.
+9,6,"Hat keinen Effekt, wenn die Fähigkeit nach Kampfbeginn erlangt wurde."
 9,9,Does not take effect if acquired after entering battle.
+10,6,Betrifft andere Pokémon mit dieser Fähigkeit.
 10,9,Affects other Pokémon with this ability.
+11,6,Verursacht nur 1/16 der maximalen []{mechanic:hp} des Angreifers Schaden.
 11,9,Inflicts only 1/16 of the attacker's maximum [HP]{mechanic:hp} in damage.
+12,6,"[]{move:fire-fang} und Attacken die [typenlosen Schaden]{mechanic:typeless-damage} verursachen, ignorieren diese Fähigkeit unabhängig von ihrem Typ."
 12,9,[]{move:fire-fang} and moves that inflict [typeless damage]{mechanic:typeless-damage} ignore this ability regardless of type.
+13,6,Hat außerhalb vom Kampf keinen Effekt.
 13,9,Has no overworld effect.
+14,6,Kann das Wesen von Pokémon mit denen in der Spielwelt interagiert wird nicht verändern.
 14,9,Cannot influence the natures of Pokémon encountered by interacting with them on the overworld.
+15,6,Gibt schwere []{mechanic:poison} als normale []{mechanic:poison} zurück.
 15,9,Passes back bad [poison]{mechanic:poison} as regular poison.
+16,6,Hat außerhalb vom Kampf keinen Effekt.
 16,9,Has no overworld effect.
+17,6,"Betrifft keine []{type:electric}-Attacken die keinen Schaden anrichten, wie []{move:thunder-wave}. Erhöht die Anzahl an Trainer-Anrufen wenn irgendein Pokémon im Team diese Fähigkeit hat."
 17,9,"Does not affect non-damaging []{type:electric} moves, i.e. []{move:thunder-wave}.  Increases the frequency of Match Call calls on the overworld if any party Pokémon has this ability."
+18,6,"Leitet []{type:electric}-Attacken um, ohne ihre Effekte zu deaktivieren oder einen []{mechanic:special-attack} Bonus zu gewähren. Leitet []{move:hidden-power} nicht um."
 18,9,Redirects []{type:electric} moves without negating them or granting any [Special Attack]{mechanic:special-attack} boost.  Does not redirect []{move:hidden-power}.
+19,6,Hat außerhalb vom Kampf keinen Effekt.
 19,9,Has no overworld effect.
+20,6,Hat außerhalb vom Kampf keinen Effekt.
 20,9,Has no overworld effect.
+21,6,"Hindert []{move:heal-bell} daran, das Pokémon zu heilen, auch außerhalb vom Kampf."
 21,9,"Prevents []{move:heal-bell} from curing the Pokémon, whether or not it is in battle."
+22,6,Hat außerhalb vom Kampf keinen Effekt.
 22,9,Has no overworld effect.
+23,6,Betrifft keine Attacken von Teammitgliedern die alle anderen Pokémon als Ziel haben. Diese Fähigkeit wird im Kampf nicht angekündigt.
 23,9,Does not affect friendly Pokémon's moves that target all other Pokémon.  This ability's presence is not announced upon entering battle.
+24,6,Hat außerhalb vom Kampf keinen Effekt.
 24,9,Has no overworld effect.
+25,6,Hat außerhalb vom Kampf keinen Effekt.
 25,9,Has no overworld effect.
+26,6,Hat außerhalb vom Kampf keinen Effekt.
 26,9,Has no overworld effect.
+27,6,"Verdoppelt den Radius in dem []{move:cut} Gras entfernt, wenn irgendein Pokémon im Team diese Fähigkeit hat."
 27,9,Doubles []{move:cut}'s grass-cutting radius on the overworld if any party Pokémon has this ability.
+28,6,Hat im Kampf keinen Effekt.
 28,9,Has no effect in battle.
+29,6,Hat außerhalb vom Kampf keinen Effekt.
 29,9,Has no overworld effect.
+30,6,Hat außerhalb vom Kampf keinen Effekt.
 30,9,Has no overworld effect.
+31,6,Hat außerhalb vom Kampf keinen Effekt.
 31,9,Has no overworld effect.
+32,6,Hat keinen Effekt während das Pokémon [schläft]{mechanic:sleep}.
 32,9,Does not take effect during [sleep]{mechanic:sleep}.
+33,6,Hat außerhalb vom Kampf keinen Effekt.
 33,9,Has no overworld effect.
+34,6,"Erhöht die Anzahl an Rufen die man außerhalb vom Kampf hört, wenn irgendein Pokémon im Team diese Fähigkeit hat."
 34,9,Increases the frequency of cries heard on the overworld if any party Pokémon has this ability.
+35,6,Hat außerhalb vom Kampf keinen Effekt.
 35,9,Has no overworld effect.
+36,6,Hat außerhalb vom Kampf keinen Effekt.
 36,9,Has no overworld effect.
+37,6,Hat außerhalb vom Kampf keinen Effekt.
 37,9,Has no overworld effect.
+38,6,[]{mechanic:poison} schadet dem Pokémon außerhalb vom Kampf.
 38,9,[Poison]{mechanic:poison} still damages the Pokémon outside of battle.
+39,6,"[]{mechanic:paralysis} hindert das Pokémon nicht daran sich zu bewegen, aber der []{mechanic:speed} Malus bleibt. []{mechanic:poison} schadet dem Pokémon außerhalb vom Kampf."
 39,9,"[Paralysis]{mechanic:paralysis} cannot prevent the Pokémon from moving, though the [Speed]{mechanic:speed} cut is unaffected.  [Poison]{mechanic:poison} still damages the Pokémon outside of battle."
+40,6,Wegen eines Glitches haben Attacken die von dieser Fähigkeit beeinflusst sind eine (100 - Genauigkeit)% Chance durch den []{move:detect} oder []{move:protect} zu treffen.
 40,9,"Due to a glitch, moves affected by this ability have a (100 - accuracy)% chance to hit through []{move:detect} or []{move:protect}."
+41,6,[]{move:rest} funktioniert normal bei [starkem Sonnenlicht]{mechanic:strong-sunlight}.
 41,9,[]{move:rest} works as usual during [strong sunlight]{mechanic:strong-sunlight}.
+42,6,[]{move:fling} kann normal benutzt werden.
 42,9,[]{move:fling} can be used as usual.
+43,6,Leitet []{type:water}-Attacken um ohne den []{mechanic:special-attack} Bonus zu gewähren. Leitet []{move:hidden-power} nicht um.
 43,9,Redirects []{type:water} moves without negating them or granting any [Special Attack]{mechanic:special-attack} boost.  Does not redirect []{move:hidden-power}.
+44,6,Kann []{ability:flower-gift} und []{ability:wonder-guard} kopieren.
 44,9,Can copy []{ability:flower-gift} and []{ability:wonder-guard}.
+45,6,Kann []{ability:forecast} und []{ability:trace} kopieren.
 45,9,Can copy []{ability:forecast} and []{ability:trace}.
+46,6,Funktioniert nur wenn es mit []{ability:minus} kombiniert wird.
 46,9,Powers up only when paired with []{ability:minus}.
+47,6,Funktioniert nur wenn es mit []{ability:plus} kombiniert wird.
 47,9,Powers up only when paired with []{ability:plus}.
+48,6,"Die Chance, dass der Effekt eintritt, beträgt 30%."
 48,9,Chance of taking effect is 30%.
+49,6,[]{move:triple-kick} wird nicht beeinflusst.
 49,9,[]{move:triple-kick} is unaffected.
+50,6,[]{move:struggle} wird nicht beeinflusst. []{move:helping-hand} und []{move:defense-curl} werden nicht beachtet.
 50,9,[]{move:struggle} is unaffected.  []{move:helping-hand} and []{move:defense-curl} are not taken into account.
+51,6,Hat außerhalb vom Kampf keinen Effekt.
 51,9,Has no overworld effect.
+52,6,"Die Chance, dass der Effekt eintritt, beträgt 33%."
 52,9,Chance of taking effect is 33%.

pokedex/data/csv/egg_group_prose.csv

@@ -1,89 +1,104 @@
 egg_group_id,local_language_id,name
 1,1,かいじゅう
+1,3,괴수
 1,5,Monstrueux
 1,6,Monster
 1,7,Monstruo
 1,8,Mostro
 1,9,Monster
 2,1,すいちゅう１
+2,3,수중 1
 2,5,Aquatique 1
 2,6,Wasser 1
 2,7,Agua 1
 2,8,Acqua 1
 2,9,Water 1
 3,1,むし
+3,3,벌레
 3,5,Insectoïde
 3,6,Käfer
 3,7,Bicho
 3,8,Coleottero
 3,9,Bug
 4,1,ひこう
+4,3,비행
 4,5,Aérien
 4,6,Flug
 4,7,Volador
 4,8,Volante
 4,9,Flying
 5,1,りくじょう
+5,3,육상
 5,5,Terrestre
 5,6,Feld
 5,7,Campo
 5,8,Campo
 5,9,Field
 6,1,ようせい
+6,3,요정
 6,5,Féerique
 6,6,Fee
 6,7,Hada
 6,8,Magico
 6,9,Fairy
 7,1,しょくぶつ
+7,3,식물
 7,5,Végétal
 7,6,Pflanze
 7,7,Planta
 7,8,Erba
 7,9,Grass
 8,1,ひとがた
+8,3,인간형
 8,5,Humanoïde
 8,6,Humanotyp
 8,7,Humanoide
 8,8,Umanoide
 8,9,Human-Like
 9,1,すいちゅう３
+9,3,수중 3
 9,5,Aquatique 3
 9,6,Wasser 3
 9,7,Agua 3
 9,8,Acqua 3
 9,9,Water 3
 10,1,こうぶつ
+10,3,광물
 10,5,Minéral
 10,6,Mineral
 10,7,Mineral
 10,8,Minerale
 10,9,Mineral
 11,1,ふていけい
+11,3,부정형
 11,5,Amorphe
 11,6,Amorph
 11,7,Amorfo
 11,8,Amorfo
 11,9,Amorphous
 12,1,すいちゅう２
+12,3,수중 2
 12,5,Aquatique 2
 12,6,Wasser 2
 12,7,Agua 2
 12,8,Acqua 2
 12,9,Water 2
 13,1,メタモン
+13,3,메타몽
 13,5,Métamorph
 13,6,Ditto
 13,7,Ditto
 13,8,Ditto
 13,9,Ditto
 14,1,ドラゴン
+14,3,드래곤
 14,5,Draconique
 14,6,Drache
 14,7,Dragón
 14,8,Drago
 14,9,Dragon
 15,1,タマゴみはっけん
+15,3,알미발견
 15,5,Inconnu
 15,6,Unbekannt
 15,7,Desconocido

pokedex/data/csv/encounter_method_prose.csv

@@ -33,3 +33,5 @@ encounter_method_id,local_language_id,name
 16,9,Walking in red flowers
 17,6,Auf unwegsamen Gelände laufen
 17,9,Walking on rough terrain
+18,9,Receive as a gift
+19,9,Receive egg as a gift

pokedex/data/csv/encounter_methods.csv

@@ -16,3 +16,5 @@ id,identifier,order
 15,purple-flowers,7
 16,red-flowers,8
 17,rough-terrain,9
+18,gift,18
+19,gift-egg,19

pokedex/data/csv/encounter_slots.csv

@@ -488,3 +488,28 @@ id,version_group_id,encounter_method_id,slot,rarity
 487,15,4,0,60
 488,15,4,1,35
 489,15,4,2,5
+490,1,18,,100
+491,2,18,,100
+492,3,18,,100
+493,4,18,,100
+494,5,18,,100
+495,6,18,,100
+496,7,18,,100
+497,8,18,,100
+498,9,18,,100
+499,10,18,,100
+500,11,18,,100
+501,14,18,,100
+502,15,18,,100
+503,16,18,,100
+504,3,19,,100
+505,4,19,,100
+506,5,19,,100
+507,6,19,,100
+508,7,19,,100
+509,8,19,,100
+510,9,19,,100
+511,10,19,,100
+512,11,19,,100
+513,14,19,,100
+514,16,19,,100

pokedex/data/csv/encounters.csv

@@ -46577,3 +46577,258 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 50287,11,343,228,19,26,26
 50288,11,343,229,37,32,32
 50289,11,343,230,19,26,26
+50290,1,285,490,1,5,5
+50291,2,285,490,1,5,5
+50292,1,285,490,4,5,5
+50293,2,285,490,4,5,5
+50294,1,285,490,7,5,5
+50295,2,285,490,7,5,5
+50296,3,285,491,25,5,5
+50297,3,281,491,1,10,10
+50298,3,314,491,4,10,10
+50299,3,282,491,7,10,10
+50300,1,761,490,129,5,5
+50301,2,761,490,129,5,5
+50302,3,761,491,129,5,5
+50303,1,762,490,106,30,30
+50304,2,762,490,106,30,30
+50305,3,762,491,106,30,30
+50306,1,762,490,107,30,30
+50307,2,762,490,107,30,30
+50308,3,762,491,107,30,30
+50309,1,763,490,133,25,25
+50310,2,763,490,133,25,25
+50311,3,763,491,133,25,25
+50312,1,764,490,131,15,15
+50313,2,764,490,131,15,15
+50314,3,764,491,131,15,15
+50315,4,184,492,152,5,5
+50316,5,184,492,152,5,5
+50317,6,184,493,152,5,5
+50318,4,184,492,155,5,5
+50319,5,184,492,155,5,5
+50320,6,184,493,155,5,5
+50321,4,184,492,158,5,5
+50322,5,184,492,158,5,5
+50323,6,184,493,158,5,5
+50324,4,765,492,21,10,10
+50325,5,765,492,21,10,10
+50326,6,765,493,21,10,10
+50327,4,766,492,133,20,20
+50328,5,766,492,133,20,20
+50329,6,766,493,133,20,20
+50330,4,767,492,213,15,15
+50331,5,767,492,213,15,15
+50332,6,767,493,213,15,15
+50333,6,250,493,147,15,15
+50334,4,240,492,236,10,10
+50335,5,240,492,236,10,10
+50336,6,240,493,236,10,10
+50337,7,393,494,252,5,5
+50338,8,393,494,252,5,5
+50339,9,393,495,252,5,5
+50340,7,393,494,255,5,5
+50341,8,393,494,255,5,5
+50342,9,393,495,255,5,5
+50343,7,393,494,258,5,5
+50344,8,393,494,258,5,5
+50345,9,393,495,258,5,5
+50346,7,768,494,351,25,25
+50347,8,768,494,351,25,25
+50348,9,768,495,351,25,25
+50349,7,769,494,374,5,5
+50350,8,769,494,374,5,5
+50351,9,769,495,374,5,5
+50352,9,770,495,152,5,5
+50353,9,770,495,155,5,5
+50354,9,770,495,158,5,5
+50355,10,285,496,1,5,5
+50356,11,285,496,1,5,5
+50357,10,285,496,4,5,5
+50358,11,285,496,4,5,5
+50359,10,285,496,7,5,5
+50360,11,285,496,7,5,5
+50361,10,761,496,129,5,5
+50362,11,761,496,129,5,5
+50363,10,762,496,106,25,25
+50364,11,762,496,106,25,25
+50365,10,762,496,107,25,25
+50366,11,762,496,107,25,25
+50367,10,763,496,133,25,25
+50368,11,763,496,133,25,25
+50369,10,764,496,131,25,25
+50370,11,764,496,131,25,25
+50371,12,135,497,387,5,5
+50372,13,135,497,387,5,5
+50373,12,135,497,390,5,5
+50374,13,135,497,390,5,5
+50375,12,135,497,393,5,5
+50376,13,135,497,393,5,5
+50377,14,141,498,387,5,5
+50378,14,141,498,390,5,5
+50379,14,141,498,393,5,5
+50380,12,771,497,133,5,5
+50381,13,771,497,133,5,5
+50382,14,771,498,133,20,20
+50383,14,772,498,137,25,25
+50384,15,184,499,152,5,5
+50385,16,184,499,152,5,5
+50386,15,184,499,155,5,5
+50387,16,184,499,155,5,5
+50388,15,184,499,158,5,5
+50389,16,184,499,158,5,5
+50390,15,765,499,21,20,20
+50391,16,765,499,21,20,20
+50392,15,766,499,133,5,5
+50393,16,766,499,133,5,5
+50394,15,773,499,213,15,15
+50395,16,773,499,213,15,15
+50396,15,250,499,147,15,15
+50397,16,250,499,147,15,15
+50398,15,240,499,236,10,10
+50399,16,240,499,236,10,10
+50400,15,285,499,1,5,5
+50401,16,285,499,1,5,5
+50402,15,285,499,4,5,5
+50403,16,285,499,4,5,5
+50404,15,285,499,7,5,5
+50405,16,285,499,7,5,5
+50406,15,764,499,252,5,5
+50407,16,764,499,252,5,5
+50408,15,764,499,255,5,5
+50409,16,764,499,255,5,5
+50410,15,764,499,258,5,5
+50411,16,764,499,258,5,5
+50412,17,774,500,495,5,5
+50413,18,774,500,495,5,5
+50414,17,774,500,498,5,5
+50415,18,774,500,498,5,5
+50416,17,774,500,501,5,5
+50417,18,774,500,501,5,5
+50418,17,579,500,511,10,10
+50419,18,579,500,511,10,10
+50420,17,579,500,513,10,10
+50421,18,579,500,513,10,10
+50422,17,579,500,515,10,10
+50423,18,579,500,515,10,10
+50424,17,775,500,570,10,10
+50425,18,775,500,570,10,10
+50426,17,622,500,129,5,5
+50427,18,622,500,129,5,5
+50428,21,657,501,495,5,5
+50429,22,657,501,495,5,5
+50430,21,657,501,498,5,5
+50431,22,657,501,498,5,5
+50432,21,657,501,501,5,5
+50433,22,657,501,501,5,5
+50434,21,577,501,570,25,25
+50435,22,577,501,570,25,25
+50436,21,776,501,585,30,30
+50437,22,776,501,585,30,30
+50438,21,656,501,133,10,10
+50439,22,656,501,133,10,10
+50440,21,622,501,129,5,5
+50441,22,622,501,129,5,5
+50442,22,777,501,147,1,1
+50443,21,777,501,443,1,1
+50444,23,778,502,650,5,5
+50445,24,778,502,650,5,5
+50446,23,778,502,653,5,5
+50447,24,778,502,653,5,5
+50448,23,778,502,656,5,5
+50449,24,778,502,656,5,5
+50450,23,779,502,1,10,10
+50451,24,779,502,1,10,10
+50452,23,779,502,4,10,10
+50453,24,779,502,4,10,10
+50454,23,779,502,7,10,10
+50455,24,779,502,7,10,10
+50456,23,736,502,696,20,20
+50457,24,736,502,696,20,20
+50458,23,736,502,698,20,20
+50459,24,736,502,698,20,20
+50460,23,780,502,448,32,32
+50461,24,780,502,448,32,32
+50462,23,723,502,131,30,30
+50463,24,723,502,131,30,30
+50464,25,393,503,252,5,5
+50465,26,393,503,252,5,5
+50466,25,393,503,255,5,5
+50467,26,393,503,255,5,5
+50468,25,393,503,258,5,5
+50469,26,393,503,258,5,5
+50470,25,781,503,25,20,20
+50471,26,781,503,25,20,20
+50472,25,782,503,25,20,20
+50473,26,782,503,25,20,20
+50474,25,783,503,25,20,20
+50475,26,783,503,25,20,20
+50476,25,784,503,25,20,20
+50477,26,784,503,25,20,20
+50478,25,785,503,381,30,30
+50479,26,785,503,380,30,30
+50480,25,768,503,351,30,30
+50481,26,768,503,351,30,30
+50482,25,393,503,152,5,5
+50483,26,393,503,152,5,5
+50484,25,393,503,155,5,5
+50485,26,393,503,155,5,5
+50486,25,393,503,158,5,5
+50487,26,393,503,158,5,5
+50488,25,393,503,495,5,5
+50489,26,393,503,495,5,5
+50490,25,393,503,498,5,5
+50491,26,393,503,498,5,5
+50492,25,393,503,501,5,5
+50493,26,393,503,501,5,5
+50494,25,769,503,374,1,1
+50495,26,769,503,374,1,1
+50496,25,393,503,387,5,5
+50497,26,393,503,387,5,5
+50498,25,393,503,390,5,5
+50499,26,393,503,390,5,5
+50500,25,393,503,393,5,5
+50501,26,393,503,393,5,5
+50502,25,786,503,323,40,40
+50503,26,786,503,323,40,40
+50504,25,786,503,319,40,40
+50505,26,786,503,319,40,40
+50506,4,189,504,175,5,5
+50507,5,189,504,175,5,5
+50508,6,189,505,175,5,5
+50509,6,205,505,172,5,5
+50510,6,205,505,173,5,5
+50511,6,205,505,174,5,5
+50512,6,205,505,236,5,5
+50513,6,205,505,238,5,5
+50514,6,205,505,239,5,5
+50515,6,205,505,240,5,5
+50516,7,787,506,360,5,5
+50517,8,787,506,360,5,5
+50518,9,787,507,360,5,5
+50519,10,518,508,175,5,5
+50520,11,518,508,175,5,5
+50521,12,788,509,175,1,1
+50522,13,788,509,175,1,1
+50523,14,788,510,175,1,1
+50524,12,789,509,440,1,1
+50525,13,789,509,440,1,1
+50526,12,124,509,447,1,1
+50527,13,124,509,447,1,1
+50528,14,124,510,447,1,1
+50529,15,790,511,175,1,1
+50530,16,790,511,175,1,1
+50531,15,791,511,179,1,1
+50532,16,791,511,179,1,1
+50533,15,791,511,194,1,1
+50534,16,791,511,194,1,1
+50535,15,791,511,218,1,1
+50536,16,791,511,218,1,1
+50537,17,653,512,636,1,1
+50538,18,653,512,636,1,1
+50539,21,792,513,440,1,1
+50540,22,792,513,440,1,1
+50541,25,787,514,360,1,1
+50542,26,787,514,360,1,1
+50543,25,787,514,175,1,1
+50544,26,787,514,175,1,1

pokedex/data/csv/generation_names.csv

@@ -1,35 +1,42 @@
 generation_id,local_language_id,name
 1,1,だいいちせだい
+1,3,1세대
 1,5,Génération I
 1,6,Generation I
 1,9,Generation I
 1,11,第一世代
 2,1,だいにせだい
+2,3,2세대
 2,5,Génération II
 2,6,Generation II
 2,9,Generation II
 2,11,第二世代
 3,1,だいさんせだい
+3,3,3세대
 3,5,Génération III
 3,6,Generation III
 3,9,Generation III
 3,11,第三世代
 4,1,だいよんせだい
+4,3,4세대
 4,5,Génération IV
 4,6,Generation IV
 4,9,Generation IV
 4,11,第四世代
 5,1,だいごせだい
+5,3,5세대
 5,5,Génération V
 5,6,Generation V
 5,9,Generation V
 5,11,第五世代
 6,1,だいろくせだい
+6,3,6세대
 6,5,Génération VI
 6,6,Generation VI
 6,9,Generation VI
 6,11,第六世代
 7,1,だいななせだい
+7,3,7세대
 7,5,Génération VII
 7,6,Generation VII
 7,9,Generation VII

pokedex/data/csv/language_names.csv

@@ -1,41 +1,51 @@
 language_id,local_language_id,name
 1,1,日本語
+1,3,일본어
 1,5,Japonais
 1,6,Japanisch
 1,9,Japanese
 2,1,正式ローマジ
+2,3,정식 로마자
 2,5,Romaji
 2,6,Rōmaji
 2,9,Official roomaji
 3,1,韓国語
+3,3,한국어
 3,5,Coréen
 3,6,Koreanisch
 3,9,Korean
 4,1,中国語
+4,3,중국어
 4,5,Chinois
 4,6,Chinesisch
 4,9,Chinese
 5,1,フランス語
+5,3,프랑스어
 5,5,Français
 5,6,Französisch
 5,9,French
 6,1,ドイツ語
+6,3,도이치어
 6,5,Allemand
 6,6,Deutsch
 6,9,German
 7,1,西語
+7,3,스페인어
 7,5,Espagnol
 7,6,Spanisch
 7,9,Spanish
 8,1,伊語
+8,3,이탈리아어
 8,5,Italien
 8,6,Italienisch
 8,9,Italian
 9,1,英語
+9,3,영어
 9,5,Anglais
 9,6,Englisch
 9,9,English
 10,1,チェコ語
+10,3,체코어
 10,5,Tchèque
 10,6,Tschechisch
 10,9,Czech

pokedex/data/csv/languages.csv

@@ -11,3 +11,4 @@ id,iso639,iso3166,identifier,official,order
 10,cs,cz,cs,0,12
 11,ja,jp,ja,1,2
 12,zh,cn,zh-Hans,1,6
+13,pt-BR,br,pt-BR,0,13

pokedex/data/csv/location_area_prose.csv

@@ -618,3 +618,35 @@ location_area_id,local_language_id,name
 756,9,Unknown Area 345
 757,9,Unknown Area 347
 758,9,Unknown Area 348
+761,9,Pokemon Center
+762,9,Fighting Dojo
+763,9,Celadon Mansion rooftop
+764,9,Silph Co. 7F
+765,9,North Gate
+766,9,Bill's house
+767,9,Mania's house
+768,9,Weather Institute
+769,9,Steven's house
+770,9,
+771,9,
+772,9,
+773,9,Kirk's house
+774,9,
+775,9,Game Freak HQ 1F
+776,9,Weather Institute
+777,9,
+778,9,
+779,9,
+780,9,
+781,9,Contest Hall
+782,9,Contest Hall
+783,9,Contest Hall
+784,9,Contest Hall
+785,9,
+786,9,
+787,9,
+788,9,West Gate
+789,9,West Gate
+790,9,Poke Mart
+791,9,Pokemon Center
+792,9,West Gate

pokedex/data/csv/location_areas.csv

@@ -650,3 +650,35 @@ id,location_id,game_index,identifier
 758,676,0,unknown-area-348
 759,677,0,
 760,661,0,
+761,120,0,pokemon-center
+762,234,0,fighting-dojo
+763,67,0,celadon-mansion
+764,234,0,silph-co-7f
+765,229,0,north-gate
+766,229,0,bills-house
+767,70,0,manias-house
+768,467,0,weather-institute
+769,432,0,stevens-house
+770,567,0,
+771,169,0,
+772,170,0,
+773,70,0,kirks-house
+774,346,0,
+775,350,0,game-freak-hq-1f
+776,361,0,weather-institute
+777,536,0,
+778,590,0,
+779,599,0,
+780,625,0,
+781,430,0,contest-hall
+782,571,0,contest-hall
+783,570,0,contest-hall
+784,431,0,contest-hall
+785,578,0,
+786,695,0,
+787,569,0,
+788,2,0,west-gate
+789,169,0,west-gate
+790,153,0,poke-mart
+791,153,0,pokemon-center
+792,349,0,west-gate

pokedex/data/csv/pokedex_prose.csv

@@ -41,3 +41,13 @@ pokedex_id,local_language_id,name,description
 15,5,Hoenn amélioré,"Pokédex régional d'Hoenn dans Rubis Oméga/Saphir Alpha, mis à jour pour les nouvelles évolutions"
 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"
+16,9,Original Alola,Sun/Moon Alola dex
+17,9,Original Melemele,Sun/Moon Melemele dex
+18,9,Original Akala,Sun/Moon Akala dex
+19,9,Original Ula'ula,Sun/Moon Ula'ula dex
+20,9,Original Poni,Sun/Moon Poni dex
+21,9,Updated Alola,Ultra Sun/Ultra Moon Alola dex
+22,9,Updated Melemele,Ultra Sun/Ultra Moon Melemele dex
+23,9,Updated Akala,Ultra Sun/Ultra Moon Akala dex
+24,9,Updated Ula'ula,Ultra Sun/Ultra Moon Ula'ula dex
+25,9,Updated Poni,Ultra Sun/Ultra Moon Poni dex

pokedex/data/csv/pokedex_version_groups.csv

@@ -15,3 +15,13 @@ pokedex_id,version_group_id
 13,15
 14,15
 15,16
+16,17
+17,17
+18,17
+19,17
+20,17
+21,18
+22,18
+23,18
+24,18
+25,18

pokedex/data/csv/pokedexes.csv

@@ -13,3 +13,13 @@ id,region_id,identifier,is_main_series
 13,6,kalos-coastal,1
 14,6,kalos-mountain,1
 15,3,updated-hoenn,1
+16,7,original-alola,1
+17,7,original-melemele,1
+18,7,original-akala,1
+19,7,original-ulaula,1
+20,7,original-poni,1
+21,7,updated-alola,1
+22,7,updated-melemele,1
+23,7,updated-akala,1
+24,7,updated-ulaula,1
+25,7,updated-poni,1

pokedex/data/csv/region_names.csv

@@ -1,30 +1,36 @@
 region_id,local_language_id,name
 1,1,カントー地方
+1,3,관동지방
 1,5,Kanto
 1,6,Kanto
 1,8,Kanto
 1,9,Kanto
 2,1,ジョウト地方
+2,3,성도지방
 2,5,Johto
 2,6,Johto
 2,8,Johto
 2,9,Johto
 3,1,ホウエン地方
+3,3,호연지방
 3,5,Hoenn
 3,6,Hoenn
 3,8,Hoenn
 3,9,Hoenn
 4,1,シンオウ地方
+4,3,신오지방
 4,5,Sinnoh
 4,6,Sinnoh
 4,8,Sinnoh
 4,9,Sinnoh
 5,1,イッシュ地方
+5,3,하나지방
 5,5,Unys
 5,6,Einall
 5,8,Unima
 5,9,Unova
 6,1,カロス地方
+6,3,칼로스지방
 6,5,Kalos
 6,6,Kalos
 6,8,Kalos

pokedex/data/csv/stat_names.csv

@@ -1,47 +1,55 @@
 stat_id,local_language_id,name
 1,1,HP
+1,3,HP
 1,5,PV
 1,6,KP
 1,7,PS
 1,8,PS
 1,9,HP
 2,1,こうげき
+2,3,공격
 2,5,Attaque
 2,6,Angriff
 2,7,Ataque
 2,8,Attacco
 2,9,Attack
 3,1,ぼうぎょ
+3,3,방어
 3,5,Défense
 3,6,Verteidigung
 3,7,Defensa
 3,8,Difesa
 3,9,Defense
 4,1,とくこう
+4,3,특수공격
 4,5,Attaque Spéciale
 4,6,Spezialangriff
 4,7,Ataque Especial
 4,8,Attacco Speciale
 4,9,Special Attack
 5,1,とくぼう
+5,3,특수방어
 5,5,Défense Spéciale
 5,6,Spezialverteidigung
 5,7,Defensa Especial
 5,8,Difesa Speciale
 5,9,Special Defense
 6,1,すばやさ
+6,3,스피드
 6,5,Vitesse
 6,6,Initiative
 6,7,Velocidad
 6,8,Velocità
 6,9,Speed
 7,1,めいちゅう
+7,3,명중률
 7,5,Précision
 7,6,Genauigkeit
 7,7,Precisión
 7,8,precisione
 7,9,accuracy
 8,1,かいひ
+8,3,회피율
 8,5,Esquive
 8,6,Fluchtwert
 8,7,Evasión

pokedex/data/csv/type_names.csv

@@ -126,12 +126,14 @@ type_id,local_language_id,name
 18,8,Folletto
 18,9,Fairy
 10001,1,？？？
+10001,3,???
 10001,5,???
 10001,6,???
 10001,7,???
 10001,8,???
 10001,9,???
 10002,1,ダーク
+10002,3,다크
 10002,5,Obscur
 10002,6,Crypto
 10002,8,Ombra

pokedex/data/csv/version_names.csv

@@ -1,135 +1,181 @@
 version_id,local_language_id,name
 1,1,赤
+1,3,레드
 1,5,Rouge
 1,6,Rot
 1,8,Rossa
 1,9,Red
 2,1,緑
+2,3,블루
 2,5,Bleu
 2,6,Blau
 2,8,Blu
 2,9,Blue
 3,1,ピカチュウ
+3,3,피카츄
 3,5,Jaune
 3,6,Gelb
 3,8,Gialla
 3,9,Yellow
 4,1,金
+4,3,골드
 4,5,Or
 4,6,Gold
 4,8,Oro
 4,9,Gold
 5,1,銀
+5,3,실버
 5,5,Argent
 5,6,Silber
 5,8,Argento
 5,9,Silver
 6,1,クリスタル
+6,3,크리스탈
 6,5,Cristal
 6,6,Kristall
 6,8,Cristallo
 6,9,Crystal
 7,1,ルビー
+7,3,루비
 7,5,Rubis
 7,6,Rubin
 7,8,Rubino
 7,9,Ruby
 8,1,サファイア
+8,3,사파이어
 8,5,Saphir
 8,6,Saphir
 8,8,Zaffiro
 8,9,Sapphire
 9,1,エメラルド
+9,3,에메랄드
 9,5,Émeraude
 9,6,Smaragd
 9,8,Smeraldo
 9,9,Emerald
 10,1,ファイアレッド
+10,3,파이어레드
 10,5,Rouge Feu
 10,6,Feuerrot
 10,8,Rosso Fuoco
 10,9,FireRed
 11,1,リーフグリーン
+11,3,리프그린
 11,5,Vert Feuille
 11,6,Blattgrün
 11,8,Verde Foglia
 11,9,LeafGreen
 12,1,ダイヤモンド
+12,3,디아루가
 12,5,Diamant
 12,6,Diamant
 12,8,Diamante
 12,9,Diamond
 13,1,パール
+13,3,펄기아
 13,5,Perle
 13,6,Perl
 13,8,Perla
 13,9,Pearl
 14,1,プラチナ
+14,3,기라티나
 14,5,Platine
 14,6,Platin
 14,8,Platino
 14,9,Platinum
 15,1,ハートゴールド
+15,3,하트골드
 15,5,Or HeartGold
 15,6,HeartGold
 15,8,Oro HeartGold
 15,9,HeartGold
 16,1,ソウルシルバー
+16,3,소울실버
 16,5,Argent SoulSilver
 16,6,SoulSilver
 16,8,Argento SoulSilver
 16,9,SoulSilver
 17,1,ブラック
+17,3,블랙
 17,5,Noir
 17,6,Schwarz
 17,8,Nera
 17,9,Black
 18,1,ホワイト
+18,3,화이트
 18,5,Blanc
 18,6,Weiß
 18,8,Bianca
 18,9,White
 19,1,コロシアム
+19,3,콜로세움
 19,5,Colosseum
 19,6,Colosseum
 19,8,Colosseum
 19,9,Colosseum
 20,1,XD
+20,3,XD
 20,5,XD
 20,6,XD
 20,8,XD
 20,9,XD
 21,1,ブラック2
+21,3,블랙 2
 21,5,Noir 2
 21,6,Schwarz 2
 21,8,Nera 2
 21,9,Black 2
 22,1,ホワイト2
+22,3,화이트 2
 22,5,Blanc 2
 22,6,Weiß 2
 22,8,Bianca 2
 22,9,White 2
 23,1,X
+23,3,X
 23,5,X
 23,6,X
 23,8,X
 23,9,X
 24,1,Y
+24,3,Y
 24,5,Y
 24,6,Y
 24,8,Y
 24,9,Y
 25,1,オメガルビー
+25,3,오메가루비
 25,5,Rubis Oméga
 25,6,Omega Rubin
 25,8,Rubino Omega
 25,9,Omega Ruby
 26,1,アルファサファイア
+26,3,알파사파이어
 26,5,Saphir Alpha
 26,6,Alpha Saphir
 26,8,Zaffiro Alpha
 26,9,Alpha Sapphire
+27,1,サン
+27,3,썬
+27,5,Soleil
+27,6,Sonne
+27,8,Sole
 27,9,Sun
+28,1,ムーン
+28,3,문
+28,5,Lune
+28,6,Mond
+28,8,Luna
 28,9,Moon
+29,1,ウルトラサン
+29,3,울트라썬
+29,5,Ultra-Soleil
+29,6,Ultrasonne
+29,8,Ultrasole
 29,9,Ultra Sun
+30,1,ウルトラムーン
+30,3,울트라문
+30,5,Ultra-Lune
+30,6,Ultramond
+30,8,Ultraluna
 30,9,Ultra Moon

pokedex/db/tables.py

@@ -90,10 +90,10 @@ class Language(TableBase):
     id = Column(Integer, primary_key=True, nullable=False,
         doc=u"A numeric ID")
     iso639 = Column(Unicode(79), nullable=False,
-        doc=u"The two-letter code of the country where this language is spoken. Note that it is not unique.",
+        doc=u"The two-letter code of the language. Note that it is not unique.",
         info=dict(format='identifier'))
     iso3166 = Column(Unicode(79), nullable=False,
-        doc=u"The two-letter code of the language. Note that it is not unique.",
+        doc=u"The two-letter code of the country where this language is spoken. Note that it is not unique.",
         info=dict(format='identifier'))
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",
@@ -850,7 +850,17 @@ create_translation_table('encounter_method_prose', EncounterMethod, 'prose',
 )
 
 class EncounterSlot(TableBase):
-    u"""An abstract "slot" within a method, associated with both some set of conditions and a rarity."""
+    u"""An abstract "slot" within a method, associated with both some set of conditions and a rarity.
+
+    "slot" has a very specific meaning:
+    If during gameplay you know sufficient details about the current game state,
+    you can predict which slot (and therefore which pokemon) will spawn.
+
+    There are currently two reasons that "slot" might be empty:
+    1) The slot corresponds to a gift pokemon.
+    2) Red/Blue's Super Rod slots, which don't correspond to in-game slots.
+       See https://github.com/veekun/pokedex/issues/166#issuecomment-220101455
+    """
 
     __tablename__ = 'encounter_slots'
     id = Column(Integer, primary_key=True, nullable=False,
@@ -1761,6 +1771,13 @@ class PokemonDexNumber(TableBase):
     pokedex_number = Column(Integer, nullable=False,
         doc=u"Number of the Pokémon in that the Pokédex")
 
+    __table_args__ = (
+        UniqueConstraint(pokedex_id, pokedex_number),
+        UniqueConstraint(pokedex_id, species_id),
+        {},
+    )
+
+
 class PokemonEggGroup(TableBase):
     u"""Maps an Egg group to a species; each species belongs to one or two egg groups."""
     __tablename__ = 'pokemon_egg_groups'

pokedex/db/translations.py

@@ -377,7 +377,10 @@ def group_by_object(stream):
     Yields ((class name, object ID), (list of messages)) pairs.
     """
     stream = iter(stream)
-    current = next(stream)
+    try:
+        current = next(stream)
+    except StopIteration:
+        return
     current_key = current.cls, current.id
     group = [current]
     for message in stream:

pokedex/tests/test_database_sanity.py

@@ -1,6 +1,7 @@
 import pytest
 parametrize = pytest.mark.parametrize
 
+from collections import Counter
 import re
 
 from sqlalchemy.orm import aliased, joinedload, lazyload
@@ -28,6 +29,28 @@ def test_encounter_slots(session):
     # Encounter slots all match the encounters they belong to
     assert sanity_q.count() == 0
 
+def test_encounter_regions(session):
+    """Check that encounter locations match the region of the game they're from.
+    """
+
+    sanity_q = session.query(tables.Encounter) \
+        .join((tables.Version, tables.Encounter.version)) \
+        .join((tables.VersionGroup, tables.Version.version_group)) \
+        .join((tables.LocationArea, tables.Encounter.location_area)) \
+        .join((tables.Location, tables.LocationArea.location)) \
+        .join((tables.Region, tables.Location.region)) \
+        .filter(~tables.VersionGroup.version_group_regions.any(tables.VersionGroupRegion.region_id == tables.Region.id))
+
+    for e in sanity_q.limit(20):
+        acceptable_regions = " or ".join(r.identifier for r in e.version.version_group.regions)
+        if e.location_area.location.region is not None:
+            print("{e} ({e.pokemon.identifier}, {e.slot.method.identifier}, {e.version.identifier}) is in {e.location_area.location.region.identifier} ({e.location_area.location.identifier}) but should be in {acceptable_regions} ({e.version.identifier})".format(e=e, acceptable_regions=acceptable_regions))
+        else:
+            print("{e} ({e.pokemon.identifier}, {e.slot.method.identifier}, {e.version.identifier}) is in a pseudo-location ({e.location_area.location.identifier}) that is not part of any region, but should be in {acceptable_regions} ({e.version.identifier})".format(e=e, acceptable_regions=acceptable_regions))
+
+    # Encounter regions match the games they belong to
+    assert sanity_q.count() == 0
+
 @parametrize('cls', tables.mapped_classes)
 def test_nonzero_autoincrement_ids(session, cls):
     """Check that autoincrementing ids don't contain zeroes
@@ -47,7 +70,7 @@ def test_nonzero_autoincrement_ids(session, cls):
         pytest.fail("No zero id in %s" % cls.__name__)
 
 def test_unique_form_order(session):
-    """Check that tone PokemonForm.order value isn't used for more species"""
+    """Check that one PokemonForm.order value isn't used for more species"""
 
     species_by_form_order = {}
 
@@ -66,6 +89,22 @@ def test_unique_form_order(session):
                         species_by_form_order[form.order].name,
                         form.species.name))
 
+def test_pokedex_numbers(session):
+    """Check that pokedex numbers are contiguous (there are no gaps)"""
+
+    dex_query = session.query(tables.Pokedex).order_by(tables.Pokedex.id)
+    failed = False
+    for dex in dex_query:
+        query = session.query(tables.PokemonDexNumber.pokedex_number).filter_by(pokedex_id=dex.id)
+        numbers = set([x[0] for x in query.all()])
+        for i in range(1, max(numbers)):
+            if i not in numbers:
+                print("number {n} is missing from the {dex.name} pokedex".format(n=i, dex=dex))
+                failed = True
+
+    assert not failed, "missing pokedex numbers"
+
+
 def test_default_forms(session):
     """Check that each pokemon has one default form and each species has one
     default pokemon."""

scripts/add-gift-encounters.py

@@ -0,0 +1,308 @@
+#!/usr/bin/env python2
+"""
+This is an unmaintained one-shot script, only included in the repo for
+reference.
+"""
+
+from pokedex.db import connect, identifier_from_name
+from pokedex.db.tables import Encounter, EncounterMethod, EncounterSlot, Language, Location, LocationArea, Pokemon, Version
+
+session = connect()
+
+def get_version(name):
+    return session.query(Version).filter_by(identifier=identifier_from_name(name)).one()
+
+R = get_version(u'red')
+B = get_version(u'blue')
+Ye = get_version(u'yellow')
+G = get_version(u'gold')
+S = get_version(u'silver')
+C = get_version(u'crystal')
+RU = get_version(u'ruby')
+SA = get_version(u'sapphire')
+EM = get_version(u'emerald')
+FR = get_version(u'firered')
+LG = get_version(u'leafgreen')
+
+DI = get_version(u'diamond')
+PE = get_version(u'pearl')
+PT = get_version(u'platinum')
+HG = get_version(u'heartgold')
+SS = get_version(u'soulsilver')
+
+BL = get_version(u'black')
+WH = get_version(u'white')
+B2 = get_version(u'black-2')
+W2 = get_version(u'white-2')
+
+X  = get_version(u'x')
+Y  = get_version(u'y')
+OR = get_version(u'omega-ruby')
+AS = get_version(u'alpha-sapphire')
+
+def normal_gift_data():
+    return [
+        # Gen I
+        [ u'bulbasaur',   [ R, B ],  5, u'pallet-town' ],
+        [ u'charmander',  [ R, B ],  5, u'pallet-town' ],
+        [ u'squirtle',    [ R, B ],  5, u'pallet-town' ],
+        [ u'pikachu',     [ Ye   ],  5, u'pallet-town' ],
+        [ u'bulbasaur',   [ Ye   ], 10, u'cerulean-city'  ],
+        [ u'charmander',  [ Ye   ], 10, u'kanto-route-24' ],
+        [ u'squirtle',    [ Ye   ], 10, u'vermilion-city' ],
+
+        #[ u'aerodactyl', [ R, B, Ye ], 30, u'pewter-city',   u'museum-of-science', u'Pewter Museum of Science' ],
+        [ u'magikarp',   [ R, B, Ye ],  5, u'kanto-route-4', u'pokemon-center',    u'Pokemon Center' ],
+        #[ u'omanyte',    [ R, B, Ye ], 30, u'mt-moon',       u'b2f' ],
+        #[ u'kabuto',     [ R, B, Ye ], 30, u'mt-moon',       u'b2f' ],
+        [ u'hitmonlee',  [ R, B, Ye ], 30, u'saffron-city',  u'fighting-dojo',     u'Fighting Dojo' ],
+        [ u'hitmonchan', [ R, B, Ye ], 30, u'saffron-city',  u'fighting-dojo',     u'Fighting Dojo' ],
+        [ u'eevee',      [ R, B, Ye ], 25, u'celadon-city',  u'celadon-mansion',   u'Celadon Mansion rooftop' ],
+        [ u'lapras',     [ R, B, Ye ], 15, u'saffron-city',  u'silph-co-7f',       u'Silph Co. 7F' ],
+
+        # Gen II
+        [ u'chikorita', [ G, S, C ],  5, u'new-bark-town' ],
+        [ u'cyndaquil', [ G, S, C ],  5, u'new-bark-town' ],
+        [ u'totodile',  [ G, S, C ],  5, u'new-bark-town' ],
+        [ u'spearow',   [ G, S, C ], 10, u'goldenrod-city', u'north-gate',   u'North Gate' ],
+        [ u'eevee',     [ G, S, C ], 20, u'goldenrod-city', u'bills-house',  u"Bill's house" ],
+        [ u'shuckle',   [ G, S, C ], 15, u'cianwood-city',  u'manias-house', u"Mania's house" ],
+        [ u'dratini',   [       C ], 15, u'dragons-den'    ],
+        [ u'tyrogue',   [ G, S, C ], 10, u'mt-mortar',      u'b1f' ],
+
+        # Gen III
+        # Note Lileep + Anorith are not listed because they are not *gifts*
+        # They're note quite encounters either
+        # but that's outta scope of gift logic
+        [ u'treecko',   [ RU, SA, EM ],  5, u'hoenn-route-101' ],
+        [ u'torchic',   [ RU, SA, EM ],  5, u'hoenn-route-101' ],
+        [ u'mudkip' ,   [ RU, SA, EM ],  5, u'hoenn-route-101' ],
+        [ u'castform',  [ RU, SA, EM ], 25, u'hoenn-route-119', u'weather-institute', u'Weather Institute' ],
+        [ u'beldum',    [ RU, SA, EM ],  5, u'mossdeep-city',   u'stevens-house',     u"Steven's house"  ],
+        [ u'chikorita', [         EM ],  5, u'littleroot-town' ],
+        [ u'cyndaquil', [         EM ],  5, u'littleroot-town' ],
+        [ u'totodile',  [         EM ],  5, u'littleroot-town' ],
+
+        [ u'bulbasaur',  [ FR, LG ],  5, u'pallet-town' ],
+        [ u'charmander', [ FR, LG ],  5, u'pallet-town' ],
+        [ u'squirtle',   [ FR, LG ],  5, u'pallet-town' ],
+        #[ u'aerodactyl', [ FR, LG ],  5, u'pewter-city',   u'museum-of-science' ],
+        [ u'magikarp',   [ FR, LG ],  5, u'kanto-route-4', u'pokemon-center' ],
+        #[ u'omanyte',    [ FR, LG ],  5, u'mt-moon',       u'b2f' ],
+        #[ u'kabuto',     [ FR, LG ],  5, u'mt-moon',       u'b2f' ],
+        [ u'hitmonlee',  [ FR, LG ], 25, u'saffron-city',  u'fighting-dojo' ],
+        [ u'hitmonchan', [ FR, LG ], 25, u'saffron-city',  u'fighting-dojo' ],
+        [ u'eevee',      [ FR, LG ], 25, u'celadon-city',  u'celadon-mansion' ],
+        [ u'lapras',     [ FR, LG ], 25, u'saffron-city',  u'silph-co-7f' ],
+
+        # Gen IV
+        [ u'turtwig',  [ DI, PE     ],  5, u'lake-verity', u'before-galactic-intervention' ],
+        [ u'chimchar', [ DI, PE     ],  5, u'lake-verity', u'before-galactic-intervention' ],
+        [ u'piplup',   [ DI, PE     ],  5, u'lake-verity', u'before-galactic-intervention' ],
+        [ u'turtwig',  [         PT ],  5, u'sinnoh-route-201' ],
+        [ u'chimchar', [         PT ],  5, u'sinnoh-route-201' ],
+        [ u'piplup',   [         PT ],  5, u'sinnoh-route-201' ],
+        [ u'eevee',    [ DI, PE,    ],  5, u'hearthome-city' ],
+        [ u'eevee',    [         PT ], 20, u'hearthome-city' ],
+        [ u'porygon',  [         PT ], 25, u'veilstone-city' ],
+
+        [ u'chikorita',  [ HG, SS ],  5, u'new-bark-town' ],
+        [ u'cyndaquil',  [ HG, SS ],  5, u'new-bark-town' ],
+        [ u'totodile',   [ HG, SS ],  5, u'new-bark-town' ],
+        [ u'spearow',    [ HG, SS ], 20, u'goldenrod-city', u'north-gate' ],
+        [ u'eevee',      [ HG, SS ],  5, u'goldenrod-city', u'bills-house' ],
+        [ u'shuckle',    [ HG, SS ], 15, u'cianwood-city', u'kirks-house', u"Kirk's house"  ],
+        [ u'dratini',    [ HG, SS ], 15, u'dragons-den'    ],
+        [ u'tyrogue',    [ HG, SS ], 10, u'mt-mortar',      u'b1f' ],
+        [ u'bulbasaur',  [ HG, SS ],  5, u'pallet-town'   ],
+        [ u'charmander', [ HG, SS ],  5, u'pallet-town'   ],
+        [ u'squirtle',   [ HG, SS ],  5, u'pallet-town'   ],
+        [ u'treecko',    [ HG, SS ],  5, u'saffron-city',   u'silph-co-7f' ],
+        [ u'torchic',    [ HG, SS ],  5, u'saffron-city',   u'silph-co-7f' ],
+        [ u'mudkip' ,    [ HG, SS ],  5, u'saffron-city',   u'silph-co-7f' ],
+
+        # Gen V
+        [ u'snivy',      [ BL, WH ],  5, u'nuvema-town'   ],
+        [ u'tepig',      [ BL, WH ],  5, u'nuvema-town'   ],
+        [ u'oshawott',   [ BL, WH ],  5, u'nuvema-town'   ],
+        [ u'pansage',    [ BL, WH ], 10, u'dreamyard'     ], # not the basement
+        [ u'pansear',    [ BL, WH ], 10, u'dreamyard'     ],
+        [ u'panpour',    [ BL, WH ], 10, u'dreamyard'     ],
+        [ u'zorua',      [ BL, WH ], 10, u'castelia-city', u'game-freak-hq-1f', u'Game Freak HQ 1F' ],
+        #[ u'tirtouga',   [ BL, WH ], 25, u'relic-castle', u'a' ],
+        #[ u'archen',     [ BL, WH ], 25, u'relic-castle', u'a' ],
+        #[ u'omanyte',    [ BL, WH ], 25, u'twist-mountain'     ],
+        #[ u'kabuto',     [ BL, WH ], 25, u'twist-mountain'     ],
+        #[ u'aerodactyl', [ BL, WH ], 25, u'twist-mountain'     ],
+        #[ u'lileep',     [ BL, WH ], 25, u'twist-mountain'     ],
+        #[ u'anorith',    [ BL, WH ], 25, u'twist-mountain'     ],
+        #[ u'cranidos',   [ BL, WH ], 25, u'twist-mountain'     ],
+        #[ u'shieldon',   [ BL, WH ], 25, u'twist-mountain'     ],
+        [ u'magikarp',   [ BL, WH ],  5, u'marvelous-bridge'   ],
+
+        [ u'snivy',      [ B2, W2 ],  5, u'aspertia-city'    ],
+        [ u'tepig',      [ B2, W2 ],  5, u'aspertia-city'    ],
+        [ u'oshawott',   [ B2, W2 ],  5, u'aspertia-city'    ],
+        [ u'zorua',      [ B2, W2 ], 25, u'driftveil-city'   ],
+        [ u'deerling',   [ B2, W2 ], 30, u'unova-route-6', u'weather-institute', u'Weather Institute' ],
+        [ u'eevee',      [ B2, W2 ], 10, u'castelia-city'    ],
+        #[ u'omanyte',    [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'kabuto',     [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'aerodactyl', [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'lileep',     [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'anorith',    [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'cranidos',   [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'shieldon',   [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'tirtouga',   [ B2, W2 ], 25, u'join-avenue'      ],
+        #[ u'archen',     [ B2, W2 ], 25, u'join-avenue'      ],
+        [ u'magikarp',   [ B2, W2 ],  5, u'marvelous-bridge' ],
+        #[ u'tirtouga',   [ B2, W2 ], 25, u'nacrene-city', u'museum', u'Nacrene City Museum' ],
+        #[ u'archen',     [ B2, W2 ], 25, u'nacrene-city', u'museum'],
+        #[ u'omanyte',    [ B2, W2 ], 25, u'twist-mountain'   ],
+        #[ u'kabuto',     [ B2, W2 ], 25, u'twist-mountain'   ],
+        #[ u'aerodactyl', [ B2, W2 ], 25, u'twist-mountain'   ],
+        #[ u'lileep',     [ B2, W2 ], 25, u'twist-mountain'   ],
+        #[ u'anorith',    [ B2, W2 ], 25, u'twist-mountain'   ],
+        #[ u'cranidos',   [ B2, W2 ], 25, u'twist-mountain'   ],
+        #[ u'shieldon',   [ B2, W2 ], 25, u'twist-mountain'   ],
+        # These are shiny...
+        [ u'dratini',    [     W2 ],  1, u'floccesy-town'    ],
+        [ u'gible',      [ B2     ],  1, u'floccesy-town'    ],
+
+        # Gen VI
+        [ u'chespin',      [ X, Y ],  5, u'aquacorde-town'   ],
+        [ u'fennekin',     [ X, Y ],  5, u'aquacorde-town'   ],
+        [ u'froakie',      [ X, Y ],  5, u'aquacorde-town'   ],
+        [ u'bulbasaur',    [ X, Y ], 10, u'lumiose-city'     ],
+        [ u'charmander',   [ X, Y ], 10, u'lumiose-city'     ],
+        [ u'squirtle',     [ X, Y ], 10, u'lumiose-city'     ],
+        [ u'tyrunt',       [ X, Y ], 20, u'glittering-cave', u'unknown-area-303' ], # 304 means ceiling
+        [ u'amaura',       [ X, Y ], 20, u'glittering-cave', u'unknown-area-303' ],
+        [ u'lucario',      [ X, Y ], 32, u'tower-of-mastery' ],
+        [ u'lapras',       [ X, Y ], 30, u'kalos-route-12'   ],
+
+        [ u'treecko',   [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'torchic',   [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'mudkip',    [ OR, AS ],  5, u'hoenn-route-101' ],
+        # cosplay pikachu is given to you the first time you participate in a contest
+        [ u'pikachu',   [ OR, AS ], 20, u'slateport-city',  u'contest-hall', u"Contest Hall" ],
+        [ u'pikachu',   [ OR, AS ], 20, u'verdanturf-town', u'contest-hall', u"Contest Hall" ],
+        [ u'pikachu',   [ OR, AS ], 20, u'fallarbor-town',  u'contest-hall', u"Contest Hall" ],
+        [ u'pikachu',   [ OR, AS ], 20, u'lilycove-city',   u'contest-hall', u"Contest Hall" ],
+        [ u'latios',    [ OR     ], 30, u'southern-island' ], # eon tickets ignored here - they're not gifts?
+        [ u'latias',    [     AS ], 30, u'southern-island' ],
+        [ u'castform',  [ OR, AS ], 30, u'hoenn-route-119', u'weather-institute' ],
+        [ u'chikorita', [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'cyndaquil', [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'totodile',  [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'snivy',     [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'tepig',     [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'oshawott',  [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'beldum',    [ OR, AS ],  1, u'mossdeep-city',   u'stevens-house'  ],
+        [ u'turtwig',   [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'chimchar',  [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'piplup',    [ OR, AS ],  5, u'hoenn-route-101' ],
+        [ u'camerupt',  [ OR, AS ], 40, u'battle-resort'    ],
+        [ u'sharpedo',  [ OR, AS ], 40, u'battle-resort'    ],
+    ]
+
+def egg_gift_data():
+    return [
+        [ u'togepi',    [ G, S, C ],  5, u'violet-city'   ],
+        [ u'pichu',     [       C ],  5, u'johto-route-34' ],
+        [ u'cleffa',    [       C ],  5, u'johto-route-34' ],
+        [ u'igglybuff', [       C ],  5, u'johto-route-34' ],
+        [ u'tyrogue',   [       C ],  5, u'johto-route-34' ],
+        [ u'smoochum',  [       C ],  5, u'johto-route-34' ],
+        [ u'elekid',    [       C ],  5, u'johto-route-34' ],
+        [ u'magby',     [       C ],  5, u'johto-route-34' ],
+
+        [ u'wynaut',    [ RU, SA, EM ],  5, u'lavaridge-town'  ],
+        [ u'togepi',     [ FR, LG ],  5, u'water-labyrinth' ],
+
+        [ u'togepi',   [ DI, PE, PT ],  1, u'eterna-city',    u'west-gate', u'West Gate' ],
+        [ u'happiny',  [ DI, PE,    ],  1, u'hearthome-city', u'west-gate', u'West Gate' ],
+        [ u'riolu',    [ DI, PE, PT ],  1, u'iron-island', u'b2f-left' ],
+        [ u'togepi',     [ HG, SS ],  1, u'violet-city',   u'poke-mart', u'Poke Mart' ],
+        [ u'mareep',     [ HG, SS ],  1, u'violet-city',   u'pokemon-center', u'Pokemon Center' ],
+        [ u'wooper',     [ HG, SS ],  1, u'violet-city',   u'pokemon-center' ],
+        [ u'slugma',     [ HG, SS ],  1, u'violet-city',   u'pokemon-center' ],
+
+        [ u'larvesta',   [ BL, WH ],  1, u'unova-route-18'     ],
+        [ u'happiny',    [ B2, W2 ],  1, u'nacrene-city', u'west-gate', u'West Gate' ],
+        [ u'wynaut',    [ OR, AS ],  1, u'lavaridge-town'  ],
+        [ u'togepi',    [ OR, AS ],  1, u'lavaridge-town'  ],
+    ]
+
+def record_method_and_gifts(gift_method, gift_data):
+
+    en = session.query(Language).filter_by(identifier=u'en').one()
+
+    for gift_datum in gift_data:
+        pokemon_name  = identifier_from_name(gift_datum[0])
+        versions      = gift_datum[1]
+        level         = identifier_from_name(str(gift_datum[2]))
+        location_name = identifier_from_name(gift_datum[3])
+        area_name       = None
+        if len(gift_datum) > 4:
+            area_name     = identifier_from_name(gift_datum[4])
+
+        pokemon       = session.query(Pokemon     ).filter_by(identifier=pokemon_name                      ).one()
+        location      = session.query(Location    ).filter_by(identifier=location_name                     ).one()
+        location_area = session.query(LocationArea).filter_by(identifier=area_name, location_id=location.id).first()
+        # Some of these don't exist yet
+        if not location_area:
+
+            location_area = LocationArea(
+                location_id = location.id,
+                game_index  = 0, # cause who knows what this means
+                identifier  = area_name
+            )
+
+            area_prose = None
+            if area_name != None:
+                area_prose = gift_datum[5]
+            location_area.name_map[en] = area_prose
+
+            session.add(location_area)
+            session.commit()
+
+        for version in versions:
+            encounter_slot = session.query(EncounterSlot).filter_by(
+                version_group_id    = version.version_group_id,
+                encounter_method_id = gift_method.id
+            ).first()
+
+            if not encounter_slot:
+                encounter_slot = EncounterSlot(
+                    version_group_id = version.version_group_id,
+                    encounter_method_id = gift_method.id,
+                    # No priority over or under other events/conditions
+                    slot                = None,
+                    # Rarity is meaningless for gifts, but say that it's
+                    # 100% to help out code that expects rarity to be defined.
+                    rarity              = 100,
+                )
+                session.add(encounter_slot)
+                session.commit()
+
+            encounter_info = {
+                'version_id':        version.id,
+                'location_area_id':  location_area.id,
+                'encounter_slot_id': encounter_slot.id,
+                'pokemon_id':        pokemon.id,
+                'min_level':         level,
+                'max_level':         level
+            }
+            encounter = session.query(Encounter).filter_by(**encounter_info).first()
+            if not encounter:
+                encounter = Encounter(**encounter_info)
+                session.add(encounter)
+
+        session.commit()
+
+normal_gift_method = session.query(EncounterMethod).filter_by(identifier=u'gift').one()
+record_method_and_gifts(normal_gift_method, normal_gift_data())
+
+egg_gift_method = session.query(EncounterMethod).filter_by(identifier=u'gift-egg').one()
+record_method_and_gifts(egg_gift_method, egg_gift_data())

setup.py

@@ -13,8 +13,8 @@ setup(
     install_requires = [
         'SQLAlchemy>=0.9.7',
         'whoosh>=2.5,<2.7',
-        'markdown',
-        'construct',
+        'markdown==2.4.1',
+        'construct<=2.5.3',
         'six>=1.9.0',
     ],
     entry_points = {