Merge pull request #1189 from SimplyBLGDev/simply-encounter-updates

Add missing special encounters gens 3-5

data/v2/csv/encounter_condition_value_map.csv

@@ -17808,3 +17808,129 @@ encounter_id,encounter_condition_value_id
 62493,71
 62494,71
 62495,71
+66657,72
+66659,72
+66665,73
+66666,73
+66667,74
+66668,74
+66671,75
+66672,75
+66673,75
+66674,75
+66675,75
+66676,75
+66679,58
+66680,58
+66681,76
+66682,76
+66715,77
+66716,77
+66717,72
+66718,72
+66721,72
+66722,72
+66725,72
+66726,72
+66729,72
+66730,72
+66731,78
+66732,79
+66733,80
+66734,80
+66735,64
+66735,81
+66736,64
+66736,81
+66846,24
+66847,24
+66848,25
+66849,25
+66850,26
+66851,26
+66852,24
+66853,24
+66854,25
+66855,25
+66856,26
+66857,26
+66852,82
+66853,82
+66854,82
+66855,82
+66856,82
+66857,82
+66858,35
+66859,35
+66860,35
+66861,35
+66862,83
+66863,83
+66864,84
+66865,84
+66866,85
+66867,85
+66868,89
+66869,90
+66870,91
+66871,91
+66872,86
+66873,86
+66874,87
+66875,87
+66876,88
+66877,88
+66878,92
+66879,92
+66880,91
+66881,91
+66882,37
+66883,37
+66882,93
+66883,93
+66884,94
+66885,94
+66884,59
+66885,59
+66888,62
+66889,62
+66890,64
+66891,64
+66892,61
+66893,61
+66894,65
+66895,65
+66896,60
+66897,60
+66898,63
+66899,63
+66900,95
+66901,95
+66902,96
+66903,96
+66904,97
+66905,97
+66906,98
+66907,98
+66910,99
+66911,99
+66910,100
+66911,100
+66912,101
+66913,101
+66946,102
+66947,102
+66960,103
+66961,103
+66972,104
+66973,104
+66986,97
+66987,97
+66988,98
+66989,98
+66996,101
+66997,101
+66998,35
+66999,35
+66998,105
+66999,105

data/v2/csv/encounter_condition_value_prose.csv

@@ -161,3 +161,37 @@ encounter_condition_value_id,local_language_id,name
 70,5,Après avoir rapporté la pièce de machine à la centrale
 71,9,Have an Event Arceus in the party
 71,5,En ayant un Arceus événementiel dans l’équipe
+72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
+73,9,Have Ice Key in bag
+74,9,Have Iron Key in bag
+75,9,Spoke to Professor Juniper in the Cave of Being
+76,9,Have Lunar Wing in bag
+77,9,Obtained Quake Badge
+78,9,Have Light Stone in bag
+79,9,Have Dark Stone in bag
+80,9,Captured Reshiram or Zekrom previously
+81,9,Defeated Ghetsis
+82,9,Has been unsuccesfully battled 11 times before
+83,9,The current minute is between 00 and 19
+84,9,The current minute is between 20 and 39
+85,9,The current minute is between 40 and 59
+86,9,The current time is between 04:00 and 19:59
+87,9,The current time is between 20:00 and 21:59
+88,9,The current time is between 22:00 and 03:59
+89,9,Have Tidal Bell in bag
+90,9,Have Clear Bell in bag
+91,9,Defeated or captured Groudon or Kyogre
+92,9,"Have Uxie, Mesprit, and Azelf in the party"
+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"
+94,9,Have Dialga or Palkia in the party
+95,9,Have Castform in party
+96,9,Have a Level 100 Pokémon in party
+97,9,Have Tornadus and Thundurus in party
+98,9,Have Reshiram and Zekrom in party
+99,9,Captured all Ultra Beasts
+100,9,Finished Looker's Sidequest
+101,9,After finishing Olivia's trial
+102,9,Have Raikou and Entei in party
+103,9,Have Groudon and Kyogre in party
+104,9,Have Dialga and Palkia in party
+105,9,Scan a specific QR Code

data/v2/csv/encounter_condition_values.csv

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

data/v2/csv/encounter_conditions.csv

@@ -12,3 +12,4 @@ id,identifier
 11,item
 12,weekday
 13,first-party-pokemon
+14,special-encounter

data/v2/csv/encounter_slots.csv

@@ -1138,3 +1138,4 @@ id,version_group_id,encounter_method_id,slot,rarity
 1137,17,1,3,24
 1138,17,1,5,1
 1139,18,1,3,24
+1140,16,30,1,100