Skip to content

Commit

Permalink
Gen 1: Fix Mirror Move Hyper Beam interaction (#8966)
Browse files Browse the repository at this point in the history 
* (Partially) fix Mirror Move after move behavior

* typo
  • Loading branch information
@livid-washed
livid-washed committed Nov 5, 2022
1 parent 3eda79c commit 40cd8b4
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 57 deletions.
102 changes: 67 additions & 35 deletions data/mods/gen1/scripts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ export const Scripts: ModdedBattleScriptsData = {
},
actions: {
// This function is the main one when running a move.
// It deals with the beforeMove and AfterMoveSelf events.
// This leads with partial trapping moves shennanigans after the move has been used.
// It deals with the beforeMove event.
// It also deals with how PP reduction works on gen 1.
runMove(moveOrMoveName, pokemon, targetLoc, sourceEffect) {
const target = this.battle.getTarget(pokemon, moveOrMoveName, targetLoc);
Expand Down Expand Up @@ -115,46 +114,79 @@ export const Scripts: ModdedBattleScriptsData = {
}
}
this.useMove(move, pokemon, target, sourceEffect);
this.battle.singleEvent('AfterMove', move, null, pokemon, target, move);
},
// This function deals with AfterMoveSelf events.
// This leads with partial trapping moves shenanigans after the move has been used.
useMove(moveOrMoveName, pokemon, target, sourceEffect) {
const moveResult = this.useMoveInner(moveOrMoveName, pokemon, target, sourceEffect);

// If target fainted
if (target && target.hp <= 0) {
// We remove recharge
if (pokemon.volatiles['mustrecharge']) pokemon.removeVolatile('mustrecharge');
delete pokemon.volatiles['partialtrappinglock'];
// We remove screens
target.side.removeSideCondition('reflect');
target.side.removeSideCondition('lightscreen');
pokemon.removeVolatile('twoturnmove');
} else if (pokemon.hp) {
this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
if (!sourceEffect && this.battle.effect.id) sourceEffect = this.battle.effect;
const baseMove = this.battle.dex.moves.get(moveOrMoveName);
let move = this.battle.dex.getActiveMove(baseMove);
if (target === undefined) target = this.battle.getRandomTarget(pokemon, move);
if (move.target === 'self') {
target = pokemon;
}
if (sourceEffect) move.sourceEffect = sourceEffect.id;

this.battle.singleEvent('ModifyMove', move, null, pokemon, target, move, move);
if (baseMove.target !== move.target) {
// Target changed in ModifyMove, so we must adjust it here
target = this.battle.getRandomTarget(pokemon, move);
}
move = this.battle.runEvent('ModifyMove', pokemon, target, move, move);
if (baseMove.target !== move.target) {
// Check again, this shouldn't ever happen on Gen 1.
target = this.battle.getRandomTarget(pokemon, move);
}
if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);

// For partial trapping moves, we are saving the target
if (move.volatileStatus === 'partiallytrapped' && target && target.hp > 0) {
// Let's check if the lock exists
if (pokemon.volatiles['partialtrappinglock'] && target.volatiles['partiallytrapped']) {
// Here the partialtrappinglock volatile has been already applied
const sourceVolatile = pokemon.volatiles['partialtrappinglock'];
const targetVolatile = target.volatiles['partiallytrapped'];
if (!sourceVolatile.locked) {
// If it's the first hit, we save the target
sourceVolatile.locked = target;
} else if (target !== pokemon && target !== sourceVolatile.locked) {
// Our target switched out! Re-roll the duration, damage, and accuracy.
const duration = this.battle.sample([2, 2, 2, 3, 3, 3, 4, 5]);
sourceVolatile.duration = duration;
sourceVolatile.locked = target;
// Duration reset thus partially trapped at 2 always.
targetVolatile.duration = 2;

if (move.id !== 'metronome') {
if (move.id !== 'mirrormove' ||
(!pokemon.side.foe.active[0]?.lastMove || pokemon.side.foe.active[0].lastMove?.id === 'mirrormove')) {
// The move is our 'final' move (a failed Mirror Move, or any move that isn't Metronome or Mirror Move).
this.battle.singleEvent('AfterMove', move, null, pokemon, target, move);

// If target fainted
if (target && target.hp <= 0) {
// We remove recharge
if (pokemon.volatiles['mustrecharge']) pokemon.removeVolatile('mustrecharge');
delete pokemon.volatiles['partialtrappinglock'];
// We remove screens
target.side.removeSideCondition('reflect');
target.side.removeSideCondition('lightscreen');
pokemon.removeVolatile('twoturnmove');
} else if (pokemon.hp) {
this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
}
} // If we move to here, the move failed and there's no partial trapping lock.
if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);

// For partial trapping moves, we are saving the target
if (move.volatileStatus === 'partiallytrapped' && target && target.hp > 0) {
// Let's check if the lock exists
if (pokemon.volatiles['partialtrappinglock'] && target.volatiles['partiallytrapped']) {
// Here the partialtrappinglock volatile has been already applied
const sourceVolatile = pokemon.volatiles['partialtrappinglock'];
const targetVolatile = target.volatiles['partiallytrapped'];
if (!sourceVolatile.locked) {
// If it's the first hit, we save the target
sourceVolatile.locked = target;
} else if (target !== pokemon && target !== sourceVolatile.locked) {
// Our target switched out! Re-roll the duration, damage, and accuracy.
const duration = this.battle.sample([2, 2, 2, 3, 3, 3, 4, 5]);
sourceVolatile.duration = duration;
sourceVolatile.locked = target;
// Duration reset thus partially trapped at 2 always.
targetVolatile.duration = 2;
}
} // If we move to here, the move failed and there's no partial trapping lock.
}
}
}
return moveResult;
},
// This is the function that actually uses the move, running ModifyMove events.
// It uses the move and then deals with the effects after the move.
useMove(moveOrMoveName, pokemon, target, sourceEffect) {
useMoveInner(moveOrMoveName, pokemon, target, sourceEffect) {
if (!sourceEffect && this.battle.effect.id) sourceEffect = this.battle.effect;
const baseMove = this.battle.dex.moves.get(moveOrMoveName);
let move = this.battle.dex.getActiveMove(baseMove);
Expand Down
160 changes: 138 additions & 22 deletions data/mods/gen1stadium/scripts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,31 +96,147 @@ export const Scripts: ModdedBattleScriptsData = {
sourceEffect = move;
}
this.battle.actions.useMove(move, pokemon, target, sourceEffect);
this.battle.singleEvent('AfterMove', move, null, pokemon, target, move);
},
// This function deals with AfterMoveSelf events.
// This leads with partial trapping moves shenanigans after the move has been used.
useMove(moveOrMoveName, pokemon, target, sourceEffect) {
const moveResult = this.useMoveInner(moveOrMoveName, pokemon, target, sourceEffect);

if (!sourceEffect && this.battle.effect.id) sourceEffect = this.battle.effect;
const baseMove = this.battle.dex.moves.get(moveOrMoveName);
let move = this.battle.dex.getActiveMove(baseMove);
if (target === undefined) target = this.battle.getRandomTarget(pokemon, move);
if (move.target === 'self') {
target = pokemon;
}
if (sourceEffect) move.sourceEffect = sourceEffect.id;

this.battle.singleEvent('ModifyMove', move, null, pokemon, target, move, move);
if (baseMove.target !== move.target) {
// Target changed in ModifyMove, so we must adjust it here
target = this.battle.getRandomTarget(pokemon, move);
}
move = this.battle.runEvent('ModifyMove', pokemon, target, move, move);
if (baseMove.target !== move.target) {
// Check again, this shouldn't ever happen on Gen 1.
target = this.battle.getRandomTarget(pokemon, move);
}

if (move.id !== 'metronome') {
if (move.id !== 'mirrormove' ||
(!pokemon.side.foe.active[0]?.lastMove || pokemon.side.foe.active[0].lastMove?.id === 'mirrormove')) {
// The move is our 'final' move (a failed Mirror Move, or any move that isn't Metronome or Mirror Move).
this.battle.singleEvent('AfterMove', move, null, pokemon, target, move);

// If target fainted
if (target && target.hp <= 0) {
// We remove screens
target.side.removeSideCondition('reflect');
target.side.removeSideCondition('lightscreen');
} else {
this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
}
if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);

// For partial trapping moves, we are saving the target.
if (move.volatileStatus === 'partiallytrapped' && target && target.hp > 0) {
// It hit, so let's remove must recharge volatile. Yup, this happens on Stadium.
target.removeVolatile('mustrecharge');
// Let's check if the lock exists
if (pokemon.volatiles['partialtrappinglock'] && target.volatiles['partiallytrapped']) {
// Here the partialtrappinglock volatile has been already applied
if (!pokemon.volatiles['partialtrappinglock'].locked) {
// If it's the first hit, we save the target
pokemon.volatiles['partialtrappinglock'].locked = target;
}
} // If we move to here, the move failed and there's no partial trapping lock
}
}
}
return moveResult;
},
// This is the function that actually uses the move, running ModifyMove events.
// It uses the move and then deals with the effects after the move.
useMoveInner(moveOrMoveName, pokemon, target, sourceEffect) {
if (!sourceEffect && this.battle.effect.id) sourceEffect = this.battle.effect;
const baseMove = this.battle.dex.moves.get(moveOrMoveName);
let move = this.battle.dex.getActiveMove(baseMove);
if (target === undefined) target = this.battle.getRandomTarget(pokemon, move);
if (move.target === 'self') {
target = pokemon;
}
if (sourceEffect) move.sourceEffect = sourceEffect.id;

// If target fainted
if (target && target.hp <= 0) {
// We remove screens
target.side.removeSideCondition('reflect');
target.side.removeSideCondition('lightscreen');
} else {
this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
this.battle.setActiveMove(move, pokemon, target);

this.battle.singleEvent('ModifyMove', move, null, pokemon, target, move, move);
if (baseMove.target !== move.target) {
// Target changed in ModifyMove, so we must adjust it here
target = this.battle.getRandomTarget(pokemon, move);
}
if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);

// For partial trapping moves, we are saving the target.
if (move.volatileStatus === 'partiallytrapped' && target && target.hp > 0) {
// It hit, so let's remove must recharge volatile. Yup, this happens on Stadium.
target.removeVolatile('mustrecharge');
// Let's check if the lock exists
if (pokemon.volatiles['partialtrappinglock'] && target.volatiles['partiallytrapped']) {
// Here the partialtrappinglock volatile has been already applied
if (!pokemon.volatiles['partialtrappinglock'].locked) {
// If it's the first hit, we save the target
pokemon.volatiles['partialtrappinglock'].locked = target;
}
} // If we move to here, the move failed and there's no partial trapping lock
move = this.battle.runEvent('ModifyMove', pokemon, target, move, move);
if (baseMove.target !== move.target) {
// Check again, this shouldn't ever happen on Gen 1.
target = this.battle.getRandomTarget(pokemon, move);
this.battle.debug('not a gen 1 mechanic');
}
if (!move) return false;

let attrs = '';
if (pokemon.fainted) {
// Removing screens upon faint.
pokemon.side.removeSideCondition('reflect');
pokemon.side.removeSideCondition('lightscreen');
return false;
}

if (sourceEffect) attrs += '|[from]' + this.battle.dex.conditions.get(sourceEffect);
this.battle.addMove('move', pokemon, move.name, target + attrs);

if (!this.battle.singleEvent('Try', move, null, pokemon, target, move)) {
return true;
}
if (!this.battle.singleEvent('TryMove', move, null, pokemon, target, move) ||
!this.battle.runEvent('TryMove', pokemon, target, move)) {
return true;
}

if (move.ignoreImmunity === undefined) {
move.ignoreImmunity = (move.category === 'Status');
}

let damage: number | undefined | false | '' = false;
if (!target || target.fainted) {
this.battle.attrLastMove('[notarget]');
this.battle.add('-notarget');
return true;
}
damage = this.tryMoveHit(target, pokemon, move);

// Store 0 damage for last damage if move failed or dealt 0 damage.
// This only happens on moves that don't deal damage but call GetDamageVarsForPlayerAttack (disassembly).
const neverDamageMoves = [
'conversion', 'haze', 'mist', 'focusenergy', 'confuseray', 'supersonic', 'transform', 'lightscreen', 'reflect', 'substitute', 'mimic', 'leechseed', 'splash', 'softboiled', 'recover', 'rest',
];
if (
!damage &&
(move.category !== 'Status' || (move.status && !['psn', 'tox', 'par'].includes(move.status))) &&
!neverDamageMoves.includes(move.id)
) {
this.battle.lastDamage = 0;
}

// Go ahead with results of the used move.
if (damage === false) {
this.battle.singleEvent('MoveFail', move, null, target, pokemon, move);
return true;
}

if (!move.negateSecondary) {
this.battle.singleEvent('AfterMoveSecondarySelf', move, null, pokemon, target, move);
this.battle.runEvent('AfterMoveSecondarySelf', pokemon, target, move);
}
return true;
},
tryMoveHit(target, pokemon, move) {
let damage: number | false | undefined = 0;
Expand Down
34 changes: 34 additions & 0 deletions test/sim/moves/mirrormove.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

const assert = require('./../../assert');
const common = require('./../../common');

let battle;

describe('Mirror Move [Gen 1]', function () {
afterEach(function () {
battle.destroy();
});

it(`[Gen 1] Mirror Move'd Hyper Beam should force a recharge turn after not KOing a Pokemon`, function () {
battle = common.gen(1).createBattle([[
{species: 'fearow', moves: ['mirrormove', 'tackle']},
], [
{species: 'aerodactyl', moves: ['hyperbeam']},
]]);
battle.makeChoices();
assert.cantMove(() => battle.choose('p1', 'move tackle'));
});

it(`[Gen 1] Mirror Move'd Hyper Beam should not force a recharge turn after KOing a Pokemon`, function () {
battle = common.gen(1).createBattle([[
{species: 'fearow', moves: ['mirrormove', 'tackle']},
], [
{species: 'kadabra', moves: ['hyperbeam']},
{species: 'exeggutor', moves: ['splash']},
]]);
battle.makeChoices();
battle.choose('p2', 'switch exeggutor');
assert.false.cantMove(() => battle.choose('p1', 'move tackle'));
});
});

0 comments on commit 40cd8b4

Please sign in to comment.