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.

Sign up for GitHub

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

Jump to bottom

Evolution updates #3009

Merged
merged 6 commits into from
May 18, 2023
Merged

Evolution updates #3009

merged 6 commits into from
May 18, 2023
+112 −51

Conversation

LOuroboros
Copy link
Collaborator

Description

Addresses an oversight brought up by PCG inside the Discord server.

Discord contact info

Lunos#4026

@LOuroboros LOuroboros force-pushed the LOuroboros-patch-1 branch 3 times, most recently from e6910d0 to 3d92c82 Compare May 16, 2023 14:32
AsparagusEduardo
AsparagusEduardo suggested changes May 16, 2023
View reviewed changes
AsparagusEduardo
AsparagusEduardo suggested changes May 16, 2023
View reviewed changes
Copy link

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

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

It's still missing updating Gligar, Happiny, and regular Sneasel evolutions, not to mention adding Hisuian Sneasel's EVO_ITEM_HOLD_DAY method.

@LOuroboros
Copy link
Collaborator Author

It's still missing updating Gligar, Happiny

Will fix.

and regular Sneasel evolutions

?

not to mention adding Hisuian Sneasel's EVO_ITEM_HOLD_DAY method.

Wot? It's not hold, it's used. And it was like, the thing this PR was originally addressing.

@LOuroboros LOuroboros changed the title Add Hisuian Sneasel's evolution to gEvolutionTable Evolution updates May 17, 2023
@LOuroboros
Copy link
Collaborator Author

Ah, you mean to extrapolate things and make Sneasel be able to evolve into Weavile via EVO_ITEM_NIGHT, and for Hisuian Sneasel to be able to evolve into Sneasler via EVO_ITEM_HOLD_DAY? Is that it @AsparagusEduardo?

@AsparagusEduardo AsparagusEduardo changed the base branch from master to upcoming May 17, 2023 05:21
@AsparagusEduardo
Copy link

Ah, you mean to extrapolate things and make Sneasel be able to evolve into Weavile via EVO_ITEM_NIGHT, and for Hisuian Sneasel to be able to evolve into Sneasler via EVO_ITEM_HOLD_DAY? Is that it @AsparagusEduardo?

Ye

@AsparagusEduardo
Copy link

Please rebase the PR to upcoming.

Also, based on discussion in the Discord server, it might be better to have a config for the items themselves to determine if they can be used for evolution or not, instead of modifying evolution data.

LOuroboros added 3 commits May 17, 2023 16:21
@LOuroboros
Add Hisuian Sneasel's evolution to gEvolutionTable

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
c161c22
@LOuroboros
Updates

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
2a478cb 
-Added EVO_ITEM_NIGHT, (it's like EVO_ITEM_DAY but nighttime specific)
-Added EVO_ITEM_HOLD (it's like the day based variations, but day agnostic)
-Turned the trade evo items into regular evolution items
-Ditched the config for the Razor Claw by request
-Updated every entry in gEvolutionTable for species that could only evolve via EVO_TRADE_ITEM to LA's standard
@LOuroboros
Review corrections (extrapolations)

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
74bd0fa
@LOuroboros
Copy link
Collaborator Author

Also, based on discussion in the Discord server, it might be better to have a config for the items themselves to determine if they can be used for evolution or not, instead of modifying evolution data.

Can you elaborate?

You mean a config just like the one I originally added for the Razor Claw, but that encompasses all the items that are being turned into evolution items here, or...?

@LOuroboros LOuroboros force-pushed the LOuroboros-patch-1 branch from 0cece13 to 813f779 Compare May 17, 2023 19:36
@LOuroboros
Post Cherrypick corrections

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
2c7b264
@LOuroboros LOuroboros force-pushed the LOuroboros-patch-1 branch from 813f779 to 2c7b264 Compare May 17, 2023 19:38
@LOuroboros
Corrected the description of EVO_ITEM_NIGHT

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
8f40267
@AsparagusEduardo
Copy link

You mean a config just like the one I originally added for the Razor Claw, but that encompasses all the items that are being turned into evolution items here, or...?

Yes. The evolution data is good as it is, the config would only be for the items themselves.

@LOuroboros
Added a config for the new items' field-evolving functionality

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
813fe3f
@AsparagusEduardo AsparagusEduardo merged commit 29d2d42 into upcoming May 18, 2023
@LOuroboros LOuroboros deleted the LOuroboros-patch-1 branch May 18, 2023 15:16
@AsparagusEduardo AsparagusEduardo mentioned this pull request May 31, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AsparagusEduardo AsparagusEduardo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@LOuroboros @AsparagusEduardo