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

Added Confusion to be healed with Full Heals and Full Restores #1112

Merged
merged 15 commits into from
May 31, 2024

Conversation

EvasiveAce
Copy link
Contributor

@EvasiveAce EvasiveAce commented May 18, 2024

Fixes Issue #1054

Please let me know if there is anything I could improve.

Video testing for Full Heal:

2024-05-18.16-09-44.mp4

Video testing for Full Restore:

2024-05-18.16-16-26.mp4

Video testing that it still will have no effect if nothing is wrong:

2024-05-18.16-16-55.mp4

@EvasiveAce EvasiveAce changed the title Added Confusion to be healed with Full Heals and Full Restores Fixed Issue #1054 - Added Confusion to be healed with Full Heals and Full Restores May 18, 2024
src/field/pokemon.ts Outdated Show resolved Hide resolved
@EvasiveAce EvasiveAce changed the title Fixed Issue #1054 - Added Confusion to be healed with Full Heals and Full Restores Added Confusion to be healed with Full Heals and Full Restores May 18, 2024
@torranx
Copy link
Contributor

torranx commented May 18, 2024

Are there any scenarios where:

  • pokemon is confused
  • resetStatus() is called
  • what called the resetStatus() is not Full Heals nor Full Restores

@rayanzmn
Copy link
Contributor

@torranx is right, for example the move heal bell which is supposed to only heal non-volatile status conditions (sleep, poison, paralysis, freeze and burn) would also heal confusion due to how resetStatus() was changed.

@bennybroseph bennybroseph marked this pull request as draft May 19, 2024 12:28
@bennybroseph bennybroseph added the enhancement New feature or request label May 19, 2024
…or not, defaults to false so you manually have to add
@EvasiveAce
Copy link
Contributor Author

@torranx and @rayanzmn you both are completely right. Thank you for bringing it to my attention.

I have some video testing that should show that it is fixed.

Video to show that Heal Bell does not affect confusion:

Heal.Bell.mp4

Video to show that Full Heals include confusion, as well as not allowing further use once confusion is fixed:

Full.Heal.mp4

Video to show that Full Restores include confusion at max HP:

MaxHPFullRestore.mp4

Video to show that Full Restores include confusion at any HP:

Full.Restore.mp4

@EvasiveAce EvasiveAce marked this pull request as ready for review May 19, 2024 16:51
src/field/pokemon.ts Outdated Show resolved Hide resolved
src/modifier/modifier.ts Outdated Show resolved Hide resolved
@ArchSinccubus
Copy link

Tested new resetStatus() method with both Confusion and a non volatile status (burn in this case)
chrome_wVp81VLQFB

@stendler
Copy link

Ah yes, the case with Heal Bell was what I suspected in the issue, but not really sure about.

@EvasiveAce Lum Berry already has some code to also heal Confusion. I think, this could now be refactored to use the new parameter on resetStatus?

@EvasiveAce
Copy link
Contributor Author

For the Lum Berry refactor, it seemed like this was the easiest way to do it.
@stendler if you want to see the refactor.

Video that shows the Lum Berry still heals confusion:

2024-05-19.17-17-07.mp4

Video that shows the Lum Berry still heals non-volatile status conditions:

2024-05-19.17-21-05.mp4

@XGSleepWalker XGSleepWalker added the game design/balance For things that heavily impact the game label May 29, 2024
@@ -2395,6 +2396,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.lapseTag(BattlerTagType.NIGHTMARE);
}
}
if (confusion) {
if (this.getTag(BattlerTagType.CONFUSED)) {
this.lapseTag(BattlerTagType.CONFUSED);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Doesn't lapseTag only make it go through a single turn? Shouldn't this be removeTag?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Either works, not sure why there are two in general.

@Tempo-anon Tempo-anon merged commit 6c4b60a into pagefaultgames:main May 31, 2024
2 checks passed
Tempo-anon added a commit that referenced this pull request May 31, 2024
XGSleepWalker pushed a commit that referenced this pull request May 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request game design/balance For things that heavily impact the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants