Permalink
Browse files

Merge pull request #35 from TheImmortal/master

Avalanche & Revenge Fixes
  • Loading branch information...
Zarel committed Apr 18, 2012
2 parents da7d092 + 4d41cbc commit 714be747256b10830896c669ffdd4edcb69ac09f
Showing with 7 additions and 11 deletions.
  1. +7 −11 movedex.js
View
@@ -586,16 +586,12 @@ exports.BattleMovedex = {
num: 419,
accuracy: 100,
basePower: 60,
- basePowerCallback: function(pokemon, target) {
- if (!pokemon.lastAttackedBy || !pokemon.lastAttackedBy.thisTurn) {
- return 60;
- }
- var move = this.getMove(pokemon.lastAttackedBy.move);
- if (move.category === 'Status') {
- return 60;
+ basePowerCallback: function(pokemon, source) {
+ if (source.lastDamage > 0 && pokemon.lastAttackedBy.thisTurn) {
+ this.debug('Boosted for getting hit by '+pokemon.lastAttackedBy.move);
+ return 120;
}
- this.debug('Boosted for getting hit by '+pokemon.lastAttackedBy.move);
- return 120;
+ return 60;
},
category: "Physical",
desc: "Base power is 60. Almost always goes last, even after another Pokemon's Focus Punch; this move's base power doubles if the user is damaged before its turn.",
@@ -8621,8 +8617,8 @@ exports.BattleMovedex = {
num: 279,
accuracy: 100,
basePower: 60,
- basePowerCallback: function(pokemon, target) {
- if (pokemon.lastAttackedBy && pokemon.lastAttackedBy.thisTurn) {
+ basePowerCallback: function(pokemon, source) {
+ if (source.lastDamage > 0 && pokemon.lastAttackedBy.thisTurn) {
this.debug('Boosted for getting hit by '+pokemon.lastAttackedBy.move);
return 120;
}

0 comments on commit 714be74

Please sign in to comment.