Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Zarel/Pokemon-Showdown
base: da7d092f4f
...
head fork: Zarel/Pokemon-Showdown
compare: 714be74725
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Showing with 7 additions and 11 deletions.
  1. +7 −11 movedex.js
View
18 movedex.js
@@ -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;
}

No commit comments for this range

Something went wrong with that request. Please try again.