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

Correctly apply Technician before item boost to Ball move

Browse Source
This commit is contained in:
urkerab 2015-12-29 21:51:08 +00:00
parent 73432847b4
commit 0b22081e7b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,10 @@ var BattleTooltips = (function () {
BattleTooltips.prototype.boostBasePower_Ball = function (BattleRoom, move, pokemon, min, max) {
var myPokemon = BattleRoom.myPokemon[pokemon.slot];
var technician = Tools.getAbility(myPokemon.baseAbility).name === 'Technician';
if (technician) {
if (min <= 60) min *= 1.5;
if (max <= 60) max *= 1.5;
}
var itemCheck = false;
if (!BattleRoom.battle.hasPseudoWeather('Magic Room') && (!pokemon.volatiles || !pokemon.volatiles['embargo'])) {
var item = Tools.getItem(myPokemon.item);
@ -58,10 +62,6 @@ var BattleTooltips = (function () {
itemCheck = true;
}
}
if (technician) {
if (min <= 60) min *= 1.5;
if (max <= 60) max *= 1.5;
}
var basePowerComment = min === max ? '' : Math.floor(min) + ' to ';
basePowerComment += Math.floor(max);
if (technician) basePowerComment += ' (Technician boosted)';