From ef6f94da4a58fdebfaf4dc7bdd1ccc5c8d114f28 Mon Sep 17 00:00:00 2001 From: Marty-D Date: Thu, 29 Dec 2016 19:10:17 -0500 Subject: [PATCH] Fix Shell Trap --- data/moves.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/moves.js b/data/moves.js index 882201e939..87bd461caf 100644 --- a/data/moves.js +++ b/data/moves.js @@ -14372,7 +14372,7 @@ exports.BattleMovedex = { accuracy: 100, basePower: 150, category: "Special", - desc: "Fails unless the user is hit by a physical attack this turn before it can execute the move.", + desc: "Fails unless the user is hit by a physical attack from an opponent this turn before it can execute the move.", shortDesc: "User must take physical damage before moving.", id: "shelltrap", name: "Shell Trap", @@ -14394,7 +14394,7 @@ exports.BattleMovedex = { this.add('-singleturn', pokemon, 'move: Shell Trap'); }, onHit: function (pokemon, source, move) { - if (move.category === 'Physical') { + if (pokemon.side !== source.side && move.category === 'Physical') { pokemon.volatiles['shelltrap'].gotHit = true; } },