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

Add missing special encounters gens 3-5 #1189

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

SimplyBLGDev
Copy link
Contributor

  • Added missing special encounters (mostly static overworld pokemon) along with corresponding missing location, location areas, and encounter conditions to support them.
  • Two entries have been added to the pokemon table to support the female version of jellicent and frillish, since this alternative form wasn't in that table yet for some reason.

Missing special encounters from gens 6 and 7 are numerous and complex, may be adding them in the near future if I can get around to it.

Added missing special encounters (mostly static overworld pokemon) along with corresponding missing location, location areas, and encounter conditions to support them.
Two entries have been added to the pokemon table to support the female version of jellicent and frillish, since this alternative form wasn't in that table yet for some reason.
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, we can this error in the CI:

UNIQUE constraint failed: pokemon_v2_encounter.id

I don't think it's releated to this file, but in this file maybe it's worth adding the trailing ,0 at lines 78-81

@SimplyBLGDev
Copy link
Contributor Author

Also there's a small edge case I wanted to discuss:
Some of these special encounters are locked to certain forms of a pokemon (for example the male and female Jellicent encounters I added in this PR) but the way the current pokemon table is set up, alternative forms are pretty binary (we have a frillish and jellicent entry in their natdex position which default to being the male form, while the female form is in the 10000+ ID range, because it's an 'alternate form'), however the wild encounters with frillish and jellicent are gender neutral, the game rolls for gender while the encounter generates, this isn't compatible with the alternate form system since only the female form has an additional entry.
Should we add another entry for the specifically male counterpart, and leave the default entry as gender neutral? (I guess this would also apply to some other pokemon like Meowstic, Indeedee, Basculegion, and Oinkologne, don't know if you can think of another one this)
If you give me the green light I'll add them myself

@Naramsim
Copy link
Member

Hmm, but I think that Jellicent in reality has two genders only, right? Male and female? There's no neutral I think.

So I think we encountered another limitation due to how the data is structured in our API.

@SimplyBLGDev
Copy link
Contributor Author

It does but most encounters can result in either male or female, while some special encounters are forced into one or the other, the same can happen in other encounters (say unown)

Added Special encounters for gens 5-7 along with necessary additional encounter conditions and location areas. Also a new encounter slot for OR AS Devon Scope
@SimplyBLGDev
Copy link
Contributor Author

This can be merged now

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.

2 participants