Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

NEXT: Fix Substitute/Skull Bash

Browse Source 
Update Substitute to be bypassed by sound moves.
Update Skull Bash to fix a bug involving Defense being raised by 1 stage too many.
This commit is contained in:
NickMP 2014-06-14 04:25:30 -04:00
parent 8a5838aac2
commit 50b0b98c1e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mods/gennext/moves.js
View File

@ -145,7 +145,7 @@ exports.BattleMovedex = {
return;
}
if (move.category === 'Status') {
if (move.notSubBlocked) {
if (move.notSubBlocked || move.isSoundBased) {
return;
}
var SubBlocked = {
@ -290,12 +290,19 @@ exports.BattleMovedex = {
onTryHit: function (target) {
target.removeVolatile('substitute');
},
effect: {
duration: 2,
onLockMove: 'skullbash',
onStart: function (pokemon) {
this.boost({def:1, spd:1, accuracy:1}, pokemon, pokemon, this.getMove('skullbash'));
onTry: function (attacker, defender, move) {
if (attacker.removeVolatile(move.id)) {
return;
}
this.add('-prepare', attacker, move.name, defender);
if (!this.runEvent('ChargeMove', attacker, defender, move)) {
this.add('-anim', attacker, move.name, defender);
attacker.removeVolatile(move.id);
return;
}
attacker.addVolatile('twoturnmove', defender);
this.boost({def:1, spd:1, accuracy:1}, attacker, attacker, this.getMove('skullbash'));
return null;
},
breaksProtect: true
},