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

[Move][P2] Fix Pollen Puff interactions when targeting an ally #864

Merged
merged 6 commits into from
Mar 24, 2025

Conversation

innerthunder
Copy link
Contributor

@innerthunder innerthunder commented Mar 21, 2025

What are the changes the user will see?

  • Pollen Puff should no longer heal targeted allies multiple times when the user has Parental Bond or Multi-Lens.
  • Pollen Puff should no longer steal items from targeted allies when the user has Grip Claw

Why am I making these changes?

fixes #838

What are the changes from a developer perspective?

  • HealOnAllyAttr now stops in-progress multi-hit moves when it successfully applies.
  • Added a stopMultiHit method to Pokemon that resets the Pokemon's turn data to stop the execution of multi-hit moves. This is now used in other edge cases where turn data needs to be reset.
  • The type guards isAttackMove, isStatusMove, and isSelfStatusMove now optionally take the user and target into account. With this option, Grip Claw now takes variable move category into account when determining if a move can steal items.

Screenshots/Videos

Pollen Puff/Parental Bond

Poketernity.-.Google.Chrome.2025-03-21.03-11-36.mp4

Overrides:

const overrides = {
  BATTLE_TYPE_OVERRIDE: "double",
  ABILITY_OVERRIDE: Abilities.PARENTAL_BOND,
  MOVESET_OVERRIDE: [MoveId.POLLEN_PUFF, MoveId.CLANGOROUS_SOUL, MoveId.SPLASH],
  ENEMY_MOVESET_OVERRIDE: MoveId.SPLASH
} satisfies Partial<InstanceType<typeof DefaultOverrides>>;

How to test the changes?

Checklist

  • ⚠️ If this is a PR for main (such as a hotfix), has the game version been updated (npm run update-version:patch / npm run update version:minor?
  • Otherwise: I'm using beta as my base branch
  • 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:silent)
    • Have I created new automated tests (npm run test:create) or updated existing tests related to the PR's changes?
  • Have I provided screenshots/videos of the changes (if applicable)?
    • Have I made sure that any UI change works for both UI themes (dark and light)?

@innerthunder innerthunder added Move For move implementations/interactions P2 Bug Minor bug. Used for when a move/ability/interaction is incorrect but is not game breaking. labels Mar 21, 2025
MokaStitcher
MokaStitcher previously approved these changes Mar 21, 2025
Copy link
Contributor

@MokaStitcher MokaStitcher left a comment

Choose a reason for hiding this comment

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

lgtm
Of note, the Parental Bond flyout still happens when using Pollen Puff on an ally, but that whole flyout thing is a larger issue probably (for example the flyout also shows when attacking an enemy even if it gets killed on the first hit, which I'm not sure should happen either)

@Tempo-anon Tempo-anon merged commit 35c44f3 into beta Mar 24, 2025
8 checks passed
@Tempo-anon Tempo-anon deleted the move/pollen-puff-fix branch March 24, 2025 01:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Move For move implementations/interactions P2 Bug Minor bug. Used for when a move/ability/interaction is incorrect but is not game breaking.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] Pollen Puff Parental Bond, Multi-Lens, Grip Claw Ally Healing Interactions Incorrect
3 participants