From 147a3f0fecc045d94de39c39b426080a376bec73 Mon Sep 17 00:00:00 2001 From: Marty-D Date: Thu, 7 Feb 2013 12:07:09 -0500 Subject: [PATCH] Add the last Pledge move messages. --- data/moves.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/moves.js b/data/moves.js index 1fad133079..5196f811c8 100644 --- a/data/moves.js +++ b/data/moves.js @@ -3584,6 +3584,7 @@ exports.BattleMovedex = { basePower: 50, basePowerCallback: function(target, source, move) { if (move.sourceEffect in {grasspledge:1, waterpledge:1}) { + this.add('-combine'); this.debug('triple damage'); return 150; } @@ -3602,6 +3603,7 @@ exports.BattleMovedex = { if (!decision.pokemon || !decision.move) continue; if (decision.pokemon.side === source.side && decision.move.id in {grasspledge:1, waterpledge:1}) { this.prioritizeQueue(decision); + this.add('-waiting', source, decision.pokemon); return null; } } @@ -4583,6 +4585,7 @@ exports.BattleMovedex = { basePower: 50, basePowerCallback: function(target, source, move) { if (move.sourceEffect in {waterpledge:1, firepledge:1}) { + this.add('-combine'); this.debug('triple damage'); return 150; } @@ -4601,6 +4604,7 @@ exports.BattleMovedex = { if (!decision.pokemon || !decision.move) continue; if (decision.pokemon.side === source.side && decision.move.id in {waterpledge:1, firepledge:1}) { this.prioritizeQueue(decision); + this.add('-waiting', source, decision.pokemon); return null; } } @@ -12957,6 +12961,7 @@ exports.BattleMovedex = { basePower: 50, basePowerCallback: function(target, source, move) { if (move.sourceEffect in {firepledge:1, grasspledge:1}) { + this.add('-combine'); this.debug('triple damage'); return 150; } @@ -12975,6 +12980,7 @@ exports.BattleMovedex = { if (!decision.pokemon || !decision.move) continue; if (decision.pokemon.side === source.side && decision.move.id in {firepledge:1, grasspledge:1}) { this.prioritizeQueue(decision); + this.add('-waiting', source, decision.pokemon); return null; } }