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

Remove unused variables

Browse Source
This commit is contained in:
V4Victini
2013-10-11 15:49:17 -04:00
parent 4e663da55e
commit 26f4943cc1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
battle-engine.js
View File

@@ -1914,6 +1914,7 @@ var Battle = (function() {
this.eventDepth--;
if (this.event.modifier !== 1 && typeof relayVar === 'number') {
// this.debug(eventid+' modifier: 0x'+('0000'+(this.event.modifier * 4096).toString(16)).slice(-4).toUpperCase());
relayVar = this.modify(relayVar, this.event.modifier);
}
this.event = parentEvent;
@@ -2662,7 +2663,7 @@ var Battle = (function() {
}
// happens after crit calculation
basePower = this.runEvent('BasePower', pokemon, target, move, bpMod, true);
basePower = this.runEvent('BasePower', pokemon, target, move, basePower, true);
if (!basePower) return 0;
basePower = clampIntRange(basePower, 1);
@@ -2704,11 +2705,11 @@ var Battle = (function() {
defBoosts = 0;
}
if (move.useTargetOffensive) attack = defender.calculateStat(attackStat, atkBoosts, atkStatMod);
else attack = attacker.calculateStat(attackStat, atkBoosts, atkStatMod);
if (move.useTargetOffensive) attack = defender.calculateStat(attackStat, atkBoosts);
else attack = attacker.calculateStat(attackStat, atkBoosts);
if (move.useSourceDefensive) defense = attacker.calculateStat(defenseStat, defBoosts, defStatMod);
else defense = defender.calculateStat(defenseStat, defBoosts, defStatMod);
if (move.useSourceDefensive) defense = attacker.calculateStat(defenseStat, defBoosts);
else defense = defender.calculateStat(defenseStat, defBoosts);
// Apply Stat Modifiers
attack = this.runEvent('Modify'+statTable[attackStat], attacker, defender, move, attack);

2
data/items.js
View File

@@ -1837,7 +1837,7 @@ exports.BattleItems = {
onModifyDamage: function(damage, source, target, move) {
if (source) {
source.addVolatile('lifeorb');
return this.chainModify(damageMod, 1.3);
return this.chainModify(1.3);
}
},
effect: {