From 120995476512db995ecd3e5c8fdc898d6cd634cd Mon Sep 17 00:00:00 2001 From: Marty-D Date: Mon, 4 May 2015 10:45:44 -0400 Subject: [PATCH] Fix Sheer Force properly --- data/abilities.js | 2 -- data/scripts.js | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/abilities.js b/data/abilities.js index d8ad86c862..33888d271d 100644 --- a/data/abilities.js +++ b/data/abilities.js @@ -2336,9 +2336,7 @@ exports.BattleAbilities = { onModifyMove: function (move, pokemon) { if (move.secondaries) { delete move.secondaries; - move.negateSecondary = true; // Actual negation of `AfterMoveSecondary` effects implemented in scripts.js - // negateSecondary will only happen if the Pokémon keeps having the Sheer Force ability in that step. pokemon.addVolatile('sheerforce'); } }, diff --git a/data/scripts.js b/data/scripts.js index f62d8371ea..daedd91860 100644 --- a/data/scripts.js +++ b/data/scripts.js @@ -173,7 +173,7 @@ exports.BattleScripts = { this.faint(pokemon, pokemon, move); } - if (!move.negateSecondary || (move.negateSecondary && !pokemon.hasAbility('sheerforce'))) { + if (!move.negateSecondary && !(pokemon.hasAbility('sheerforce') && pokemon.volatiles['sheerforce'])) { this.singleEvent('AfterMoveSecondarySelf', move, null, pokemon, target, move); this.runEvent('AfterMoveSecondarySelf', pokemon, target, move); } @@ -324,7 +324,7 @@ exports.BattleScripts = { if (!damage && damage !== 0) return damage; - if (target && (!move.negateSecondary || (move.negateSecondary && !pokemon.hasAbility('sheerforce')))) { + if (target && !move.negateSecondary && !(pokemon.hasAbility('sheerforce') && pokemon.volatiles['sheerforce'])) { this.singleEvent('AfterMoveSecondary', move, null, target, pokemon, move); this.runEvent('AfterMoveSecondary', target, pokemon, move); }