Gens 1 & 2: Fix Counter

Some inherited functions from gen 6 were messing with the proper functionality.
smogon · Jan 7, 2015 · eac5f93 · eac5f93
1 parent 45babe4
commit eac5f93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mods/gen1/moves.js b/mods/gen1/moves.js
@@ -204,7 +204,7 @@ exports.BattleMovedex = {
 		damageCallback: function (pokemon, target) {
 			// Counter mechanics on gen 1 might be hard to understand.
 			// It will fail if the last move selected by the opponent has base power 0 or is not Normal or Fighting Type.
-			// If both are true, counter will deal twice the last damage dealt in battle.
+			// If both are true, counter will deal twice the last damage dealt in battle, no matter what was the move.
 			// That means that, if opponent switches, counter will use last counter damage * 2.
 			var lastUsedMove = this.getMove(target.side.lastMove);
 			if (lastUsedMove && lastUsedMove.basePower > 0 && lastUsedMove.type in {'Normal': 1, 'Fighting': 1} && target.battle.lastDamage > 0) {

diff --git a/mods/gen2/moves.js b/mods/gen2/moves.js
@@ -24,7 +24,10 @@ exports.BattleMovedex = {
 				return 2 * pokemon.lastAttackedBy.damage;
 			}
 			return false;
-		}
+		},
+		beforeTurnCallback: function () {},
+		onTryHit: function () {},
+		effect: {}
 	},
 	encore: {
 		inherit: true,