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

Fix Skull Bash and Power Herb.

Browse Source 
- Skull Bash gives +1 Defense even with Power Herb.
- Sky Drop is not affected by Power Herb.
This commit is contained in:
Marty-D 2013-03-13 11:44:05 -04:00
parent d23b9acf95
commit e60936e185
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/items.js
View File

@ -2164,7 +2164,7 @@ exports.BattleItems = {
},
"powerherb": {
id: "powerherb",
onChargeMove: function(pokemon, move) {
onChargeMove: function(pokemon, target, move) {
if (pokemon.useItem()) {
this.debug('power herb - remove charge turn for '+move.id);
return false; // skip charge turn

29
data/moves.js
View File

@ -1123,7 +1123,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -2291,7 +2291,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -2420,7 +2420,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -3902,7 +3902,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -4123,7 +4123,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -5905,7 +5905,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -8982,7 +8982,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -10047,7 +10047,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -10376,11 +10376,12 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
attacker.addVolatile(move.id, defender);
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
attacker.removeVolatile(move.id);
return;
}
attacker.addVolatile(move.id, defender);
return null;
},
effect: {
@ -10411,7 +10412,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}
@ -10459,10 +10460,6 @@ exports.BattleMovedex = {
return null;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender)) {
this.add('-anim', attacker, move.name, defender);
return;
}
attacker.addVolatile(move.id, defender);
return null;
},
@ -10942,7 +10939,7 @@ exports.BattleMovedex = {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (this.isWeather('sunnyday') || !this.runEvent('ChargeMove', attacker, defender)) {
if (this.isWeather('sunnyday') || !this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
return;
}