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

Random Battle updates

Browse Source 
- Add Foul Play to Mandibuzz
- Prevent more than one Stealth Rock setter per team
- Prevent more than one hazard remover per team
This commit is contained in:
The Immortal 2015-08-10 22:27:49 +04:00
parent c25557e680
commit c2903eae0c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/formats-data.js
View File

@ -4649,7 +4649,7 @@ exports.BattleFormatsData = {
tier: "LC"
},
mandibuzz: {
randomBattleMoves: ["knockoff","roost","taunt","whirlwind","toxic","uturn","bravebird","defog"],
randomBattleMoves: ["foulplay","knockoff","roost","taunt","whirlwind","toxic","uturn","bravebird","defog"],
randomDoubleBattleMoves: ["knockoff","roost","taunt","tailwind","snarl","uturn","bravebird","protect"],
eventPokemon: [
{"generation":5,"level":25,"gender":"F","isHidden":true,"moves":["pluck","nastyplot","flatter","feintattack"]}

12
data/scripts.js
View File

@ -1210,8 +1210,8 @@ 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 'toxicspikes': case 'waterspout':
if (counter.setupType || !!counter['speedsetup'] || (hasMove['rest'] && hasMove['sleeptalk'])) rejected = true;
case 'defog': case 'rapidspin':
if (counter.setupType || !!counter['speedsetup'] || (hasMove['rest'] && hasMove['sleeptalk']) || teamDetails.hazardClear > 1) rejected = true;
break;
case 'fakeout':
if (counter.setupType || hasMove['substitute'] || hasMove['switcheroo'] || hasMove['trick']) rejected = true;
@ -1219,6 +1219,9 @@ exports.BattleScripts = {
case 'foulplay': case 'nightshade': case 'seismictoss': case 'superfang':
if (counter.setupType) rejected = true;
break;
case 'haze': case 'healingwish': case 'pursuit': case 'spikes': case 'toxicspikes': case 'waterspout':
if (counter.setupType || !!counter['speedsetup'] || (hasMove['rest'] && hasMove['sleeptalk'])) rejected = true;
break;
case 'healbell':
if (!!counter['speedsetup']) rejected = true;
break;
@ -1230,7 +1233,7 @@ exports.BattleScripts = {
if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true;
break;
case 'stealthrock':
if (counter.setupType || !!counter['speedsetup'] || hasMove['rest'] || teamDetails.stealthRock > 2) rejected = true;
if (counter.setupType || !!counter['speedsetup'] || hasMove['rest'] || teamDetails.stealthRock > 1) rejected = true;
break;
case 'switcheroo': case 'trick':
if (counter.setupType || counter.Physical + counter.Special < 2) rejected = true;
@ -1941,7 +1944,7 @@ exports.BattleScripts = {
var baseFormes = {};
var uberCount = 0;
var puCount = 0;
var teamDetails = {megaCount: 0, stealthRock: 0};
var teamDetails = {megaCount: 0, stealthRock: 0, hazardClear: 0};
while (pokemonPool.length && pokemonLeft < 6) {
var template = this.getTemplate(this.sampleNoReplace(pokemonPool));
@ -2075,6 +2078,7 @@ exports.BattleScripts = {
// Increment mega, stealthrock, and base species counters
if (isMegaSet) teamDetails.megaCount++;
if (set.moves.indexOf('stealthrock') >= 0) teamDetails.stealthRock++;
if (set.moves.indexOf('defog') >= 0 || set.moves.indexOf('rapidspin') >= 0) teamDetails.hazardClear++;
baseFormes[template.baseSpecies] = 1;
}
return pokemon;