From 3a6b52db44afc0c43e3ef3ca63e178aaaba084ba Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Sat, 30 Mar 2013 12:51:53 -0700 Subject: [PATCH] sync client moves.js --- data/moves.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/moves.js b/data/moves.js index cf8e246ea..8844bc540 100644 --- a/data/moves.js +++ b/data/moves.js @@ -2074,11 +2074,11 @@ exports.BattleMovedex = { delete move.volatileStatus; delete move.onHit; move.self = { boosts: {atk:1,def:1,spe:-1}}; - move.target = "self"; + move.target = move.nonGhostTarget; } }, - onTryHit: function(target, source) { - if (target.volatiles.curse) return false; + onTryHit: function(target, source, move) { + if (move.volatileStatus && target.volatiles.curse) return false; }, onHit: function(target, source) { this.directDamage(source.maxhp/2, source, source); @@ -2094,7 +2094,7 @@ exports.BattleMovedex = { }, secondary: false, target: "normal", - ghostTarget: "self", + nonGhostTarget: "self", type: "Ghost" }, "cut": {