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

Merge pull request #1265 from ascriptmaster/skydrop-patch

Browse Source 
Sky Drop refactor and bug fixes
This commit is contained in:
Guangcong Luo
2014-10-19 23:23:53 -05:00
parent f0824ef1cc 2ffaf0fc77
commit 623ff87f74
2 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
data/moves.js
View File

@@ -5312,10 +5312,20 @@ exports.BattleMovedex = {
pokemon.disabledMoves[m] = true;
}
var applies = false;
if (pokemon.removeVolatile('bounce') || pokemon.removeVolatile('fly') || pokemon.removeVolatile('skydrop')) {
if (pokemon.removeVolatile('bounce') || pokemon.removeVolatile('fly')) {
applies = true;
this.cancelMove(pokemon);
}
if (pokemon.volatiles['skydrop']) {
applies = true;
this.cancelMove(pokemon);
if (pokemon.volatiles['skydrop'].source) {
this.add('-end', pokemon.volatiles['twoturnmove'].source, 'Sky Drop', '[interrupt]');
}
pokemon.removeVolatile('skydrop');
pokemon.removeVolatile('twoturnmove');
}
if (pokemon.volatiles['magnetrise']) {
applies = true;
delete pokemon.volatiles['magnetrise'];
@@ -11989,37 +11999,32 @@ exports.BattleMovedex = {
pp: 10,
priority: 0,
isContact: true,
isTwoTurnMove: true,
onTry: function (attacker, defender, move) {
if (defender.fainted) return false;
if (attacker.removeVolatile(move.id)) {
return;
}
if (defender.volatiles['substitute'] || defender.side === attacker.side) {
return false;
}
if (defender.weightkg >= 200) {
this.add('-fail', defender, 'move: Sky Drop', '[heavy]');
onTryHit: function (target, source, move) {
if (target.fainted) return false;
if (source.removeVolatile(move.id)) {
if (target !== source.volatiles['twoturnmove'].source) return false;
if (target.hasType('Flying') && !target.negateImmunity['Ground']) {
this.add('-immune', target, '[msg]');
this.add('-end', target, 'Sky Drop');
return null;
}
} else {
if (target.volatiles['substitute'] || target.side === source.side) {
return false;
}
if (target.weightkg >= 200) {
this.add('-fail', target, 'move: Sky Drop', '[heavy]');
return null;
}
this.add('-prepare', source, move.name, target);
source.addVolatile('twoturnmove', target);
return null;
}
if (defender.volatiles['protect']) {
this.add('-activate', defender, 'Protect');
return null;
}
if (defender.volatiles['bounce'] || defender.volatiles['dig'] || defender.volatiles['dive'] || defender.volatiles['fly'] || defender.volatiles['phantomforce'] || defender.volatiles['shadowforce'] || defender.volatiles['skydrop']) {
this.add('-miss', attacker, defender);
return null;
}
this.add('-prepare', attacker, move.name, defender);
attacker.addVolatile('twoturnmove', defender);
return null;
},
onTryHit: function (target, source) {
if (target !== source.volatiles['twoturnmove'].source) return false;
if (target.hasType('Flying')) {
this.add('-immune', target, '[msg]');
return null;
}
onHit: function (target, source) {
this.add('-end', target, 'Sky Drop');
},
effect: {
duration: 2,
@@ -12029,6 +12034,7 @@ exports.BattleMovedex = {
if (defender !== this.effectData.source) return;
defender.trapped = true;
},
onFoeBeforeMovePriority: 11,
onFoeBeforeMove: function (attacker, defender, move) {
if (attacker === this.effectData.source) {
this.debug('Sky drop nullifying.');
@@ -12036,6 +12042,11 @@ exports.BattleMovedex = {
return null;
}
},
onRedirectTarget: function (target, source, source2) {
if (source !== this.effectData.target) return;
if (this.effectData.source.fainted) return;
return this.effectData.source;
},
onAnyAccuracy: function (accuracy, target, source, move) {
if (target !== this.effectData.target && target !== this.effectData.source) {
return;
@@ -12064,6 +12075,11 @@ exports.BattleMovedex = {
if (move.id === 'gust' || move.id === 'twister') {
return this.chainModify(2);
}
},
onFaint: function (target) {
if (target.volatiles['skydrop'] && target.volatiles['twoturnmove'].source) {
this.add('-end', target.volatiles['twoturnmove'].source, 'Sky Drop', '[interrupt]');
}
}
},
secondary: false,

7
data/scripts.js
View File

@@ -542,6 +542,13 @@ exports.BattleScripts = {
if (!template.isMega) return false;
if (pokemon.baseTemplate.baseSpecies !== template.baseSpecies) return false;
var foeActive = side.foe.active;
for (var i = 0; i < foeActive.length; i++) {
if (foeActive[i].volatiles['skydrop'] && foeActive[i].volatiles['skydrop'].source === pokemon) {
return false;
}
}
// okay, mega evolution is possible
pokemon.formeChange(template);
pokemon.baseTemplate = template; // mega evolution is permanent :o