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

Fix Quick and Wide Guard

Browse Source 
They were blocking ally moves. Furthermore, Quick Guard was also blocking foes´ moves not targetting the guarded side.
This commit is contained in:
Ivo Julca 2014-01-20 22:11:42 -05:00
parent fc7b521ffc
commit b536d8615e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/moves.js
View File

@ -10015,7 +10015,7 @@ exports.BattleMovedex = {
onTryHit: function(target, source, effect) {
// Quick Guard blocks moves with positive priority, even those given increased priority by Prankster or Gale Wings.
// (e.g. it blocks 0 priority moves boosted by Prankster or Gale Wings)
if (effect && (effect.id === 'feint' || effect.priority <= 0)) {
if (effect && (effect.id === 'feint' || effect.priority <= 0 || source.side === this.effectData.source.side || source.side === target.side)) {
return;
}
this.add('-activate', target, 'Quick Guard');
@ -14592,7 +14592,7 @@ exports.BattleMovedex = {
onTryHitPriority: 4,
onTryHit: function(target, source, effect) {
// Wide Guard blocks damaging spread moves
if (effect && (effect.category === 'Status' || (effect.target !== 'allAdjacent' && effect.target !== 'allAdjacentFoes'))) {
if (effect && (effect.category === 'Status' || (effect.target !== 'allAdjacent' && effect.target !== 'allAdjacentFoes') || this.effectData.source.side === source.side)) {
return;
}
this.add('-activate', target, 'Wide Guard');