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

Simulate Gen 1 Fight Button for Wrap #2327

Merged
merged 9 commits into from
Mar 12, 2025

Conversation

HisuianZoroark
Copy link
Contributor

@HisuianZoroark HisuianZoroark commented Feb 24, 2025

Adds a warning if you are partial trapping/partially trapped, also collaborated with @InAShellnut

To be merged with smogon/pokemon-showdown#10936

@Zarel
Copy link
Member

Zarel commented Mar 1, 2025

These feel like they should be in finalDecisionMove, rather than their own variables? Maybe finalDecisionMove should be a string enum of possible reasons?

Ditto for maybeDisabled and maybeTrapped server-side.

@HisuianZoroark
Copy link
Contributor Author

Ditto for maybeDisabled and maybeTrapped server-side.

I mean, sure? My biggest concern is that maybePartiallyTrapping takes a 'string' argument for a move so im not sure how to go about it

@Zarel
Copy link
Member

Zarel commented Mar 2, 2025

We got to an understanding on Discord. The client only needs to know whether it's possible to cancel after using a move, and whether it's possiblce to cancel after switching, and a reason for each.

I won't merge until that's in.

@HisuianZoroark HisuianZoroark marked this pull request as ready for review March 8, 2025 23:22
@Zarel Zarel changed the title Add warning for the Gen 1 Fight Button Simulate Gen 1 Fight Button for Wrap Mar 11, 2025
@Zarel
Copy link
Member

Zarel commented Mar 11, 2025

Current design:

image

Please ignore the Kabutops, I just played Gen 1 randbat and used surgery to graft Wrap onto the first pokemon I saw.

@Zarel Zarel merged commit 4865bd3 into smogon:master Mar 12, 2025
1 check passed
@Zarel
Copy link
Member

Zarel commented Mar 12, 2025

To be clear, the text is not finalized, but it makes sense to make the current version playable while waiting for the RBY council to slowly deliberate on it.

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