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 for burn up/double shock #2962

Merged
merged 4 commits into from
Apr 30, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

@AlexOn1ine AlexOn1ine commented Apr 28, 2023

Description

Fixes Burn Up and Double Shock not losing the typing when a target is killed and double pp consumption when used.

/Edit: Added tests including one specific for this scenario that fails without the fix.

Images

double_shock

Issue(s) that this PR fixes

Fixes #2961, Fixes #2960

Discord contact info

AlexOnline#2331

@AlexOn1ine AlexOn1ine force-pushed the burn_up_double_shock branch from 2306149 to 4146f01 Compare April 29, 2023 09:02
test/move_effect_burn_up.c Outdated Show resolved Hide resolved
test/move_effect_burn_up.c Outdated Show resolved Hide resolved
test/move_effect_burn_up.c Show resolved Hide resolved
test/move_effect_double_shock.c Outdated Show resolved Hide resolved
test/move_effect_double_shock.c Show resolved Hide resolved
test/move_effect_double_shock.c Outdated Show resolved Hide resolved
test/move_effect_double_shock.c Outdated Show resolved Hide resolved
test/move_effect_burn_up.c Outdated Show resolved Hide resolved
@AlexOn1ine
Copy link
Collaborator Author

Applied all suggestions.

@AsparagusEduardo AsparagusEduardo merged commit 2d6282f into rh-hideout:upcoming Apr 30, 2023
@AlexOn1ine AlexOn1ine deleted the burn_up_double_shock branch May 13, 2023 19:41
@AsparagusEduardo AsparagusEduardo mentioned this pull request May 31, 2023
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.

Burn Up is affected by the user's Pressure Ability Burn Up doesn't remove Fire-Type if it gets a KO
2 participants