diff --git a/src/data/mystery-encounters/encounters/dark-deal.ts b/src/data/mystery-encounters/encounters/dark-deal.ts index a78144347af..7bdbac2a42f 100644 --- a/src/data/mystery-encounters/encounters/dark-deal.ts +++ b/src/data/mystery-encounters/encounters/dark-deal.ts @@ -67,7 +67,7 @@ const excludedBosses = [ Species.PECHARUNT ]; -export const DarkDealEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.DARK_DEAL) .withEncounterTier(MysteryEncounterTier.ROGUE) .withIntroSpriteConfigs([ diff --git a/src/data/mystery-encounters/encounters/department-store-sale.ts b/src/data/mystery-encounters/encounters/department-store-sale.ts index 935ed635f9e..a60b6dfa4bf 100644 --- a/src/data/mystery-encounters/encounters/department-store-sale.ts +++ b/src/data/mystery-encounters/encounters/department-store-sale.ts @@ -11,7 +11,7 @@ import { modifierTypes } from "#app/modifier/modifier-type"; import { Species } from "#enums/species"; import { randSeedInt } from "#app/utils"; -export const DepartmentStoreSaleEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const DepartmentStoreSaleEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.DEPARTMENT_STORE_SALE) .withEncounterTier(MysteryEncounterTier.COMMON) .withIntroSpriteConfigs([ diff --git a/src/data/mystery-encounters/encounters/fight-or-flight.ts b/src/data/mystery-encounters/encounters/fight-or-flight.ts index 8669f6259fe..6b852ea7512 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight.ts @@ -36,7 +36,7 @@ const validMovesForSteal = [ Moves.GIGA_DRAIN ]; -export const FightOrFlightEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.FIGHT_OR_FLIGHT) .withEncounterTier(MysteryEncounterTier.COMMON) .withIntroSpriteConfigs([]) // Set in onInit() diff --git a/src/data/mystery-encounters/encounters/mysterious-challengers.ts b/src/data/mystery-encounters/encounters/mysterious-challengers.ts index d3e753cc91b..25b39b0667a 100644 --- a/src/data/mystery-encounters/encounters/mysterious-challengers.ts +++ b/src/data/mystery-encounters/encounters/mysterious-challengers.ts @@ -15,7 +15,7 @@ import { import * as Utils from "../../../utils"; import { PartyMemberStrength } from "#enums/party-member-strength"; -export const MysteriousChallengersEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const MysteriousChallengersEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.MYSTERIOUS_CHALLENGERS) .withEncounterTier(MysteryEncounterTier.GREAT) .withIntroSpriteConfigs([]) // These are set in onInit() diff --git a/src/data/mystery-encounters/encounters/mysterious-chest.ts b/src/data/mystery-encounters/encounters/mysterious-chest.ts index 9f8faf278fa..8ad0a5adb52 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest.ts @@ -15,7 +15,7 @@ import { MysteryEncounterOptionBuilder } from "../mystery-encounter-option"; import { GameOverPhase } from "#app/phases"; import { randSeedInt } from "#app/utils"; -export const MysteriousChestEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.MYSTERIOUS_CHEST) .withEncounterTier(MysteryEncounterTier.COMMON) .withIntroSpriteConfigs([ diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer.ts index 06cdfbff4c8..866b63f7533 100644 --- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer.ts +++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer.ts @@ -22,7 +22,7 @@ import { randSeedInt } from "#app/utils"; import Pokemon, { PlayerPokemon } from "#app/field/pokemon"; import { StatusEffect } from "#app/data/status-effect"; -export const ShadyVitaminDealerEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.SHADY_VITAMIN_DEALER) .withEncounterTier(MysteryEncounterTier.COMMON) .withIntroSpriteConfigs([ diff --git a/src/data/mystery-encounters/encounters/sleeping-snorlax.ts b/src/data/mystery-encounters/encounters/sleeping-snorlax.ts index b75787ad566..3c94da5129b 100644 --- a/src/data/mystery-encounters/encounters/sleeping-snorlax.ts +++ b/src/data/mystery-encounters/encounters/sleeping-snorlax.ts @@ -21,7 +21,7 @@ import { Status, StatusEffect } from "../../status-effect"; import { Moves } from "#enums/moves"; import { BerryType } from "#enums/berry-type"; -export const SleepingSnorlaxEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const SleepingSnorlaxEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.SLEEPING_SNORLAX) .withEncounterTier(MysteryEncounterTier.ULTRA) .withIntroSpriteConfigs([ diff --git a/src/data/mystery-encounters/encounters/training-session.ts b/src/data/mystery-encounters/encounters/training-session.ts index 6c50209e4ca..ad5da7ded36 100644 --- a/src/data/mystery-encounters/encounters/training-session.ts +++ b/src/data/mystery-encounters/encounters/training-session.ts @@ -24,7 +24,7 @@ import { AbilityAttr } from "#app/system/game-data"; import { Stat } from "#app/data/pokemon-stat"; import { pokemonInfo } from "#app/locales/en/pokemon-info"; -export const TrainingSessionEncounter: MysteryEncounter = new MysteryEncounterBuilder() +export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilder .withEncounterType(MysteryEncounterType.TRAINING_SESSION) .withEncounterTier(MysteryEncounterTier.ULTRA) .withIntroSpriteConfigs([ diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts index 9e956e6050f..8071dc81c8f 100644 --- a/src/data/mystery-encounters/mystery-encounter.ts +++ b/src/data/mystery-encounters/mystery-encounter.ts @@ -360,12 +360,12 @@ export class MysteryEncounterBuilder implements Partial { */ /** - * Defines the type of encounter which is used as an identifier, should be tied to a unique MysteryEncounterType + * @statif Defines the type of encounter which is used as an identifier, should be tied to a unique MysteryEncounterType * @param encounterType * @returns this */ - withEncounterType(encounterType: MysteryEncounterType): this & Pick { - return Object.assign(this, { encounterType: encounterType }); + static withEncounterType(encounterType: MysteryEncounterType): MysteryEncounterBuilder & Pick { + return Object.assign(new MysteryEncounterBuilder(), { encounterType: encounterType }); } /**