diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv index 2cbae57..f2aaf05 100644 --- a/pokedex/data/csv/encounter_slots.csv +++ b/pokedex/data/csv/encounter_slots.csv @@ -489,7 +489,7 @@ id,version_group_id,encounter_method_id,slot,rarity 488,15,4,1,35 489,15,4,2,5 490,1,18,,100 -491,15,18,,100 +491,2,18,,100 492,3,18,,100 493,4,18,,100 494,5,18,,100 @@ -500,15 +500,16 @@ id,version_group_id,encounter_method_id,slot,rarity 499,10,18,,100 500,11,18,,100 501,14,18,,100 -502,16,18,,100 -503,3,19,,100 -504,4,19,,100 -505,5,19,,100 -506,6,19,,100 -507,7,19,,100 -508,8,19,,100 -509,9,19,,100 -510,10,19,,100 -511,11,19,,100 -512,14,19,,100 -513,16,19,,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 diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index 9db65f9..240688d 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46583,25 +46583,25 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50293,2,285,490,4,5,5 50294,1,285,490,7,5,5 50295,2,285,490,7,5,5 -50296,24,285,491,25,5,5 -50297,24,281,491,1,10,10 -50298,24,314,491,4,10,10 -50299,24,282,491,7,10,10 +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,762,490,129,5,5 50301,2,762,490,129,5,5 -50302,24,762,491,129,5,5 +50302,3,762,491,129,5,5 50303,1,763,490,106,30,30 50304,2,763,490,106,30,30 -50305,24,763,491,106,30,30 +50305,3,763,491,106,30,30 50306,1,763,490,107,30,30 50307,2,763,490,107,30,30 -50308,24,763,491,107,30,30 +50308,3,763,491,107,30,30 50309,1,764,490,133,25,25 50310,2,764,490,133,25,25 -50311,24,764,491,133,25,25 +50311,3,764,491,133,25,25 50312,1,765,490,131,15,15 50313,2,765,490,131,15,15 -50314,24,765,491,131,15,15 +50314,3,765,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 @@ -46731,98 +46731,98 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50441,22,622,501,129,5,5 50442,22,780,501,147,1,1 50443,21,780,501,443,1,1 -50444,23,781,491,650,5,5 -50445,24,781,491,650,5,5 -50446,23,781,491,653,5,5 -50447,24,781,491,653,5,5 -50448,23,781,491,656,5,5 -50449,24,781,491,656,5,5 -50450,23,782,491,1,10,10 -50451,24,782,491,1,10,10 -50452,23,782,491,4,10,10 -50453,24,782,491,4,10,10 -50454,23,782,491,7,10,10 -50455,24,782,491,7,10,10 -50456,23,736,491,696,20,20 -50457,24,736,491,696,20,20 -50458,23,736,491,698,20,20 -50459,24,736,491,698,20,20 -50460,23,783,491,448,32,32 -50461,24,783,491,448,32,32 -50462,23,723,491,131,30,30 -50463,24,723,491,131,30,30 -50464,25,393,502,252,5,5 -50465,26,393,502,252,5,5 -50466,25,393,502,255,5,5 -50467,26,393,502,255,5,5 -50468,25,393,502,258,5,5 -50469,26,393,502,258,5,5 -50470,25,784,502,25,20,20 -50471,26,784,502,25,20,20 -50472,25,785,502,381,30,30 -50473,26,785,502,380,30,30 -50474,25,769,502,351,30,30 -50475,26,769,502,351,30,30 -50476,25,393,502,152,5,5 -50477,26,393,502,152,5,5 -50478,25,393,502,155,5,5 -50479,26,393,502,155,5,5 -50480,25,393,502,158,5,5 -50481,26,393,502,158,5,5 -50482,25,393,502,495,5,5 -50483,26,393,502,495,5,5 -50484,25,393,502,498,5,5 -50485,26,393,502,498,5,5 -50486,25,393,502,501,5,5 -50487,26,393,502,501,5,5 -50488,25,770,502,374,1,1 -50489,26,770,502,374,1,1 -50490,25,141,502,387,5,5 -50491,26,141,502,387,5,5 -50492,25,141,502,390,5,5 -50493,26,141,502,390,5,5 -50494,25,141,502,393,5,5 -50495,26,141,502,393,5,5 -50496,25,786,502,323,40,40 -50497,26,786,502,323,40,40 -50498,25,786,502,319,40,40 -50499,26,786,502,319,40,40 -50500,4,189,503,175,5,5 -50501,5,189,503,175,5,5 -50502,6,189,504,175,5,5 -50503,6,205,504,172,5,5 -50504,6,205,504,173,5,5 -50505,6,205,504,174,5,5 -50506,6,205,504,236,5,5 -50507,6,205,504,238,5,5 -50508,6,205,504,239,5,5 -50509,6,205,504,240,5,5 -50510,7,787,505,360,5,5 -50511,8,787,505,360,5,5 -50512,9,787,506,360,5,5 -50513,10,518,507,175,5,5 -50514,11,518,507,175,5,5 -50515,12,788,508,175,1,1 -50516,13,788,508,175,1,1 -50517,14,788,509,175,1,1 -50518,12,789,508,440,1,1 -50519,13,789,508,440,1,1 -50520,12,124,508,447,1,1 -50521,13,124,508,447,1,1 -50522,14,124,509,447,1,1 -50523,15,790,510,175,1,1 -50524,16,790,510,175,1,1 -50525,15,791,510,179,1,1 -50526,16,791,510,179,1,1 -50527,15,791,510,194,1,1 -50528,16,791,510,194,1,1 -50529,15,791,510,218,1,1 -50530,16,791,510,218,1,1 -50531,17,653,511,636,1,1 -50532,18,653,511,636,1,1 -50533,21,792,512,440,1,1 -50534,22,792,512,440,1,1 -50535,25,787,513,360,1,1 -50536,26,787,513,360,1,1 -50537,25,787,513,175,1,1 -50538,26,787,513,175,1,1 +50444,23,781,502,650,5,5 +50445,24,781,502,650,5,5 +50446,23,781,502,653,5,5 +50447,24,781,502,653,5,5 +50448,23,781,502,656,5,5 +50449,24,781,502,656,5,5 +50450,23,782,502,1,10,10 +50451,24,782,502,1,10,10 +50452,23,782,502,4,10,10 +50453,24,782,502,4,10,10 +50454,23,782,502,7,10,10 +50455,24,782,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,783,502,448,32,32 +50461,24,783,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,784,503,25,20,20 +50471,26,784,503,25,20,20 +50472,25,785,503,381,30,30 +50473,26,785,503,380,30,30 +50474,25,769,503,351,30,30 +50475,26,769,503,351,30,30 +50476,25,393,503,152,5,5 +50477,26,393,503,152,5,5 +50478,25,393,503,155,5,5 +50479,26,393,503,155,5,5 +50480,25,393,503,158,5,5 +50481,26,393,503,158,5,5 +50482,25,393,503,495,5,5 +50483,26,393,503,495,5,5 +50484,25,393,503,498,5,5 +50485,26,393,503,498,5,5 +50486,25,393,503,501,5,5 +50487,26,393,503,501,5,5 +50488,25,770,503,374,1,1 +50489,26,770,503,374,1,1 +50490,25,141,503,387,5,5 +50491,26,141,503,387,5,5 +50492,25,141,503,390,5,5 +50493,26,141,503,390,5,5 +50494,25,141,503,393,5,5 +50495,26,141,503,393,5,5 +50496,25,786,503,323,40,40 +50497,26,786,503,323,40,40 +50498,25,786,503,319,40,40 +50499,26,786,503,319,40,40 +50500,4,189,504,175,5,5 +50501,5,189,504,175,5,5 +50502,6,189,505,175,5,5 +50503,6,205,505,172,5,5 +50504,6,205,505,173,5,5 +50505,6,205,505,174,5,5 +50506,6,205,505,236,5,5 +50507,6,205,505,238,5,5 +50508,6,205,505,239,5,5 +50509,6,205,505,240,5,5 +50510,7,787,506,360,5,5 +50511,8,787,506,360,5,5 +50512,9,787,507,360,5,5 +50513,10,518,508,175,5,5 +50514,11,518,508,175,5,5 +50515,12,788,509,175,1,1 +50516,13,788,509,175,1,1 +50517,14,788,510,175,1,1 +50518,12,789,509,440,1,1 +50519,13,789,509,440,1,1 +50520,12,124,509,447,1,1 +50521,13,124,509,447,1,1 +50522,14,124,510,447,1,1 +50523,15,790,511,175,1,1 +50524,16,790,511,175,1,1 +50525,15,791,511,179,1,1 +50526,16,791,511,179,1,1 +50527,15,791,511,194,1,1 +50528,16,791,511,194,1,1 +50529,15,791,511,218,1,1 +50530,16,791,511,218,1,1 +50531,17,653,512,636,1,1 +50532,18,653,512,636,1,1 +50533,21,792,513,440,1,1 +50534,22,792,513,440,1,1 +50535,25,787,514,360,1,1 +50536,26,787,514,360,1,1 +50537,25,787,514,175,1,1 +50538,26,787,514,175,1,1 diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 47556be..2100358 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -14,7 +14,7 @@ def get_version(name): R = get_version(u'red') B = get_version(u'blue') -Y = get_version(u'yellow') +Ye = get_version(u'yellow') G = get_version(u'gold') S = get_version(u'silver') C = get_version(u'crystal') @@ -46,19 +46,19 @@ def normal_gift_data(): [ 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', [ Y ], 5, u'pallet-town' ], - [ u'bulbasaur', [ Y ], 10, u'cerulean-city' ], - [ u'charmander', [ Y ], 10, u'kanto-route-24' ], - [ u'squirtle', [ Y ], 10, u'vermilion-city' ], + [ 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, Y ], 30, u'pewter-city', u'museum-of-science', u'Pewter Museum of Science' ], - [ u'magikarp', [ R, B, Y ], 5, u'kanto-route-4', u'pokemon-center', u'Pokemon Center' ], - #[ u'omanyte', [ R, B, Y ], 30, u'mt-moon', u'b2f' ], - #[ u'kabuto', [ R, B, Y ], 30, u'mt-moon', u'b2f' ], - [ u'hitmonlee', [ R, B, Y ], 30, u'saffron-city', u'fighting-dojo', u'Fighting Dojo' ], - [ u'hitmonchan', [ R, B, Y ], 30, u'saffron-city', u'fighting-dojo', u'Fighting Dojo' ], - [ u'eevee', [ R, B, Y ], 25, u'celadon-city', u'celadon-mansion', u'Celadon Mansion rooftop' ], - [ u'lapras', [ R, B, Y ], 15, u'saffron-city', u'silph-co-7f', u'Silph Co. 7F' ], + #[ 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' ],