-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Added Confusion to be healed with Full Heals and Full Restores #1112
Conversation
Are there any scenarios where:
|
@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. |
…or not, defaults to false so you manually have to add
@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.mp4Video to show that Full Heals include confusion, as well as not allowing further use once confusion is fixed: Full.Heal.mp4Video to show that Full Restores include confusion at max HP: MaxHPFullRestore.mp4Video to show that Full Restores include confusion at any HP: Full.Restore.mp4 |
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? |
For the Lum Berry refactor, it seemed like this was the easiest way to do it. Video that shows the Lum Berry still heals confusion: 2024-05-19.17-17-07.mp4Video that shows the Lum Berry still heals non-volatile status conditions: 2024-05-19.17-21-05.mp4 |
…Ace/pokerogue into confusion-fix-bug-branch
3f4ec0f
to
820728b
Compare
@@ -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); |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
This reverts commit 6c4b60a.
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