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

Fix some Mold Breaker bugs with drag-out moves

Browse Source 
- Process the 'runSwitch' decision directly in Battle#dragIn in gen
  5 and up. This allows the Pokemon executing the drag-out move to
  remain as battle.activePokemon for the duration of the dragging
  action. This fixes Mold Breaker's interaction when moves that drag
  out Pokemon are used.
- Add a check for battle.activePokemon.isActive in the Mold Breaker
  ability activation check to prevent glitches with Red Card.
- Remove Damage/SubDamage from Mold Breaker's check and instead add
  an additional check for the Damage event specifically to use extra
  criteria. This fixes its interaction with Magic Guard.
This commit is contained in:
Kevin Lau 2015-06-08 03:49:56 -07:00
parent b59c53f886
commit 1da65efb12
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
battle-engine.js
View File

@ -1923,6 +1923,9 @@ Battle = (function () {
this.update();
return true;
};
Battle.prototype.suppressAttackEvents = function () {
return (this.activePokemon && this.activePokemon.isActive && !this.activePokemon.ignoringAbility() && this.activePokemon.getAbility().stopAttackEvents);
};
Battle.prototype.setActiveMove = function (move, pokemon, target) {
if (!move) move = null;
if (!pokemon) pokemon = null;
@ -2233,7 +2236,7 @@ Battle = (function () {
// it's changed; call it off
continue;
}
if (status.effectType === 'Ability' && this.activePokemon && this.activePokemon !== thing && !this.activePokemon.ignoringAbility() && this.activePokemon.getAbility().stopAttackEvents) {
if (status.effectType === 'Ability' && this.suppressAttackEvents() && this.activePokemon !== thing) {
// ignore attacking events
var AttackingEvents = {
BeforeMove: 1,
@ -2241,8 +2244,6 @@ Battle = (function () {
Immunity: 1,
Accuracy: 1,
RedirectTarget: 1,
Damage: 1,
SubDamage: 1,
Heal: 1,
TakeItem: 1,
SetStatus: 1,
@ -2264,8 +2265,12 @@ Battle = (function () {
this.debug(eventid + ' handler suppressed by Mold Breaker');
}
continue;
} else if (eventid === 'Damage' && effect && effect.effectType === 'Move') {
this.debug(eventid + ' handler suppressed by Mold Breaker');
continue;
}
} else if (eventid !== 'Start' && status.effectType === 'Item' && (thing instanceof BattlePokemon) && thing.ignoringItem()) {
}
if (eventid !== 'Start' && status.effectType === 'Item' && (thing instanceof BattlePokemon) && thing.ignoringItem()) {
if (eventid !== 'ModifyPokemon' && eventid !== 'Update') {
this.debug(eventid + ' handler suppressed by Embargo, Klutz or Magic Room');
}
@ -2715,7 +2720,17 @@ Battle = (function () {
}
this.add('drag', pokemon, pokemon.getDetails);
pokemon.update();
this.addQueue({pokemon: pokemon, choice: 'runSwitch'});
if (this.gen >= 5) {
this.runEvent('SwitchIn', pokemon);
if (!pokemon.hp) return true;
pokemon.isStarted = true;
if (!pokemon.fainted) {
this.singleEvent('Start', pokemon.getAbility(), pokemon.abilityData, pokemon);
this.singleEvent('Start', pokemon.getItem(), pokemon.itemData, pokemon);
}
} else {
this.addQueue({pokemon: pokemon, choice: 'runSwitch'});
}
return true;
};
Battle.prototype.swapPosition = function (pokemon, slot, attributes) {