From d0e18e3e1555f0c959f0a9aec00a0e6acfe9659f Mon Sep 17 00:00:00 2001 From: Kevin Lau Date: Wed, 19 Aug 2015 12:41:35 -0700 Subject: [PATCH] Random Battle: Update Slurpuff Give it Dazzling Gleam as an attack option, and reject Unburden on it if it doesn't have setup moves. --- data/formats-data.js | 2 +- data/scripts.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/formats-data.js b/data/formats-data.js index 411e3192fc..e0d28f4496 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -5054,7 +5054,7 @@ exports.BattleFormatsData = { tier: "LC Uber" }, slurpuff: { - randomBattleMoves: ["substitute","bellydrum","playrough","return","drainpunch","calmmind","drainingkiss","flamethrower","surf"], + randomBattleMoves: ["substitute","bellydrum","playrough","return","drainpunch","calmmind","drainingkiss","dazzlinggleam","flamethrower","surf"], randomDoubleBattleMoves: ["substitute","bellydrum","playrough","return","drainpunch","dazzlinggleam","surf","psychic","flamethrower","protect"], tier: "UU" }, diff --git a/data/scripts.js b/data/scripts.js index e190b0c143..a47c267aed 100644 --- a/data/scripts.js +++ b/data/scripts.js @@ -1287,7 +1287,7 @@ exports.BattleScripts = { if (hasMove['discharge'] || (hasMove['thunder'] && hasMove['raindance']) || (hasMove['voltswitch'] && hasMove['wildcharge'])) rejected = true; break; case 'drainingkiss': - if (hasMove['dazzlinggleam']) rejected = true; + if (hasMove['dazzlinggleam'] || counter.setupType !== 'Special') rejected = true; break; case 'aurasphere': case 'drainpunch': if (!hasMove['bulkup'] && (hasMove['closecombat'] || hasMove['highjumpkick'])) rejected = true; @@ -1622,7 +1622,7 @@ exports.BattleScripts = { } else if (ability === 'Swift Swim') { rejectAbility = !hasMove['raindance']; } else if (ability === 'Unburden') { - rejectAbility = template.baseStats.spe > 120; + rejectAbility = template.baseStats.spe > 120 || (template.id === 'slurpuff' && !counter.setupType); } if (rejectAbility) { @@ -2791,7 +2791,7 @@ exports.BattleScripts = { } else if (ability === 'Swift Swim') { rejectAbility = !hasMove['raindance']; } else if (ability === 'Unburden') { - rejectAbility = template.baseStats.spe > 120; + rejectAbility = template.baseStats.spe > 120 || (template.id === 'slurpuff' && !counter.setupType); } if (rejectAbility) {