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

Revert move-phase.ts

Browse Source
This commit is contained in:
Bertie690 2025-07-06 13:17:08 +02:00 committed by GitHub
parent 10e42905f7
commit a140e075cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/phases/move-phase.ts
View File

@ -11,7 +11,7 @@ import { MoveFlags } from "#enums/MoveFlags";
import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms/form-change-triggers";
import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect"; import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect";
import { PokemonType } from "#enums/pokemon-type"; import { PokemonType } from "#enums/pokemon-type";
import { getTerrainBlockMessage, getWeatherBlockMessage } from "#app/data/weather"; import { getWeatherBlockMessage } from "#app/data/weather";
import { MoveUsedEvent } from "#app/events/battle-scene"; import { MoveUsedEvent } from "#app/events/battle-scene";
import type { PokemonMove } from "#app/data/moves/pokemon-move"; import type { PokemonMove } from "#app/data/moves/pokemon-move";
import type Pokemon from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon";
@ -26,6 +26,7 @@ import { BattlerTagType } from "#enums/battler-tag-type";
import { MoveId } from "#enums/move-id"; import { MoveId } from "#enums/move-id";
import { StatusEffect } from "#enums/status-effect"; import { StatusEffect } from "#enums/status-effect";
import i18next from "i18next"; import i18next from "i18next";
import { getTerrainBlockMessage } from "#app/data/terrain";
import { isVirtual, isIgnorePP, isReflected, MoveUseMode, isIgnoreStatus } from "#enums/move-use-mode"; import { isVirtual, isIgnorePP, isReflected, MoveUseMode, isIgnoreStatus } from "#enums/move-use-mode";
import { frenzyMissFunc } from "#app/data/moves/move-utils"; import { frenzyMissFunc } from "#app/data/moves/move-utils";
@ -377,10 +378,12 @@ export class MovePhase extends BattlePhase {
success = passesConditions && !failedDueToWeather && !failedDueToTerrain; success = passesConditions && !failedDueToWeather && !failedDueToTerrain;
} }
// Update the battle's "last move" pointer, unless we're currently mimicking a move // Update the battle's "last move" pointer, unless we're currently mimicking a move.
// or the move failed. if (!allMoves[this.move.moveId].hasAttr("CopyMoveAttr")) {
if (!allMoves[this.move.moveId].hasAttr("CallMoveAttr") && success) { // The last move used is unaffected by moves that fail
globalScene.currentBattle.lastMove = this.move.moveId; if (success) {
globalScene.currentBattle.lastMove = this.move.moveId;
}
} }
/** /**
@ -686,4 +689,4 @@ export class MovePhase extends BattlePhase {
public showFailedText(failedText: string = i18next.t("battle:attackFailed")): void { public showFailedText(failedText: string = i18next.t("battle:attackFailed")): void {
globalScene.phaseManager.queueMessage(failedText); globalScene.phaseManager.queueMessage(failedText);
} }
} }