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

Implement Poison Heal Ability #1245

Merged
merged 10 commits into from
May 30, 2024

Conversation

EvasiveAce
Copy link
Contributor

Implements the Poison Heal Ability

Please let me know if there is anything I can change or improve on. Thank you.

Video to show that Toxic works as intended:

Toxic.mp4

Video to show that Poison Powder works as intended;

Poison.Powder.mp4

@Madmadness65 Madmadness65 added the Ability Affects an ability label May 22, 2024
src/data/ability.ts Outdated Show resolved Hide resolved
src/data/ability.ts Outdated Show resolved Hide resolved
Copy link
Collaborator

@Tempo-anon Tempo-anon left a comment

Choose a reason for hiding this comment

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

Code looks mostly okay to me, just had some comments.

Can you also test this with things like neutralizing gas, skill swap, and toxic?

When a Pokémon with Poison Heal is badly poisoned, this has no effect on the Pokémon's HP recovery. However, the bad poison counter still increases each turn even if the Pokémon has Poison Heal; as such, if Gastro Acid is used on the Pokémon with Poison Heal after being badly poisoned for five turns, it will incur poison damage starting at 5/16 (instead of 1/16).

@EvasiveAce
Copy link
Contributor Author

Code looks mostly okay to me, just had some comments.

Can you also test this with things like neutralizing gas, skill swap, and toxic?

When a Pokémon with Poison Heal is badly poisoned, this has no effect on the Pokémon's HP recovery. However, the bad poison counter still increases each turn even if the Pokémon has Poison Heal; as such, if Gastro Acid is used on the Pokémon with Poison Heal after being badly poisoned for five turns, it will incur poison damage starting at 5/16 (instead of 1/16).

I have done some of the updates you thought would be good. @TempsRay

Video to show the new notification system (only showAbility when actually healing)

NewShowAbility.mp4

Video to show Neutralizing Gas:

NeutralizingGas.mp4

Video to show Skill Swap

SkilSwap.mp4

For Toxic, it should be in the original post, the first video.

@Tempo-anon Tempo-anon removed their request for review May 29, 2024 15:24
@EvasiveAce EvasiveAce force-pushed the poison-heal-branch branch 2 times, most recently from 5ef6dbf to f57ae47 Compare May 29, 2024 16:20
@@ -2293,6 +2312,29 @@ export class PostTurnAbAttr extends AbAttr {
}
}

export class PostTurnPoisonHealAbAttr extends PostTurnAbAttr {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you add some documentation on this class and the BlockPoisonToxicDamageAbAttr class to explain at a quick glance what it does and where it's used (Poison Heal)?

/**
  * Ability attribute to heal the user if the user is poisoned or toxic'd. Used by Poison Heal
  */

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is the newest commit better?

@EvasiveAce
Copy link
Contributor Author

I changed the way healing is done from Heal() to a HealPhase

Video to show how Toxic works with the new phase:

Tox.mp4

Video to show the same thing but with Poison Powder:

PoisonPowd.mp4

src/data/ability.ts Outdated Show resolved Hide resolved
src/data/ability.ts Outdated Show resolved Hide resolved
@Tempo-anon Tempo-anon merged commit d2c5a28 into pagefaultgames:main May 30, 2024
2 checks passed
MrWaterT added a commit to MrWaterT/pokerogue that referenced this pull request Jun 6, 2024
ability-trigeer.ts
  windPowerCharged: Wind Power/Wind Rider pagefaultgames#1566
  Perish Body pagefaultgames#1554
  Poison Heal pagefaultgames#1245
menu.ts
  Loading screen disclaimer 7c9e5e9
modifier-type.ts
  TM description with overlay key notice pagefaultgames#1585
Tempo-anon pushed a commit that referenced this pull request Jun 7, 2024
* [Localization] Apply Korean to update

ability-trigeer.ts
  windPowerCharged: Wind Power/Wind Rider #1566
  Perish Body #1554
  Poison Heal #1245
menu.ts
  Loading screen disclaimer 7c9e5e9
modifier-type.ts
  TM description with overlay key notice #1585

* Correct wrong text and align text width

change RV
remove space from FGEN

* Edit wrong space

* Use special color(official) rather than unofficial shiny

* Translate iceFaceAvoidedDamage
frutescens pushed a commit to frutescens/pokerogue that referenced this pull request Jun 10, 2024
* [Localization] Apply Korean to update

ability-trigeer.ts
  windPowerCharged: Wind Power/Wind Rider pagefaultgames#1566
  Perish Body pagefaultgames#1554
  Poison Heal pagefaultgames#1245
menu.ts
  Loading screen disclaimer 7c9e5e9
modifier-type.ts
  TM description with overlay key notice pagefaultgames#1585

* Correct wrong text and align text width

change RV
remove space from FGEN

* Edit wrong space

* Use special color(official) rather than unofficial shiny

* Translate iceFaceAvoidedDamage
Korwai pushed a commit to Korwai/pokerogue that referenced this pull request Jun 14, 2024
* Implement Poison Heal Ability

* Removed unneeded import

* Fix some comments, as well as make Poison Heal only notify when healing

* Eslint fix

* Revert Phases

* Pushing for sake of reviewing; PR IS NOT DONE IT NEEDS TO BE TESTED AND COMMENTED AGAIN

* Changed the way healing is done, through a heal phase instead of heal(); Also added better documentation

* Changed healing, as well as making abilityTriggers updated
Korwai pushed a commit to Korwai/pokerogue that referenced this pull request Jun 14, 2024
* [Localization] Apply Korean to update

ability-trigeer.ts
  windPowerCharged: Wind Power/Wind Rider pagefaultgames#1566
  Perish Body pagefaultgames#1554
  Poison Heal pagefaultgames#1245
menu.ts
  Loading screen disclaimer 7c9e5e9
modifier-type.ts
  TM description with overlay key notice pagefaultgames#1585

* Correct wrong text and align text width

change RV
remove space from FGEN

* Edit wrong space

* Use special color(official) rather than unofficial shiny

* Translate iceFaceAvoidedDamage
SavGRY pushed a commit to SavGRY/pokerogue that referenced this pull request Jun 16, 2024
* Implement Poison Heal Ability

* Removed unneeded import

* Fix some comments, as well as make Poison Heal only notify when healing

* Eslint fix

* Revert Phases

* Pushing for sake of reviewing; PR IS NOT DONE IT NEEDS TO BE TESTED AND COMMENTED AGAIN

* Changed the way healing is done, through a heal phase instead of heal(); Also added better documentation

* Changed healing, as well as making abilityTriggers updated
SavGRY pushed a commit to SavGRY/pokerogue that referenced this pull request Jun 16, 2024
* [Localization] Apply Korean to update

ability-trigeer.ts
  windPowerCharged: Wind Power/Wind Rider pagefaultgames#1566
  Perish Body pagefaultgames#1554
  Poison Heal pagefaultgames#1245
menu.ts
  Loading screen disclaimer 7c9e5e9
modifier-type.ts
  TM description with overlay key notice pagefaultgames#1585

* Correct wrong text and align text width

change RV
remove space from FGEN

* Edit wrong space

* Use special color(official) rather than unofficial shiny

* Translate iceFaceAvoidedDamage
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ability Affects an ability
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants