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

Fix Life Orb + Emergency Exit interaction (#6738)

Browse Source
This commit is contained in:
fart 2020-05-25 17:14:59 -04:00 committed by GitHub
parent a4f56d27d2
commit 0450e8cb65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/scripts.ts
View File

@ -285,6 +285,11 @@ export const BattleScripts: BattleScriptsData = {
if (!move.negateSecondary && !(move.hasSheerForce && pokemon.hasAbility('sheerforce'))) {
this.singleEvent('AfterMoveSecondarySelf', move, null, pokemon, target, move);
this.runEvent('AfterMoveSecondarySelf', pokemon, target, move);
if (pokemon && pokemon !== target && move && move.category !== 'Status') {
if (pokemon.hp <= pokemon.maxhp / 2) {
this.runEvent('EmergencyExit', pokemon, pokemon);
}
}
}
return true;

2
test/sim/abilities/emergencyexit.js
View File

@ -108,7 +108,7 @@ describe(`Emergency Exit`, function () {
assert.equal(battle.requestState, 'switch');
});
it.skip('should request switch-out after taking Life Orb recoil', function () {
it('should request switch-out after taking Life Orb recoil', function () {
battle = common.createBattle([[
{species: "Golisopod", item: "lifeorb", ability: 'emergencyexit', moves: ['peck']},
{species: "Wynaut", moves: ['sleeptalk']},