Skip to content

Commit 7755c12

Browse files
authored
Add XD Encounters, Encounter Conditions, Locations, Location Areas, Encounter Methods, and a few more things (#1446)
* Add XD Encounters, Encounter Conditions, Locations, Location Areas * remove trainer names add hooh conditions - Ho-Oh in colosseum actually two encounter conditions I made for XD Pokemon (complete mt. battle, catch all shadows) so I added those to it. - Removed trainer name from the trade encounter condition as we discussed * remove ! * fix mr mime and poliwrath level * rename phenac colosseum to stadium * location prose rename * add togetic to encounter condition, change pokespot location areas * Update locations.csv
1 parent 8711df8 commit 7755c12

15 files changed

+259
-5
lines changed

data/v2/csv/encounter_condition_prose.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ encounter_condition_id,local_language_id,name
3232
13,5,Premier Pokemon de l'équipe
3333
13,9,First party Pokemon
3434
14,5,Rencontre spéciale
35-
14,9,Special encounter
35+
14,9,Special encounter
36+
15,9,Trade a specific Pokemon to an NPC!

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18084,3 +18084,13 @@ encounter_id,encounter_condition_value_id
1808418084
69576,108
1808518085
69610,108
1808618086
69611,108
18087+
71105,109
18088+
71106,110
18089+
71107,111
18090+
71108,112
18091+
71095,113
18092+
71109,114
18093+
71110,114
18094+
71111,114
18095+
71008,114
18096+
71008,113

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,4 +228,10 @@ encounter_condition_value_id,local_language_id,name
228228
104,9,Have Dialga and Palkia in party
229229
104,5,Avoir Dialga et Palkia dans l'équipe
230230
105,9,Scan a specific QR Code
231-
105,5,Scanner un code QR spécifique
231+
105,5,Scanner un code QR spécifique
232+
109,9,Trade Danny the Purified Shadow Togepi or Togetic for an Elekid
233+
110,9,Trade Duking a Trapinch for a Meditite from a Pokespot
234+
111,9,Trade Duking a Surskit for a Shuckle from a Pokespot
235+
112,9,Trade Duking a Wooper for a Larvitar from a Pokespot
236+
113,9,Catch all 82 Shadow Pokemon and Mirror B will appear in Gateon with a Shadow Dragonite
237+
114,9,Complete Mt. Battle to receive a special prize Pokemon

data/v2/csv/encounter_condition_values.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,9 @@ id,encounter_condition_id,identifier,is_default
107107
106,10,other-caught-articuno,0
108108
107,10,other-caught-zapdos,0
109109
108,10,other-caught-moltres,0
110+
109,15,trade-togepi-or-togetic,1
111+
110,15,trade-trapinch,1
112+
111,15,trade-surskit,1
113+
112,15,trade-wooper,1
114+
113,9,story-progress-catch-all-shadow-pokemon,0
115+
114,9,other-complete-mt-battle,0

data/v2/csv/encounter_conditions.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ id,identifier
1313
12,weekday
1414
13,first-party-pokemon
1515
14,special-encounter
16+
15,trade

data/v2/csv/encounter_method_prose.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,4 @@ encounter_method_id,local_language_id,name
9999
50,9,Receiving an egg from the Pokemon center in New York City that contains the special move Wish.
100100
51,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness."
101101
52,9,"Snagging a Pokemon from a trainer in Pokemon Colosseum or Pokemon XD: Gale of Darkness, after you have failed to capture them once."
102+
53,9,"Finding a Wild Pokemon at any of the three Pokespots in Pokemon XD: Gale of Darkness."

data/v2/csv/encounter_methods.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ id,identifier,order
5151
50,new-york-pokecenter-wish-eggs,50
5252
51,snag,51
5353
52,snag-rematch,52
54+
53,pokespot,53

data/v2/csv/encounter_slots.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,3 +1365,9 @@ id,version_group_id,encounter_method_id,slot,rarity
13651365
1364,12,51,,100
13661366
1365,12,18,,100
13671367
1366,12,52,,100
1368+
1367,13,51,,100
1369+
1368,13,18,,100
1370+
1369,13,53,1,50
1371+
1370,13,53,2,35
1372+
1371,13,53,3,15
1373+
1372,13,36,,100

data/v2/csv/encounters.csv

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65451,3 +65451,107 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6545165451
71010,19,1262,1364,179,37,37
6545265452
71011,19,1262,1364,212,50,50
6545365453
71012,19,1260,1366,185,35,35
65454+
71013,20,1263,1368,133,10,10
65455+
71014,20,1264,1367,216,11,11
65456+
71015,20,1265,1367,165,10,10
65457+
71016,20,1266,1367,261,10,10
65458+
71017,20,1267,1367,228,17,17
65459+
71018,20,1267,1367,343,17,17
65460+
71019,20,1267,1367,363,17,17
65461+
71020,20,1267,1367,179,17,17
65462+
71021,20,1267,1367,316,17,17
65463+
71022,20,1267,1367,273,17,17
65464+
71023,20,1268,1367,167,14,14
65465+
71024,20,1269,1367,322,14,14
65466+
71025,20,1269,1367,285,15,15
65467+
71026,20,1269,1367,318,15,15
65468+
71027,20,1269,1367,301,18,18
65469+
71028,20,1270,1367,100,19,19
65470+
71029,20,1271,1367,296,18,18
65471+
71030,20,1271,1367,37,18,18
65472+
71031,20,1272,1367,355,19,19
65473+
71032,20,1273,1367,280,20,20
65474+
71033,20,1274,1367,303,22,22
65475+
71034,20,1233,1367,361,20,20
65476+
71035,20,1233,1367,204,20,20
65477+
71036,20,1275,1367,177,22,22
65478+
71037,20,1275,1367,315,22,22
65479+
71038,20,1275,1367,52,22,22
65480+
71039,20,1299,1367,220,22,22
65481+
71040,20,1249,1367,21,22,22
65482+
71041,20,1249,1367,88,23,23
65483+
71042,20,1249,1367,86,23,23
65484+
71043,20,1249,1367,337,25,25
65485+
71044,20,1298,1367,299,26,26
65486+
71045,20,1276,1367,335,28,28
65487+
71046,20,1277,1367,46,28,28
65488+
71047,20,1277,1367,58,28,28
65489+
71048,20,1278,1367,90,29,29
65490+
71049,20,1279,1367,15,30,30
65491+
71050,20,1279,1367,17,30,30
65492+
71051,20,1280,1367,114,30,30
65493+
71052,20,1280,1367,12,30,30
65494+
71053,20,1280,1367,82,30,30
65495+
71054,20,1281,1367,49,32,32
65496+
71055,20,1281,1367,70,32,32
65497+
71056,20,1281,1367,24,33,33
65498+
71057,20,1282,1367,57,34,34
65499+
71058,20,1282,1367,97,34,34
65500+
71059,20,1283,1367,55,33,33
65501+
71060,20,1283,1367,302,33,33
65502+
71061,20,1284,1367,20,34,34
65503+
71062,20,1284,1367,85,34,34
65504+
71063,20,1284,1367,83,36,36
65505+
71064,20,1284,1367,334,36,36
65506+
71065,20,1285,1367,115,36,36
65507+
71066,20,1285,1367,354,37,37
65508+
71067,20,1286,1367,126,36,36
65509+
71068,20,1286,1367,127,35,35
65510+
71069,20,1287,1367,219,38,38
65511+
71070,20,1287,1367,78,40,40
65512+
71071,20,1287,1367,106,38,38
65513+
71072,20,1287,1367,107,38,38
65514+
71073,20,1288,1367,108,38,38
65515+
71074,20,1288,1367,123,40,40
65516+
71075,20,1288,1367,113,39,39
65517+
71076,20,1289,1367,338,41,41
65518+
71077,20,1289,1367,121,41,41
65519+
71078,20,1289,1367,125,43,43
65520+
71079,20,1289,1367,277,43,43
65521+
71080,20,1289,1367,143,43,43
65522+
71081,20,1289,1367,62,42,42
65523+
71082,20,1289,1367,122,42,42
65524+
71083,20,1290,1367,51,40,40
65525+
71084,20,1291,1367,310,44,44
65526+
71085,20,1291,1367,373,50,50
65527+
71086,20,1291,1367,105,44,44
65528+
71087,20,1291,1367,131,44,44
65529+
71088,20,1292,1367,249,50,50
65530+
71089,20,1292,1367,144,50,50
65531+
71090,20,1292,1367,145,50,50
65532+
71091,20,1292,1367,146,50,50
65533+
71092,20,1292,1367,128,46,46
65534+
71093,20,1292,1367,112,46,46
65535+
71094,20,1292,1367,103,46,46
65536+
71095,20,1266,1367,149,55,55
65537+
71096,20,1294,1369,27,10,23
65538+
71097,20,1294,1370,207,10,20
65539+
71098,20,1294,1371,328,10,20
65540+
71099,20,1295,1369,187,10,20
65541+
71100,20,1295,1370,231,10,20
65542+
71101,20,1295,1371,283,10,20
65543+
71102,20,1270,1369,41,10,21
65544+
71103,20,1270,1370,304,10,21
65545+
71104,20,1270,1371,194,10,21
65546+
71105,20,1297,1372,239,20,20
65547+
71106,20,1250,1372,307,20,20
65548+
71107,20,1250,1372,213,20,20
65549+
71108,20,1250,1372,246,20,20
65550+
71109,20,1296,1368,152,5,5
65551+
71110,20,1296,1368,155,5,5
65552+
71111,20,1296,1368,158,5,5
65553+
71112,20,1297,1368,175,25,25
65554+
71113,20,1294,1367,299,26,26
65555+
71114,20,1295,1367,299,26,26
65556+
71115,20,1270,1367,299,26,26
65557+
71116,20,1259,1367,299,26,26

data/v2/csv/location_area_encounter_rates.csv

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3877,3 +3877,12 @@ location_area_id,encounter_method_id,version_id,rate
38773877
1206,1,7,10
38783878
1206,1,8,10
38793879
1206,1,9,10
3880+
1270,53,20,50
3881+
1270,53,20,35
3882+
1270,53,20,15
3883+
1294,53,20,50
3884+
1294,53,20,35
3885+
1294,53,20,15
3886+
1295,53,20,50
3887+
1295,53,20,35
3888+
1295,53,20,15

0 commit comments

Comments
 (0)