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

Indicator when a candy upgrade is available #1083

Merged
merged 35 commits into from
May 28, 2024

Conversation

josericardo-fo
Copy link
Contributor

@josericardo-fo josericardo-fo commented May 18, 2024

Adds a candy indicator when a passive/cost reduction upgrade can be purchased.
Also addds the setting Candy Upgrade Icon with three options ('Off' by default):

image

'No' doesn't show icons, 'Passives Only' only shows icons when you have enough candies to unlock that Pokémon's Passive Ability and 'On' shows icons when you have enough candies to unlock its Passive or Reduce its cost.

Examples: 'Off' and everything has enough candies

image

'Passives Only' and the last row had their passives unlocked (since Snorlax has Munchlax as its baby, the icon still appears if you can unlock its baby Passive)

image

'Passives Only', the last row had their passives unlocked, the first row has their costs reduced twice and the second row had their costs reduced once and the third row has everything unlocked

image

The icons also update themselves when you buy something

Purchasing Tests

@josericardo-fo josericardo-fo marked this pull request as draft May 18, 2024 05:08
@Madmadness65 Madmadness65 added the Enhancement New feature or request label May 18, 2024
@josericardo-fo josericardo-fo marked this pull request as ready for review May 18, 2024 20:36
@josericardo-fo
Copy link
Contributor Author

Finished. Waiting for review.

@brain-frog brain-frog linked an issue May 20, 2024 that may be closed by this pull request
@j-diefenbach
Copy link
Contributor

j-diefenbach commented May 26, 2024

LGTM although the one line comments might be a little excessive. E.g. you could change 'on mode' 'off mode' etc. to a single line comment above or further above clarifying which mode is what, a decent amount of that code is pretty clear in what it does so comments aren't necessary for those cases imo.
*Plus lint fixes lol

@bennybroseph
Copy link
Collaborator

candy.passive.mp4
candy.all.mp4
animation.passive.mp4
animation.all.mp4

@josericardo-fo
Copy link
Contributor Author

josericardo-fo commented May 27, 2024

After changing settings, some starters Y position are wrong.

image

Restarting the page when changing the setting could fix it

@josericardo-fo
Copy link
Contributor Author

josericardo-fo commented May 28, 2024

@Molker Ready for review

@brain-frog brain-frog merged commit 7e003d6 into pagefaultgames:main May 28, 2024
2 checks passed
@josericardo-fo josericardo-fo deleted the candy-upgrade branch May 28, 2024 18:05
Korwai pushed a commit to Korwai/pokerogue that referenced this pull request Jun 14, 2024
* initial implementation

* updated logic

* reverse retTint

* added candy overlays and colors

* added settings and minor fixes

* german changes

* logic fix

* german changes pt2

* german changes pt3

* setting name changed

* Update battle-scene.ts

* initial animation implementation

* minor fixes

* main compatibility

* minor fix

* logic for animations

* eslint fixes

* final generation logic

* Pause Animation when Selected or Purchased

* Disable Indicator if not Root Species

* Add to Reload and Add Anchor

* Fix Animation on Change

* Fix Icon on Change

* Code Cleanup

* fix

---------

Co-authored-by: Benjamin Odom <[email protected]>
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.

Adding Indicator to show a starter upgrade is available
6 participants