From 26f4943cc19fc284dfd09c8bd08083d6f5b37037 Mon Sep 17 00:00:00 2001 From: V4Victini Date: Fri, 11 Oct 2013 15:49:17 -0400 Subject: [PATCH] Remove unused variables --- battle-engine.js | 11 ++++++----- data/items.js | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/battle-engine.js b/battle-engine.js index 371a38c8db..d1f544244b 100644 --- a/battle-engine.js +++ b/battle-engine.js @@ -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); diff --git a/data/items.js b/data/items.js index a0587eac9c..d929e41d12 100644 --- a/data/items.js +++ b/data/items.js @@ -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: {