mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-08 17:32:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid disabling virtual moves

Browse Source
This commit is contained in:
Zach Day 2024-08-09 20:48:01 -04:00
parent 14de49e8be
commit 8923720cda
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/battler-tags.ts
View File

@ -135,7 +135,7 @@ export abstract class DisablingBattlerTag extends BattlerTag {
*/ */
export class DisabledTag extends DisablingBattlerTag { export class DisabledTag extends DisablingBattlerTag {
/** The move being disabled. Gets set when {@linkcode onAdd} is called for this tag. */ /** The move being disabled. Gets set when {@linkcode onAdd} is called for this tag. */
public moveId: integer = 0; public moveId: Moves = Moves.NONE;
public override moveIsDisabled(move: Moves): boolean { public override moveIsDisabled(move: Moves): boolean {
return move === this.moveId; return move === this.moveId;
@ -152,13 +152,9 @@ export class DisabledTag extends DisablingBattlerTag {
override onAdd(pokemon: Pokemon): void { override onAdd(pokemon: Pokemon): void {
super.onAdd(pokemon); super.onAdd(pokemon);
const history = pokemon.getLastXMoves(); const move = pokemon.getLastXMoves()
if (history.length === 0) { .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual);
return; if (move === undefined) {
}
const move = history.find(m => m.move !== Moves.NONE);
if (move === undefined || move.move === Moves.STRUGGLE) {
return; return;
} }