Skip to content

Commit 608eb0c

Browse files
authored
Merge pull request #1189 from SimplyBLGDev/simply-encounter-updates
Add missing special encounters gens 3-5
2 parents fa37697 + 59dc9f6 commit 608eb0c

10 files changed

+669
-11
lines changed

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17808,3 +17808,129 @@ encounter_id,encounter_condition_value_id
1780817808
62493,71
1780917809
62494,71
1781017810
62495,71
17811+
66657,72
17812+
66659,72
17813+
66665,73
17814+
66666,73
17815+
66667,74
17816+
66668,74
17817+
66671,75
17818+
66672,75
17819+
66673,75
17820+
66674,75
17821+
66675,75
17822+
66676,75
17823+
66679,58
17824+
66680,58
17825+
66681,76
17826+
66682,76
17827+
66715,77
17828+
66716,77
17829+
66717,72
17830+
66718,72
17831+
66721,72
17832+
66722,72
17833+
66725,72
17834+
66726,72
17835+
66729,72
17836+
66730,72
17837+
66731,78
17838+
66732,79
17839+
66733,80
17840+
66734,80
17841+
66735,64
17842+
66735,81
17843+
66736,64
17844+
66736,81
17845+
66846,24
17846+
66847,24
17847+
66848,25
17848+
66849,25
17849+
66850,26
17850+
66851,26
17851+
66852,24
17852+
66853,24
17853+
66854,25
17854+
66855,25
17855+
66856,26
17856+
66857,26
17857+
66852,82
17858+
66853,82
17859+
66854,82
17860+
66855,82
17861+
66856,82
17862+
66857,82
17863+
66858,35
17864+
66859,35
17865+
66860,35
17866+
66861,35
17867+
66862,83
17868+
66863,83
17869+
66864,84
17870+
66865,84
17871+
66866,85
17872+
66867,85
17873+
66868,89
17874+
66869,90
17875+
66870,91
17876+
66871,91
17877+
66872,86
17878+
66873,86
17879+
66874,87
17880+
66875,87
17881+
66876,88
17882+
66877,88
17883+
66878,92
17884+
66879,92
17885+
66880,91
17886+
66881,91
17887+
66882,37
17888+
66883,37
17889+
66882,93
17890+
66883,93
17891+
66884,94
17892+
66885,94
17893+
66884,59
17894+
66885,59
17895+
66888,62
17896+
66889,62
17897+
66890,64
17898+
66891,64
17899+
66892,61
17900+
66893,61
17901+
66894,65
17902+
66895,65
17903+
66896,60
17904+
66897,60
17905+
66898,63
17906+
66899,63
17907+
66900,95
17908+
66901,95
17909+
66902,96
17910+
66903,96
17911+
66904,97
17912+
66905,97
17913+
66906,98
17914+
66907,98
17915+
66910,99
17916+
66911,99
17917+
66910,100
17918+
66911,100
17919+
66912,101
17920+
66913,101
17921+
66946,102
17922+
66947,102
17923+
66960,103
17924+
66961,103
17925+
66972,104
17926+
66973,104
17927+
66986,97
17928+
66987,97
17929+
66988,98
17930+
66989,98
17931+
66996,101
17932+
66997,101
17933+
66998,35
17934+
66999,35
17935+
66998,105
17936+
66999,105

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,37 @@ encounter_condition_value_id,local_language_id,name
161161
70,5,Après avoir rapporté la pièce de machine à la centrale
162162
71,9,Have an Event Arceus in the party
163163
71,5,En ayant un Arceus événementiel dans l’équipe
164+
72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
165+
73,9,Have Ice Key in bag
166+
74,9,Have Iron Key in bag
167+
75,9,Spoke to Professor Juniper in the Cave of Being
168+
76,9,Have Lunar Wing in bag
169+
77,9,Obtained Quake Badge
170+
78,9,Have Light Stone in bag
171+
79,9,Have Dark Stone in bag
172+
80,9,Captured Reshiram or Zekrom previously
173+
81,9,Defeated Ghetsis
174+
82,9,Has been unsuccesfully battled 11 times before
175+
83,9,The current minute is between 00 and 19
176+
84,9,The current minute is between 20 and 39
177+
85,9,The current minute is between 40 and 59
178+
86,9,The current time is between 04:00 and 19:59
179+
87,9,The current time is between 20:00 and 21:59
180+
88,9,The current time is between 22:00 and 03:59
181+
89,9,Have Tidal Bell in bag
182+
90,9,Have Clear Bell in bag
183+
91,9,Defeated or captured Groudon or Kyogre
184+
92,9,"Have Uxie, Mesprit, and Azelf in the party"
185+
93,9,"After capturing the three regis in the game, have a nicknamed Regice holding a cold-based item, plus Regirock and Registeel in the party"
186+
94,9,Have Dialga or Palkia in the party
187+
95,9,Have Castform in party
188+
96,9,Have a Level 100 Pokémon in party
189+
97,9,Have Tornadus and Thundurus in party
190+
98,9,Have Reshiram and Zekrom in party
191+
99,9,Captured all Ultra Beasts
192+
100,9,Finished Looker's Sidequest
193+
101,9,After finishing Olivia's trial
194+
102,9,Have Raikou and Entei in party
195+
103,9,Have Groudon and Kyogre in party
196+
104,9,Have Dialga and Palkia in party
197+
105,9,Scan a specific QR Code

data/v2/csv/encounter_condition_values.csv

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,37 @@ id,encounter_condition_id,identifier,is_default
7070
69,10,other-talked-to-32-people-underground,0
7171
70,9,story-progress-returned-machine-part,0
7272
71,10,other-event-arceus-in-party,0
73+
72,14,special-encounter-couldnt-capture-before,0
74+
73,11,item-ice-key,0
75+
74,11,item-iron-key,0
76+
75,9,story-progress-juniper-cave-of-being,0
77+
76,11,item-lunar-wing,0
78+
77,9,story-progress-quake-badge,0
79+
78,11,item-light-stone,0
80+
79,11,item-dark-stone,0
81+
80,10,other-captured-reshiram-or-zekrom,0
82+
81,9,defeated-ghetsis,0
83+
82,10,other-found-11-times-roaming,0
84+
83,2,time-minute-00-to-19,0
85+
84,2,time-minute-20-to-39,0
86+
85,2,time-minute-40-to-59,0
87+
86,2,time-04-00-to-19-59,0
88+
87,2,time-20-00-to-21-59,0
89+
88,2,time-21-00-to-03-59,0
90+
89,11,item-tidal-bell,0
91+
90,11,item-clear-bell,0
92+
91,9,story-progress-defeated-groudon-or-kyogre,0
93+
92,10,other-uxie-mesprit-azelf-in-party,0
94+
93,10,other-nicknamed-cold-item-regice-regirock-registeel3,0
95+
94,10,other-dialga-or-palkia-in-party,0
96+
95,10,other-castform-in-party,0
97+
96,10,other-level-100-pokemon-in-party,0
98+
97,10,other-tornadus-thundurus-in-party,0
99+
98,10,other-reshiram-zekrom-in-party,0
100+
99,10,other-captured-all-ultra-beasts,0
101+
100,9,story-progress-finished-looker-sidequest,0
102+
101,9,story-progress-beat-olivias-trial,0
103+
102,10,other-raikou-entei-in-party,0
104+
103,10,other-groudon-kyogre-in-party,0
105+
104,10,other-dialga-palkia-in-party,0
106+
105,10,other-scan-qr-code,0

data/v2/csv/encounter_conditions.csv

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

data/v2/csv/encounter_slots.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,3 +1138,4 @@ id,version_group_id,encounter_method_id,slot,rarity
11381138
1137,17,1,3,24
11391139
1138,17,1,5,1
11401140
1139,18,1,3,24
1141+
1140,16,30,1,100

0 commit comments

Comments
 (0)