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

Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive #5430

Merged
merged 8 commits into from
Sep 24, 2024

Conversation

PhallenTree
Copy link

@PhallenTree PhallenTree commented Sep 23, 2024

  • Adds Snatch interactions with Swallow and Dancer:

Dancer will not activate if the move is stolen by Snatch.

If Swallow is stolen and the user of Snatch is not under the effects of Stockpile, it will nonetheless recover 25% of its max HP.

  • Fixes Electrified Dragon Darts sometimes not correctly avoiding targets with ability immunity (Volt Absorb, Motor Drive)

  • Fixes Trace not activating a switch-in ability it traces, removes unused RESOURCE_FLAG_TRACED.

  • Fixes multiple Primal Reversions not occurring after multiple battlers fainted.

  • Fixes the wrong battler's ability pop up occuring from Switch in ability bug when mulitply mons faint at the same time #5427 (doesn't fix other battlers' Booster Energy not activating)

  • Simplified Quash code (assumes the turn order is correct when using the move)

Added tests for Dancer; also for the Dragon Darts, Trace, Primal Reversion fixes

Issue(s) that this PR fixes

Fixes #5425, fixes #5426

Discord contact info

PhallenTree

@AlexOn1ine
Copy link
Collaborator

I think there is some Trace script that could also be cleaned up. BattleScript_TraceActivatesEnd3 is calling a script which I think can be directly called from C

@AlexOn1ine AlexOn1ine merged commit e67d5a2 into rh-hideout:master Sep 24, 2024
1 check passed
Comment on lines -10014 to +10010
call BattleScript_AbilityPopUpTarget
call BattleScript_AbilityPopUpScripting
Copy link
Collaborator

Choose a reason for hiding this comment

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

I just realized that I wrote this. I deserve to be banished to the shadow realm for this.

Very smart.

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.

Tracing Intimidate Doesn't Proc It Primal Reversion not Always Activating in Double Battles
2 participants