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

Remove unused variables

Browse Source
This commit is contained in:
urkerab 2015-12-29 18:37:57 +00:00
parent c35b528430
commit 24730fa2f5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
var BattleTooltips = (function () {
function BattleTooltips() {}
BattleTooltips.prototype.boostBasePower = function (BattleRoom, move, pokemon, target, basePower, basePowerComment) {
BattleTooltips.prototype.boostBasePower = function (BattleRoom, move, pokemon, basePower, basePowerComment) {
var myPokemon = BattleRoom.myPokemon[pokemon.slot];
var ability = Tools.getAbility(myPokemon.baseAbility).name;
var thereIsWeather = (BattleRoom.battle.weather in {'sunnyday': 1, 'desolateland': 1, 'raindance': 1, 'primordialsea': 1, 'sandstorm': 1, 'hail':1});
if (!BattleRoom.battle.hasPseudoWeather('Magic Room') && (!pokemon.volatiles || !pokemon.volatiles['embargo'])) {
var item = Tools.getItem(myPokemon.item);
var pos = BattleRoom.choice.choices.length;
@ -36,7 +34,7 @@ var BattleTooltips = (function () {
return basePower == 0 ? basePowerComment : basePower + basePowerComment;
}
};
BattleTooltips.prototype.boostBasePower_Ball = function (BattleRoom, move, pokemon, target, basePower, basePowerComment, min, max) {
BattleTooltips.prototype.boostBasePower_Ball = function (BattleRoom, move, pokemon, min, max) {
var myPokemon = BattleRoom.myPokemon[pokemon.slot];
var ability = Tools.getAbility(myPokemon.baseAbility).name;
var item = Tools.getItem(myPokemon.item);
@ -45,6 +43,7 @@ var BattleTooltips = (function () {
var splitItemName = item.name.split(' ');
var moveName = move.name;
var itemCheck = false;
var basePowerComment = '';
if (!BattleRoom.battle.hasPseudoWeather('Magic Room') && (!pokemon.volatiles || !pokemon.volatiles['embargo'])) {
if (splitItemName[1] == 'Gem' && moveType == splitItemName[0]) {
min *= BattleRoom.battle.gen >= 6 ? 1.3 : 1.5;

6
js/client-battle.js
View File

@ -1440,7 +1440,7 @@
basePowerComment = (min === max) ? max : min + ' to ' + max;
}
} else {
return Tooltips.boostBasePower_Ball(this, move, pokemon, target, basePower, basePowerComment, min, max);
return Tooltips.boostBasePower_Ball(this, move, pokemon, min, max);
}
}
if (move.id === 'gyroball') {
@ -1461,7 +1461,7 @@
basePowerComment = (min === max) ? max : min + ' to ' + max;
}
} else {
return Tooltips.boostBasePower_Ball(this, move, pokemon, target, basePower, basePowerComment, min, max);
return Tooltips.boostBasePower_Ball(this, move, pokemon, min, max);
}
}
// Movements which have base power changed due to items.
@ -1514,7 +1514,7 @@
}
}
if (myPokemon.item) {
return Tooltips.boostBasePower(this, move, pokemon, target, basePower, basePowerComment);
return Tooltips.boostBasePower(this, move, pokemon, basePower, basePowerComment);
} else {
return basePower == 0 ? basePowerComment : basePower + basePowerComment;
}