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

Fix other conflicts

Browse Source
This commit is contained in:
Dean 2025-05-20 14:41:42 -07:00
parent 475fa5ac86
commit 42996ac31f
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/abilities/ability-class.ts
View File

@ -12,6 +12,7 @@ export class Ability implements Localizable {
public name: string; public name: string;
public description: string; public description: string;
public generation: number; public generation: number;
public postSummonPriority: number;
public isBypassFaint: boolean; public isBypassFaint: boolean;
public isIgnorable: boolean; public isIgnorable: boolean;
public isSuppressable = true; public isSuppressable = true;
@ -20,11 +21,12 @@ export class Ability implements Localizable {
public attrs: AbAttr[]; public attrs: AbAttr[];
public conditions: AbAttrCondition[]; public conditions: AbAttrCondition[];
constructor(id: Abilities, generation: number) { constructor(id: Abilities, generation: number, postSummonPriority = 0) {
this.id = id; this.id = id;
this.nameAppend = ""; this.nameAppend = "";
this.generation = generation; this.generation = generation;
this.postSummonPriority = postSummonPriority;
this.attrs = []; this.attrs = [];
this.conditions = []; this.conditions = [];

2
src/data/phase-priority-queue.ts
View File

@ -4,7 +4,7 @@ import { ActivatePriorityQueuePhase } from "#app/phases/activate-priority-queue-
import type { PostSummonPhase } from "#app/phases/post-summon-phase"; import type { PostSummonPhase } from "#app/phases/post-summon-phase";
import { PostSummonActivateAbilityPhase } from "#app/phases/post-summon-activate-ability-phase"; import { PostSummonActivateAbilityPhase } from "#app/phases/post-summon-activate-ability-phase";
import { Stat } from "#enums/stat"; import { Stat } from "#enums/stat";
import { BooleanHolder } from "#app/utils"; import { BooleanHolder } from "#app/utils/common";
import { TrickRoomTag } from "#app/data/arena-tag"; import { TrickRoomTag } from "#app/data/arena-tag";
import { DynamicPhaseType } from "#enums/dynamic-phase-type"; import { DynamicPhaseType } from "#enums/dynamic-phase-type";

2
src/phases/post-summon-activate-ability-phase.ts
View File

@ -1,5 +1,5 @@
import type { BattlerIndex } from "#app/battle"; import type { BattlerIndex } from "#app/battle";
import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/ability"; import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/abilities/ability";
import { PostSummonPhase } from "#app/phases/post-summon-phase"; import { PostSummonPhase } from "#app/phases/post-summon-phase";
/** /**

5
test/abilities/ability_activation_order.test.ts
View File

@ -1,4 +1,3 @@
import { PreventBerryUseAbAttr, TerrainEventTypeChangeAbAttr } from "#app/data/ability";
import { Abilities } from "#enums/abilities"; import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves"; import { Moves } from "#enums/moves";
import { Species } from "#enums/species"; import { Species } from "#enums/species";
@ -6,7 +5,7 @@ import { Stat } from "#enums/stat";
import { WeatherType } from "#enums/weather-type"; import { WeatherType } from "#enums/weather-type";
import GameManager from "#test/testUtils/gameManager"; import GameManager from "#test/testUtils/gameManager";
import Phaser from "phaser"; import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
describe("Ability Activation Order", () => { describe("Ability Activation Order", () => {
let phaserGame: Phaser.Game; let phaserGame: Phaser.Game;
@ -27,7 +26,7 @@ describe("Ability Activation Order", () => {
game.override game.override
.moveset([Moves.SPLASH]) .moveset([Moves.SPLASH])
.ability(Abilities.BALL_FETCH) .ability(Abilities.BALL_FETCH)
.battleType("single") .battleStyle("single")
.disableCrits() .disableCrits()
.enemySpecies(Species.MAGIKARP) .enemySpecies(Species.MAGIKARP)
.enemyAbility(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH)