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

Gen 4 Random Battle: Minor updates (#3994)

Browse Source 
* Ensure that Relicanth always gets Head Smash
* Ensure that Water Spout Wailord gets Specs/Scarf instead of LO, even with Self-Destruct
* Ensure that Body Slam Jirachi and Dunsparce don't get Band/Scarf
* Default to Leftovers instead of Life Orb on sets with Super Fang
This commit is contained in:
Honko 2017-09-18 17:11:26 -07:00 committed by The Immortal
parent e6f0f0efd7
commit ff19cc4183
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mods/gen4/random-teams.js
View File

@ -383,6 +383,7 @@ class RandomGen4Teams extends RandomGen5Teams {
(hasType['Ground'] && !counter['Ground']) ||
(hasType['Ice'] && !counter['Ice'] && (!hasType['Water'] || !counter['Water'])) ||
(hasType['Psychic'] && !!counter['Psychic'] && !hasType['Flying'] && template.types.length > 1 && counter.stab < 2) ||
(hasType['Rock'] && !counter['Rock'] && movePool.includes('headsmash')) ||
(hasType['Water'] && !counter['Water'] && (!hasType['Ice'] || !counter['Ice'])) ||
((hasAbility['Adaptability'] && !counter.setupType && template.types.length > 1 && (!counter[template.types[0]] || !counter[template.types[1]])) ||
(hasAbility['Guts'] && hasType['Normal'] && movePool.includes('facade')) ||
@ -576,9 +577,9 @@ class RandomGen4Teams extends RandomGen5Teams {
item = 'Sitrus Berry';
// Medium priority
} else if (counter.Physical >= 4 && !hasMove['fakeout'] && !hasMove['rapidspin'] && !hasMove['suckerpunch']) {
} else if (counter.Physical >= 4 && !(hasMove['bodyslam'] && hasAbility['Serene Grace']) && !hasMove['fakeout'] && !hasMove['rapidspin'] && !hasMove['suckerpunch']) {
item = template.baseStats.spe >= 60 && template.baseStats.spe <= 108 && !counter['priority'] && !hasMove['bodyslam'] && this.random(3) ? 'Choice Scarf' : 'Choice Band';
} else if ((counter.Special >= 4 || (counter.Special >= 3 && (hasMove['batonpass'] || hasMove['uturn']))) && !hasMove['chargebeam']) {
} else if ((counter.Special >= 4 || (counter.Special >= 3 && (hasMove['batonpass'] || hasMove['uturn'] || hasMove['waterspout'] && hasMove['selfdestruct']))) && !hasMove['chargebeam']) {
item = template.baseStats.spe >= 60 && template.baseStats.spe <= 108 && ability !== 'Speed Boost' && !counter['priority'] && this.random(3) ? 'Choice Scarf' : 'Choice Specs';
} else if (hasMove['endeavor'] || hasMove['flail'] || hasMove['reversal']) {
item = 'Focus Sash';
@ -607,7 +608,7 @@ class RandomGen4Teams extends RandomGen5Teams {
item = 'Black Sludge';
} else if (this.getEffectiveness('Rock', template) >= 1 || hasMove['roar']) {
item = 'Leftovers';
} else if (counter.Status <= 1 && !hasMove['rapidspin']) {
} else if (counter.Status <= 1 && !hasMove['rapidspin'] && !hasMove['superfang']) {
item = 'Life Orb';
} else {
item = 'Leftovers';