From 731cd771d475c23d95c31ba44d82200c57b18f1c Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 7 Apr 2018 11:46:24 -0400 Subject: [PATCH 01/21] gift-pokemon: Add gift encounter method --- pokedex/data/csv/encounter_methods.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/pokedex/data/csv/encounter_methods.csv b/pokedex/data/csv/encounter_methods.csv index 18be59a..3aef65d 100644 --- a/pokedex/data/csv/encounter_methods.csv +++ b/pokedex/data/csv/encounter_methods.csv @@ -16,3 +16,4 @@ id,identifier,order 15,purple-flowers,7 16,red-flowers,8 17,rough-terrain,9 +18,gift,18 From d84c24fe6bb31005b41aef7144dcd6b46a3bc0bb Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 7 Apr 2018 17:32:16 -0400 Subject: [PATCH 02/21] gift-pokemon: Record red/blue/yellow pkmn --- scripts/add-gift-encounters.py | 97 ++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 scripts/add-gift-encounters.py diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py new file mode 100644 index 0000000..b3fd53e --- /dev/null +++ b/scripts/add-gift-encounters.py @@ -0,0 +1,97 @@ +#!/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, EncounterSlot, LocationArea +from pokedex.db.tables import EncounterMethod, Location, Pokemon, Version + +session = connect() + +def get_version(name): + return session.query(Version).filter_by(identifier=identifier_from_name(name)).one() + +def gift_data(): + R = get_version(u'red') + B = get_version(u'blue') + Y = get_version(u'yellow') + 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', [ 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'aerodactyl', [ R, B, Y ], 30, u'pewter-city', u'museum-of-science' ], + [ u'magikarp', [ R, B, Y ], 5, u'kanto-route-4', 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'hitmonchan', [ R, B, Y ], 30, u'saffron-city', u'fighting-dojo' ], + [ u'eevee', [ R, B, Y ], 25, u'celadon-city', u'celadon-mansion' ], + [ u'lapras', [ R, B, Y ], 15, u'saffron-city', u'silph-co-7f' ], + ] + + +gift_method = session.query(EncounterMethod).filter_by(identifier=u'gift').one() + +for gift_data in gift_data(): + pokemon_name = identifier_from_name(gift_data[0]) + versions = gift_data[1] + level = identifier_from_name(str(gift_data[2])) + location_name = identifier_from_name(gift_data[3]) + area_name = None + if len(gift_data) > 4: + area_name = identifier_from_name(gift_data[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 + ) + 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 + rarity = None, + ) + 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() From 0f10d9a88a2318c039481938c45369dc07cd6446 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 7 Apr 2018 18:02:47 -0400 Subject: [PATCH 03/21] gift-pokemon: Gold, Silver, Crystal --- scripts/add-gift-encounters.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index b3fd53e..2b2abb9 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -17,6 +17,9 @@ def gift_data(): R = get_version(u'red') B = get_version(u'blue') Y = get_version(u'yellow') + G = get_version(u'gold') + S = get_version(u'silver') + C = get_version(u'crystal') return [ # Gen I [ u'bulbasaur', [ R, B ], 5, u'pallet-town' ], @@ -35,6 +38,24 @@ def gift_data(): [ u'hitmonchan', [ R, B, Y ], 30, u'saffron-city', u'fighting-dojo' ], [ u'eevee', [ R, B, Y ], 25, u'celadon-city', u'celadon-mansion' ], [ u'lapras', [ R, B, Y ], 15, u'saffron-city', 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'togepi', [ G, S, C ], 0, u'violet-city' ], + [ u'pichu', [ C ], 0, u'johto-route-34' ], + [ u'cleffa', [ C ], 0, u'johto-route-34' ], + [ u'igglybuff', [ C ], 0, u'johto-route-34' ], + [ u'tyrogue', [ C ], 0, u'johto-route-34' ], + [ u'smoochum', [ C ], 0, u'johto-route-34' ], + [ u'elekid', [ C ], 0, u'johto-route-34' ], + [ u'magby', [ C ], 0, u'johto-route-34' ], + [ u'spearow', [ G, S, C ], 10, u'goldenrod-city', u'north-gate' ], + [ u'eevee', [ G, S, C ], 20, u'goldenrod-city' ], + [ u'shuckle', [ G, S, C ], 15, u'cianwood-city' ], + [ u'dratini', [ C ], 15, u'dragons-den' ], + [ u'tyrogue', [ G, S, C ], 10, u'mt-mortar', u'b1f' ], ] From 17c71e6240b622c09abbf80fc18012ea05a3ec02 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 7 Apr 2018 23:11:33 -0400 Subject: [PATCH 04/21] gift-pokemon: Gen III Both the new and the reboots --- scripts/add-gift-encounters.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 2b2abb9..4275cb4 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -20,6 +20,11 @@ def gift_data(): 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') return [ # Gen I [ u'bulbasaur', [ R, B ], 5, u'pallet-town' ], @@ -56,6 +61,30 @@ def gift_data(): [ u'shuckle', [ G, S, C ], 15, u'cianwood-city' ], [ u'dratini', [ C ], 15, u'dragons-den' ], [ u'tyrogue', [ G, S, C ], 10, u'mt-mortar', u'b1f' ], + + # Gen III + [ 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'wynaut', [ RU, SA, EM ], 0, u'lavaridge-town' ], + [ u'castform', [ RU, SA, EM ], 25, u'hoenn-route-119', u'weather-center' ], + [ u'beldum', [ RU, SA, EM ], 5, u'mossdeep-city', u'stevens-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' ], + [ u'togepi', [ FR, LG ], 0, u'water-labyrinth' ], ] From 7dcd72801cd1838862c93c505d09b7272722f164 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sun, 8 Apr 2018 00:23:28 -0400 Subject: [PATCH 05/21] gift-pokemon: Generation IV --- scripts/add-gift-encounters.py | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 4275cb4..9077382 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -25,6 +25,12 @@ def gift_data(): 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') return [ # Gen I [ u'bulbasaur', [ R, B ], 5, u'pallet-town' ], @@ -85,6 +91,39 @@ def gift_data(): [ u'eevee', [ FR, LG ], 25, u'celadon-city', u'celadon-mansion' ], [ u'lapras', [ FR, LG ], 25, u'saffron-city', u'silph-co-7f' ], [ u'togepi', [ FR, LG ], 0, u'water-labyrinth' ], + + # 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'togepi', [ DI, PE, PT ], 0, u'eterna-city' ], + [ u'eevee', [ DI, PE, ], 5, u'hearthome-city' ], + [ u'eevee', [ PT ], 20, u'hearthome-city' ], + [ u'happiny', [ DI, PE, ], 0, u'hearthome-city' ], + [ u'porygon', [ PT ], 25, u'veilstone-city' ], + [ u'riolu', [ DI, PE, PT ], 0, u'iron-island', u'b2f-left' ], + + [ 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'togepi', [ HG, SS ], 0, u'violet-city' ], + [ u'spearow', [ HG, SS ], 20, u'goldenrod-city', u'north-gate' ], + [ u'eevee', [ HG, SS ], 5, u'goldenrod-city' ], + [ u'shuckle', [ HG, SS ], 15, u'cianwood-city' ], + [ u'dratini', [ HG, SS ], 15, u'dragons-den' ], + [ u'tyrogue', [ HG, SS ], 10, u'mt-mortar', u'b1f' ], + [ u'mareep', [ HG, SS ], 0, u'violet-city' ], + [ u'wooper', [ HG, SS ], 0, u'violet-city' ], + [ u'slugma', [ HG, SS ], 0, u'violet-city' ], + [ 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' ], ] From 1846fec9582950a9531b3eba8adea6af4ce84abd Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sun, 8 Apr 2018 12:58:28 -0400 Subject: [PATCH 06/21] gift-pokemon: Generation V --- scripts/add-gift-encounters.py | 59 ++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 9077382..3890a76 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -31,6 +31,12 @@ def gift_data(): 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') + return [ # Gen I [ u'bulbasaur', [ R, B ], 5, u'pallet-town' ], @@ -69,6 +75,9 @@ def gift_data(): [ 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' ], @@ -124,6 +133,56 @@ def gift_data(): [ 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'tirtouga', [ BL, WH ], 25, u'relic-castle', u'a' ], + [ u'archen', [ BL, WH ], 25, u'relic-castle', u'a' ], + [ u'larvesta', [ BL, WH ], 0, u'unova-route-18' ], + [ 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'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'happiny', [ B2, W2 ], 0, u'nacrene-city' ], + [ u'tirtouga', [ B2, W2 ], 25, u'nacrene-city' ], + [ u'archen', [ B2, W2 ], 25, u'nacrene-city' ], + [ 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' ], ] From 61dfeed80f151b5ae15e1dfa29df592730b15fe1 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Mon, 9 Apr 2018 21:39:11 -0400 Subject: [PATCH 07/21] gift-pokemon: Gen VI --- scripts/add-gift-encounters.py | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 3890a76..6480432 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -37,6 +37,11 @@ def gift_data(): 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') + return [ # Gen I [ u'bulbasaur', [ R, B ], 5, u'pallet-town' ], @@ -183,6 +188,41 @@ def gift_data(): # 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' ], + [ u'pikachu', [ OR, AS ], 20, u'contest-hall' ], # suprisingly, this location exists already + [ u'wynaut', [ OR, AS ], 0, u'lavaridge-town' ], + [ 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-center' ], + [ 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'togepi', [ OR, AS ], 0, u'lavaridge-town' ], + [ 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'sinnoh-route-201' ], + [ u'chimchar', [ OR, AS ], 5, u'sinnoh-route-201' ], + [ u'piplup', [ OR, AS ], 5, u'sinnoh-route-201' ], + [ u'camerupt', [ OR, AS ], 40, u'battle-resort' ], + [ u'sharpedo', [ OR, AS ], 40, u'battle-resort' ], + ] From 8694c8464a0b0a663fcd30f3358ea29a6ab0ed53 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 14 Apr 2018 11:30:57 -0400 Subject: [PATCH 08/21] gift-pokemon: Document empty encounter_slots I'm going to record gift-pokemon as having no encounter slot, which I believe is correct by-and-large (since you always get the same mon). There are a few randomized gift pokemon which do have some type of encounter slot (eg. Crystal's Odd Egg). Those aren't tracked (yet). --- pokedex/db/tables.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 05e5bb9..0675265 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -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, From b7500e92f081cc8092fb4f1bc9d16bd2156bc30a Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 14 Apr 2018 12:52:11 -0400 Subject: [PATCH 09/21] gift-pokemon: CSV file updates From sqlite: .headers on .mode csv .output $filename select * from $table Then remove all the dumb carriage returns in vim --- pokedex/data/csv/encounter_slots.csv | 13 ++ pokedex/data/csv/encounters.csv | 318 +++++++++++++++++++++++++++ pokedex/data/csv/location_areas.csv | 23 ++ 3 files changed, 354 insertions(+) diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv index dc8549f..3e17c6f 100644 --- a/pokedex/data/csv/encounter_slots.csv +++ b/pokedex/data/csv/encounter_slots.csv @@ -488,3 +488,16 @@ 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,, +491,15,18,, +492,3,18,, +493,4,18,, +494,5,18,, +495,6,18,, +496,7,18,, +497,8,18,, +498,9,18,, +499,10,18,, +500,11,18,, +501,14,18,, +502,16,18,, diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index f1537e4..81969bf 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46577,3 +46577,321 @@ 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,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 +50300,1,761,490,142,30,30 +50301,2,761,490,142,30,30 +50302,24,761,491,142,30,30 +50303,1,762,490,129,5,5 +50304,2,762,490,129,5,5 +50305,24,762,491,129,5,5 +50306,1,327,490,138,30,30 +50307,2,327,490,138,30,30 +50308,24,327,491,138,30,30 +50309,1,327,490,140,30,30 +50310,2,327,490,140,30,30 +50311,24,327,491,140,30,30 +50312,1,763,490,106,30,30 +50313,2,763,490,106,30,30 +50314,24,763,491,106,30,30 +50315,1,763,490,107,30,30 +50316,2,763,490,107,30,30 +50317,24,763,491,107,30,30 +50318,1,764,490,133,25,25 +50319,2,764,490,133,25,25 +50320,24,764,491,133,25,25 +50321,1,765,490,131,15,15 +50322,2,765,490,131,15,15 +50323,24,765,491,131,15,15 +50324,4,184,492,152,5,5 +50325,5,184,492,152,5,5 +50326,6,184,493,152,5,5 +50327,4,184,492,155,5,5 +50328,5,184,492,155,5,5 +50329,6,184,493,155,5,5 +50330,4,184,492,158,5,5 +50331,5,184,492,158,5,5 +50332,6,184,493,158,5,5 +50333,4,189,492,175,0,0 +50334,5,189,492,175,0,0 +50335,6,189,493,175,0,0 +50336,6,205,493,172,0,0 +50337,6,205,493,173,0,0 +50338,6,205,493,174,0,0 +50339,6,205,493,236,0,0 +50340,6,205,493,238,0,0 +50341,6,205,493,239,0,0 +50342,6,205,493,240,0,0 +50343,4,766,492,21,10,10 +50344,5,766,492,21,10,10 +50345,6,766,493,21,10,10 +50346,4,767,492,133,20,20 +50347,5,767,492,133,20,20 +50348,6,767,493,133,20,20 +50349,4,235,492,213,15,15 +50350,5,235,492,213,15,15 +50351,6,235,493,213,15,15 +50352,6,250,493,147,15,15 +50353,4,240,492,236,10,10 +50354,5,240,492,236,10,10 +50355,6,240,493,236,10,10 +50356,7,393,494,252,5,5 +50357,8,393,494,252,5,5 +50358,9,393,495,252,5,5 +50359,7,393,494,255,5,5 +50360,8,393,494,255,5,5 +50361,9,393,495,255,5,5 +50362,7,393,494,258,5,5 +50363,8,393,494,258,5,5 +50364,9,393,495,258,5,5 +50365,7,768,494,360,0,0 +50366,8,768,494,360,0,0 +50367,9,768,495,360,0,0 +50368,7,769,494,351,25,25 +50369,8,769,494,351,25,25 +50370,9,769,495,351,25,25 +50371,7,770,494,374,5,5 +50372,8,770,494,374,5,5 +50373,9,770,495,374,5,5 +50374,9,771,495,152,5,5 +50375,9,771,495,155,5,5 +50376,9,771,495,158,5,5 +50377,10,285,496,1,5,5 +50378,11,285,496,1,5,5 +50379,10,285,496,4,5,5 +50380,11,285,496,4,5,5 +50381,10,285,496,7,5,5 +50382,11,285,496,7,5,5 +50383,10,761,496,142,5,5 +50384,11,761,496,142,5,5 +50385,10,762,496,129,5,5 +50386,11,762,496,129,5,5 +50387,10,327,496,138,5,5 +50388,11,327,496,138,5,5 +50389,10,327,496,140,5,5 +50390,11,327,496,140,5,5 +50391,10,763,496,106,25,25 +50392,11,763,496,106,25,25 +50393,10,763,496,107,25,25 +50394,11,763,496,107,25,25 +50395,10,764,496,133,25,25 +50396,11,764,496,133,25,25 +50397,10,765,496,131,25,25 +50398,11,765,496,131,25,25 +50399,10,518,496,175,0,0 +50400,11,518,496,175,0,0 +50401,12,135,497,387,5,5 +50402,13,135,497,387,5,5 +50403,12,135,497,390,5,5 +50404,13,135,497,390,5,5 +50405,12,135,497,393,5,5 +50406,13,135,497,393,5,5 +50407,14,141,498,387,5,5 +50408,14,141,498,390,5,5 +50409,14,141,498,393,5,5 +50410,12,2,497,175,0,0 +50411,13,2,497,175,0,0 +50412,14,2,498,175,0,0 +50413,12,772,497,133,5,5 +50414,13,772,497,133,5,5 +50415,14,772,498,133,20,20 +50416,12,772,497,440,0,0 +50417,13,772,497,440,0,0 +50418,14,773,498,137,25,25 +50419,12,124,497,447,0,0 +50420,13,124,497,447,0,0 +50421,14,124,498,447,0,0 +50422,15,184,499,152,5,5 +50423,16,184,499,152,5,5 +50424,15,184,499,155,5,5 +50425,16,184,499,155,5,5 +50426,15,184,499,158,5,5 +50427,16,184,499,158,5,5 +50428,15,189,499,175,0,0 +50429,16,189,499,175,0,0 +50430,15,766,499,21,20,20 +50431,16,766,499,21,20,20 +50432,15,767,499,133,5,5 +50433,16,767,499,133,5,5 +50434,15,235,499,213,15,15 +50435,16,235,499,213,15,15 +50436,15,250,499,147,15,15 +50437,16,250,499,147,15,15 +50438,15,240,499,236,10,10 +50439,16,240,499,236,10,10 +50440,15,189,499,179,0,0 +50441,16,189,499,179,0,0 +50442,15,189,499,194,0,0 +50443,16,189,499,194,0,0 +50444,15,189,499,218,0,0 +50445,16,189,499,218,0,0 +50446,15,285,499,1,5,5 +50447,16,285,499,1,5,5 +50448,15,285,499,4,5,5 +50449,16,285,499,4,5,5 +50450,15,285,499,7,5,5 +50451,16,285,499,7,5,5 +50452,15,765,499,252,5,5 +50453,16,765,499,252,5,5 +50454,15,765,499,255,5,5 +50455,16,765,499,255,5,5 +50456,15,765,499,258,5,5 +50457,16,765,499,258,5,5 +50458,17,774,500,495,5,5 +50459,18,774,500,495,5,5 +50460,17,774,500,498,5,5 +50461,18,774,500,498,5,5 +50462,17,774,500,501,5,5 +50463,18,774,500,501,5,5 +50464,17,579,500,511,10,10 +50465,18,579,500,511,10,10 +50466,17,579,500,513,10,10 +50467,18,579,500,513,10,10 +50468,17,579,500,515,10,10 +50469,18,579,500,515,10,10 +50470,17,656,500,570,10,10 +50471,18,656,500,570,10,10 +50472,17,585,500,564,25,25 +50473,18,585,500,564,25,25 +50474,17,585,500,566,25,25 +50475,18,585,500,566,25,25 +50476,17,653,500,636,0,0 +50477,18,653,500,636,0,0 +50478,17,593,500,138,25,25 +50479,18,593,500,138,25,25 +50480,17,593,500,140,25,25 +50481,18,593,500,140,25,25 +50482,17,593,500,142,25,25 +50483,18,593,500,142,25,25 +50484,17,593,500,345,25,25 +50485,18,593,500,345,25,25 +50486,17,593,500,347,25,25 +50487,18,593,500,347,25,25 +50488,17,593,500,408,25,25 +50489,18,593,500,408,25,25 +50490,17,593,500,410,25,25 +50491,18,593,500,410,25,25 +50492,17,622,500,129,5,5 +50493,18,622,500,129,5,5 +50494,21,657,501,495,5,5 +50495,22,657,501,495,5,5 +50496,21,657,501,498,5,5 +50497,22,657,501,498,5,5 +50498,21,657,501,501,5,5 +50499,22,657,501,501,5,5 +50500,21,577,501,570,25,25 +50501,22,577,501,570,25,25 +50502,21,629,501,585,30,30 +50503,22,629,501,585,30,30 +50504,21,656,501,133,10,10 +50505,22,656,501,133,10,10 +50506,21,775,501,138,25,25 +50507,22,775,501,138,25,25 +50508,21,775,501,140,25,25 +50509,22,775,501,140,25,25 +50510,21,775,501,142,25,25 +50511,22,775,501,142,25,25 +50512,21,775,501,345,25,25 +50513,22,775,501,345,25,25 +50514,21,775,501,347,25,25 +50515,22,775,501,347,25,25 +50516,21,775,501,408,25,25 +50517,22,775,501,408,25,25 +50518,21,775,501,410,25,25 +50519,22,775,501,410,25,25 +50520,21,775,501,564,25,25 +50521,22,775,501,564,25,25 +50522,21,775,501,566,25,25 +50523,22,775,501,566,25,25 +50524,21,622,501,129,5,5 +50525,22,622,501,129,5,5 +50526,21,776,501,440,0,0 +50527,22,776,501,440,0,0 +50528,21,776,501,564,25,25 +50529,22,776,501,564,25,25 +50530,21,776,501,566,25,25 +50531,22,776,501,566,25,25 +50532,21,593,501,138,25,25 +50533,22,593,501,138,25,25 +50534,21,593,501,140,25,25 +50535,22,593,501,140,25,25 +50536,21,593,501,142,25,25 +50537,22,593,501,142,25,25 +50538,21,593,501,345,25,25 +50539,22,593,501,345,25,25 +50540,21,593,501,347,25,25 +50541,22,593,501,347,25,25 +50542,21,593,501,408,25,25 +50543,22,593,501,408,25,25 +50544,21,593,501,410,25,25 +50545,22,593,501,410,25,25 +50546,22,777,501,147,1,1 +50547,21,777,501,443,1,1 +50548,23,778,491,650,5,5 +50549,24,778,491,650,5,5 +50550,23,778,491,653,5,5 +50551,24,778,491,653,5,5 +50552,23,778,491,656,5,5 +50553,24,778,491,656,5,5 +50554,23,779,491,1,10,10 +50555,24,779,491,1,10,10 +50556,23,779,491,4,10,10 +50557,24,779,491,4,10,10 +50558,23,779,491,7,10,10 +50559,24,779,491,7,10,10 +50560,23,736,491,696,20,20 +50561,24,736,491,696,20,20 +50562,23,736,491,698,20,20 +50563,24,736,491,698,20,20 +50564,23,780,491,448,32,32 +50565,24,780,491,448,32,32 +50566,23,723,491,131,30,30 +50567,24,723,491,131,30,30 +50568,25,393,502,252,5,5 +50569,26,393,502,252,5,5 +50570,25,393,502,255,5,5 +50571,26,393,502,255,5,5 +50572,25,393,502,258,5,5 +50573,26,393,502,258,5,5 +50574,25,781,502,25,20,20 +50575,26,781,502,25,20,20 +50576,25,768,502,360,0,0 +50577,26,768,502,360,0,0 +50578,25,782,502,381,30,30 +50579,26,782,502,380,30,30 +50580,25,769,502,351,30,30 +50581,26,769,502,351,30,30 +50582,25,393,502,152,5,5 +50583,26,393,502,152,5,5 +50584,25,393,502,155,5,5 +50585,26,393,502,155,5,5 +50586,25,393,502,158,5,5 +50587,26,393,502,158,5,5 +50588,25,768,502,175,0,0 +50589,26,768,502,175,0,0 +50590,25,393,502,495,5,5 +50591,26,393,502,495,5,5 +50592,25,393,502,498,5,5 +50593,26,393,502,498,5,5 +50594,25,393,502,501,5,5 +50595,26,393,502,501,5,5 +50596,25,770,502,374,1,1 +50597,26,770,502,374,1,1 +50598,25,141,502,387,5,5 +50599,26,141,502,387,5,5 +50600,25,141,502,390,5,5 +50601,26,141,502,390,5,5 +50602,25,141,502,393,5,5 +50603,26,141,502,393,5,5 +50604,25,783,502,323,40,40 +50605,26,783,502,323,40,40 +50606,25,783,502,319,40,40 +50607,26,783,502,319,40,40 diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv index c2dd8b1..02f28a3 100644 --- a/pokedex/data/csv/location_areas.csv +++ b/pokedex/data/csv/location_areas.csv @@ -650,3 +650,26 @@ id,location_id,game_index,identifier 758,676,0,unknown-area-348 759,677,0, 760,661,0, +761,231,0,museum-of-science +762,120,0,pokemon-center +763,234,0,fighting-dojo +764,67,0,celadon-mansion +765,234,0,silph-co-7f +766,229,0,north-gate +767,229,0, +768,569,0, +769,467,0,weather-center +770,432,0,stevens-house +771,567,0, +772,169,0, +773,170,0, +774,346,0, +775,535,0, +776,349,0, +777,536,0, +778,590,0, +779,599,0, +780,625,0, +781,200,0, +782,578,0, +783,691,0, From 618aa0064bb70b45231fd44d9fd072c8343aa42f Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Wed, 19 Sep 2018 13:25:05 -0400 Subject: [PATCH 10/21] gift-pokemon: separate gift-egg method This allows us to indicate eggs by the method, rather than by the level (which will now merely reflect the hatch level in that generation) --- pokedex/data/csv/encounter_methods.csv | 1 + scripts/add-gift-encounters.py | 201 +++++++++++++------------ 2 files changed, 106 insertions(+), 96 deletions(-) diff --git a/pokedex/data/csv/encounter_methods.csv b/pokedex/data/csv/encounter_methods.csv index 3aef65d..20debcd 100644 --- a/pokedex/data/csv/encounter_methods.csv +++ b/pokedex/data/csv/encounter_methods.csv @@ -17,3 +17,4 @@ id,identifier,order 16,red-flowers,8 17,rough-terrain,9 18,gift,18 +19,gift-egg,19 diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 6480432..73cec24 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -13,35 +13,35 @@ session = connect() def get_version(name): return session.query(Version).filter_by(identifier=identifier_from_name(name)).one() -def gift_data(): - R = get_version(u'red') - B = get_version(u'blue') - Y = 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') +R = get_version(u'red') +B = get_version(u'blue') +Y = 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') +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') +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') +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' ], @@ -65,14 +65,6 @@ def gift_data(): [ 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'togepi', [ G, S, C ], 0, u'violet-city' ], - [ u'pichu', [ C ], 0, u'johto-route-34' ], - [ u'cleffa', [ C ], 0, u'johto-route-34' ], - [ u'igglybuff', [ C ], 0, u'johto-route-34' ], - [ u'tyrogue', [ C ], 0, u'johto-route-34' ], - [ u'smoochum', [ C ], 0, u'johto-route-34' ], - [ u'elekid', [ C ], 0, u'johto-route-34' ], - [ u'magby', [ C ], 0, u'johto-route-34' ], [ u'spearow', [ G, S, C ], 10, u'goldenrod-city', u'north-gate' ], [ u'eevee', [ G, S, C ], 20, u'goldenrod-city' ], [ u'shuckle', [ G, S, C ], 15, u'cianwood-city' ], @@ -86,7 +78,6 @@ def gift_data(): [ 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'wynaut', [ RU, SA, EM ], 0, u'lavaridge-town' ], [ u'castform', [ RU, SA, EM ], 25, u'hoenn-route-119', u'weather-center' ], [ u'beldum', [ RU, SA, EM ], 5, u'mossdeep-city', u'stevens-house' ], [ u'chikorita', [ EM ], 5, u'littleroot-town' ], @@ -104,7 +95,6 @@ def gift_data(): [ 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' ], - [ u'togepi', [ FR, LG ], 0, u'water-labyrinth' ], # Gen IV [ u'turtwig', [ DI, PE ], 5, u'lake-verity', u'before-galactic-intervention' ], @@ -113,25 +103,18 @@ def gift_data(): [ 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'togepi', [ DI, PE, PT ], 0, u'eterna-city' ], [ u'eevee', [ DI, PE, ], 5, u'hearthome-city' ], [ u'eevee', [ PT ], 20, u'hearthome-city' ], - [ u'happiny', [ DI, PE, ], 0, u'hearthome-city' ], [ u'porygon', [ PT ], 25, u'veilstone-city' ], - [ u'riolu', [ DI, PE, PT ], 0, u'iron-island', u'b2f-left' ], [ 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'togepi', [ HG, SS ], 0, u'violet-city' ], [ u'spearow', [ HG, SS ], 20, u'goldenrod-city', u'north-gate' ], [ u'eevee', [ HG, SS ], 5, u'goldenrod-city' ], [ u'shuckle', [ HG, SS ], 15, u'cianwood-city' ], [ u'dratini', [ HG, SS ], 15, u'dragons-den' ], [ u'tyrogue', [ HG, SS ], 10, u'mt-mortar', u'b1f' ], - [ u'mareep', [ HG, SS ], 0, u'violet-city' ], - [ u'wooper', [ HG, SS ], 0, u'violet-city' ], - [ u'slugma', [ HG, SS ], 0, u'violet-city' ], [ u'bulbasaur', [ HG, SS ], 5, u'pallet-town' ], [ u'charmander', [ HG, SS ], 5, u'pallet-town' ], [ u'squirtle', [ HG, SS ], 5, u'pallet-town' ], @@ -149,7 +132,6 @@ def gift_data(): [ u'zorua', [ BL, WH ], 10, u'castelia-city' ], [ u'tirtouga', [ BL, WH ], 25, u'relic-castle', u'a' ], [ u'archen', [ BL, WH ], 25, u'relic-castle', u'a' ], - [ u'larvesta', [ BL, WH ], 0, u'unova-route-18' ], [ u'omanyte', [ BL, WH ], 25, u'twist-mountain' ], [ u'kabuto', [ BL, WH ], 25, u'twist-mountain' ], [ u'aerodactyl', [ BL, WH ], 25, u'twist-mountain' ], @@ -175,7 +157,6 @@ def gift_data(): [ 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'happiny', [ B2, W2 ], 0, u'nacrene-city' ], [ u'tirtouga', [ B2, W2 ], 25, u'nacrene-city' ], [ u'archen', [ B2, W2 ], 25, u'nacrene-city' ], [ u'omanyte', [ B2, W2 ], 25, u'twist-mountain' ], @@ -205,14 +186,12 @@ def gift_data(): [ u'torchic', [ OR, AS ], 5, u'hoenn-route-101' ], [ u'mudkip', [ OR, AS ], 5, u'hoenn-route-101' ], [ u'pikachu', [ OR, AS ], 20, u'contest-hall' ], # suprisingly, this location exists already - [ u'wynaut', [ OR, AS ], 0, u'lavaridge-town' ], [ 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-center' ], [ 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'togepi', [ OR, AS ], 0, u'lavaridge-town' ], [ 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' ], @@ -222,64 +201,94 @@ def gift_data(): [ u'piplup', [ OR, AS ], 5, u'sinnoh-route-201' ], [ 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' ], -gift_method = session.query(EncounterMethod).filter_by(identifier=u'gift').one() + [ u'wynaut', [ RU, SA, EM ], 5, u'lavaridge-town' ], + [ u'togepi', [ FR, LG ], 5, u'water-labyrinth' ], -for gift_data in gift_data(): - pokemon_name = identifier_from_name(gift_data[0]) - versions = gift_data[1] - level = identifier_from_name(str(gift_data[2])) - location_name = identifier_from_name(gift_data[3]) - area_name = None - if len(gift_data) > 4: - area_name = identifier_from_name(gift_data[4]) + [ u'togepi', [ DI, PE, PT ], 1, u'eterna-city' ], + [ u'happiny', [ DI, PE, ], 1, u'hearthome-city' ], + [ u'riolu', [ DI, PE, PT ], 1, u'iron-island', u'b2f-left' ], + [ u'togepi', [ HG, SS ], 1, u'violet-city' ], + [ u'mareep', [ HG, SS ], 1, u'violet-city' ], + [ u'wooper', [ HG, SS ], 1, u'violet-city' ], + [ u'slugma', [ HG, SS ], 1, u'violet-city' ], + [ u'larvesta', [ BL, WH ], 1, u'unova-route-18' ], + [ u'happiny', [ B2, W2 ], 1, u'nacrene-city' ], + [ u'wynaut', [ OR, AS ], 1, u'lavaridge-town' ], + [ u'togepi', [ OR, AS ], 1, u'lavaridge-town' ], + ] - 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 - ) - session.add(location_area) - session.commit() +def record_method_and_gifts(gift_method, gift_data): + 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]) - 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 - rarity = None, + 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 ) - session.add(encounter_slot) + session.add(location_area) 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) + 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() - session.commit() + 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 + rarity = None, + ) + 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()) From 5e8ec47256778c5dcc9a2762970cc1b328f87786 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 22 Sep 2018 13:20:51 -0400 Subject: [PATCH 11/21] gift-pokemon: Add new location_area_prose entries --- scripts/add-gift-encounters.py | 63 +++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 73cec24..670fbd4 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -5,8 +5,7 @@ reference. """ from pokedex.db import connect, identifier_from_name -from pokedex.db.tables import Encounter, EncounterSlot, LocationArea -from pokedex.db.tables import EncounterMethod, Location, Pokemon, Version +from pokedex.db.tables import Encounter, EncounterMethod, EncounterSlot, Language, Location, LocationArea, Pokemon, Version session = connect() @@ -52,22 +51,22 @@ def normal_gift_data(): [ u'charmander', [ Y ], 10, u'kanto-route-24' ], [ u'squirtle', [ Y ], 10, u'vermilion-city' ], - [ u'aerodactyl', [ R, B, Y ], 30, u'pewter-city', u'museum-of-science' ], - [ u'magikarp', [ R, B, Y ], 5, u'kanto-route-4', u'pokemon-center' ], + [ 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'hitmonchan', [ R, B, Y ], 30, u'saffron-city', u'fighting-dojo' ], - [ u'eevee', [ R, B, Y ], 25, u'celadon-city', u'celadon-mansion' ], - [ u'lapras', [ R, B, Y ], 15, u'saffron-city', u'silph-co-7f' ], + [ 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' ], # 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'eevee', [ G, S, C ], 20, u'goldenrod-city' ], - [ u'shuckle', [ G, S, C ], 15, u'cianwood-city' ], + [ 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' ], @@ -78,8 +77,8 @@ def normal_gift_data(): [ 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-center' ], - [ u'beldum', [ RU, SA, EM ], 5, u'mossdeep-city', u'stevens-house' ], + [ 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' ], @@ -111,8 +110,8 @@ def normal_gift_data(): [ 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'shuckle', [ HG, SS ], 15, u'cianwood-city' ], + [ 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' ], @@ -129,7 +128,7 @@ def normal_gift_data(): [ 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'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' ], @@ -145,7 +144,7 @@ def normal_gift_data(): [ 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'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' ], @@ -157,8 +156,8 @@ def normal_gift_data(): [ 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'archen', [ B2, W2 ], 25, u'nacrene-city' ], + [ 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' ], @@ -188,7 +187,7 @@ def normal_gift_data(): [ u'pikachu', [ OR, AS ], 20, u'contest-hall' ], # suprisingly, this location exists already [ 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-center' ], + [ 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' ], @@ -217,21 +216,24 @@ def egg_gift_data(): [ 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'happiny', [ DI, PE, ], 1, u'hearthome-city' ], + [ 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'mareep', [ HG, SS ], 1, u'violet-city' ], - [ u'wooper', [ HG, SS ], 1, u'violet-city' ], - [ u'slugma', [ HG, SS ], 1, u'violet-city' ], + [ 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'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] @@ -246,11 +248,18 @@ def record_method_and_gifts(gift_method, gift_data): 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() From 203b903999f95272667efc68edc5ecdf8376d3d5 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 22 Sep 2018 13:27:39 -0400 Subject: [PATCH 12/21] gift-pokemon: Add encounter_method_prose --- pokedex/data/csv/encounter_method_prose.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pokedex/data/csv/encounter_method_prose.csv b/pokedex/data/csv/encounter_method_prose.csv index ded0903..45a9949 100644 --- a/pokedex/data/csv/encounter_method_prose.csv +++ b/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 From 305d4f5d0e3b4a5034c21b989251577559d53b95 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 22 Sep 2018 21:34:23 -0400 Subject: [PATCH 13/21] gift-pokemon: Quoting on location_area_prose This change implies no functionality, but it was easiest to just make it - sqlite insists on quoting spaces, though it's not needed. Not rolling it back, since theoretically someone could run into the same thing again in the future. --- pokedex/data/csv/location_area_prose.csv | 290 +++++++++++------------ 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/pokedex/data/csv/location_area_prose.csv b/pokedex/data/csv/location_area_prose.csv index 41eec1c..c3bcc6b 100644 --- a/pokedex/data/csv/location_area_prose.csv +++ b/pokedex/data/csv/location_area_prose.csv @@ -9,7 +9,7 @@ location_area_id,local_language_id,name 8,9, 9,9, 10,9, -11,9,Route 207 +11,9,"Route 207" 12,9,2F 13,9,3F 14,9,snowfall @@ -19,39 +19,39 @@ location_area_id,local_language_id,name 18,9,6F 19,9,7F 20,9,cave -21,9,Route 216 -22,9,Route 211 +21,9,"Route 216" +22,9,"Route 211" 23,9,B1F -24,9,Area 1 -25,9,Area 2 -26,9,Area 3 -27,9,Area 4 -28,9,Area 5 -29,9,Area 6 +24,9,"Area 1" +25,9,"Area 2" +26,9,"Area 3" +27,9,"Area 4" +28,9,"Area 5" +29,9,"Area 6" 30,9,2F 31,9,1F -32,9,B1F a -33,9,B1F b -34,9,B1F c -35,9,B2F a -36,9,B2F b -37,9,B2F c -38,9,B3F a -39,9,B3F b -40,9,B3F c -41,9,B3F d -42,9,B3F e -43,9,B4F a -44,9,B4F b -45,9,B4F c -46,9,B4F d +32,9,"B1F a" +33,9,"B1F b" +34,9,"B1F c" +35,9,"B2F a" +36,9,"B2F b" +37,9,"B2F c" +38,9,"B3F a" +39,9,"B3F b" +40,9,"B3F c" +41,9,"B3F d" +42,9,"B3F e" +43,9,"B4F a" +44,9,"B4F b" +45,9,"B4F c" +46,9,"B4F d" 47,9,B5F 48,9,1F 49,9,2F 50,9,B1F -51,9,inside B1F +51,9,"inside B1F" 52,9,inside -53,9,inside exit +53,9,"inside exit" 54,9, 55,9,1F 56,9,B1F @@ -59,13 +59,13 @@ location_area_id,local_language_id,name 58,9,entrance 59,9,inside 60,9, -61,9,pillar 1 -62,9,pillar 2 -63,9,pillar 3 -64,9,before pillar 1 -70,9,between pillars 1 and 2 -76,9,between pillars 2 and 3 -82,9,after pillar 3 +61,9,"pillar 1" +62,9,"pillar 2" +63,9,"pillar 3" +64,9,"before pillar 1" +70,9,"between pillars 1 and 2" +76,9,"between pillars 2 and 3" +82,9,"after pillar 3" 107,9,1F 108,9,B1F 109,9,B2F @@ -74,28 +74,28 @@ location_area_id,local_language_id,name 112,9,B5F 113,9,1F 114,9,B1F -115,9,0–9 different Unown caught -116,9,10–25 different Unown caught -117,9,26+ different Unown caught +115,9,"0–9 different Unown caught" +116,9,"10–25 different Unown caught" +117,9,"26+ different Unown caught" 118,9, 119,9, 120,9,1F -121,9,B1F left -122,9,B1F right -123,9,B2F right -124,9,B2F left +121,9,"B1F left" +122,9,"B1F right" +123,9,"B2F right" +124,9,"B2F left" 125,9,B3F 126,9,entrance -127,9,dining room -128,9,2F private room +127,9,"dining room" +128,9,"2F private room" 129,9,2F -130,9,2F leftmost room -131,9,2F left room -132,9,2F middle room -133,9,2F right room -134,9,2F rightmost room -135,9,before Galactic intervention -136,9,after Galactic intervention +130,9,"2F leftmost room" +131,9,"2F left room" +132,9,"2F middle room" +133,9,"2F right room" +134,9,"2F rightmost room" +135,9,"before Galactic intervention" +136,9,"after Galactic intervention" 137,9, 138,9, 139,9, @@ -153,10 +153,10 @@ location_area_id,local_language_id,name 191,9,3F 192,9, 193,9,Outside -194,9,Interior A -195,9,Interior B -196,9,Interior C -197,9,Interior D +194,9,"Interior A" +195,9,"Interior B" +196,9,"Interior C" +197,9,"Interior D" 198,9,1F 199,9,B1F 200,9,B2F @@ -188,15 +188,15 @@ location_area_id,local_language_id,name 226,9, 227,9,1F 228,9,B1F -229,9,empty floor X +229,9,"empty floor X" 230,9,B2F -231,9,empty floor Y +231,9,"empty floor Y" 232,9,B3F 235,9, 236,9, 237,9,1F -238,9,Lower Cave -239,9,Upper Cave +238,9,"Lower Cave" +239,9,"Upper Cave" 240,9,B1F 241,9, 242,9, @@ -209,10 +209,10 @@ location_area_id,local_language_id,name 250,9, 251,9, 252,9, -253,9,Violet City entrance -254,9,Blackthorn City entrance +253,9,"Violet City entrance" +254,9,"Blackthorn City entrance" 255,9, -256,9,Mt. Moon Square +256,9,"Mt. Moon Square" 257,9, 258,9,1F 259,9,B1F @@ -220,10 +220,10 @@ location_area_id,local_language_id,name 261,9,B3F 262,9,B4F 263,9,2F -264,9,1F top +264,9,"1F top" 265,9,4F -266,9,cave gate -267,9,inside cave +266,9,"cave gate" +267,9,"inside cave" 268,9,10F 269,9,outside 270,9,1F @@ -303,7 +303,7 @@ location_area_id,local_language_id,name 346,9,"Area 1, east" 347,9,"Area 2, north" 348,9,"Area 3, west" -349,9,S.S. Anne dock +349,9,"S.S. Anne dock" 350,9, 351,9, 352,9, @@ -313,12 +313,12 @@ location_area_id,local_language_id,name 356,9, 357,9,back 358,9,B1F -359,9,back/small room +359,9,"back/small room" 360,9, 361,9,1F 362,9,B1F 363,9,B2F -364,9,1F/small Room +364,9,"1F/small Room" 365,9, 366,9, 367,9, @@ -383,14 +383,14 @@ location_area_id,local_language_id,name 426,9, 427,9, 428,9, -429,9,NW/mach bike area -430,9,NE/acro bike area +429,9,"NW/mach bike area" +430,9,"NE/acro bike area" 431,9,SW 432,9,SE 433,9, 434,9, -435,9,expansion south -436,9,expansion north +435,9,"expansion south" +436,9,"expansion north" 437,9, 438,9, 439,9, @@ -425,17 +425,17 @@ location_area_id,local_language_id,name 498,9,B1F 499,9,waterfall 500,9, -501,9,room 1 -502,9,room 2 -503,9,room 3 -504,9,room 4 -505,9,room 5 -506,9,room 6 -507,9,room 7 -508,9,room 8 -509,9,room 9 -510,9,room 10 -511,9,item rooms +501,9,"room 1" +502,9,"room 2" +503,9,"room 3" +504,9,"room 4" +505,9,"room 5" +506,9,"room 6" +507,9,"room 7" +508,9,"room 8" +509,9,"room 9" +510,9,"room 10" +511,9,"item rooms" 512,9, 513,9, 514,9, @@ -488,25 +488,25 @@ location_area_id,local_language_id,name 596,9,1F 597,9,2F 598,9,outside -599,9,Unknown Area 53 -600,9,Unknown Area 54 -601,9,Unknown Area 55 -602,9,Unknown Area 56 -603,9,Unknown Area 57 -604,9,Unknown Area 58 -605,9,Unknown Area 59 -606,9,Unknown Area 60 -607,9,Unknown Area 61 -608,9,Unknown Area 62 -609,9,Unknown Area 63 -610,9,Unknown Area 64 -611,9,Unknown Area 65 -612,9,Unknown Area 66 +599,9,"Unknown Area 53" +600,9,"Unknown Area 54" +601,9,"Unknown Area 55" +602,9,"Unknown Area 56" +603,9,"Unknown Area 57" +604,9,"Unknown Area 58" +605,9,"Unknown Area 59" +606,9,"Unknown Area 60" +607,9,"Unknown Area 61" +608,9,"Unknown Area 62" +609,9,"Unknown Area 63" +610,9,"Unknown Area 64" +611,9,"Unknown Area 65" +612,9,"Unknown Area 66" 613,9, 614,9,outside 615,9, 616,9,forest -617,9,forest cave +617,9,"forest cave" 618,9, 619,9, 620,9, @@ -533,7 +533,7 @@ location_area_id,local_language_id,name 641,9,B1F 642,9,B2F 643,9, -644,9,Victory Road gate +644,9,"Victory Road gate" 645,9, 646,9, 647,9, @@ -550,40 +550,40 @@ location_area_id,local_language_id,name 658,9, 659,9, 660,9,7F -661,9,unknown area 71 -662,9,unknown area 72 -663,9,unknown area 73 -664,9,unknown area 74 -665,9,unknown area 75 -666,9,unknown area 76 -667,9,unknown area 77 -668,9,unknown area 78 -669,9,unknown area 79 -670,9,unknown area 80 +661,9,"unknown area 71" +662,9,"unknown area 72" +663,9,"unknown area 73" +664,9,"unknown area 74" +665,9,"unknown area 75" +666,9,"unknown area 76" +667,9,"unknown area 77" +668,9,"unknown area 78" +669,9,"unknown area 79" +670,9,"unknown area 80" 671,9, -672,9,unknown area 38 +672,9,"unknown area 38" 673,9,outer 674,9,inner 675,9,outer 676,9,inner -677,9,unknown area 48 -678,9,unknown area 49 -679,9,unknown area 50 -680,9,unknown area 51 -681,9,unknown area 52 -682,9,unknown area 53 -683,9,unknown area 54 -684,9,unknown area 55 -685,9,unknown area 56 -686,9,unknown area 57 -687,9,unknown area 58 -688,9,unknown area 59 -689,9,unknown area 60 +677,9,"unknown area 48" +678,9,"unknown area 49" +679,9,"unknown area 50" +680,9,"unknown area 51" +681,9,"unknown area 52" +682,9,"unknown area 53" +683,9,"unknown area 54" +684,9,"unknown area 55" +685,9,"unknown area 56" +686,9,"unknown area 57" +687,9,"unknown area 58" +688,9,"unknown area 59" +689,9,"unknown area 60" 690,9,1F 691,9,B1F -692,9,Castelia Sewers entrance -693,9,Relic Castle entrance -694,9,PWT entrance +692,9,"Castelia Sewers entrance" +693,9,"Relic Castle entrance" +694,9,"PWT entrance" 695,9, 696,9, 697,9, @@ -597,24 +597,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 +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" From 10db4d9d23f61a6699afc697408de07703fdae77 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 22 Sep 2018 21:45:34 -0400 Subject: [PATCH 14/21] gift-pokemon: Rerun with changes Using the following steps: * Unroll the previous commit with bulk CSV changes (b7500e92f081cc8092fb4f1bc9d16bd2156bc30a) * remove and re-initialize the database * follow the steps in that commit * Only select location_area_prose in English (there's a bunch of czech translations tracked separately in pokedex/data/csv/translations/cs.csv) --- pokedex/data/csv/encounter_slots.csv | 11 ++++ pokedex/data/csv/encounters.csv | 66 ++++++++++++++++++++++++ pokedex/data/csv/location_area_prose.csv | 13 +++++ pokedex/data/csv/location_areas.csv | 13 +++++ 4 files changed, 103 insertions(+) diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv index 3e17c6f..9534534 100644 --- a/pokedex/data/csv/encounter_slots.csv +++ b/pokedex/data/csv/encounter_slots.csv @@ -501,3 +501,14 @@ id,version_group_id,encounter_method_id,slot,rarity 500,11,18,, 501,14,18,, 502,16,18,, +503,3,19,, +504,4,19,, +505,5,19,, +506,6,19,, +507,7,19,, +508,8,19,, +509,9,19,, +510,10,19,, +511,11,19,, +512,14,19,, +513,16,19,, diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index 81969bf..e02a6c5 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46895,3 +46895,69 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50605,26,783,502,323,40,40 50606,25,783,502,319,40,40 50607,26,783,502,319,40,40 +50608,4,784,492,133,20,20 +50609,5,784,492,133,20,20 +50610,6,784,493,133,20,20 +50611,4,785,492,213,15,15 +50612,5,785,492,213,15,15 +50613,6,785,493,213,15,15 +50614,7,786,494,351,25,25 +50615,8,786,494,351,25,25 +50616,9,786,495,351,25,25 +50617,15,784,499,133,5,5 +50618,16,784,499,133,5,5 +50619,15,787,499,213,15,15 +50620,16,787,499,213,15,15 +50621,17,788,500,570,10,10 +50622,18,788,500,570,10,10 +50623,21,789,501,585,30,30 +50624,22,789,501,585,30,30 +50625,21,790,501,564,25,25 +50626,22,790,501,564,25,25 +50627,21,790,501,566,25,25 +50628,22,790,501,566,25,25 +50629,25,786,502,351,30,30 +50630,26,786,502,351,30,30 +50631,25,791,502,323,40,40 +50632,26,791,502,323,40,40 +50633,25,791,502,319,40,40 +50634,26,791,502,319,40,40 +50635,4,189,503,175,5,5 +50636,5,189,503,175,5,5 +50637,6,189,504,175,5,5 +50638,6,205,504,172,5,5 +50639,6,205,504,173,5,5 +50640,6,205,504,174,5,5 +50641,6,205,504,236,5,5 +50642,6,205,504,238,5,5 +50643,6,205,504,239,5,5 +50644,6,205,504,240,5,5 +50645,7,768,505,360,5,5 +50646,8,768,505,360,5,5 +50647,9,768,506,360,5,5 +50648,10,518,507,175,5,5 +50649,11,518,507,175,5,5 +50650,12,792,508,175,1,1 +50651,13,792,508,175,1,1 +50652,14,792,509,175,1,1 +50653,12,793,508,440,1,1 +50654,13,793,508,440,1,1 +50655,12,124,508,447,1,1 +50656,13,124,508,447,1,1 +50657,14,124,509,447,1,1 +50658,15,794,510,175,1,1 +50659,16,794,510,175,1,1 +50660,15,795,510,179,1,1 +50661,16,795,510,179,1,1 +50662,15,795,510,194,1,1 +50663,16,795,510,194,1,1 +50664,15,795,510,218,1,1 +50665,16,795,510,218,1,1 +50666,17,653,511,636,1,1 +50667,18,653,511,636,1,1 +50668,21,796,512,440,1,1 +50669,22,796,512,440,1,1 +50670,25,768,513,360,1,1 +50671,26,768,513,360,1,1 +50672,25,768,513,175,1,1 +50673,26,768,513,175,1,1 diff --git a/pokedex/data/csv/location_area_prose.csv b/pokedex/data/csv/location_area_prose.csv index c3bcc6b..ef50f06 100644 --- a/pokedex/data/csv/location_area_prose.csv +++ b/pokedex/data/csv/location_area_prose.csv @@ -618,3 +618,16 @@ location_area_id,local_language_id,name 756,9,"Unknown Area 345" 757,9,"Unknown Area 347" 758,9,"Unknown Area 348" +784,9,"Bill's house" +785,9,"Mania's house" +786,9,"Weather Institute" +787,9,"Kirk's house" +788,9,"Game Freak HQ 1F" +789,9,"Weather Institute" +790,9,"Nacrene City Museum" +791,9, +792,9,"West Gate" +793,9,"West Gate" +794,9,"Poke Mart" +795,9,"Pokemon Center" +796,9,"West Gate" diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv index 02f28a3..3943841 100644 --- a/pokedex/data/csv/location_areas.csv +++ b/pokedex/data/csv/location_areas.csv @@ -673,3 +673,16 @@ id,location_id,game_index,identifier 781,200,0, 782,578,0, 783,691,0, +784,229,0,bills-house +785,70,0,manias-house +786,467,0,weather-institute +787,70,0,kirks-house +788,350,0,game-freak-hq-1f +789,361,0,weather-institute +790,349,0,museum +791,695,0, +792,2,0,west-gate +793,169,0,west-gate +794,153,0,poke-mart +795,153,0,pokemon-center +796,349,0,west-gate From 4155bc445953472d673fa1533291d57929405325 Mon Sep 17 00:00:00 2001 From: Jonathan Rubin Date: Sat, 6 Oct 2018 14:34:15 -0400 Subject: [PATCH 15/21] gift pokemon CSV updates - 3rd time is the charm use `pokedex dump` to apply CSV changes --- pokedex/data/csv/encounters.csv | 616 ++++++++++------------- pokedex/data/csv/location_area_prose.csv | 335 ++++++------ pokedex/data/csv/location_areas.csv | 48 +- 3 files changed, 474 insertions(+), 525 deletions(-) diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index e02a6c5..a405df0 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46620,344 +46620,278 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50330,4,184,492,158,5,5 50331,5,184,492,158,5,5 50332,6,184,493,158,5,5 -50333,4,189,492,175,0,0 -50334,5,189,492,175,0,0 -50335,6,189,493,175,0,0 -50336,6,205,493,172,0,0 -50337,6,205,493,173,0,0 -50338,6,205,493,174,0,0 -50339,6,205,493,236,0,0 -50340,6,205,493,238,0,0 -50341,6,205,493,239,0,0 -50342,6,205,493,240,0,0 -50343,4,766,492,21,10,10 -50344,5,766,492,21,10,10 -50345,6,766,493,21,10,10 -50346,4,767,492,133,20,20 -50347,5,767,492,133,20,20 -50348,6,767,493,133,20,20 -50349,4,235,492,213,15,15 -50350,5,235,492,213,15,15 -50351,6,235,493,213,15,15 -50352,6,250,493,147,15,15 -50353,4,240,492,236,10,10 -50354,5,240,492,236,10,10 -50355,6,240,493,236,10,10 -50356,7,393,494,252,5,5 -50357,8,393,494,252,5,5 -50358,9,393,495,252,5,5 -50359,7,393,494,255,5,5 -50360,8,393,494,255,5,5 -50361,9,393,495,255,5,5 -50362,7,393,494,258,5,5 -50363,8,393,494,258,5,5 -50364,9,393,495,258,5,5 -50365,7,768,494,360,0,0 -50366,8,768,494,360,0,0 -50367,9,768,495,360,0,0 -50368,7,769,494,351,25,25 -50369,8,769,494,351,25,25 -50370,9,769,495,351,25,25 -50371,7,770,494,374,5,5 -50372,8,770,494,374,5,5 -50373,9,770,495,374,5,5 -50374,9,771,495,152,5,5 -50375,9,771,495,155,5,5 -50376,9,771,495,158,5,5 -50377,10,285,496,1,5,5 -50378,11,285,496,1,5,5 -50379,10,285,496,4,5,5 -50380,11,285,496,4,5,5 -50381,10,285,496,7,5,5 -50382,11,285,496,7,5,5 -50383,10,761,496,142,5,5 -50384,11,761,496,142,5,5 -50385,10,762,496,129,5,5 -50386,11,762,496,129,5,5 -50387,10,327,496,138,5,5 -50388,11,327,496,138,5,5 -50389,10,327,496,140,5,5 -50390,11,327,496,140,5,5 -50391,10,763,496,106,25,25 -50392,11,763,496,106,25,25 -50393,10,763,496,107,25,25 -50394,11,763,496,107,25,25 -50395,10,764,496,133,25,25 -50396,11,764,496,133,25,25 -50397,10,765,496,131,25,25 -50398,11,765,496,131,25,25 -50399,10,518,496,175,0,0 -50400,11,518,496,175,0,0 -50401,12,135,497,387,5,5 -50402,13,135,497,387,5,5 -50403,12,135,497,390,5,5 -50404,13,135,497,390,5,5 -50405,12,135,497,393,5,5 -50406,13,135,497,393,5,5 -50407,14,141,498,387,5,5 -50408,14,141,498,390,5,5 -50409,14,141,498,393,5,5 -50410,12,2,497,175,0,0 -50411,13,2,497,175,0,0 -50412,14,2,498,175,0,0 -50413,12,772,497,133,5,5 -50414,13,772,497,133,5,5 -50415,14,772,498,133,20,20 -50416,12,772,497,440,0,0 -50417,13,772,497,440,0,0 -50418,14,773,498,137,25,25 -50419,12,124,497,447,0,0 -50420,13,124,497,447,0,0 -50421,14,124,498,447,0,0 -50422,15,184,499,152,5,5 -50423,16,184,499,152,5,5 -50424,15,184,499,155,5,5 -50425,16,184,499,155,5,5 -50426,15,184,499,158,5,5 -50427,16,184,499,158,5,5 -50428,15,189,499,175,0,0 -50429,16,189,499,175,0,0 -50430,15,766,499,21,20,20 -50431,16,766,499,21,20,20 -50432,15,767,499,133,5,5 -50433,16,767,499,133,5,5 -50434,15,235,499,213,15,15 -50435,16,235,499,213,15,15 -50436,15,250,499,147,15,15 -50437,16,250,499,147,15,15 -50438,15,240,499,236,10,10 -50439,16,240,499,236,10,10 -50440,15,189,499,179,0,0 -50441,16,189,499,179,0,0 -50442,15,189,499,194,0,0 -50443,16,189,499,194,0,0 -50444,15,189,499,218,0,0 -50445,16,189,499,218,0,0 -50446,15,285,499,1,5,5 -50447,16,285,499,1,5,5 -50448,15,285,499,4,5,5 -50449,16,285,499,4,5,5 -50450,15,285,499,7,5,5 -50451,16,285,499,7,5,5 -50452,15,765,499,252,5,5 -50453,16,765,499,252,5,5 -50454,15,765,499,255,5,5 -50455,16,765,499,255,5,5 -50456,15,765,499,258,5,5 -50457,16,765,499,258,5,5 -50458,17,774,500,495,5,5 -50459,18,774,500,495,5,5 -50460,17,774,500,498,5,5 -50461,18,774,500,498,5,5 -50462,17,774,500,501,5,5 -50463,18,774,500,501,5,5 -50464,17,579,500,511,10,10 -50465,18,579,500,511,10,10 -50466,17,579,500,513,10,10 -50467,18,579,500,513,10,10 -50468,17,579,500,515,10,10 -50469,18,579,500,515,10,10 -50470,17,656,500,570,10,10 -50471,18,656,500,570,10,10 -50472,17,585,500,564,25,25 -50473,18,585,500,564,25,25 -50474,17,585,500,566,25,25 -50475,18,585,500,566,25,25 -50476,17,653,500,636,0,0 -50477,18,653,500,636,0,0 -50478,17,593,500,138,25,25 -50479,18,593,500,138,25,25 -50480,17,593,500,140,25,25 -50481,18,593,500,140,25,25 -50482,17,593,500,142,25,25 -50483,18,593,500,142,25,25 -50484,17,593,500,345,25,25 -50485,18,593,500,345,25,25 -50486,17,593,500,347,25,25 -50487,18,593,500,347,25,25 -50488,17,593,500,408,25,25 -50489,18,593,500,408,25,25 -50490,17,593,500,410,25,25 -50491,18,593,500,410,25,25 -50492,17,622,500,129,5,5 -50493,18,622,500,129,5,5 -50494,21,657,501,495,5,5 -50495,22,657,501,495,5,5 -50496,21,657,501,498,5,5 -50497,22,657,501,498,5,5 -50498,21,657,501,501,5,5 -50499,22,657,501,501,5,5 -50500,21,577,501,570,25,25 -50501,22,577,501,570,25,25 -50502,21,629,501,585,30,30 -50503,22,629,501,585,30,30 -50504,21,656,501,133,10,10 -50505,22,656,501,133,10,10 -50506,21,775,501,138,25,25 -50507,22,775,501,138,25,25 -50508,21,775,501,140,25,25 -50509,22,775,501,140,25,25 -50510,21,775,501,142,25,25 -50511,22,775,501,142,25,25 -50512,21,775,501,345,25,25 -50513,22,775,501,345,25,25 -50514,21,775,501,347,25,25 -50515,22,775,501,347,25,25 -50516,21,775,501,408,25,25 -50517,22,775,501,408,25,25 -50518,21,775,501,410,25,25 -50519,22,775,501,410,25,25 -50520,21,775,501,564,25,25 -50521,22,775,501,564,25,25 -50522,21,775,501,566,25,25 -50523,22,775,501,566,25,25 -50524,21,622,501,129,5,5 -50525,22,622,501,129,5,5 -50526,21,776,501,440,0,0 -50527,22,776,501,440,0,0 -50528,21,776,501,564,25,25 -50529,22,776,501,564,25,25 -50530,21,776,501,566,25,25 -50531,22,776,501,566,25,25 -50532,21,593,501,138,25,25 -50533,22,593,501,138,25,25 -50534,21,593,501,140,25,25 -50535,22,593,501,140,25,25 -50536,21,593,501,142,25,25 -50537,22,593,501,142,25,25 -50538,21,593,501,345,25,25 -50539,22,593,501,345,25,25 -50540,21,593,501,347,25,25 -50541,22,593,501,347,25,25 -50542,21,593,501,408,25,25 -50543,22,593,501,408,25,25 -50544,21,593,501,410,25,25 -50545,22,593,501,410,25,25 -50546,22,777,501,147,1,1 -50547,21,777,501,443,1,1 -50548,23,778,491,650,5,5 -50549,24,778,491,650,5,5 -50550,23,778,491,653,5,5 -50551,24,778,491,653,5,5 -50552,23,778,491,656,5,5 -50553,24,778,491,656,5,5 -50554,23,779,491,1,10,10 -50555,24,779,491,1,10,10 -50556,23,779,491,4,10,10 -50557,24,779,491,4,10,10 -50558,23,779,491,7,10,10 -50559,24,779,491,7,10,10 -50560,23,736,491,696,20,20 -50561,24,736,491,696,20,20 -50562,23,736,491,698,20,20 -50563,24,736,491,698,20,20 -50564,23,780,491,448,32,32 -50565,24,780,491,448,32,32 -50566,23,723,491,131,30,30 -50567,24,723,491,131,30,30 -50568,25,393,502,252,5,5 -50569,26,393,502,252,5,5 -50570,25,393,502,255,5,5 -50571,26,393,502,255,5,5 -50572,25,393,502,258,5,5 -50573,26,393,502,258,5,5 -50574,25,781,502,25,20,20 -50575,26,781,502,25,20,20 -50576,25,768,502,360,0,0 -50577,26,768,502,360,0,0 -50578,25,782,502,381,30,30 -50579,26,782,502,380,30,30 -50580,25,769,502,351,30,30 -50581,26,769,502,351,30,30 -50582,25,393,502,152,5,5 -50583,26,393,502,152,5,5 -50584,25,393,502,155,5,5 -50585,26,393,502,155,5,5 -50586,25,393,502,158,5,5 -50587,26,393,502,158,5,5 -50588,25,768,502,175,0,0 -50589,26,768,502,175,0,0 -50590,25,393,502,495,5,5 -50591,26,393,502,495,5,5 -50592,25,393,502,498,5,5 -50593,26,393,502,498,5,5 -50594,25,393,502,501,5,5 -50595,26,393,502,501,5,5 -50596,25,770,502,374,1,1 -50597,26,770,502,374,1,1 -50598,25,141,502,387,5,5 -50599,26,141,502,387,5,5 -50600,25,141,502,390,5,5 -50601,26,141,502,390,5,5 -50602,25,141,502,393,5,5 -50603,26,141,502,393,5,5 -50604,25,783,502,323,40,40 -50605,26,783,502,323,40,40 -50606,25,783,502,319,40,40 -50607,26,783,502,319,40,40 -50608,4,784,492,133,20,20 -50609,5,784,492,133,20,20 -50610,6,784,493,133,20,20 -50611,4,785,492,213,15,15 -50612,5,785,492,213,15,15 -50613,6,785,493,213,15,15 -50614,7,786,494,351,25,25 -50615,8,786,494,351,25,25 -50616,9,786,495,351,25,25 -50617,15,784,499,133,5,5 -50618,16,784,499,133,5,5 -50619,15,787,499,213,15,15 -50620,16,787,499,213,15,15 -50621,17,788,500,570,10,10 -50622,18,788,500,570,10,10 -50623,21,789,501,585,30,30 -50624,22,789,501,585,30,30 -50625,21,790,501,564,25,25 -50626,22,790,501,564,25,25 -50627,21,790,501,566,25,25 -50628,22,790,501,566,25,25 -50629,25,786,502,351,30,30 -50630,26,786,502,351,30,30 -50631,25,791,502,323,40,40 -50632,26,791,502,323,40,40 -50633,25,791,502,319,40,40 -50634,26,791,502,319,40,40 -50635,4,189,503,175,5,5 -50636,5,189,503,175,5,5 -50637,6,189,504,175,5,5 -50638,6,205,504,172,5,5 -50639,6,205,504,173,5,5 -50640,6,205,504,174,5,5 -50641,6,205,504,236,5,5 -50642,6,205,504,238,5,5 -50643,6,205,504,239,5,5 -50644,6,205,504,240,5,5 -50645,7,768,505,360,5,5 -50646,8,768,505,360,5,5 -50647,9,768,506,360,5,5 -50648,10,518,507,175,5,5 -50649,11,518,507,175,5,5 -50650,12,792,508,175,1,1 -50651,13,792,508,175,1,1 -50652,14,792,509,175,1,1 -50653,12,793,508,440,1,1 -50654,13,793,508,440,1,1 -50655,12,124,508,447,1,1 -50656,13,124,508,447,1,1 -50657,14,124,509,447,1,1 -50658,15,794,510,175,1,1 -50659,16,794,510,175,1,1 -50660,15,795,510,179,1,1 -50661,16,795,510,179,1,1 -50662,15,795,510,194,1,1 -50663,16,795,510,194,1,1 -50664,15,795,510,218,1,1 -50665,16,795,510,218,1,1 -50666,17,653,511,636,1,1 -50667,18,653,511,636,1,1 -50668,21,796,512,440,1,1 -50669,22,796,512,440,1,1 -50670,25,768,513,360,1,1 -50671,26,768,513,360,1,1 -50672,25,768,513,175,1,1 -50673,26,768,513,175,1,1 +50333,4,766,492,21,10,10 +50334,5,766,492,21,10,10 +50335,6,766,493,21,10,10 +50336,4,767,492,133,20,20 +50337,5,767,492,133,20,20 +50338,6,767,493,133,20,20 +50339,4,768,492,213,15,15 +50340,5,768,492,213,15,15 +50341,6,768,493,213,15,15 +50342,6,250,493,147,15,15 +50343,4,240,492,236,10,10 +50344,5,240,492,236,10,10 +50345,6,240,493,236,10,10 +50346,7,393,494,252,5,5 +50347,8,393,494,252,5,5 +50348,9,393,495,252,5,5 +50349,7,393,494,255,5,5 +50350,8,393,494,255,5,5 +50351,9,393,495,255,5,5 +50352,7,393,494,258,5,5 +50353,8,393,494,258,5,5 +50354,9,393,495,258,5,5 +50355,7,769,494,351,25,25 +50356,8,769,494,351,25,25 +50357,9,769,495,351,25,25 +50358,7,770,494,374,5,5 +50359,8,770,494,374,5,5 +50360,9,770,495,374,5,5 +50361,9,771,495,152,5,5 +50362,9,771,495,155,5,5 +50363,9,771,495,158,5,5 +50364,10,285,496,1,5,5 +50365,11,285,496,1,5,5 +50366,10,285,496,4,5,5 +50367,11,285,496,4,5,5 +50368,10,285,496,7,5,5 +50369,11,285,496,7,5,5 +50370,10,761,496,142,5,5 +50371,11,761,496,142,5,5 +50372,10,762,496,129,5,5 +50373,11,762,496,129,5,5 +50374,10,327,496,138,5,5 +50375,11,327,496,138,5,5 +50376,10,327,496,140,5,5 +50377,11,327,496,140,5,5 +50378,10,763,496,106,25,25 +50379,11,763,496,106,25,25 +50380,10,763,496,107,25,25 +50381,11,763,496,107,25,25 +50382,10,764,496,133,25,25 +50383,11,764,496,133,25,25 +50384,10,765,496,131,25,25 +50385,11,765,496,131,25,25 +50386,12,135,497,387,5,5 +50387,13,135,497,387,5,5 +50388,12,135,497,390,5,5 +50389,13,135,497,390,5,5 +50390,12,135,497,393,5,5 +50391,13,135,497,393,5,5 +50392,14,141,498,387,5,5 +50393,14,141,498,390,5,5 +50394,14,141,498,393,5,5 +50395,12,772,497,133,5,5 +50396,13,772,497,133,5,5 +50397,14,772,498,133,20,20 +50398,14,773,498,137,25,25 +50399,15,184,499,152,5,5 +50400,16,184,499,152,5,5 +50401,15,184,499,155,5,5 +50402,16,184,499,155,5,5 +50403,15,184,499,158,5,5 +50404,16,184,499,158,5,5 +50405,15,766,499,21,20,20 +50406,16,766,499,21,20,20 +50407,15,767,499,133,5,5 +50408,16,767,499,133,5,5 +50409,15,774,499,213,15,15 +50410,16,774,499,213,15,15 +50411,15,250,499,147,15,15 +50412,16,250,499,147,15,15 +50413,15,240,499,236,10,10 +50414,16,240,499,236,10,10 +50415,15,285,499,1,5,5 +50416,16,285,499,1,5,5 +50417,15,285,499,4,5,5 +50418,16,285,499,4,5,5 +50419,15,285,499,7,5,5 +50420,16,285,499,7,5,5 +50421,15,765,499,252,5,5 +50422,16,765,499,252,5,5 +50423,15,765,499,255,5,5 +50424,16,765,499,255,5,5 +50425,15,765,499,258,5,5 +50426,16,765,499,258,5,5 +50427,17,775,500,495,5,5 +50428,18,775,500,495,5,5 +50429,17,775,500,498,5,5 +50430,18,775,500,498,5,5 +50431,17,775,500,501,5,5 +50432,18,775,500,501,5,5 +50433,17,579,500,511,10,10 +50434,18,579,500,511,10,10 +50435,17,579,500,513,10,10 +50436,18,579,500,513,10,10 +50437,17,579,500,515,10,10 +50438,18,579,500,515,10,10 +50439,17,776,500,570,10,10 +50440,18,776,500,570,10,10 +50441,17,585,500,564,25,25 +50442,18,585,500,564,25,25 +50443,17,585,500,566,25,25 +50444,18,585,500,566,25,25 +50445,17,593,500,138,25,25 +50446,18,593,500,138,25,25 +50447,17,593,500,140,25,25 +50448,18,593,500,140,25,25 +50449,17,593,500,142,25,25 +50450,18,593,500,142,25,25 +50451,17,593,500,345,25,25 +50452,18,593,500,345,25,25 +50453,17,593,500,347,25,25 +50454,18,593,500,347,25,25 +50455,17,593,500,408,25,25 +50456,18,593,500,408,25,25 +50457,17,593,500,410,25,25 +50458,18,593,500,410,25,25 +50459,17,622,500,129,5,5 +50460,18,622,500,129,5,5 +50461,21,657,501,495,5,5 +50462,22,657,501,495,5,5 +50463,21,657,501,498,5,5 +50464,22,657,501,498,5,5 +50465,21,657,501,501,5,5 +50466,22,657,501,501,5,5 +50467,21,577,501,570,25,25 +50468,22,577,501,570,25,25 +50469,21,777,501,585,30,30 +50470,22,777,501,585,30,30 +50471,21,656,501,133,10,10 +50472,22,656,501,133,10,10 +50473,21,778,501,138,25,25 +50474,22,778,501,138,25,25 +50475,21,778,501,140,25,25 +50476,22,778,501,140,25,25 +50477,21,778,501,142,25,25 +50478,22,778,501,142,25,25 +50479,21,778,501,345,25,25 +50480,22,778,501,345,25,25 +50481,21,778,501,347,25,25 +50482,22,778,501,347,25,25 +50483,21,778,501,408,25,25 +50484,22,778,501,408,25,25 +50485,21,778,501,410,25,25 +50486,22,778,501,410,25,25 +50487,21,778,501,564,25,25 +50488,22,778,501,564,25,25 +50489,21,778,501,566,25,25 +50490,22,778,501,566,25,25 +50491,21,622,501,129,5,5 +50492,22,622,501,129,5,5 +50493,21,779,501,564,25,25 +50494,22,779,501,564,25,25 +50495,21,779,501,566,25,25 +50496,22,779,501,566,25,25 +50497,21,593,501,138,25,25 +50498,22,593,501,138,25,25 +50499,21,593,501,140,25,25 +50500,22,593,501,140,25,25 +50501,21,593,501,142,25,25 +50502,22,593,501,142,25,25 +50503,21,593,501,345,25,25 +50504,22,593,501,345,25,25 +50505,21,593,501,347,25,25 +50506,22,593,501,347,25,25 +50507,21,593,501,408,25,25 +50508,22,593,501,408,25,25 +50509,21,593,501,410,25,25 +50510,22,593,501,410,25,25 +50511,22,780,501,147,1,1 +50512,21,780,501,443,1,1 +50513,23,781,491,650,5,5 +50514,24,781,491,650,5,5 +50515,23,781,491,653,5,5 +50516,24,781,491,653,5,5 +50517,23,781,491,656,5,5 +50518,24,781,491,656,5,5 +50519,23,782,491,1,10,10 +50520,24,782,491,1,10,10 +50521,23,782,491,4,10,10 +50522,24,782,491,4,10,10 +50523,23,782,491,7,10,10 +50524,24,782,491,7,10,10 +50525,23,736,491,696,20,20 +50526,24,736,491,696,20,20 +50527,23,736,491,698,20,20 +50528,24,736,491,698,20,20 +50529,23,783,491,448,32,32 +50530,24,783,491,448,32,32 +50531,23,723,491,131,30,30 +50532,24,723,491,131,30,30 +50533,25,393,502,252,5,5 +50534,26,393,502,252,5,5 +50535,25,393,502,255,5,5 +50536,26,393,502,255,5,5 +50537,25,393,502,258,5,5 +50538,26,393,502,258,5,5 +50539,25,784,502,25,20,20 +50540,26,784,502,25,20,20 +50541,25,785,502,381,30,30 +50542,26,785,502,380,30,30 +50543,25,769,502,351,30,30 +50544,26,769,502,351,30,30 +50545,25,393,502,152,5,5 +50546,26,393,502,152,5,5 +50547,25,393,502,155,5,5 +50548,26,393,502,155,5,5 +50549,25,393,502,158,5,5 +50550,26,393,502,158,5,5 +50551,25,393,502,495,5,5 +50552,26,393,502,495,5,5 +50553,25,393,502,498,5,5 +50554,26,393,502,498,5,5 +50555,25,393,502,501,5,5 +50556,26,393,502,501,5,5 +50557,25,770,502,374,1,1 +50558,26,770,502,374,1,1 +50559,25,141,502,387,5,5 +50560,26,141,502,387,5,5 +50561,25,141,502,390,5,5 +50562,26,141,502,390,5,5 +50563,25,141,502,393,5,5 +50564,26,141,502,393,5,5 +50565,25,786,502,323,40,40 +50566,26,786,502,323,40,40 +50567,25,786,502,319,40,40 +50568,26,786,502,319,40,40 +50569,4,189,503,175,5,5 +50570,5,189,503,175,5,5 +50571,6,189,504,175,5,5 +50572,6,205,504,172,5,5 +50573,6,205,504,173,5,5 +50574,6,205,504,174,5,5 +50575,6,205,504,236,5,5 +50576,6,205,504,238,5,5 +50577,6,205,504,239,5,5 +50578,6,205,504,240,5,5 +50579,7,787,505,360,5,5 +50580,8,787,505,360,5,5 +50581,9,787,506,360,5,5 +50582,10,518,507,175,5,5 +50583,11,518,507,175,5,5 +50584,12,788,508,175,1,1 +50585,13,788,508,175,1,1 +50586,14,788,509,175,1,1 +50587,12,789,508,440,1,1 +50588,13,789,508,440,1,1 +50589,12,124,508,447,1,1 +50590,13,124,508,447,1,1 +50591,14,124,509,447,1,1 +50592,15,790,510,175,1,1 +50593,16,790,510,175,1,1 +50594,15,791,510,179,1,1 +50595,16,791,510,179,1,1 +50596,15,791,510,194,1,1 +50597,16,791,510,194,1,1 +50598,15,791,510,218,1,1 +50599,16,791,510,218,1,1 +50600,17,653,511,636,1,1 +50601,18,653,511,636,1,1 +50602,21,792,512,440,1,1 +50603,22,792,512,440,1,1 +50604,25,787,513,360,1,1 +50605,26,787,513,360,1,1 +50606,25,787,513,175,1,1 +50607,26,787,513,175,1,1 diff --git a/pokedex/data/csv/location_area_prose.csv b/pokedex/data/csv/location_area_prose.csv index ef50f06..fc45a51 100644 --- a/pokedex/data/csv/location_area_prose.csv +++ b/pokedex/data/csv/location_area_prose.csv @@ -9,7 +9,7 @@ location_area_id,local_language_id,name 8,9, 9,9, 10,9, -11,9,"Route 207" +11,9,Route 207 12,9,2F 13,9,3F 14,9,snowfall @@ -19,39 +19,39 @@ location_area_id,local_language_id,name 18,9,6F 19,9,7F 20,9,cave -21,9,"Route 216" -22,9,"Route 211" +21,9,Route 216 +22,9,Route 211 23,9,B1F -24,9,"Area 1" -25,9,"Area 2" -26,9,"Area 3" -27,9,"Area 4" -28,9,"Area 5" -29,9,"Area 6" +24,9,Area 1 +25,9,Area 2 +26,9,Area 3 +27,9,Area 4 +28,9,Area 5 +29,9,Area 6 30,9,2F 31,9,1F -32,9,"B1F a" -33,9,"B1F b" -34,9,"B1F c" -35,9,"B2F a" -36,9,"B2F b" -37,9,"B2F c" -38,9,"B3F a" -39,9,"B3F b" -40,9,"B3F c" -41,9,"B3F d" -42,9,"B3F e" -43,9,"B4F a" -44,9,"B4F b" -45,9,"B4F c" -46,9,"B4F d" +32,9,B1F a +33,9,B1F b +34,9,B1F c +35,9,B2F a +36,9,B2F b +37,9,B2F c +38,9,B3F a +39,9,B3F b +40,9,B3F c +41,9,B3F d +42,9,B3F e +43,9,B4F a +44,9,B4F b +45,9,B4F c +46,9,B4F d 47,9,B5F 48,9,1F 49,9,2F 50,9,B1F -51,9,"inside B1F" +51,9,inside B1F 52,9,inside -53,9,"inside exit" +53,9,inside exit 54,9, 55,9,1F 56,9,B1F @@ -59,13 +59,13 @@ location_area_id,local_language_id,name 58,9,entrance 59,9,inside 60,9, -61,9,"pillar 1" -62,9,"pillar 2" -63,9,"pillar 3" -64,9,"before pillar 1" -70,9,"between pillars 1 and 2" -76,9,"between pillars 2 and 3" -82,9,"after pillar 3" +61,9,pillar 1 +62,9,pillar 2 +63,9,pillar 3 +64,9,before pillar 1 +70,9,between pillars 1 and 2 +76,9,between pillars 2 and 3 +82,9,after pillar 3 107,9,1F 108,9,B1F 109,9,B2F @@ -74,28 +74,28 @@ location_area_id,local_language_id,name 112,9,B5F 113,9,1F 114,9,B1F -115,9,"0–9 different Unown caught" -116,9,"10–25 different Unown caught" -117,9,"26+ different Unown caught" +115,9,0–9 different Unown caught +116,9,10–25 different Unown caught +117,9,26+ different Unown caught 118,9, 119,9, 120,9,1F -121,9,"B1F left" -122,9,"B1F right" -123,9,"B2F right" -124,9,"B2F left" +121,9,B1F left +122,9,B1F right +123,9,B2F right +124,9,B2F left 125,9,B3F 126,9,entrance -127,9,"dining room" -128,9,"2F private room" +127,9,dining room +128,9,2F private room 129,9,2F -130,9,"2F leftmost room" -131,9,"2F left room" -132,9,"2F middle room" -133,9,"2F right room" -134,9,"2F rightmost room" -135,9,"before Galactic intervention" -136,9,"after Galactic intervention" +130,9,2F leftmost room +131,9,2F left room +132,9,2F middle room +133,9,2F right room +134,9,2F rightmost room +135,9,before Galactic intervention +136,9,after Galactic intervention 137,9, 138,9, 139,9, @@ -153,10 +153,10 @@ location_area_id,local_language_id,name 191,9,3F 192,9, 193,9,Outside -194,9,"Interior A" -195,9,"Interior B" -196,9,"Interior C" -197,9,"Interior D" +194,9,Interior A +195,9,Interior B +196,9,Interior C +197,9,Interior D 198,9,1F 199,9,B1F 200,9,B2F @@ -188,15 +188,15 @@ location_area_id,local_language_id,name 226,9, 227,9,1F 228,9,B1F -229,9,"empty floor X" +229,9,empty floor X 230,9,B2F -231,9,"empty floor Y" +231,9,empty floor Y 232,9,B3F 235,9, 236,9, 237,9,1F -238,9,"Lower Cave" -239,9,"Upper Cave" +238,9,Lower Cave +239,9,Upper Cave 240,9,B1F 241,9, 242,9, @@ -209,10 +209,10 @@ location_area_id,local_language_id,name 250,9, 251,9, 252,9, -253,9,"Violet City entrance" -254,9,"Blackthorn City entrance" +253,9,Violet City entrance +254,9,Blackthorn City entrance 255,9, -256,9,"Mt. Moon Square" +256,9,Mt. Moon Square 257,9, 258,9,1F 259,9,B1F @@ -220,10 +220,10 @@ location_area_id,local_language_id,name 261,9,B3F 262,9,B4F 263,9,2F -264,9,"1F top" +264,9,1F top 265,9,4F -266,9,"cave gate" -267,9,"inside cave" +266,9,cave gate +267,9,inside cave 268,9,10F 269,9,outside 270,9,1F @@ -303,7 +303,7 @@ location_area_id,local_language_id,name 346,9,"Area 1, east" 347,9,"Area 2, north" 348,9,"Area 3, west" -349,9,"S.S. Anne dock" +349,9,S.S. Anne dock 350,9, 351,9, 352,9, @@ -313,12 +313,12 @@ location_area_id,local_language_id,name 356,9, 357,9,back 358,9,B1F -359,9,"back/small room" +359,9,back/small room 360,9, 361,9,1F 362,9,B1F 363,9,B2F -364,9,"1F/small Room" +364,9,1F/small Room 365,9, 366,9, 367,9, @@ -383,14 +383,14 @@ location_area_id,local_language_id,name 426,9, 427,9, 428,9, -429,9,"NW/mach bike area" -430,9,"NE/acro bike area" +429,9,NW/mach bike area +430,9,NE/acro bike area 431,9,SW 432,9,SE 433,9, 434,9, -435,9,"expansion south" -436,9,"expansion north" +435,9,expansion south +436,9,expansion north 437,9, 438,9, 439,9, @@ -425,17 +425,17 @@ location_area_id,local_language_id,name 498,9,B1F 499,9,waterfall 500,9, -501,9,"room 1" -502,9,"room 2" -503,9,"room 3" -504,9,"room 4" -505,9,"room 5" -506,9,"room 6" -507,9,"room 7" -508,9,"room 8" -509,9,"room 9" -510,9,"room 10" -511,9,"item rooms" +501,9,room 1 +502,9,room 2 +503,9,room 3 +504,9,room 4 +505,9,room 5 +506,9,room 6 +507,9,room 7 +508,9,room 8 +509,9,room 9 +510,9,room 10 +511,9,item rooms 512,9, 513,9, 514,9, @@ -488,25 +488,25 @@ location_area_id,local_language_id,name 596,9,1F 597,9,2F 598,9,outside -599,9,"Unknown Area 53" -600,9,"Unknown Area 54" -601,9,"Unknown Area 55" -602,9,"Unknown Area 56" -603,9,"Unknown Area 57" -604,9,"Unknown Area 58" -605,9,"Unknown Area 59" -606,9,"Unknown Area 60" -607,9,"Unknown Area 61" -608,9,"Unknown Area 62" -609,9,"Unknown Area 63" -610,9,"Unknown Area 64" -611,9,"Unknown Area 65" -612,9,"Unknown Area 66" +599,9,Unknown Area 53 +600,9,Unknown Area 54 +601,9,Unknown Area 55 +602,9,Unknown Area 56 +603,9,Unknown Area 57 +604,9,Unknown Area 58 +605,9,Unknown Area 59 +606,9,Unknown Area 60 +607,9,Unknown Area 61 +608,9,Unknown Area 62 +609,9,Unknown Area 63 +610,9,Unknown Area 64 +611,9,Unknown Area 65 +612,9,Unknown Area 66 613,9, 614,9,outside 615,9, 616,9,forest -617,9,"forest cave" +617,9,forest cave 618,9, 619,9, 620,9, @@ -533,7 +533,7 @@ location_area_id,local_language_id,name 641,9,B1F 642,9,B2F 643,9, -644,9,"Victory Road gate" +644,9,Victory Road gate 645,9, 646,9, 647,9, @@ -550,40 +550,40 @@ location_area_id,local_language_id,name 658,9, 659,9, 660,9,7F -661,9,"unknown area 71" -662,9,"unknown area 72" -663,9,"unknown area 73" -664,9,"unknown area 74" -665,9,"unknown area 75" -666,9,"unknown area 76" -667,9,"unknown area 77" -668,9,"unknown area 78" -669,9,"unknown area 79" -670,9,"unknown area 80" +661,9,unknown area 71 +662,9,unknown area 72 +663,9,unknown area 73 +664,9,unknown area 74 +665,9,unknown area 75 +666,9,unknown area 76 +667,9,unknown area 77 +668,9,unknown area 78 +669,9,unknown area 79 +670,9,unknown area 80 671,9, -672,9,"unknown area 38" +672,9,unknown area 38 673,9,outer 674,9,inner 675,9,outer 676,9,inner -677,9,"unknown area 48" -678,9,"unknown area 49" -679,9,"unknown area 50" -680,9,"unknown area 51" -681,9,"unknown area 52" -682,9,"unknown area 53" -683,9,"unknown area 54" -684,9,"unknown area 55" -685,9,"unknown area 56" -686,9,"unknown area 57" -687,9,"unknown area 58" -688,9,"unknown area 59" -689,9,"unknown area 60" +677,9,unknown area 48 +678,9,unknown area 49 +679,9,unknown area 50 +680,9,unknown area 51 +681,9,unknown area 52 +682,9,unknown area 53 +683,9,unknown area 54 +684,9,unknown area 55 +685,9,unknown area 56 +686,9,unknown area 57 +687,9,unknown area 58 +688,9,unknown area 59 +689,9,unknown area 60 690,9,1F 691,9,B1F -692,9,"Castelia Sewers entrance" -693,9,"Relic Castle entrance" -694,9,"PWT entrance" +692,9,Castelia Sewers entrance +693,9,Relic Castle entrance +694,9,PWT entrance 695,9, 696,9, 697,9, @@ -597,37 +597,56 @@ 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" -784,9,"Bill's house" -785,9,"Mania's house" -786,9,"Weather Institute" -787,9,"Kirk's house" -788,9,"Game Freak HQ 1F" -789,9,"Weather Institute" -790,9,"Nacrene City Museum" -791,9, -792,9,"West Gate" -793,9,"West Gate" -794,9,"Poke Mart" -795,9,"Pokemon Center" -796,9,"West Gate" +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 +761,9,Pewter Museum of Science +762,9,Pokemon Center +763,9,Fighting Dojo +764,9,Celadon Mansion rooftop +765,9,Silph Co. 7F +766,9,North Gate +767,9,Bill's house +768,9,Mania's house +769,9,Weather Institute +770,9,Steven's house +771,9, +772,9, +773,9, +774,9,Kirk's house +775,9, +776,9,Game Freak HQ 1F +777,9,Weather Institute +778,9, +779,9,Nacrene City Museum +780,9, +781,9, +782,9, +783,9, +784,9, +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 diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv index 3943841..3a9b1fc 100644 --- a/pokedex/data/csv/location_areas.csv +++ b/pokedex/data/csv/location_areas.csv @@ -656,33 +656,29 @@ id,location_id,game_index,identifier 764,67,0,celadon-mansion 765,234,0,silph-co-7f 766,229,0,north-gate -767,229,0, -768,569,0, -769,467,0,weather-center +767,229,0,bills-house +768,70,0,manias-house +769,467,0,weather-institute 770,432,0,stevens-house 771,567,0, 772,169,0, 773,170,0, -774,346,0, -775,535,0, -776,349,0, -777,536,0, -778,590,0, -779,599,0, -780,625,0, -781,200,0, -782,578,0, -783,691,0, -784,229,0,bills-house -785,70,0,manias-house -786,467,0,weather-institute -787,70,0,kirks-house -788,350,0,game-freak-hq-1f -789,361,0,weather-institute -790,349,0,museum -791,695,0, -792,2,0,west-gate -793,169,0,west-gate -794,153,0,poke-mart -795,153,0,pokemon-center -796,349,0,west-gate +774,70,0,kirks-house +775,346,0, +776,350,0,game-freak-hq-1f +777,361,0,weather-institute +778,535,0, +779,349,0,museum +780,536,0, +781,590,0, +782,599,0, +783,625,0, +784,200,0, +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 From 6fd43b097c7990b8ad3373b728fbe203f350ecc2 Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Sat, 27 Oct 2018 14:37:27 -0700 Subject: [PATCH 16/21] Exclude fossil pokemon for now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fossil pokémon don't fit with the rest of the gift pokemon: rather than being given a pokémon directly, you get an item which can be exchanged for a pokémon somewhere else ("revived"). To handle them properly we'd have to add an item location table. I don't want to figure that out right now, so just ignore the fossils for now. --- scripts/add-gift-encounters.py | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 670fbd4..7f7ba0a 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -51,10 +51,10 @@ def normal_gift_data(): [ u'charmander', [ Y ], 10, u'kanto-route-24' ], [ u'squirtle', [ Y ], 10, u'vermilion-city' ], - [ u'aerodactyl', [ R, B, Y ], 30, u'pewter-city', u'museum-of-science', u'Pewter Museum of Science' ], + #[ 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'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' ], @@ -86,10 +86,10 @@ def normal_gift_data(): [ 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'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'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' ], @@ -129,15 +129,15 @@ def normal_gift_data(): [ 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'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' ], @@ -146,25 +146,25 @@ def normal_gift_data(): [ 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'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' ], + #[ 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' ], From ada0e9c545dd77072635c4b6fe28fb0110cc28e8 Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Sat, 27 Oct 2018 14:44:55 -0700 Subject: [PATCH 17/21] Set rarity for gift encounter slots --- pokedex/data/csv/encounter_slots.csv | 48 ++++++++++++++-------------- scripts/add-gift-encounters.py | 5 +-- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv index 9534534..2cbae57 100644 --- a/pokedex/data/csv/encounter_slots.csv +++ b/pokedex/data/csv/encounter_slots.csv @@ -488,27 +488,27 @@ 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,, -491,15,18,, -492,3,18,, -493,4,18,, -494,5,18,, -495,6,18,, -496,7,18,, -497,8,18,, -498,9,18,, -499,10,18,, -500,11,18,, -501,14,18,, -502,16,18,, -503,3,19,, -504,4,19,, -505,5,19,, -506,6,19,, -507,7,19,, -508,8,19,, -509,9,19,, -510,10,19,, -511,11,19,, -512,14,19,, -513,16,19,, +490,1,18,,100 +491,15,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,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 diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 7f7ba0a..47556be 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -275,8 +275,9 @@ def record_method_and_gifts(gift_method, gift_data): encounter_method_id = gift_method.id, # No priority over or under other events/conditions slot = None, - # Rarity is meaningless for gifts - rarity = 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() From 14bcc8f2bfe8f0ec251d85e70a3fd43c5d949ccc Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Sat, 27 Oct 2018 15:07:25 -0700 Subject: [PATCH 18/21] Rerun gift encounters script --- pokedex/data/csv/encounters.csv | 547 ++++++++++++++------------------ 1 file changed, 239 insertions(+), 308 deletions(-) diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index a405df0..9db65f9 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46587,311 +46587,242 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50297,24,281,491,1,10,10 50298,24,314,491,4,10,10 50299,24,282,491,7,10,10 -50300,1,761,490,142,30,30 -50301,2,761,490,142,30,30 -50302,24,761,491,142,30,30 -50303,1,762,490,129,5,5 -50304,2,762,490,129,5,5 -50305,24,762,491,129,5,5 -50306,1,327,490,138,30,30 -50307,2,327,490,138,30,30 -50308,24,327,491,138,30,30 -50309,1,327,490,140,30,30 -50310,2,327,490,140,30,30 -50311,24,327,491,140,30,30 -50312,1,763,490,106,30,30 -50313,2,763,490,106,30,30 -50314,24,763,491,106,30,30 -50315,1,763,490,107,30,30 -50316,2,763,490,107,30,30 -50317,24,763,491,107,30,30 -50318,1,764,490,133,25,25 -50319,2,764,490,133,25,25 -50320,24,764,491,133,25,25 -50321,1,765,490,131,15,15 -50322,2,765,490,131,15,15 -50323,24,765,491,131,15,15 -50324,4,184,492,152,5,5 -50325,5,184,492,152,5,5 -50326,6,184,493,152,5,5 -50327,4,184,492,155,5,5 -50328,5,184,492,155,5,5 -50329,6,184,493,155,5,5 -50330,4,184,492,158,5,5 -50331,5,184,492,158,5,5 -50332,6,184,493,158,5,5 -50333,4,766,492,21,10,10 -50334,5,766,492,21,10,10 -50335,6,766,493,21,10,10 -50336,4,767,492,133,20,20 -50337,5,767,492,133,20,20 -50338,6,767,493,133,20,20 -50339,4,768,492,213,15,15 -50340,5,768,492,213,15,15 -50341,6,768,493,213,15,15 -50342,6,250,493,147,15,15 -50343,4,240,492,236,10,10 -50344,5,240,492,236,10,10 -50345,6,240,493,236,10,10 -50346,7,393,494,252,5,5 -50347,8,393,494,252,5,5 -50348,9,393,495,252,5,5 -50349,7,393,494,255,5,5 -50350,8,393,494,255,5,5 -50351,9,393,495,255,5,5 -50352,7,393,494,258,5,5 -50353,8,393,494,258,5,5 -50354,9,393,495,258,5,5 -50355,7,769,494,351,25,25 -50356,8,769,494,351,25,25 -50357,9,769,495,351,25,25 -50358,7,770,494,374,5,5 -50359,8,770,494,374,5,5 -50360,9,770,495,374,5,5 -50361,9,771,495,152,5,5 -50362,9,771,495,155,5,5 -50363,9,771,495,158,5,5 -50364,10,285,496,1,5,5 -50365,11,285,496,1,5,5 -50366,10,285,496,4,5,5 -50367,11,285,496,4,5,5 -50368,10,285,496,7,5,5 -50369,11,285,496,7,5,5 -50370,10,761,496,142,5,5 -50371,11,761,496,142,5,5 -50372,10,762,496,129,5,5 -50373,11,762,496,129,5,5 -50374,10,327,496,138,5,5 -50375,11,327,496,138,5,5 -50376,10,327,496,140,5,5 -50377,11,327,496,140,5,5 -50378,10,763,496,106,25,25 -50379,11,763,496,106,25,25 -50380,10,763,496,107,25,25 -50381,11,763,496,107,25,25 -50382,10,764,496,133,25,25 -50383,11,764,496,133,25,25 -50384,10,765,496,131,25,25 -50385,11,765,496,131,25,25 -50386,12,135,497,387,5,5 -50387,13,135,497,387,5,5 -50388,12,135,497,390,5,5 -50389,13,135,497,390,5,5 -50390,12,135,497,393,5,5 -50391,13,135,497,393,5,5 -50392,14,141,498,387,5,5 -50393,14,141,498,390,5,5 -50394,14,141,498,393,5,5 -50395,12,772,497,133,5,5 -50396,13,772,497,133,5,5 -50397,14,772,498,133,20,20 -50398,14,773,498,137,25,25 -50399,15,184,499,152,5,5 -50400,16,184,499,152,5,5 -50401,15,184,499,155,5,5 -50402,16,184,499,155,5,5 -50403,15,184,499,158,5,5 -50404,16,184,499,158,5,5 -50405,15,766,499,21,20,20 -50406,16,766,499,21,20,20 -50407,15,767,499,133,5,5 -50408,16,767,499,133,5,5 -50409,15,774,499,213,15,15 -50410,16,774,499,213,15,15 -50411,15,250,499,147,15,15 -50412,16,250,499,147,15,15 -50413,15,240,499,236,10,10 -50414,16,240,499,236,10,10 -50415,15,285,499,1,5,5 -50416,16,285,499,1,5,5 -50417,15,285,499,4,5,5 -50418,16,285,499,4,5,5 -50419,15,285,499,7,5,5 -50420,16,285,499,7,5,5 -50421,15,765,499,252,5,5 -50422,16,765,499,252,5,5 -50423,15,765,499,255,5,5 -50424,16,765,499,255,5,5 -50425,15,765,499,258,5,5 -50426,16,765,499,258,5,5 -50427,17,775,500,495,5,5 -50428,18,775,500,495,5,5 -50429,17,775,500,498,5,5 -50430,18,775,500,498,5,5 -50431,17,775,500,501,5,5 -50432,18,775,500,501,5,5 -50433,17,579,500,511,10,10 -50434,18,579,500,511,10,10 -50435,17,579,500,513,10,10 -50436,18,579,500,513,10,10 -50437,17,579,500,515,10,10 -50438,18,579,500,515,10,10 -50439,17,776,500,570,10,10 -50440,18,776,500,570,10,10 -50441,17,585,500,564,25,25 -50442,18,585,500,564,25,25 -50443,17,585,500,566,25,25 -50444,18,585,500,566,25,25 -50445,17,593,500,138,25,25 -50446,18,593,500,138,25,25 -50447,17,593,500,140,25,25 -50448,18,593,500,140,25,25 -50449,17,593,500,142,25,25 -50450,18,593,500,142,25,25 -50451,17,593,500,345,25,25 -50452,18,593,500,345,25,25 -50453,17,593,500,347,25,25 -50454,18,593,500,347,25,25 -50455,17,593,500,408,25,25 -50456,18,593,500,408,25,25 -50457,17,593,500,410,25,25 -50458,18,593,500,410,25,25 -50459,17,622,500,129,5,5 -50460,18,622,500,129,5,5 -50461,21,657,501,495,5,5 -50462,22,657,501,495,5,5 -50463,21,657,501,498,5,5 -50464,22,657,501,498,5,5 -50465,21,657,501,501,5,5 -50466,22,657,501,501,5,5 -50467,21,577,501,570,25,25 -50468,22,577,501,570,25,25 -50469,21,777,501,585,30,30 -50470,22,777,501,585,30,30 -50471,21,656,501,133,10,10 -50472,22,656,501,133,10,10 -50473,21,778,501,138,25,25 -50474,22,778,501,138,25,25 -50475,21,778,501,140,25,25 -50476,22,778,501,140,25,25 -50477,21,778,501,142,25,25 -50478,22,778,501,142,25,25 -50479,21,778,501,345,25,25 -50480,22,778,501,345,25,25 -50481,21,778,501,347,25,25 -50482,22,778,501,347,25,25 -50483,21,778,501,408,25,25 -50484,22,778,501,408,25,25 -50485,21,778,501,410,25,25 -50486,22,778,501,410,25,25 -50487,21,778,501,564,25,25 -50488,22,778,501,564,25,25 -50489,21,778,501,566,25,25 -50490,22,778,501,566,25,25 -50491,21,622,501,129,5,5 -50492,22,622,501,129,5,5 -50493,21,779,501,564,25,25 -50494,22,779,501,564,25,25 -50495,21,779,501,566,25,25 -50496,22,779,501,566,25,25 -50497,21,593,501,138,25,25 -50498,22,593,501,138,25,25 -50499,21,593,501,140,25,25 -50500,22,593,501,140,25,25 -50501,21,593,501,142,25,25 -50502,22,593,501,142,25,25 -50503,21,593,501,345,25,25 -50504,22,593,501,345,25,25 -50505,21,593,501,347,25,25 -50506,22,593,501,347,25,25 -50507,21,593,501,408,25,25 -50508,22,593,501,408,25,25 -50509,21,593,501,410,25,25 -50510,22,593,501,410,25,25 -50511,22,780,501,147,1,1 -50512,21,780,501,443,1,1 -50513,23,781,491,650,5,5 -50514,24,781,491,650,5,5 -50515,23,781,491,653,5,5 -50516,24,781,491,653,5,5 -50517,23,781,491,656,5,5 -50518,24,781,491,656,5,5 -50519,23,782,491,1,10,10 -50520,24,782,491,1,10,10 -50521,23,782,491,4,10,10 -50522,24,782,491,4,10,10 -50523,23,782,491,7,10,10 -50524,24,782,491,7,10,10 -50525,23,736,491,696,20,20 -50526,24,736,491,696,20,20 -50527,23,736,491,698,20,20 -50528,24,736,491,698,20,20 -50529,23,783,491,448,32,32 -50530,24,783,491,448,32,32 -50531,23,723,491,131,30,30 -50532,24,723,491,131,30,30 -50533,25,393,502,252,5,5 -50534,26,393,502,252,5,5 -50535,25,393,502,255,5,5 -50536,26,393,502,255,5,5 -50537,25,393,502,258,5,5 -50538,26,393,502,258,5,5 -50539,25,784,502,25,20,20 -50540,26,784,502,25,20,20 -50541,25,785,502,381,30,30 -50542,26,785,502,380,30,30 -50543,25,769,502,351,30,30 -50544,26,769,502,351,30,30 -50545,25,393,502,152,5,5 -50546,26,393,502,152,5,5 -50547,25,393,502,155,5,5 -50548,26,393,502,155,5,5 -50549,25,393,502,158,5,5 -50550,26,393,502,158,5,5 -50551,25,393,502,495,5,5 -50552,26,393,502,495,5,5 -50553,25,393,502,498,5,5 -50554,26,393,502,498,5,5 -50555,25,393,502,501,5,5 -50556,26,393,502,501,5,5 -50557,25,770,502,374,1,1 -50558,26,770,502,374,1,1 -50559,25,141,502,387,5,5 -50560,26,141,502,387,5,5 -50561,25,141,502,390,5,5 -50562,26,141,502,390,5,5 -50563,25,141,502,393,5,5 -50564,26,141,502,393,5,5 -50565,25,786,502,323,40,40 -50566,26,786,502,323,40,40 -50567,25,786,502,319,40,40 -50568,26,786,502,319,40,40 -50569,4,189,503,175,5,5 -50570,5,189,503,175,5,5 -50571,6,189,504,175,5,5 -50572,6,205,504,172,5,5 -50573,6,205,504,173,5,5 -50574,6,205,504,174,5,5 -50575,6,205,504,236,5,5 -50576,6,205,504,238,5,5 -50577,6,205,504,239,5,5 -50578,6,205,504,240,5,5 -50579,7,787,505,360,5,5 -50580,8,787,505,360,5,5 -50581,9,787,506,360,5,5 -50582,10,518,507,175,5,5 -50583,11,518,507,175,5,5 -50584,12,788,508,175,1,1 -50585,13,788,508,175,1,1 -50586,14,788,509,175,1,1 -50587,12,789,508,440,1,1 -50588,13,789,508,440,1,1 -50589,12,124,508,447,1,1 -50590,13,124,508,447,1,1 -50591,14,124,509,447,1,1 -50592,15,790,510,175,1,1 -50593,16,790,510,175,1,1 -50594,15,791,510,179,1,1 -50595,16,791,510,179,1,1 -50596,15,791,510,194,1,1 -50597,16,791,510,194,1,1 -50598,15,791,510,218,1,1 -50599,16,791,510,218,1,1 -50600,17,653,511,636,1,1 -50601,18,653,511,636,1,1 -50602,21,792,512,440,1,1 -50603,22,792,512,440,1,1 -50604,25,787,513,360,1,1 -50605,26,787,513,360,1,1 -50606,25,787,513,175,1,1 -50607,26,787,513,175,1,1 +50300,1,762,490,129,5,5 +50301,2,762,490,129,5,5 +50302,24,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 +50306,1,763,490,107,30,30 +50307,2,763,490,107,30,30 +50308,24,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 +50312,1,765,490,131,15,15 +50313,2,765,490,131,15,15 +50314,24,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 +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,766,492,21,10,10 +50325,5,766,492,21,10,10 +50326,6,766,493,21,10,10 +50327,4,767,492,133,20,20 +50328,5,767,492,133,20,20 +50329,6,767,493,133,20,20 +50330,4,768,492,213,15,15 +50331,5,768,492,213,15,15 +50332,6,768,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,769,494,351,25,25 +50347,8,769,494,351,25,25 +50348,9,769,495,351,25,25 +50349,7,770,494,374,5,5 +50350,8,770,494,374,5,5 +50351,9,770,495,374,5,5 +50352,9,771,495,152,5,5 +50353,9,771,495,155,5,5 +50354,9,771,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,762,496,129,5,5 +50362,11,762,496,129,5,5 +50363,10,763,496,106,25,25 +50364,11,763,496,106,25,25 +50365,10,763,496,107,25,25 +50366,11,763,496,107,25,25 +50367,10,764,496,133,25,25 +50368,11,764,496,133,25,25 +50369,10,765,496,131,25,25 +50370,11,765,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,772,497,133,5,5 +50381,13,772,497,133,5,5 +50382,14,772,498,133,20,20 +50383,14,773,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,766,499,21,20,20 +50391,16,766,499,21,20,20 +50392,15,767,499,133,5,5 +50393,16,767,499,133,5,5 +50394,15,774,499,213,15,15 +50395,16,774,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,765,499,252,5,5 +50407,16,765,499,252,5,5 +50408,15,765,499,255,5,5 +50409,16,765,499,255,5,5 +50410,15,765,499,258,5,5 +50411,16,765,499,258,5,5 +50412,17,775,500,495,5,5 +50413,18,775,500,495,5,5 +50414,17,775,500,498,5,5 +50415,18,775,500,498,5,5 +50416,17,775,500,501,5,5 +50417,18,775,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,776,500,570,10,10 +50425,18,776,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,777,501,585,30,30 +50437,22,777,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,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 From 53e0fc00858b8b329a036071ac61aef0e50b301b Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Sat, 3 Nov 2018 17:06:44 -0700 Subject: [PATCH 19/21] gift-encounters: fix Yellow gift pokemon They were being interpreted as being in Y instead. --- pokedex/data/csv/encounter_slots.csv | 27 ++-- pokedex/data/csv/encounters.csv | 208 +++++++++++++-------------- scripts/add-gift-encounters.py | 26 ++-- 3 files changed, 131 insertions(+), 130 deletions(-) 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' ], From 8161bd84e4c44c15640cf04c23e5b858a510e7ec Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Fri, 12 Jul 2019 18:48:07 -0700 Subject: [PATCH 20/21] gift-pokemon: fix Cosplay Pikachu and Sinnoh starter gift locations Cosplay Pikachu was listed as being encountered in contest-hall, but that's a Sinnoh location. In OR/AS, the contest halls are not a first-class location but rather just treated as part of the town or city they are in. Cosplay Pikachu is given to the player after they participate in their first contest, so its location can be any of the four cities with a contest hall. The Sinnoh starter that the player obtains in OR/AS is on Hoenn Route 101, not Sinnoh Route 201 (probably a copy/paste error). Add a test to make sure that encounter regions always match the region(s) that their game takes place in. --- pokedex/data/csv/encounters.csv | 144 ++++++++++++----------- pokedex/data/csv/location_area_prose.csv | 4 + pokedex/data/csv/location_areas.csv | 4 + pokedex/tests/test_database_sanity.py | 22 ++++ scripts/add-gift-encounters.py | 12 +- 5 files changed, 113 insertions(+), 73 deletions(-) diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index 240688d..3ffc6f1 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46757,72 +46757,78 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 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 +50470,25,793,503,25,20,20 +50471,26,793,503,25,20,20 +50472,25,794,503,25,20,20 +50473,26,794,503,25,20,20 +50474,25,795,503,25,20,20 +50475,26,795,503,25,20,20 +50476,25,796,503,25,20,20 +50477,26,796,503,25,20,20 +50478,25,785,503,381,30,30 +50479,26,785,503,380,30,30 +50480,25,769,503,351,30,30 +50481,26,769,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,770,503,374,1,1 +50495,26,770,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 diff --git a/pokedex/data/csv/location_area_prose.csv b/pokedex/data/csv/location_area_prose.csv index fc45a51..a696bf1 100644 --- a/pokedex/data/csv/location_area_prose.csv +++ b/pokedex/data/csv/location_area_prose.csv @@ -650,3 +650,7 @@ location_area_id,local_language_id,name 790,9,Poke Mart 791,9,Pokemon Center 792,9,West Gate +793,9,Contest Hall +794,9,Contest Hall +795,9,Contest Hall +796,9,Contest Hall diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv index 3a9b1fc..4b360a0 100644 --- a/pokedex/data/csv/location_areas.csv +++ b/pokedex/data/csv/location_areas.csv @@ -682,3 +682,7 @@ id,location_id,game_index,identifier 790,153,0,poke-mart 791,153,0,pokemon-center 792,349,0,west-gate +793,430,0,contest-hall +794,571,0,contest-hall +795,570,0,contest-hall +796,431,0,contest-hall diff --git a/pokedex/tests/test_database_sanity.py b/pokedex/tests/test_database_sanity.py index f5747ca..228effc 100644 --- a/pokedex/tests/test_database_sanity.py +++ b/pokedex/tests/test_database_sanity.py @@ -26,6 +26,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 diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py index 2100358..16714ee 100644 --- a/scripts/add-gift-encounters.py +++ b/scripts/add-gift-encounters.py @@ -184,7 +184,11 @@ def normal_gift_data(): [ 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' ], - [ u'pikachu', [ OR, AS ], 20, u'contest-hall' ], # suprisingly, this location exists already + # 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' ], @@ -195,9 +199,9 @@ def normal_gift_data(): [ 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'sinnoh-route-201' ], - [ u'chimchar', [ OR, AS ], 5, u'sinnoh-route-201' ], - [ u'piplup', [ OR, AS ], 5, u'sinnoh-route-201' ], + [ 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' ], ] From b6dfbbcd5854e88ea90cf50e7a50e5ded16496d2 Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Fri, 12 Jul 2019 19:14:59 -0700 Subject: [PATCH 21/21] gift-pokemon: rerun script This removes a few location areas that are no longer needed now that we've dropped fossil pokemon. --- pokedex/data/csv/encounters.csv | 194 +++++++++++------------ pokedex/data/csv/location_area_prose.csv | 44 +++-- pokedex/data/csv/location_areas.csv | 52 +++--- 3 files changed, 141 insertions(+), 149 deletions(-) diff --git a/pokedex/data/csv/encounters.csv b/pokedex/data/csv/encounters.csv index 3ffc6f1..19dc356 100644 --- a/pokedex/data/csv/encounters.csv +++ b/pokedex/data/csv/encounters.csv @@ -46587,21 +46587,21 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 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,3,762,491,129,5,5 -50303,1,763,490,106,30,30 -50304,2,763,490,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,3,763,491,107,30,30 -50309,1,764,490,133,25,25 -50310,2,764,490,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,3,765,491,131,15,15 +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 @@ -46611,15 +46611,15 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50321,4,184,492,158,5,5 50322,5,184,492,158,5,5 50323,6,184,493,158,5,5 -50324,4,766,492,21,10,10 -50325,5,766,492,21,10,10 -50326,6,766,493,21,10,10 -50327,4,767,492,133,20,20 -50328,5,767,492,133,20,20 -50329,6,767,493,133,20,20 -50330,4,768,492,213,15,15 -50331,5,768,492,213,15,15 -50332,6,768,493,213,15,15 +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 @@ -46633,31 +46633,31 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50343,7,393,494,258,5,5 50344,8,393,494,258,5,5 50345,9,393,495,258,5,5 -50346,7,769,494,351,25,25 -50347,8,769,494,351,25,25 -50348,9,769,495,351,25,25 -50349,7,770,494,374,5,5 -50350,8,770,494,374,5,5 -50351,9,770,495,374,5,5 -50352,9,771,495,152,5,5 -50353,9,771,495,155,5,5 -50354,9,771,495,158,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,762,496,129,5,5 -50362,11,762,496,129,5,5 -50363,10,763,496,106,25,25 -50364,11,763,496,106,25,25 -50365,10,763,496,107,25,25 -50366,11,763,496,107,25,25 -50367,10,764,496,133,25,25 -50368,11,764,496,133,25,25 -50369,10,765,496,131,25,25 -50370,11,765,496,131,25,25 +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 @@ -46667,22 +46667,22 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50377,14,141,498,387,5,5 50378,14,141,498,390,5,5 50379,14,141,498,393,5,5 -50380,12,772,497,133,5,5 -50381,13,772,497,133,5,5 -50382,14,772,498,133,20,20 -50383,14,773,498,137,25,25 +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,766,499,21,20,20 -50391,16,766,499,21,20,20 -50392,15,767,499,133,5,5 -50393,16,767,499,133,5,5 -50394,15,774,499,213,15,15 -50395,16,774,499,213,15,15 +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 @@ -46693,26 +46693,26 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50403,16,285,499,4,5,5 50404,15,285,499,7,5,5 50405,16,285,499,7,5,5 -50406,15,765,499,252,5,5 -50407,16,765,499,252,5,5 -50408,15,765,499,255,5,5 -50409,16,765,499,255,5,5 -50410,15,765,499,258,5,5 -50411,16,765,499,258,5,5 -50412,17,775,500,495,5,5 -50413,18,775,500,495,5,5 -50414,17,775,500,498,5,5 -50415,18,775,500,498,5,5 -50416,17,775,500,501,5,5 -50417,18,775,500,501,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,776,500,570,10,10 -50425,18,776,500,570,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 @@ -46723,32 +46723,32 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50433,22,657,501,501,5,5 50434,21,577,501,570,25,25 50435,22,577,501,570,25,25 -50436,21,777,501,585,30,30 -50437,22,777,501,585,30,30 +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,780,501,147,1,1 -50443,21,780,501,443,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 +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,783,502,448,32,32 -50461,24,783,502,448,32,32 +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 @@ -46757,18 +46757,18 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50467,26,393,503,255,5,5 50468,25,393,503,258,5,5 50469,26,393,503,258,5,5 -50470,25,793,503,25,20,20 -50471,26,793,503,25,20,20 -50472,25,794,503,25,20,20 -50473,26,794,503,25,20,20 -50474,25,795,503,25,20,20 -50475,26,795,503,25,20,20 -50476,25,796,503,25,20,20 -50477,26,796,503,25,20,20 +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,769,503,351,30,30 -50481,26,769,503,351,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 @@ -46781,8 +46781,8 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 50491,26,393,503,498,5,5 50492,25,393,503,501,5,5 50493,26,393,503,501,5,5 -50494,25,770,503,374,1,1 -50495,26,770,503,374,1,1 +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 diff --git a/pokedex/data/csv/location_area_prose.csv b/pokedex/data/csv/location_area_prose.csv index a696bf1..4222347 100644 --- a/pokedex/data/csv/location_area_prose.csv +++ b/pokedex/data/csv/location_area_prose.csv @@ -618,30 +618,30 @@ location_area_id,local_language_id,name 756,9,Unknown Area 345 757,9,Unknown Area 347 758,9,Unknown Area 348 -761,9,Pewter Museum of Science -762,9,Pokemon Center -763,9,Fighting Dojo -764,9,Celadon Mansion rooftop -765,9,Silph Co. 7F -766,9,North Gate -767,9,Bill's house -768,9,Mania's house -769,9,Weather Institute -770,9,Steven's house +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, -774,9,Kirk's house -775,9, -776,9,Game Freak HQ 1F -777,9,Weather Institute +773,9,Kirk's house +774,9, +775,9,Game Freak HQ 1F +776,9,Weather Institute +777,9, 778,9, -779,9,Nacrene City Museum +779,9, 780,9, -781,9, -782,9, -783,9, -784,9, +781,9,Contest Hall +782,9,Contest Hall +783,9,Contest Hall +784,9,Contest Hall 785,9, 786,9, 787,9, @@ -650,7 +650,3 @@ location_area_id,local_language_id,name 790,9,Poke Mart 791,9,Pokemon Center 792,9,West Gate -793,9,Contest Hall -794,9,Contest Hall -795,9,Contest Hall -796,9,Contest Hall diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv index 4b360a0..3ddc00d 100644 --- a/pokedex/data/csv/location_areas.csv +++ b/pokedex/data/csv/location_areas.csv @@ -650,30 +650,30 @@ id,location_id,game_index,identifier 758,676,0,unknown-area-348 759,677,0, 760,661,0, -761,231,0,museum-of-science -762,120,0,pokemon-center -763,234,0,fighting-dojo -764,67,0,celadon-mansion -765,234,0,silph-co-7f -766,229,0,north-gate -767,229,0,bills-house -768,70,0,manias-house -769,467,0,weather-institute -770,432,0,stevens-house -771,567,0, -772,169,0, -773,170,0, -774,70,0,kirks-house -775,346,0, -776,350,0,game-freak-hq-1f -777,361,0,weather-institute -778,535,0, -779,349,0,museum -780,536,0, -781,590,0, -782,599,0, -783,625,0, -784,200,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, @@ -682,7 +682,3 @@ id,location_id,game_index,identifier 790,153,0,poke-mart 791,153,0,pokemon-center 792,349,0,west-gate -793,430,0,contest-hall -794,571,0,contest-hall -795,570,0,contest-hall -796,431,0,contest-hall