Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-16 01:14:54 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add the last Pledge move messages.

Browse Source
This commit is contained in:
Marty-D 2013-02-07 12:07:09 -05:00
parent 01f304a6dc
commit 147a3f0fec
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/moves.js
View File

@ -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;
}
}