From 763763641057842d3af0530ab3ef1eb11b28d2dd Mon Sep 17 00:00:00 2001 From: Relados Date: Sun, 6 Apr 2014 09:31:05 -0500 Subject: [PATCH] Prevent multiple statusing moves Hypnosis, Stun Spore and Sleep Powder were not fully accounted for. --- data/scripts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/scripts.js b/data/scripts.js index 70b5edc957..fec195f082 100644 --- a/data/scripts.js +++ b/data/scripts.js @@ -1107,7 +1107,7 @@ exports.BattleScripts = { if (!setupType && !hasMove['batonpass'] && hasMove['thunderwave']) rejected = true; if ((hasMove['stealthrock'] || hasMove['spikes'] || hasMove['toxicspikes']) && !hasMove['batonpass']) rejected = true; break; - case 'thunderwave': + case 'thunderwave': case 'stunspore': if (setupType && (hasMove['rockpolish'] || hasMove['agility'])) rejected = true; if (hasMove['discharge'] || hasMove['trickroom']) rejected = true; if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true; @@ -1120,10 +1120,10 @@ exports.BattleScripts = { if (hasMove['rockpolish'] || hasMove['agility']) rejected = true; break; case 'willowisp': - if (hasMove['scald'] || hasMove['yawn'] || hasMove['spore'] || hasMove['sleeppowder']) rejected = true; + if (hasMove['scald'] || hasMove['yawn'] || hasMove['spore'] || hasMove['sleeppowder'] || hasMove['hypnosis']) rejected = true; break; case 'toxic': - if (hasMove['thunderwave'] || hasMove['willowisp'] || hasMove['scald'] || hasMove['yawn'] || hasMove['spore'] || hasMove['sleeppowder']) rejected = true; + if (hasMove['thunderwave'] || hasMove['willowisp'] || hasMove['scald'] || hasMove['yawn'] || hasMove['spore'] || hasMove['sleeppowder'] || hasMove['stunspore'] || hasMove['hypnosis']) rejected = true; break; }