Fix interaction of Ruin Abilities with themselves #9328
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
data/abilities.ts
Outdated
| @@ -357,7 +357,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = { | |||
| }, | |||
| onAnyModifySpD(spd, target, source, move) { | |||
| const abilityHolder = this.effectState.target; | |||
| if (abilityHolder === target) return; | |||
| if (abilityHolder === target || target.hasAbility('Beads of Ruin')) return; | |||
There was a problem hiding this comment.
we can probably just shorten these to just the hasAbility check right? since that must return true on the ability holder
There was a problem hiding this comment.
That feels correct
DaWoblefet
changed the title
pyuk-bot
reviewed
Jan 15, 2023
data/abilities.ts
Outdated
| @@ -4437,7 +4437,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = { | |||
| }, | |||
| onAnyModifyDef(def, target, source, move) { | |||
| const abilityHolder = this.effectState.target; | |||
| if (abilityHolder === target) return; | |||
| if (abilityHolder === target || target.hasAbility('Sword of Ruin')) return; | |||
| if (!move.ruinedDef?.hasAbility('Sword of Ruin')) move.ruinedDef = abilityHolder; | |||
| if (move.ruinedDef !== abilityHolder && move.ruinedDef !== target) return; | |||
There was a problem hiding this comment.
Suggested change
| if (move.ruinedDef !== abilityHolder && move.ruinedDef !== target) return; | |
| if (move.ruinedDef !== abilityHolder) return; |
This part of the check is redundant now.
data/abilities.ts
Outdated
| @@ -357,7 +357,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = { | |||
| }, | |||
| onAnyModifySpD(spd, target, source, move) { | |||
| const abilityHolder = this.effectState.target; | |||
| if (abilityHolder === target) return; | |||
| if (abilityHolder === target || target.hasAbility('Beads of Ruin')) return; | |||
| if (!move.ruinedSpD?.hasAbility('Beads of Ruin')) move.ruinedSpD = abilityHolder; | |||
| if (move.ruinedSpD !== abilityHolder && move.ruinedSpD !== target) return; | |||
There was a problem hiding this comment.
Suggested change
| if (move.ruinedSpD !== abilityHolder && move.ruinedSpD !== target) return; | |
| if (move.ruinedSpD !== abilityHolder) return; |
|
Implemented all suggestions, thanks! |
|
Thank you! |
urkerab
reviewed
Jan 15, 2023
Comment on lines
361
to
+362
| if (!move.ruinedSpD?.hasAbility('Beads of Ruin')) move.ruinedSpD = abilityHolder; | ||
| if (move.ruinedSpD !== abilityHolder && move.ruinedSpD !== target) return; | ||
| if (move.ruinedSpD !== abilityHolder) return; |
There was a problem hiding this comment.
(Although with the new mechanics couldn't ruinedSpD et. al. just be boolean?)
There was a problem hiding this comment.
Oh, Def and SpD are harder because of spread moves. Never mind then.
MathyFurret
pushed a commit
to MathyFurret/pokemon-showdown
that referenced
this pull request
Jan 21, 2023
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.
https://www.smogon.com/forums/threads/bug-reports-v4-read-original-post-before-posting.3663703/page-104#post-9468014