Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-18 19:28:35 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Pledge moves

Browse Source
This commit is contained in:
Guangcong Luo 2020-02-15 13:27:28 -08:00
parent 72b23d2d4c
commit 1fa9e141f6
3 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
data/moves.js
View File

@ -278,11 +278,11 @@ let BattleMovedex = {
pp: 15,
priority: 0,
flags: {authentic: 1, mystery: 1},
onHit(target) {
onHit(target, source, move) {
if (target.side.active.length < 2) return false; // fails in singles
let action = this.queue.willMove(target);
if (action) {
this.queue.prioritizeAction(action);
this.queue.prioritizeAction(action, move);
this.add('-activate', target, 'move: After You');
} else {
return false;
@ -5410,7 +5410,7 @@ let BattleMovedex = {
// @ts-ignore
if (action.pokemon.side === source.side && ['grasspledge', 'waterpledge'].includes(action.move.id)) {
// @ts-ignore
this.queue.prioritizeAction(action);
this.queue.prioritizeAction(action, move);
this.add('-waiting', source, action.pokemon);
return null;
}
@ -5420,18 +5420,12 @@ let BattleMovedex = {
if (move.sourceEffect === 'waterpledge') {
move.type = 'Water';
move.forceSTAB = true;
move.self = {sideCondition: 'waterpledge'};
}
if (move.sourceEffect === 'grasspledge') {
move.type = 'Fire';
move.forceSTAB = true;
}
},
onHit(target, source, move) {
if (move.sourceEffect === 'grasspledge') {
target.side.addSideCondition('firepledge');
}
if (move.sourceEffect === 'waterpledge') {
source.side.addSideCondition('waterpledge');
move.sideCondition = 'firepledge';
}
},
effect: {
@ -7636,7 +7630,7 @@ let BattleMovedex = {
// @ts-ignore
if (action.pokemon.side === source.side && ['waterpledge', 'firepledge'].includes(action.move.id)) {
// @ts-ignore
this.queue.prioritizeAction(action);
this.queue.prioritizeAction(action, move);
this.add('-waiting', source, action.pokemon);
return null;
}
@ -7646,18 +7640,12 @@ let BattleMovedex = {
if (move.sourceEffect === 'waterpledge') {
move.type = 'Grass';
move.forceSTAB = true;
move.sideCondition = 'grasspledge';
}
if (move.sourceEffect === 'firepledge') {
move.type = 'Fire';
move.forceSTAB = true;
}
},
onHit(target, source, move) {
if (move.sourceEffect === 'waterpledge') {
target.side.addSideCondition('grasspledge');
}
if (move.sourceEffect === 'firepledge') {
target.side.addSideCondition('firepledge');
move.sideCondition = 'firepledge';
}
},
effect: {
@ -15867,7 +15855,7 @@ let BattleMovedex = {
// @ts-ignore
if (action.move.id === 'round') {
// @ts-ignore
this.queue.prioritizeAction(action);
this.queue.prioritizeAction(action, move);
return;
}
}
@ -16618,7 +16606,7 @@ let BattleMovedex = {
pokemon.volatiles['shelltrap'].gotHit = true;
let action = this.queue.willMove(pokemon);
if (action) {
this.queue.prioritizeAction(action);
this.queue.prioritizeAction(action, move);
}
}
},
@ -20758,7 +20746,7 @@ let BattleMovedex = {
// @ts-ignore
if (action.pokemon.side === source.side && ['firepledge', 'grasspledge'].includes(action.move.id)) {
// @ts-ignore
this.queue.prioritizeAction(action);
this.queue.prioritizeAction(action, move);
this.add('-waiting', source, action.pokemon);
return null;
}
@ -20768,18 +20756,12 @@ let BattleMovedex = {
if (move.sourceEffect === 'grasspledge') {
move.type = 'Grass';
move.forceSTAB = true;
move.sideCondition = 'grasspledge';
}
if (move.sourceEffect === 'firepledge') {
move.type = 'Water';
move.forceSTAB = true;
}
},
onHit(target, source, move) {
if (move.sourceEffect === 'firepledge') {
source.side.addSideCondition('waterpledge');
}
if (move.sourceEffect === 'grasspledge') {
target.side.addSideCondition('grasspledge');
move.self = {sideCondition: 'waterpledge'};
}
},
effect: {

2
sim/battle-queue.ts
View File

@ -218,7 +218,7 @@ export class BattleQueue extends Array<Action> {
/**
* Makes the passed action happen next (skipping speed order).
*/
prioritizeAction(action: MoveAction | SwitchAction, source?: Pokemon, sourceEffect?: Effect) {
prioritizeAction(action: MoveAction | SwitchAction, sourceEffect?: Effect) {
for (const [i, curAction] of this.entries()) {
if (curAction === action) {
this.splice(i, 1);

30
test/sim/moves/pledge.js Normal file
View File

@ -0,0 +1,30 @@
'use strict';
const assert = require('./../../assert');
const common = require('./../../common');
let battle;
describe('Pledge moves', function () {
afterEach(function () {
battle.destroy();
});
it(`should work`, function () {
battle = common.createBattle({gameType: 'doubles'});
battle.setPlayer('p1', {team: [
{species: 'Ninjask', ability: 'noability', moves: ['waterpledge']},
{species: 'Incineroar', ability: 'noability', moves: ['grasspledge']},
]});
battle.setPlayer('p2', {team: [
{species: 'Garchomp', ability: 'noability', moves: ['waterpledge']},
{species: 'Mew', ability: 'noability', moves: ['firepledge']},
]});
battle.makeChoices('move 1 1, move 1 1', 'move 1 1, move 1 2');
// Incineroar should start Grass Pledge first, then faint to Water Pledge
assert(battle.p2.sideConditions['waterpledge']);
assert(battle.p2.sideConditions['grasspledge']);
assert.fainted(battle.p1.active[1]);
});
});