Add oras surfing and fishing encounters (Part 1)#1542
Conversation
|
Hi I completely missed this PR, sorry for the late reply. I'll try to see if the additions round up in the next days |
Hi, All fine was busy last days... |
… + fix some jotho double ids
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Adds new encounter data and normalizes encounter method records in the v2 CSV dataset.
Changes:
- Appends new encounter rows for additional location areas/versions.
- Introduces new encounter slots tied to newly added methods/slot distributions.
- Fixes missing IDs in encounter methods and adds prose for new methods.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| data/v2/csv/encounters.csv | Adds new encounter rows referencing newly-added slot IDs. |
| data/v2/csv/encounter_slots.csv | Adds new encounter slot definitions to support the new encounters/methods. |
| data/v2/csv/encounter_methods.csv | Fills in missing IDs and adds a new encounter method. |
| data/v2/csv/encounter_method_prose.csv | Adds new prose rows for honey-tree and poke-nav-surfing. |
| 54,hidden-grotto,54 | ||
| 55,honey-tree,54 No newline at end of file | ||
| 55,honey-tree,54 | ||
| 56,poke-nav-surfing,55 No newline at end of file |
There was a problem hiding this comment.
Maybe we should just have poke-nav as the method, seeing as we don't have something like that for other similar grass encounters in the game.
| 55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear. No newline at end of file | ||
| 55,9,Slathering a Honey Tree with Honey and waiting for a Pokémon to appear. | ||
| 56,9,Surfing and using the PokéNav Plus in Pokémon Omega Ruby and Alpha Sapphire | ||
| 56,6,Surfen und das Poké-Multi-Navi nutzen in Pokémon Omega Rubin und Alpha Saphire No newline at end of file |
|
@Naramsim I dont know why there still a Merge conflict, I fixed it local... |
|
Sorry for the Ping got it solved localy |
| 54,hidden-grotto,54 | ||
| 55,honey-tree,54 No newline at end of file | ||
| 55,honey-tree,54 | ||
| 56,poke-nav-surfing,55 No newline at end of file |
| 1496,10,1,8,5 | ||
| 1497,10,1,9,5 | ||
| 1498,10,1,10,5 | ||
| 1499,16,5,,60 |
There was a problem hiding this comment.
Could you reveal a bit how you added all these numbers? I just checked the entries for Frillish and they seem ok.
There was a problem hiding this comment.
I did a little reverse engeniering on some data, and copied the structure for the data I added.
As data source I used the german vatient of Bulbepedia (https://www.pokewiki.de/Hauptseite)
There was a problem hiding this comment.
Thanks! Can you change the order in the file above, fix again the conflicts?
There was a problem hiding this comment.
These are all missing the slot number, these should be added in as well. For example,
| 1499,16,5,,60 | |
| 1499,16,5,1,60 |
jemarq04
left a comment
There was a problem hiding this comment.
I've added some comments as I reviewed the contributions. Not sure why encounters in Heartgold/Soulsilver were added to this? This is not in the scope of the PR.
Also, regarding the PokeNav encounters, we should just use one encounter slot set at 100% rarity since these seem to be chosen at an undetermined rarity. I'd rather not choose an arbitrary 60/35/5 split between the possible encounters.
| 1496,10,1,8,5 | ||
| 1497,10,1,9,5 | ||
| 1498,10,1,10,5 | ||
| 1499,16,5,,60 |
There was a problem hiding this comment.
These are all missing the slot number, these should be added in as well. For example,
| 1499,16,5,,60 | |
| 1499,16,5,1,60 |
| 54,hidden-grotto,54 | ||
| 55,honey-tree,54 No newline at end of file | ||
| 55,honey-tree,54 | ||
| 56,poke-nav-surfing,55 No newline at end of file |
There was a problem hiding this comment.
Maybe we should just have poke-nav as the method, seeing as we don't have something like that for other similar grass encounters in the game.
| 75523,16,236,1487,190,15,16 | ||
| 75524,15,241,1482,163,15,16 | ||
| 75525,16,241,1482,163,15,16 | ||
| 75526,15,241,1483,204,15,16 |
There was a problem hiding this comment.
| 75523,16,236,1487,190,15,16 | |
| 75524,15,241,1482,163,15,16 | |
| 75525,16,241,1482,163,15,16 | |
| 75526,15,241,1483,204,15,16 |
Why did this PR add anything to do with headbutt encounters in Johto?
| 75291,25,395,1499,72,20,25 | ||
| 75292,25,395,1500,278,20,20 | ||
| 75293,25,395,1501,279,25,30 | ||
| 75294,25,395,1502,129,10,15 | ||
| 75295,25,395,1503,72,5,5 | ||
| 75296,25,395,1504,129,25,25 | ||
| 75297,25,395,1505,72,25,25 | ||
| 75298,25,395,1506,320,25,25 | ||
| 75299,25,395,1507,320,30,40 | ||
| 75300,26,395,1499,72,20,25 | ||
| 75301,26,395,1500,278,20,20 | ||
| 75302,26,395,1501,279,25,30 |
There was a problem hiding this comment.
| 75291,25,395,1499,72,20,25 | |
| 75292,25,395,1500,278,20,20 | |
| 75293,25,395,1501,279,25,30 | |
| 75294,25,395,1502,129,10,15 | |
| 75295,25,395,1503,72,5,5 | |
| 75296,25,395,1504,129,25,25 | |
| 75297,25,395,1505,72,25,25 | |
| 75298,25,395,1506,320,25,25 | |
| 75299,25,395,1507,320,30,40 | |
| 75300,26,395,1499,72,20,25 | |
| 75301,26,395,1500,278,20,20 | |
| 75302,26,395,1501,279,25,30 | |
| 75291,25,395,1523,72,20,25 | |
| 75292,25,395,1524,278,20,20 | |
| 75293,25,395,1525,279,25,30 | |
| 75294,25,395,1502,129,10,15 | |
| 75295,25,395,1503,72,5,5 | |
| 75296,25,395,1504,129,25,25 | |
| 75297,25,395,1505,72,25,25 | |
| 75298,25,395,1506,320,25,25 | |
| 75299,25,395,1507,320,30,40 | |
| 75300,26,395,1523,72,20,25 | |
| 75301,26,395,1524,278,20,20 | |
| 75302,26,395,1525,279,25,30 |
The surfing encounters in Route 103 should be at rates 65/30/5% (not 60/35/5 as was used).
| 75338,25,350,1517,341,30,40 | ||
| 75339,26,350,1508,183,15,15 | ||
| 75340,26,350,1509,184,20,25 | ||
| 75341,26,350,1510,283,20,20 |
There was a problem hiding this comment.
| 75341,26,350,1510,283,20,20 | |
| 75341,26,350,1510,283,15,15 |
Surskit should be level 15 in Petalburg City, to match what was given in Omega Ruby.
Change description
I am adding the surfing and fishing encounters from ORAS to the project.
I will add in this PR Route 101 to 109, Oldale Town, Petalburg City, Rustboro City, Dewford Town and Slateport City
AI coding assistance disclosure
I used only the inline assistance of VS-Code (not sure if its AI).
Contributor check list