From 1a6e62ef7bd53de2d37db890aa23cf79fd5300a3 Mon Sep 17 00:00:00 2001 From: Marty-D Date: Sun, 5 Apr 2015 10:55:02 -0400 Subject: [PATCH] Fix Pickpocket --- data/abilities.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/abilities.js b/data/abilities.js index 6465c23673..30b3c32729 100644 --- a/data/abilities.js +++ b/data/abilities.js @@ -1850,9 +1850,9 @@ exports.BattleAbilities = { num: 53 }, "pickpocket": { - desc: "If this Pokemon has no item, it steals the item off a Pokemon that makes contact with it.", + desc: "If this Pokemon has no item, it steals the item off a Pokemon that makes contact with it. This effect applies after all hits from a multi-hit move; Sheer Force prevents it from activating if the move has a secondary effect.", shortDesc: "If this Pokemon has no item, it steals the item off a Pokemon making contact with it.", - onAfterDamage: function (damage, target, source, move) { + onAfterMoveSecondary: function (target, source, move) { if (source && source !== target && move && move.flags['contact']) { if (target.item) { return; @@ -1865,7 +1865,7 @@ exports.BattleAbilities = { source.item = yourItem.id; return; } - this.add('-item', target, yourItem, '[from] ability: Pickpocket'); + this.add('-item', target, yourItem, '[from] ability: Pickpocket', '[of] ' + source); } }, id: "pickpocket",