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

Ally Switch #3533

Merged
merged 17 commits into from
Dec 20, 2023
Merged

Ally Switch #3533

merged 17 commits into from
Dec 20, 2023

Conversation

DizzyEggg
Copy link
Collaborator

Fixes #273

It's almost the oldest open issue and the last not done move effect from Generation5(well except Pledge moves). It's not an understatement to say it's a historic PR.

Potential for things to break: moderately high
Some testing before merging would be nice.

Animation(Psychic BG + variation of Double Team):
Ally Switch anim

@AlexOn1ine
Copy link
Collaborator

If you use Ally Switch with both mons, The second mon goes seemingly for a random move and according to bulbagarden the second ally switch should just fail.

ally_switch.mp4

Some things that are missing

  • If a Pokémon targeted an ally with a move, but as a result of Ally Switch the Pokémon is now targeting itself when it would execute the move, the move will fail
  • Snipe Shot and the Abilities Stalwart and Propeller Tail ignore Ally Switch and hit the intended target.
  • Using Ally Switch consecutively now decreases the chance of success for each consecutive use. Ally Switch will fail when used successfully by another ally Pokémon on the same turn.

Source

@DizzyEggg
Copy link
Collaborator Author

@AlexOn1ine

PR updated and ready to merge:

  • as a result of Ally Switch the second mon goes seemingly for a random move - fixed + test
  • Snipe Shot and the Abilities Stalwart and Propeller Tail ignore Ally Switch - fixed + test
  • If a Pokémon targeted an ally with a move, but as a result of Ally Switch the Pokémon is now targeting itself when it would execute the move, the move will fail - fixed + test
  • Using Ally Switch consecutively now decreases the chance of success for each consecutive use - fixed(with a config) + test
  • Ally Switch will fail when used successfully by another ally Pokémon on the same turn. - not implemented! I actually checked it on Showdown, and the move did not fail. I usually trust Showdown more than Bulbapedia, so I decided to leave it as it is.

Note: better squash this PR when it gets merged, the history is a bit messy

Copy link
Collaborator

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

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

giphy

@AlexOn1ine AlexOn1ine merged commit 6137db1 into rh-hideout:upcoming Dec 20, 2023
1 check passed
Pawkkie pushed a commit to Pawkkie/pokeemerald-expansion that referenced this pull request May 16, 2024
* ally switch move animation

* Ally Switch anim done

* ally switch test and improve animation

* derp

* add ally switch known failing test for ally targeting moves

* moves which targetted ally fail after ally switch

* ally switch works like protect

---------

Co-authored-by: root <root@LAPTOP-3SNV7DEQ>
Co-authored-by: Alex <[email protected]>
@DizzyEggg DizzyEggg deleted the ally_switch branch June 23, 2024 11:21
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