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

[Balance] Prevent MEs on X1 Waves (#6204)

Browse Source 
* [Balance] Prevent MEs on X1 Waves

* Fix Bug-Type Superfan Encounter Test

* Fix Unit Tests
This commit is contained in:
Amani H. 2025-08-02 23:05:54 -04:00 committed by GitHub
parent e8ab79ebed
commit 0bc78cb715
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/battle-scene.ts
View File

@ -3528,6 +3528,7 @@ export class BattleScene extends SceneBase {
this.gameMode.hasMysteryEncounters &&
battleType === BattleType.WILD &&
!this.gameMode.isBoss(waveIndex) &&
waveIndex % 10 !== 1 &&
waveIndex < highestMysteryEncounterWave &&
waveIndex > lowestMysteryEncounterWave
);

2
src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
View File

@ -59,7 +59,7 @@ export const TeleportingHijinksEncounter: MysteryEncounter = MysteryEncounterBui
)
.withEncounterTier(MysteryEncounterTier.COMMON)
.withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
.withSceneRequirement(new WaveModulusRequirement([1, 2, 3], 10)) // Must be in first 3 waves after boss wave
.withSceneRequirement(new WaveModulusRequirement([2, 3, 4], 10)) // Must be in first 3 waves after boss wave
.withSceneRequirement(new MoneyRequirement(0, MONEY_COST_MULTIPLIER)) // Must be able to pay teleport cost
.withAutoHideIntroVisuals(false)
.withCatchAllowed(true)

2
test/mystery-encounter/encounters/berries-abound-encounter.test.ts
View File

@ -174,7 +174,7 @@ describe("Berries Abound - Mystery Encounter", () => {
});
it("should start battle if fastest pokemon is slower than boss below wave 50", async () => {
game.override.startingWave(41);
game.override.startingWave(42);
const encounterTextSpy = vi.spyOn(EncounterDialogueUtils, "showEncounterText");
await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty);

12
test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
View File

@ -253,7 +253,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
});
it("should start battle against the Bug-Type Superfan with wave 70 party template", async () => {
game.override.startingWave(61);
game.override.startingWave(63);
await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
await runMysteryEncounterToEnd(game, 1, undefined, true);
@ -268,7 +268,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
});
it("should start battle against the Bug-Type Superfan with wave 100 party template", async () => {
game.override.startingWave(81);
game.override.startingWave(83);
await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
await runMysteryEncounterToEnd(game, 1, undefined, true);
@ -284,7 +284,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
});
it("should start battle against the Bug-Type Superfan with wave 120 party template", async () => {
game.override.startingWave(111);
game.override.startingWave(113);
await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
await runMysteryEncounterToEnd(game, 1, undefined, true);
@ -302,7 +302,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
});
it("should start battle against the Bug-Type Superfan with wave 140 party template", async () => {
game.override.startingWave(131);
game.override.startingWave(133);
await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
await runMysteryEncounterToEnd(game, 1, undefined, true);
@ -320,7 +320,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
});
it("should start battle against the Bug-Type Superfan with wave 160 party template", async () => {
game.override.startingWave(151);
game.override.startingWave(153);
await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
await runMysteryEncounterToEnd(game, 1, undefined, true);
@ -338,7 +338,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
});
it("should start battle against the Bug-Type Superfan with wave 180 party template", async () => {
game.override.startingWave(171);
game.override.startingWave(173);
await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
await runMysteryEncounterToEnd(game, 1, undefined, true);

20
test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
View File

@ -79,14 +79,6 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
expect(TeleportingHijinksEncounter.options.length).toBe(3);
});
it("should run in waves that are X1", async () => {
game.override.startingWave(11).mysteryEncounterTier(MysteryEncounterTier.COMMON);
await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).toBe(MysteryEncounterType.TELEPORTING_HIJINKS);
});
it("should run in waves that are X2", async () => {
game.override.startingWave(32).mysteryEncounterTier(MysteryEncounterTier.COMMON);
@ -103,8 +95,16 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
expect(scene.currentBattle?.mysteryEncounter?.encounterType).toBe(MysteryEncounterType.TELEPORTING_HIJINKS);
});
it("should NOT run in waves that are not X1, X2, or X3", async () => {
game.override.startingWave(54);
it("should run in waves that are X4", async () => {
game.override.startingWave(54).mysteryEncounterTier(MysteryEncounterTier.COMMON);
await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).toBe(MysteryEncounterType.TELEPORTING_HIJINKS);
});
it("should NOT run in waves that are not X2, X3, or X4", async () => {
game.override.startingWave(67);
await game.runToMysteryEncounter();

12
test/mystery-encounter/mystery-encounter.test.ts
View File

@ -24,7 +24,7 @@ describe("Mystery Encounters", () => {
beforeEach(() => {
game = new GameManager(phaserGame);
scene = game.scene;
game.override.startingWave(11).mysteryEncounterChance(100);
game.override.startingWave(12).mysteryEncounterChance(100);
});
it("Spawns a mystery encounter", async () => {
@ -37,12 +37,20 @@ describe("Mystery Encounters", () => {
expect(game.scene.phaseManager.getCurrentPhase()!.constructor.name).toBe(MysteryEncounterPhase.name);
});
it("Encounters should not run on X1 waves", async () => {
game.override.startingWave(11);
await game.runToMysteryEncounter();
expect(scene.currentBattle.mysteryEncounter).toBeUndefined();
});
it("Encounters should not run below wave 10", async () => {
game.override.startingWave(9);
await game.runToMysteryEncounter();
expect(scene.currentBattle?.mysteryEncounter?.encounterType).not.toBe(MysteryEncounterType.MYSTERIOUS_CHALLENGERS);
expect(scene.currentBattle.mysteryEncounter).toBeUndefined();
});
it("Encounters should not run above wave 180", async () => {

2
test/phases/mystery-encounter-phase.test.ts
View File

@ -27,7 +27,7 @@ describe("Mystery Encounter Phases", () => {
beforeEach(() => {
game = new GameManager(phaserGame);
game.override.startingWave(11).mysteryEncounterChance(100).seed("test"); // Seed guarantees wild encounter to be replaced by ME
game.override.startingWave(12).mysteryEncounterChance(100).seed("test"); // Seed guarantees wild encounter to be replaced by ME
});
describe("MysteryEncounterPhase", () => {