Added gen 4 location internal ids and some pseudo-locations.

diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv
index 889574b..043d58d 100644 (file)
--- a/pokedex/data/csv/location_areas.csv
+++ b/pokedex/data/csv/location_areas.csv
@@ -76,7 +76,7 @@ id,location_id,internal_id,name
 114,20,114,B1F
 115,22,115,0–9 different Unown caught
 116,22,116,10–25 different Unown caught
 114,20,114,B1F
 115,22,115,0–9 different Unown caught
 116,22,116,10–25 different Unown caught

-117,22,117,26+ different Unown caught
+117,180,117,26+ different Unown caught

 118,23,118,
 119,24,119,
 120,24,120,1F
 118,23,118,
 119,24,119,
 120,24,120,1F

diff --git a/pokedex/data/csv/location_internal_ids.csv b/pokedex/data/csv/location_internal_ids.csv
new file mode 100644 (file)
index 0000000..e276d68
--- /dev/null
+++ b/pokedex/data/csv/location_internal_ids.csv
@@ -0,0 +1,324 @@
+location_id,generation_id,internal_id
+1,4,7
+2,4,9
+3,4,11
+4,4,13
+5,4,15
+6,4,46
+7,4,47
+8,4,48
+9,4,49
+10,4,50
+11,4,52
+12,4,53
+13,4,54
+14,4,57
+15,4,59
+16,4,84
+17,4,75
+18,4,62
+19,4,64
+20,4,65
+22,4,66
+23,4,68
+24,4,69
+25,4,70
+26,4,76
+27,4,77
+28,4,78
+29,4,73
+30,4,74
+31,4,16
+32,4,17
+33,4,18
+34,4,19
+35,4,20
+36,4,21
+37,4,22
+38,4,23
+39,4,24
+41,4,25
+42,4,26
+43,4,27
+44,4,28
+45,4,29
+46,4,30
+47,4,31
+48,4,32
+49,4,33
+50,4,34
+51,4,36
+52,4,37
+53,4,39
+54,4,40
+55,4,42
+56,4,43
+57,4,44
+58,4,1
+59,4,5
+60,4,83
+61,4,35
+62,4,38
+63,4,41
+64,4,45
+65,4,136
+66,4,206
+67,4,144
+68,4,141
+69,4,127
+70,4,130
+71,4,146
+72,4,220
+73,4,197
+74,4,222
+75,4,133
+76,4,145
+77,4,217
+78,4,214
+79,4,135
+80,4,198
+81,4,216
+82,4,137
+83,4,207
+84,4,126
+85,4,132
+86,4,138
+87,4,200
+88,4,149
+89,4,158
+90,4,159
+91,4,160
+92,4,161
+93,4,162
+94,4,163
+95,4,164
+96,4,165
+97,4,166
+98,4,167
+99,4,150
+100,4,168
+101,4,169
+102,4,170
+103,4,172
+104,4,173
+105,4,174
+106,4,175
+107,4,176
+108,4,177
+109,4,151
+110,4,178
+111,4,179
+112,4,180
+113,4,181
+114,4,182
+115,4,183
+116,4,184
+117,4,185
+118,4,186
+119,4,187
+120,4,152
+121,4,188
+122,4,189
+123,4,190
+124,4,191
+125,4,192
+126,4,193
+127,4,194
+128,4,195
+129,4,196
+130,4,153
+131,4,154
+132,4,155
+133,4,156
+134,4,157
+135,4,209
+136,4,203
+137,4,211
+138,4,204
+139,4,205
+140,4,223
+141,4,210
+147,4,199
+151,4,143
+152,4,221
+153,4,128
+154,4,139
+155,4,224
+156,4,218
+157,4,171
+158,4,201
+161,4,106
+162,4,202
+163,4,2
+164,4,3
+165,4,4
+167,4,6
+168,4,8
+169,4,10
+170,4,12
+171,4,14
+172,4,51
+173,4,55
+174,4,56
+175,4,58
+177,4,60
+178,4,61
+179,4,63
+180,4,67
+181,4,71
+182,4,72
+183,4,79
+184,4,80
+185,4,81
+186,4,82
+187,4,85
+188,4,86
+190,4,87
+191,4,88
+192,4,89
+193,4,90
+194,4,91
+195,4,92
+196,4,93
+197,4,94
+198,4,95
+199,4,96
+200,4,97
+201,4,98
+202,4,99
+203,4,100
+204,4,101
+205,4,102
+206,4,103
+207,4,104
+208,4,105
+209,4,107
+210,4,108
+211,4,109
+212,4,110
+213,4,111
+214,4,112
+215,4,113
+216,4,114
+217,4,115
+218,4,116
+219,4,117
+220,4,118
+221,4,119
+222,4,120
+223,4,121
+224,4,122
+225,4,123
+226,4,124
+227,4,125
+228,4,129
+229,4,131
+230,4,134
+231,4,140
+232,4,142
+233,4,147
+234,4,148
+236,4,212
+237,4,213
+238,4,215
+239,4,219
+241,4,225
+242,4,226
+243,4,227
+244,4,228
+245,4,229
+246,4,230
+247,4,231
+248,4,232
+249,4,233
+250,4,234
+252,4,208
+253,4,2000
+254,4,2001
+255,4,2002
+256,4,2003
+257,4,2004
+258,4,2005
+259,4,2006
+260,4,2008
+261,4,2009
+262,4,2010
+263,4,2011
+264,4,2012
+265,4,3000
+266,4,3001
+267,4,3002
+268,4,3003
+269,4,3004
+270,4,3005
+271,4,3006
+272,4,3007
+273,4,3008
+274,4,3009
+275,4,3010
+276,4,3011
+277,4,3012
+278,4,3013
+279,4,3014
+280,4,3015
+281,4,3016
+282,4,3017
+283,4,3018
+284,4,3019
+285,4,3020
+286,4,3021
+287,4,3022
+288,4,3023
+289,4,3024
+290,4,3025
+291,4,3026
+292,4,3027
+293,4,3028
+294,4,3029
+295,4,3030
+296,4,3031
+297,4,3032
+298,4,3033
+299,4,3034
+300,4,3035
+301,4,3036
+302,4,3037
+303,4,3038
+304,4,3039
+305,4,3040
+306,4,3041
+307,4,3042
+308,4,3043
+309,4,3044
+310,4,3045
+311,4,3046
+312,4,3047
+313,4,3048
+314,4,3049
+315,4,3050
+316,4,3051
+317,4,3052
+318,4,3053
+319,4,3054
+320,4,3055
+321,4,3056
+322,4,3057
+323,4,3058
+324,4,3059
+325,4,3060
+326,4,3061
+327,4,3062
+328,4,3063
+329,4,3064
+330,4,3065
+331,4,3066
+332,4,3067
+333,4,3068
+334,4,3069
+335,4,3070
+336,4,3071
+337,4,3072
+338,4,3073
+339,4,3074
+340,4,3075
+341,4,3076

diff --git a/pokedex/data/csv/locations.csv b/pokedex/data/csv/locations.csv
index d851221..9e126ee 100644 (file)
--- a/pokedex/data/csv/locations.csv
+++ b/pokedex/data/csv/locations.csv
@@ -13,13 +13,13 @@ id,region_id,name
 12,4,Solaceon Ruins
 13,4,Victory Road
 14,4,Ravaged Path
 12,4,Solaceon Ruins
 13,4,Victory Road
 14,4,Ravaged Path

-15,4,Oreburgh Tunnel
+15,4,Oreburgh Gate

 16,4,Stark Mountain
 17,4,Spring Path
 18,4,Turnback Cave
 19,4,Snowpoint Temple
 20,4,Wayward Cave
 16,4,Stark Mountain
 17,4,Spring Path
 18,4,Turnback Cave
 19,4,Snowpoint Temple
 20,4,Wayward Cave

-22,4,Ruin Maniac Tunnel
+22,4,Ruin Maniac Cave

 23,4,Trophy Garden
 24,4,Iron Island
 25,4,Old Chateau
 23,4,Trophy Garden
 24,4,Iron Island
 25,4,Old Chateau


@@ -56,7 +56,7 @@ id,region_id,name
 56,4,Route 228
 57,4,Route 229
 58,4,Twinleaf Town
 56,4,Route 228
 57,4,Route 229
 58,4,Twinleaf Town

-59,4,Celestic City
+59,4,Celestic Town

 60,4,Resort Area
 61,4,Sea Route 220
 62,4,Sea Route 223
 60,4,Resort Area
 61,4,Sea Route 220
 62,4,Sea Route 223


@@ -155,3 +155,177 @@ id,region_id,name
 160,1,Pokémon Tower
 161,1,Pokémon Mansion
 162,1,Safari Zone
 160,1,Pokémon Tower
 161,1,Pokémon Mansion
 162,1,Safari Zone

+163,4,Sandgem Town
+164,4,Floaroma Town
+165,4,Solaceon Town
+167,4,Jubilife City
+168,4,Oreburgh City
+169,4,Hearthome City
+170,4,Veilstone City
+171,4,Snowpoint City
+172,4,Spear Pillar
+173,4,Pal Park
+174,4,Amity Square
+175,4,Floaroma Meadow
+177,4,Fullmoon Island
+178,4,Sendoff Spring
+179,4,Flower Paradise
+180,4,Maniac Tunnel
+181,4,Galactic HQ
+182,4,Verity Lakefront
+183,4,Newmoon Island
+184,4,Battle Tower
+185,4,Fight Area
+186,4,Survival Area
+187,4,Seabreak Path
+188,4,Hall of Origin
+189,4,Hall of Origin
+190,4,Verity Cavern
+191,4,Valor Cavern
+192,4,Acuity Cavern
+193,4,Jubilife TV
+194,4,Pokétch Co.
+195,4,GTS
+196,4,Trainers’ School
+197,4,Mining Museum
+198,4,Flower Shop
+199,4,Cycle Shop
+200,4,Contest Hall
+201,4,Poffin House
+202,4,Foreign Building
+203,4,Pokémon Day Care
+204,4,Veilstone Store
+205,4,Game Corner
+206,4,Canalave Library
+207,4,Vista Lighthouse
+208,4,Sunyshore Market
+209,4,Footstep House
+210,4,Café
+211,4,Grand Lake
+212,4,Restaurant
+213,4,Battle Park
+214,4,Battle Frontier
+215,4,Battle Factory
+216,4,Battle Castle
+217,4,Battle Arcade
+218,4,Battle Hall
+219,4,Distortion World
+220,4,Global Terminal
+221,4,Villa
+222,4,Battleground
+223,4,ROTOM's Room
+224,4,T.G. Eterna Bldg
+225,4,Iron Ruins
+226,4,Iceberg Ruins
+227,4,Rock Peak Ruins
+228,2,Azalea Town
+229,2,Goldenrod City
+230,2,Mahogany Town
+231,2,Pewter City
+232,2,Lavender Town
+233,2,Indigo Plateau
+234,2,Saffron City
+236,2,Lighthouse
+237,2,Team Rocket HQ
+238,2,Goldenrod Tunnel
+239,2,Mt. Silver Cave
+241,2,Pokéathlon Dome
+242,2,S.S. Aqua
+243,2,Safari Zone Gate
+244,2,Cliff Cave
+245,2,Frontier Access
+246,2,Bellchime Trail
+247,2,Sinjoh Ruins
+248,2,Embedded Tower
+249,2,Pokéwalker
+250,2,Cliff Edge Gate
+252,2,Radio Tower
+253,,Day-Care Couple
+254,,Link trade (arrive)
+255,,Link trade (met)
+256,,Kanto
+257,,Johto
+258,,Hoenn
+259,,Sinnoh
+260,,Distant land
+261,,Traveling Man
+262,,Riley
+263,,Cynthia
+264,,Mystery Zone
+265,,Lovely place
+266,,Pokémon Ranger
+267,,Faraway place
+268,,Pokémon Movie
+269,,Pokémon Movie 06
+270,,Pokémon Movie 07
+271,,Pokémon Movie 08
+272,,Pokémon Movie 09
+273,,Pokémon Movie 10
+274,,Pokémon Movie 11
+275,,Pokémon Movie 12
+276,,Pokémon Movie 13
+277,,Pokémon Movie 14
+278,,Pokémon Movie 15
+279,,Pokémon Movie 16
+280,,Pokémon Cartoon
+281,,Space World
+282,,Space World 06
+283,,Space World 07
+284,,Space World 08
+285,,Space World 09
+286,,Space World 10
+287,,Space World 11
+288,,Space World 12
+289,,Space World 13
+290,,Space World 14
+291,,Space World 15
+292,,Space World 16
+293,,Pokémon Festa
+294,,Pokémon Festa 06
+295,,Pokémon Festa 07
+296,,Pokémon Festa 08
+297,,Pokémon Festa 09
+298,,Pokémon Festa 10
+299,,Pokémon Festa 11
+300,,Pokémon Festa 12
+301,,Pokémon Festa 13
+302,,Pokémon Festa 14
+303,,Pokémon Festa 15
+304,,Pokémon Festa 16
+305,,POKéPARK
+306,,POKéPARK 06
+307,,POKéPARK 07
+308,,POKéPARK 08
+309,,POKéPARK 09
+310,,POKéPARK 10
+311,,POKéPARK 11
+312,,POKéPARK 12
+313,,POKéPARK 13
+314,,POKéPARK 14
+315,,POKéPARK 15
+316,,POKéPARK 16
+317,,Pokémon Center
+318,,PC Tokyo
+319,,PC Osaka
+320,,PC Fukuoka
+321,,PC Nagoya
+322,,PC Sapporo
+323,,PC Yokohama
+324,,Nintendo World
+325,,Pokémon Event
+326,,Pokémon Event 06
+327,,Pokémon Event 07
+328,,Pokémon Event 08
+329,,Pokémon Event 09
+330,,Pokémon Event 10
+331,,Pokémon Event 11
+332,,Pokémon Event 12
+333,,Pokémon Event 13
+334,,Pokémon Event 14
+335,,Pokémon Event 15
+336,,Pokémon Event 16
+337,,Wi-Fi Event
+338,,Wi-Fi Gift
+339,,Pokémon Fan Club
+340,,Event Site
+341,,Concert Event

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 85cdc22..b771dab 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -293,6 +293,12 @@ class LocationAreaEncounterRate(TableBase):
     version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, autoincrement=False)
     rate = Column(Integer, nullable=True)
 
     version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, autoincrement=False)
     rate = Column(Integer, nullable=True)
 

+class LocationInternalID(TableBase):
+    __tablename__ = 'location_internal_ids'
+    location_id = Column(Integer, ForeignKey('locations.id'), nullable=False, primary_key=True)
+    generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True)
+    internal_id = Column(Integer, nullable=False)
+

 class Machine(TableBase):
     __tablename__ = 'machines'
     machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
 class Machine(TableBase):
     __tablename__ = 'machines'
     machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False)


@@ -764,6 +770,9 @@ ItemCategory.pocket = relation(ItemPocket)
 
 ItemFlavorText.version_group = relation(VersionGroup)
 
 
 ItemFlavorText.version_group = relation(VersionGroup)
 

+ItemInternalID.item = relation(Item, backref='internal_ids')
+ItemInternalID.generation = relation(Generation)
+

 ItemName.language = relation(Language)
 
 ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.name)
 ItemName.language = relation(Language)
 
 ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.name)


@@ -772,6 +781,9 @@ Location.region = relation(Region, backref='locations')
 
 LocationArea.location = relation(Location, backref='areas')
 
 
 LocationArea.location = relation(Location, backref='areas')
 

+LocationInternalID.location = relation(Location, backref='internal_ids')
+LocationInternalID.generation = relation(Generation)
+

 Machine.item = relation(Item)
 Machine.version_group = relation(VersionGroup)
 
 Machine.item = relation(Item)
 Machine.version_group = relation(VersionGroup)