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

Merge pull request #2314 from ascriptmaster/randoms

Browse Source 
Random Battle: Fix dual STAB for Psychic-type Pokemon
This commit is contained in:
The Immortal 2015-12-11 00:40:44 +04:00
commit affe8c9be6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts.js
View File

@ -1540,7 +1540,7 @@ exports.BattleScripts = {
(hasType['Fire'] && !counter['Fire']) ||
(hasType['Ground'] && !counter['Ground'] && (counter.setupType || counter['speedsetup'])) ||
(hasType['Ice'] && !counter['Ice']) ||
(hasType['Psychic'] && !!counter['Psychic'] && !hasType['Flying'] && !hasAbility['Pixilate'] && template.types.length > 1 && counter.stab < 2) ||
(hasType['Psychic'] && !!counter['Psychic'] && !hasType['Flying'] && !hasAbility['Pixilate'] && template.types.length > 1 && !counter[template.types.filter(t => t !== 'Psychic')[0]]) ||
(hasMove['raindance'] && hasType['Water'] && !counter['Water']) ||
(movePool.indexOf('technoblast') >= 0 || template.requiredMove && movePool.indexOf(toId(template.requiredMove)) >= 0)) &&
(counter['physicalsetup'] + counter['specialsetup'] < 2 && (!counter.setupType || counter.setupType === 'Mixed' || (move.category !== counter.setupType && move.category !== 'Status') || counter[counter.setupType] + counter.Status > 3))) {