From cf77e666faa7d004ded2c8d1da3ee90a15cca1af Mon Sep 17 00:00:00 2001 From: Marty-D Date: Sat, 15 Aug 2015 00:09:41 -0400 Subject: [PATCH] Fix race conditions with added flinch effects - Sheer Force removes secondary effects before King's Rock/Razor Fang adds the flinch effect to moves, which Serene Grace can then double --- data/abilities.js | 1 + data/items.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/data/abilities.js b/data/abilities.js index 8e28430603..3b0c45c1eb 100644 --- a/data/abilities.js +++ b/data/abilities.js @@ -2268,6 +2268,7 @@ exports.BattleAbilities = { }, "serenegrace": { shortDesc: "This Pokemon's moves have their secondary effect chance doubled.", + onModifyMovePriority: -2, onModifyMove: function (move) { if (move.secondaries && move.id !== 'secretpower') { this.debug('doubling secondary chance'); diff --git a/data/items.js b/data/items.js index a5b90892eb..0a0e53e862 100644 --- a/data/items.js +++ b/data/items.js @@ -2180,6 +2180,7 @@ exports.BattleItems = { basePower: 30, volatileStatus: 'flinch' }, + onModifyMovePriority: -1, onModifyMove: function (move) { if (move.category !== "Status") { if (!move.secondaries) move.secondaries = []; @@ -3570,6 +3571,7 @@ exports.BattleItems = { basePower: 30, volatileStatus: 'flinch' }, + onModifyMovePriority: -1, onModifyMove: function (move) { if (move.category !== "Status") { if (!move.secondaries) move.secondaries = [];