Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1605 from ascriptmaster/randoms

Browse Source 
Random Battle: Fix Baton Pass check
This commit is contained in:
Juanma Serrano 2015-03-09 10:38:58 +01:00
commit 090cad4773
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/scripts.js
View File

@ -1126,7 +1126,7 @@ exports.BattleScripts = {
if (!hasMove['cosmicpower'] && !setupType) rejected = true;
break;
case 'batonpass':
if (!setupType && !hasMove['substitute'] && !hasMove['cosmicpower'] && !hasMove['wish'] && !counter['speedsetup'] && hasAbility['Speed Boost']) rejected = true;
if (!setupType && !hasMove['substitute'] && !hasMove['cosmicpower'] && !hasMove['wish'] && !counter['speedsetup'] && !hasAbility['Speed Boost']) rejected = true;
break;
// We only need to set up once
@ -2377,7 +2377,7 @@ exports.BattleScripts = {
if (!hasMove['cosmicpower'] && !setupType) rejected = true;
break;
case 'batonpass':
if (!setupType && !hasMove['substitute'] && !hasMove['cosmicpower'] && !counter['speedsetup'] && hasAbility['Speed Boost']) rejected = true;
if (!setupType && !hasMove['substitute'] && !hasMove['cosmicpower'] && !counter['speedsetup'] && !hasAbility['Speed Boost']) rejected = true;
break;
// we only need to set up once