Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-05 21:17:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Random Battle: Reject Toxic Spikes where Spikes is rejected

Browse Source 
Prevents things like Shell Smash + Toxic Spikes.
This commit is contained in:
Kevin Lau 2015-05-08 00:34:58 -07:00
parent e18ae9aaf7
commit c9c54ada16
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

@ -1191,7 +1191,7 @@ exports.BattleScripts = {
if (!!counter['speedsetup'] || hasMove['encore'] || hasMove['raindance'] || hasMove['roar'] || hasMove['whirlwind']) rejected = true;
if (counter.setupType && hasMove['stormthrow']) rejected = true;
break;
case 'defog': case 'pursuit': case 'haze': case 'healingwish': case 'rapidspin': case 'spikes': case 'waterspout':
case 'defog': case 'pursuit': case 'haze': case 'healingwish': case 'rapidspin': case 'spikes': case 'toxicspikes': case 'waterspout':
if (counter.setupType || !!counter['speedsetup'] || (hasMove['rest'] && hasMove['sleeptalk'])) rejected = true;
break;
case 'fakeout':
@ -2340,7 +2340,7 @@ exports.BattleScripts = {
case 'seismictoss': case 'nightshade': case 'superfang':
if (counter.setupType) rejected = true;
break;
case 'rapidspin': case 'perishsong': case 'magiccoat': case 'spikes':
case 'rapidspin': case 'perishsong': case 'magiccoat': case 'spikes': case 'toxicspikes':
if (counter.setupType) rejected = true;
break;
case 'uturn': case 'voltswitch':