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

Fix Gen 1 Wrap #10936

Merged
merged 10 commits into from
Mar 9, 2025
Merged

Fix Gen 1 Wrap #10936

merged 10 commits into from
Mar 9, 2025

Conversation

Zarel
Copy link
Member

@Zarel Zarel commented Mar 3, 2025

Supersedes #10924

There's no need for complicated Fight button mechanics, we have to deal with the same thing in newer generations and maybeDisabled fully covers it.

Changes:

  • maybeDisabled (move choices can't be cancelled) is in effect for all turns except the last of a 5-turn Wrap
    • Wrap no longer leaks when it's ended
  • Wrap no longer misses or consumes PP on turns after the first
  • Wrap does the same damage on all turns as the first
  • If the foe switches, Wrap ends but the attacker is forced into using Wrap again (with miss chance and deducting PP)
  • The text shown is now accurate (no "move failed" and no "pokemon used Wrap" on subsequent Wrap turns)

@HisuianZoroark
Copy link
Contributor

HisuianZoroark commented Mar 3, 2025

maybeDisabled (move choices can't be cancelled) is in effect for all turns except the last of a 5-turn Wrap

You should be able to at least cancel on a turn that has ended but you wouldn't know it. Would it be able to do that and also have the message display?

@Zarel
Copy link
Member Author

Zarel commented Mar 3, 2025

You should be able to at least cancel on a turn that has ended but you wouldn't know it. Would it be able to do that and also have the message display?

Hm. I see why you would want that, but that's not how we've implemented maybeDisabled in the past, and we don't think the small possibility of wanting to cancel in this very specific situation was worth implementing. I'm open to someone else implementing it, but that should probably go into a different PR.

@HisuianZoroark
Copy link
Contributor

I'm open to someone else implementing it, but that should probably go into a different PR.

I am willing to work on this then

@Zarel
Copy link
Member Author

Zarel commented Mar 3, 2025

Also useful would be someone writing tests for my changes.

I'm commenting rather than deleting because if we do end up
implementing the fight button part, we'll need it.
@Zarel
Copy link
Member Author

Zarel commented Mar 4, 2025

I can see why simulating pressing the Fight button would be useful. I think I'll leave that for another PR. Probably it would use a flag on the pokemon, separate from maybeDisabled. Call it maybeLocked, I think?

@Zarel
Copy link
Member Author

Zarel commented Mar 9, 2025

Source for Wrap defender taking poison damage: https://www.youtube.com/watch?v=qaKw1mWIH28

@Zarel Zarel merged commit c280cca into master Mar 9, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants