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

[QoL] Summary option when new Pokemon caught and party is full #2242

Merged
merged 13 commits into from
Jul 5, 2024

Conversation

frutescens
Copy link
Collaborator

@frutescens frutescens commented Jun 15, 2024

Recreated because of git issues
Original Found at : #2210

What are the changes?

When a player's party is full, they are presented with yes/no options to add the Pokemon to the party or release the newly caught Pokemon. This adds a 'SUMMARY' option so that the player could look at the caught Pokemon's summary before making a decision.

Why am I doing these changes?

I decided to make these decisions following a discussion in the Discord about the UI and the player's access to essential information regarding party formation. In addition, this feature brings PokeRogue in line to the mainline Pokemon games, which do allow the player to look at the summary page of a newly caught Pokemon.

What did change?

This alters the presentation of confirm-ui-handler.ts when a new Pokemon is caught and the player's party is at max from {YES, NO} to {SUMMARY, YES, NO}
In addition, it changes summary-ui-handler.ts behavior in regards to the cancellation button using differences found in setModeWithoutClear() and setMode(). The video will be also demonstrating that the Summary-UI in other occasions has not been altered in behavior in the comments.

Screenshots/Videos

Please see Discord. https://discord.com/channels/1125469663833370665/1249614808400007198/1249614815345901629

How to test the changes?

Catch a Pokemon with a full party.

Checklist

  • There is no overlap with another PR?
  • The PR is self-contained and cannot be split into smaller PRs?
  • Have I provided a clear explanation of the changes?
  • Have I tested the changes (manually)?
    • Are all unit tests still passing? (npm run test)
  • Are the changes visual?
    • Have I provided screenshots/videos of the changes?

@Greenlamp2 Greenlamp2 added the Enhancement New feature or request label Jun 15, 2024
src/phases.ts Outdated Show resolved Hide resolved
@frutescens
Copy link
Collaborator Author

I saw the test results - will fix tonight.

@frutescens
Copy link
Collaborator Author

image

Copy link
Collaborator

@flx-sta flx-sta left a comment

Choose a reason for hiding this comment

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

There is some wild stuff happening in this:

Screen_Recording_2024-07-02_at_8.05.37_PM.mov

Copy link
Collaborator

@flx-sta flx-sta left a comment

Choose a reason for hiding this comment

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

Copy link
Collaborator

@flx-sta flx-sta left a comment

Choose a reason for hiding this comment

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

1 thing I noticed is that the "learn move" phase seems to now go AFTER the next encounter phase( you can see that in video I posted before)

On live this is not the case. It's as described in Should

To clarify:

Is

  1. caught pokemon + prompt
  2. next counter
  3. learn new move prompt
  4. ...

Should

  1. caught pokemon + prompt
    1. learn new move prompt
  2. next counter
  3. ...

@frutescens
Copy link
Collaborator Author

Copy link
Collaborator

@flx-sta flx-sta left a comment

Choose a reason for hiding this comment

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

lgtm.

The phase order war corrected

src/phases.ts Show resolved Hide resolved
@frutescens
Copy link
Collaborator Author

Tested @Fontbane's changes for the errors above and in the previous PR - found nothing wrong + looks good! thank you :)

@Tempo-anon Tempo-anon merged commit 759e4d0 into pagefaultgames:main Jul 5, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants