Add MOVE_SHELL_TRAP Effect #2716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrgriffin
reviewed
Feb 21, 2023
src/battle_script_commands.c
Outdated
| @@ -5725,6 +5726,22 @@ static void Cmd_moveend(void) | |||
| else | |||
| gBattleStruct->lastMoveFailed &= ~(gBitTable[gBattlerAttacker]); | |||
|
|
|||
| // Set ShellTrap to activate after the attacker's turn if target was hit by a physical move. | |||
| if (gBattleMoves[gBattleMons[gBattlerTarget].moves[gBattleStruct->chosenMovePositions[gBattlerTarget]]].effect == EFFECT_SHELL_TRAP | |||
There was a problem hiding this comment.
This is ridiculously narrow, but in a double-battle where I KO one of the foes and replace the move I chose with Shell Trap, could it then activate on the same turn despite not having been chosen?
There was a problem hiding this comment.
You're totally right, I think this is exactly what would happen. I think it could be easily fixed tho
mrgriffin
previously approved these changes
Feb 22, 2023
mrgriffin
reviewed
Feb 22, 2023
mrgriffin
approved these changes
Feb 22, 2023
Closed
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2476
Replaces #2132
I used AgustinGDLV's branch as a base and worked on that. Everything should be covered here.
Also added tests for Shell Trap effect.