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

Tooltips: Don't skip 1.2x ability boosts for normal type moves (#922)

Browse Source
This commit is contained in:
asgdf
2017-05-17 09:27:13 +02:00
committed by Guangcong Luo
parent 9fd0b58b37
commit b388ff5f15
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/client-battle-tooltips.js
View File

@@ -1128,14 +1128,13 @@ var BattleTooltips = (function () {
abilityBoost = 0.75;
}
} else if (move.type === 'Normal' && move.category !== 'Status' &&
ability in {'Aerilate': 1, 'Galvanize':1, 'Pixilate': 1, 'Refrigerate': 1} &&
!(move.id in {'naturalgift': 1, 'struggle': 1} ||
move.id === 'weatherball' && thereIsWeather ||
move.id === 'multiattack' && item.onMemory ||
move.id === 'judgment' && item.onPlate ||
move.id === 'technoblast' && item.onDrive)) {
if (ability in {'Aerilate': 1, 'Galvanize':1, 'Pixilate': 1, 'Refrigerate': 1}) {
abilityBoost = (this.battle.gen > 6 ? 1.2 : 1.3);
}
abilityBoost = (this.battle.gen > 6 ? 1.2 : 1.3);
} else if ((ability === 'Iron Fist' && move.flags['punch']) ||
(ability === 'Reckless' && (move.recoil || move.hasCustomRecoil)) ||
(ability === 'Normalize' && this.battle.gen > 6)) {