From b388ff5f159fbb8b6a6e0cf9c331bae440ba03b0 Mon Sep 17 00:00:00 2001 From: asgdf Date: Wed, 17 May 2017 09:27:13 +0200 Subject: [PATCH] Tooltips: Don't skip 1.2x ability boosts for normal type moves (#922) --- js/client-battle-tooltips.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/client-battle-tooltips.js b/js/client-battle-tooltips.js index 846270ac9..7f16250eb 100644 --- a/js/client-battle-tooltips.js +++ b/js/client-battle-tooltips.js @@ -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)) {