Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Johto Safari Zone, fix encounters/methods, roaming Pokemon and new encounters #738

Merged
merged 34 commits into from
Aug 30, 2022

Conversation

SimplyBLGDev
Copy link
Contributor

After much research I was able to find out some mechanics from the johto safari zone, it uses completely different encounter slots in walking, surfing, old rod, good rod and super rod, I was able to determine that it's 10 walk slots all have a 10% chance but wasn't so lucky in finding the chance for the surfing, old rod, good rod and super rod 12 slots, I have -some- confidence that it has 10 10% chance slots and 2 0% chance slots, if more info comes to light about these slots I'll update this info at another time.

  • Added Johto Safari Zone location
  • Added all 12 Safari Zone areas
  • Added all 2880 encounters from the safari zone (For both HG and SS)

After much research I was able to find out some mechanics from the johto safari zone, it uses completely different encounter slots in walking, surfing, old rod, good rod and super rod, I was able to determine that it's 10 walk slots all have a 10% chance but wasn't so lucky in finding the chance for the surfing, old rod, good rod and super rod 12 slots, I have -some- confidence that it has 10 10% chance slots and 2 0% chance slots, if more info comes to light about these slots I'll update this info at another time.

+ Added Johto Safari Zone location
+ Added all 12 Safari Zone areas
+ Added all 2880 encounters from the safari zone (For both HG and SS)
@SimplyBLGDev
Copy link
Contributor Author

You can find the tool I made to generate all these rows in this gist.

In another time I'll add the missing event Pokemon encounters for gens 4 and 5 (I'll make another PR for that in the future)

@SimplyBLGDev
Copy link
Contributor Author

It also is important to note that these are the regular encounters for the safari zone areas and does not include the block encounters, I'll add those at a later date, although that may require some new data structures due to the uniqueness of the mechanic.

For some reason the conditions on this specific area where missing in crystal, despite the data being present in encounters the conditions were not attached to them
@SimplyBLGDev
Copy link
Contributor Author

#737 Is solved with my original commit
I've also added some missing conditions in crystal route 13, as reported #735

+ Moltres at Mt. Ember Summit
Rock smash encounters at Mt. Ember summit FR/LG
Roaming Pokémon can be encountered exclusively on grass or water in different situations in different games and at different encounter rates, which is something that wasn't reflected in the previous encounter method (which used to be only one).

+ Added Roaming grass encounter method
+ Added Roaming water encounter method
+ Moved Crystal, Firered, Leafgreen, Ruby, Sapphire and Emerald roaming Pokémon to the new encounter methods
@SimplyBLGDev SimplyBLGDev changed the title Johto Safari Zone, encounters, methods, location and location areas Johto Safari Zone, fix encounters/methods, roaming Pokemon and new encounters Jul 24, 2022
+ Magikarp in Route 3
+ Fossil Pokémon in Cinnabar Lab
+ Fossils in Rustboro city
+ Magikarp in Route 3
+ Fossils in Cinnabar Lab
+ National Dex requirement for Hearthome Eeevee D/P
+ Defeat Jupiter Eterna City Togepi Egg
+ Remove Togepi Egg from D/P (was incorrect)
+ Clear Team Galactic Iron Island Riolu Egg
+ Passwords for Mareep, Wooper, Slugma Eggs
+ Zephyr Badge Togepi Egg
+ Defeat Red Bulbasaur, Charmander, Squirtle, Treecko, Torchic, Mudkip
+ Receive Kanto starter Treecko, Torchic, Mudkip
+ Dratini in Dragon's Den
+ Tentacool in Cianwood Pokémon Center
+ Dratini in Dragon's Den
@SimplyBLGDev
Copy link
Contributor Author

@Naramsim Ok, I'm done, this is ready to be merged

@SimplyBLGDev
Copy link
Contributor Author

Something to be noted is that I was about to fix the unown encounters in FR/LG, HG/SS, D/P and Pt but unown forms aren't listed with the other alternative forms in the pokemon table for some reason, I'd add them but I need your OK to do so @Naramsim

After some research I found that the Johto Safari zone uses different encounter slots for morning, day and night and I also arrived at these chances for them, I modified the encounters and added the new encounter slots as appropriate, these chances could be wrong but I experimentally tested them and believe that these chances are correct, the chances I found are as follow:
+ When walking there are 10 slots with 10% chance each
+ When fishing with an old-rod, good-rod, super-rod or when surfing the chances are as follow:
| Morning | Day | Night |
|---------|-----|-------|
| 10%     | 10% | 5%    |
| 10%     | 10% | 10%   |
| 10%     | 5%  | 5%    |
| 10%     | 10% | 10%   |
| 5%      | 5%  | 15%   |
| 10%     | 10% | 15%   |
| 5%      | 15% | 0%    |
| 10%     | 15% | 0%    |
| 15%     | 0%  | 10%   |
| 15%     | 0%  | 10%   |
| 0%      | 10% | 10%   |
| 0%      | 10% | 10%   |
Will update if more precise information becomes available
+ Voltorb and electrodes in Power Plant
+ Voltorb, Electrode, Koffing in Rocket HQ
+ Lapras on Fridays in Union Cave
+ Kecleon in Route 119 and 120 with Devon Scope
+ Added high friendship requirement for Togepi Egg in Water Labyrinth
+ Spiritomb in Route 209
+ Rotom in Old Chateau
+ Voltorb in Power plant
@SimplyBLGDev
Copy link
Contributor Author

This is a pretty big commit but it's ready to be merged, one of my websites uses the encounter data so if it could be reviewed soon that would be great.

Still missing:

  • Gen 5, 6, 7 & 8 static, legendary and event Pokémon encounters
  • Bug catching contest slots and encounters (It works differently than most encounters and the safari zone, these mechanics haven't been decompiled yet so it requires some extra research)
  • Separate missing alternate form Pokemon to the Pokemon table (So that they can be referenced in the encounters)
  • Update alternate forms encounters for these Pokémon (Most notably Shellos, Gastrodon, Burmy, Wormadam and Unown) in appropriate games.

@SimplyBLGDev
Copy link
Contributor Author

Paging @Naramsim can we merge these changes?

@Naramsim
Copy link
Member

@SimplyBLGDev I'm sooooo sorry!!! please excuse me! I got your email in my spam folder! Thanks for pinging me there! I'll merge the PR. I didn't really review it, but I see it only adds CSV data so I think we are fine with it.

Maybe you can test the staging env later.

@Naramsim Naramsim self-requested a review August 30, 2022 09:21
@Naramsim Naramsim merged commit 42b93a5 into PokeAPI:master Aug 30, 2022
@pokeapi-machine-user
Copy link

A PokeAPI/api-data refresh has started. In 45 minutes the staging branch of PokeAPI/api-data will be pushed with the new generated data.

The staging branch will be deployed in our staging environment and you will be able to review the entire API.

A Pull Request (master<-staging) will be also created at PokeAPI/api-data and assigned to the PokeAPI Core team to be reviewed. If approved and merged new data will soon be available worldwide at pokeapi.co.

@pokeapi-machine-user
Copy link

The updater script has finished its job and has now opened a Pull Request towards PokeAPI/api-data with the updated data.

You can see the Pull Request deployed at our staging environment when CircleCI deploy will be finished (check the started time of the last build).

@SimplyBLGDev SimplyBLGDev deleted the simply-fix-missing-encounters branch August 30, 2022 11:11
@Naramsim
Copy link
Member

@SimplyBLGDev , can you test on https://staging.pokeapi.co/api/v2/

@SimplyBLGDev
Copy link
Contributor Author

@SimplyBLGDev , can you test on https://staging.pokeapi.co/api/v2/

I can see the new data, seems to be correct at first glance.

@Naramsim
Copy link
Member

Ok, I merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants