Merge 4fa130ad9f into 79576ad117

* [GitHub] Update `.github/CODEOWNERS` file

`@pagefaultgames/senior-dev-team` added to
`package.json` and `pnpm-lock.yaml`

`@pagefaultgames/balance-team` added to `/src/data/trainers`

* Move senior dev team entries to the bottom of the file

.github/CODEOWNERS

@@ -3,9 +3,6 @@
 # everything (whole code-base) - Junior Devs
 * @pagefaultgames/junior-dev-team
 
-# github actions/templates etc. - Dev Leads
-/.github @pagefaultgames/senior-dev-team
-
 # Art Team
 /public/**/*.png @pagefaultgames/art-team
 /public/**/*.json @pagefaultgames/art-team
@@ -19,4 +16,11 @@
 /public/audio @pagefaultgames/composer-team
 
 # Balance Files; contain actual code logic and must also be owned by dev team
-/src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+/src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+/src/data/trainers @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+
+# GitHub actions/templates etc. - Senior Devs
+# Should be defined last in the file to make sure these always override all other definitions
+/.github @pagefaultgames/senior-dev-team
+package.json @pagefaultgames/senior-dev-team
+pnpm-lock.yaml @pagefaultgames/senior-dev-team

test/moves/parting-shot.test.ts

@@ -134,7 +134,7 @@ describe("Moves - Parting Shot", () => {
 
       game.move.select(MoveId.PARTING_SHOT);
 
-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);
       expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
       expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-1);
       expect(game.scene.getPlayerField()[0].species.speciesId).toBe(SpeciesId.MURKROW);

test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts

@@ -366,7 +366,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await skipBattleRunMysteryEncounterRewardsPhase(game, false);
 
       expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterRewardsPhase.name);
-      game.phaseInterceptor["prompts"] = []; // Clear out prompt handlers
+      game.promptHandler["prompts"] = []; // Clear out prompt handlers
       game.onNextPrompt("MysteryEncounterRewardsPhase", UiMode.OPTION_SELECT, () => {
         game.endPhase();
       });

test/test-utils/phase-interceptor.ts

@@ -99,7 +99,7 @@ export class PhaseInterceptor {
         currentPhase = pm.getCurrentPhase()!;
         // TODO: Remove proof-of-concept error throw after signature update
         if (!currentPhase) {
-          throw new Error("currentPhase is null after being started! aaaaaaaaaaa");
+          throw new Error("currentPhase is null after being started!");
         }
 
         if (currentPhase.is(this.target)) {