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

Merge pull request #490 from urkerab/bp-preview-punishment-storedpower

Browse Source 
Fix base power preview for Punishment and Stored Power
This commit is contained in:
Guangcong Luo 2015-09-27 15:24:52 -05:00
commit 857f6165cb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/client-battle.js
View File

@ -1326,9 +1326,10 @@
var boosts = Object.keys(target.boosts);
var multiply = 0;
for (var i = 0; i < boosts.length; i++) {
if (target.boosts[boosts[i]] && target.boosts[boosts[i]] > 0) multiply++;
if (target.boosts[boosts[i]] > 0) multiply += target.boosts[boosts[i]];
}
basePower = 60 + 20 * multiply;
if (basePower > 200) basePower = 200;
}
if (move.id === 'smellingsalts') {
if (target.status === 'par') {
@ -1337,10 +1338,10 @@
}
}
if (move.id === 'storedpower') {
var boosts = Object.keys(pokemon.boosts);
var boosts = Object.keys(target.boosts);
var multiply = 0;
for (var i = 0; i < boosts.length; i++) {
if (pokemon.boosts[boosts[i]] && pokemon.boosts[boosts[i]] > 0) multiply++;
if (pokemon.boosts[boosts[i]] > 0) multiply += pokemon.boosts[boosts[i]];
}
basePower = 20 + 20 * multiply;
}