mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-25 00:39:27 +02:00
Fix tag lapsing on battle start in MEs with free enemy moves
This commit is contained in:
parent
e5af2dc49a
commit
380e2090a9
@ -25,6 +25,7 @@ import { GameOverPhase } from "#app/phases/game-over-phase";
|
|||||||
import { SwitchPhase } from "#app/phases/switch-phase";
|
import { SwitchPhase } from "#app/phases/switch-phase";
|
||||||
import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
|
import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
|
||||||
import { SwitchType } from "#enums/switch-type";
|
import { SwitchType } from "#enums/switch-type";
|
||||||
|
import { BattlerTagType } from "#enums/battler-tag-type";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Will handle (in order):
|
* Will handle (in order):
|
||||||
@ -218,9 +219,14 @@ export class MysteryEncounterBattleStartCleanupPhase extends Phase {
|
|||||||
start() {
|
start() {
|
||||||
super.start();
|
super.start();
|
||||||
|
|
||||||
|
// Lapse any residual flinches but ignore all other turn-end battle tags
|
||||||
const field = this.scene.getField(true).filter(p => p.summonData);
|
const field = this.scene.getField(true).filter(p => p.summonData);
|
||||||
field.forEach(pokemon => {
|
field.forEach(pokemon => {
|
||||||
pokemon.lapseTags(BattlerTagLapseType.TURN_END);
|
const tags = pokemon.summonData.tags;
|
||||||
|
tags.filter(t => t.tagType === BattlerTagType.FLINCHED && !(t.lapse(pokemon, BattlerTagLapseType.TURN_END))).forEach(t => {
|
||||||
|
t.onRemove(pokemon);
|
||||||
|
tags.splice(tags.indexOf(t), 1);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Remove any status tick phases
|
// Remove any status tick phases
|
||||||
|
Loading…
Reference in New Issue
Block a user