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

Run effectiveness events even for string type (#5310)

Browse Source
This commit is contained in:
urkerab
2019-03-14 11:03:14 +00:00
committed by Guangcong Luo
parent f7982c390c
commit 2ea89698b0
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sim/pokemon.ts
View File

@@ -1598,15 +1598,17 @@ export class Pokemon {
runEffectiveness(moveOrType: ActiveMove | string) {
let totalTypeMod = 0;
const move = (typeof moveOrType !== 'string' ? moveOrType : null);
let move;
if (typeof moveOrType === 'string') {
move = this.battle.getActiveMove('Judgment');
move.type = moveOrType;
} else {
move = moveOrType;
}
for (const type of this.getTypes()) {
let typeMod = this.battle.getEffectiveness(moveOrType, type);
if (move) {
typeMod = this.battle.singleEvent('Effectiveness', move, null, this, type, move, typeMod);
totalTypeMod += this.battle.runEvent('Effectiveness', this, type, move, typeMod);
} else {
totalTypeMod += typeMod;
}
typeMod = this.battle.singleEvent('Effectiveness', move, null, this, type, move, typeMod);
totalTypeMod += this.battle.runEvent('Effectiveness', this, type, move, typeMod);
}
return totalTypeMod;
}

21
test/simulator/misc/inversebattle.js
View File

@@ -35,6 +35,27 @@ describe('Inverse Battle', function () {
assert.notStrictEqual(battle.p2.active[0].hp, battle.p2.active[0].maxhp);
});
it('should affect Stealth Rock damage', function () {
battle.join('p1', 'Guest 1', 1, [{species: "Smeargle", moves: ['splash', 'stealthrock']}]);
battle.join('p2', 'Guest 2', 1, [
{species: "Ninjask", moves: ['protect']},
{species: "Steelix", moves: ['rest']},
{species: "Hitmonchan", moves: ['rest']},
{species: "Chansey", moves: ['wish']},
{species: "Staraptor", moves: ['roost']},
{species: "Volcarona", moves: ['roost']},
]);
battle.makeChoices('move stealthrock', 'move protect');
let pokemon;
for (let i = 2; i <= 6; i++) {
battle.makeChoices('move splash', 'switch ' + i);
pokemon = battle.p2.active[0];
const expectedPercent = Math.pow(0.5, i - 1);
const expectedDamage = Math.floor(pokemon.maxhp * expectedPercent);
assert.strictEqual(pokemon.maxhp - pokemon.hp, expectedDamage, `${pokemon.name} should take ${expectedPercent * 100}%`);
}
});
it('should not affect ability-based immunities', function () {
battle.join('p1', 'Guest 1', 1, [{species: "Hariyama", ability: 'guts', moves: ['earthquake']}]);
battle.join('p2', 'Guest 2', 1, [{species: "Mismagius", ability: 'levitate', moves: ['shadowsneak']}]);