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

Update arena-tag.ts

Browse Source
This commit is contained in:
Bertie690 2025-07-12 14:14:38 +02:00 committed by GitHub
parent 9536b58d96
commit 65d998f901
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/arena-tag.ts
View File

@ -898,10 +898,10 @@ interface DelayedAttack {
/** The {@linkcode BattlerIndex} of the attack's target. */ /** The {@linkcode BattlerIndex} of the attack's target. */
targetIndex: BattlerIndex; targetIndex: BattlerIndex;
/** /**
* The number of turns left. * The number of turns left until activation.
* The attack will trigger once its turn count reaches 0, at which point it is removed. * The attack will trigger once its turn count reaches 0, at which point it is removed.
*/ */
turnCount: number; turnsLeft: number;
} }
/** /**
@ -930,7 +930,7 @@ export class DelayedAttackTag extends ArenaTag {
* @param turnCount - The number of turns to delay the attack; default `3` * @param turnCount - The number of turns to delay the attack; default `3`
*/ */
public queueAttack(source: Pokemon, move: MoveId, targetIndex: BattlerIndex, turnCount = 3): void { public queueAttack(source: Pokemon, move: MoveId, targetIndex: BattlerIndex, turnCount = 3): void {
this.delayedAttacks.push({ sourceId: source.id, move, targetIndex, turnCount }); this.delayedAttacks.push({ sourceId: source.id, move, targetIndex, turnsLeft: turnCount });
} }
/** /**
@ -951,7 +951,7 @@ export class DelayedAttackTag extends ArenaTag {
const source = globalScene.getPokemonById(attack.sourceId); const source = globalScene.getPokemonById(attack.sourceId);
const target: Pokemon | undefined = globalScene.getField()[attack.targetIndex]; const target: Pokemon | undefined = globalScene.getField()[attack.targetIndex];
if (--attack.turnCount > 0) { if (--attack.turnsLeft > 0) {
// attack still cooking // attack still cooking
continue; continue;
} }
@ -959,7 +959,7 @@ export class DelayedAttackTag extends ArenaTag {
if (!source || !target || source === target || target.isFainted()) { if (!source || !target || source === target || target.isFainted()) {
// source/target either nonexistent or the exact same pokemon; silently mark for deletion // source/target either nonexistent or the exact same pokemon; silently mark for deletion
// TODO: move into an overriddable method if wish is made into a delayed attack // TODO: move into an overriddable method if wish is made into a delayed attack
attack.turnCount = -1; attack.turnsLeft = -1;
continue; continue;
} }
@ -985,6 +985,8 @@ export class DelayedAttackTag extends ArenaTag {
protected triggerAttack(attack: DelayedAttack): void { protected triggerAttack(attack: DelayedAttack): void {
const source = globalScene.getPokemonById(attack.sourceId)!; const source = globalScene.getPokemonById(attack.sourceId)!;
const target = globalScene.getField()[attack.targetIndex]; const target = globalScene.getField()[attack.targetIndex];
source.turnData.extraTurns++;
globalScene.phaseManager.queueMessage( globalScene.phaseManager.queueMessage(
i18next.t("moveTriggers:tookMoveAttack", { i18next.t("moveTriggers:tookMoveAttack", {
pokemonName: getPokemonNameWithAffix(target), pokemonName: getPokemonNameWithAffix(target),