mirror of
https://github.com/smogon/pokemon-showdown.git
synced 2026-05-09 04:23:45 -05:00
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
This commit is contained in:
parent
46586337e6
commit
cf77e666fa
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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 = [];
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user