diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 3c561206abe..c731677775d 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -764,57 +764,65 @@ export default class BattleScene extends SceneBase { return true; } - getParty(): PlayerPokemon[] { + public getPlayerParty(): PlayerPokemon[] { return this.party; } - getPlayerPokemon(): PlayerPokemon | undefined { - return this.getPlayerField().find(p => p.isActive()); - } - /** - * Finds the first {@linkcode Pokemon.isActive() | active PlayerPokemon} that isn't also currently switching out - * @returns Either the first {@linkcode PlayerPokemon} satisfying, or undefined if no player pokemon on the field satisfy + * @returns An array of {@linkcode PlayerPokemon} filtered from the player's party + * that are {@linkcode PlayerPokemon.isAllowedInBattle | allowed in battle}. */ - getNonSwitchedPlayerPokemon(): PlayerPokemon | undefined { - return this.getPlayerField().find(p => p.isActive() && p.switchOutStatus === false); + public getPokemonAllowedInBattle(): PlayerPokemon[] { + return this.getPlayerParty().filter(p => p.isAllowedInBattle()); } /** - * Returns an array of PlayerPokemon of length 1 or 2 depending on if double battles or not + * @returns The first {@linkcode PlayerPokemon} that is {@linkcode getPlayerField on the field} + * and {@linkcode PlayerPokemon.isActive is active} + * (aka {@linkcode PlayerPokemon.isAllowedInBattle is allowed in battle}), + * or `undefined` if there are no valid pokemon + * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true` + */ + public getPlayerPokemon(includeSwitching: boolean = true): PlayerPokemon | undefined { + return this.getPlayerField().find(p => p.isActive() && (includeSwitching || p.switchOutStatus === false)); + } + + /** + * Returns an array of PlayerPokemon of length 1 or 2 depending on if in a double battle or not. + * Does not actually check if the pokemon are on the field or not. * @returns array of {@linkcode PlayerPokemon} */ - getPlayerField(): PlayerPokemon[] { - const party = this.getParty(); + public getPlayerField(): PlayerPokemon[] { + const party = this.getPlayerParty(); return party.slice(0, Math.min(party.length, this.currentBattle?.double ? 2 : 1)); } - getEnemyParty(): EnemyPokemon[] { + public getEnemyParty(): EnemyPokemon[] { return this.currentBattle?.enemyParty ?? []; } - getEnemyPokemon(): EnemyPokemon | undefined { - return this.getEnemyField().find(p => p.isActive()); - } - /** - * Finds the first {@linkcode Pokemon.isActive() | active EnemyPokemon} pokemon from the enemy that isn't also currently switching out - * @returns Either the first {@linkcode EnemyPokemon} satisfying, or undefined if no player pokemon on the field satisfy + * @returns The first {@linkcode EnemyPokemon} that is {@linkcode getEnemyField on the field} + * and {@linkcode EnemyPokemon.isActive is active} + * (aka {@linkcode EnemyPokemon.isAllowedInBattle is allowed in battle}), + * or `undefined` if there are no valid pokemon + * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true` */ - getNonSwitchedEnemyPokemon(): EnemyPokemon | undefined { - return this.getEnemyField().find(p => p.isActive() && p.switchOutStatus === false); + public getEnemyPokemon(includeSwitching: boolean = true): EnemyPokemon | undefined { + return this.getEnemyField().find(p => p.isActive() && (includeSwitching || p.switchOutStatus === false)); } /** - * Returns an array of EnemyPokemon of length 1 or 2 depending on if double battles or not + * Returns an array of EnemyPokemon of length 1 or 2 depending on if in a double battle or not. + * Does not actually check if the pokemon are on the field or not. * @returns array of {@linkcode EnemyPokemon} */ - getEnemyField(): EnemyPokemon[] { + public getEnemyField(): EnemyPokemon[] { const party = this.getEnemyParty(); return party.slice(0, Math.min(party.length, this.currentBattle?.double ? 2 : 1)); } - getField(activeOnly: boolean = false): Pokemon[] { + public getField(activeOnly: boolean = false): Pokemon[] { const ret = new Array(4).fill(null); const playerField = this.getPlayerField(); const enemyField = this.getEnemyField(); @@ -867,7 +875,7 @@ export default class BattleScene extends SceneBase { getPokemonById(pokemonId: integer): Pokemon | null { const findInParty = (party: Pokemon[]) => party.find(p => p.id === pokemonId); - return (findInParty(this.getParty()) || findInParty(this.getEnemyParty())) ?? null; + return (findInParty(this.getPlayerParty()) || findInParty(this.getEnemyParty())) ?? null; } addPlayerPokemon(species: PokemonSpecies, level: integer, abilityIndex?: integer, formIndex?: integer, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: integer[], nature?: Nature, dataSource?: Pokemon | PokemonData, postProcess?: (playerPokemon: PlayerPokemon) => void): PlayerPokemon { @@ -1062,7 +1070,7 @@ export default class BattleScene extends SceneBase { this.modifierBar.removeAll(true); this.enemyModifierBar.removeAll(true); - for (const p of this.getParty()) { + for (const p of this.getPlayerParty()) { p.destroy(); } this.party = []; @@ -1275,7 +1283,7 @@ export default class BattleScene extends SceneBase { } }); - for (const pokemon of this.getParty()) { + for (const pokemon of this.getPlayerParty()) { pokemon.resetBattleData(); applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon); } @@ -1285,7 +1293,7 @@ export default class BattleScene extends SceneBase { } } - for (const pokemon of this.getParty()) { + for (const pokemon of this.getPlayerParty()) { this.triggerPokemonFormChange(pokemon, SpeciesFormChangeTimeOfDayTrigger); } @@ -1480,7 +1488,7 @@ export default class BattleScene extends SceneBase { } trySpreadPokerus(): void { - const party = this.getParty(); + const party = this.getPlayerParty(); const infectedIndexes: integer[] = []; const spread = (index: number, spreadTo: number) => { const partyMember = party[index + spreadTo]; @@ -1677,7 +1685,7 @@ export default class BattleScene extends SceneBase { updateAndShowText(duration: number): void { const labels = [ this.luckLabelText, this.luckText ]; labels.forEach(t => t.setAlpha(0)); - const luckValue = getPartyLuckValue(this.getParty()); + const luckValue = getPartyLuckValue(this.getPlayerParty()); this.luckText.setText(getLuckString(luckValue)); if (luckValue < 14) { this.luckText.setTint(getLuckTextTint(luckValue)); @@ -2615,7 +2623,7 @@ export default class BattleScene extends SceneBase { removePartyMemberModifiers(partyMemberIndex: integer): Promise { return new Promise(resolve => { - const pokemonId = this.getParty()[partyMemberIndex].id; + const pokemonId = this.getPlayerParty()[partyMemberIndex].id; const modifiersToRemove = this.modifiers.filter(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId); for (const m of modifiersToRemove) { this.modifiers.splice(this.modifiers.indexOf(m), 1); @@ -2742,7 +2750,7 @@ export default class BattleScene extends SceneBase { } } - this.updatePartyForModifiers(player ? this.getParty() : this.getEnemyParty(), instant).then(() => { + this.updatePartyForModifiers(player ? this.getPlayerParty() : this.getEnemyParty(), instant).then(() => { (player ? this.modifierBar : this.enemyModifierBar).updateModifiers(modifiers); if (!player) { this.updateUIPositions(); @@ -2980,7 +2988,7 @@ export default class BattleScene extends SceneBase { */ getActiveKeys(): string[] { const keys: string[] = []; - const playerParty = this.getParty(); + const playerParty = this.getPlayerParty(); playerParty.forEach(p => { keys.push(p.getSpriteKey(true)); keys.push(p.getBattleSpriteKey(true, true)); @@ -3016,7 +3024,7 @@ export default class BattleScene extends SceneBase { this.setFieldScale(0.75); this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false); this.currentBattle.double = true; - const availablePartyMembers = this.getParty().filter((p) => p.isAllowedInBattle()); + const availablePartyMembers = this.getPlayerParty().filter((p) => p.isAllowedInBattle()); if (availablePartyMembers.length > 1) { this.pushPhase(new ToggleDoublePositionPhase(this, true)); if (!availablePartyMembers[1].isOnField()) { @@ -3041,7 +3049,7 @@ export default class BattleScene extends SceneBase { */ applyPartyExp(expValue: number, pokemonDefeated: boolean, useWaveIndexMultiplier?: boolean, pokemonParticipantIds?: Set): void { const participantIds = pokemonParticipantIds ?? this.currentBattle.playerParticipantIds; - const party = this.getParty(); + const party = this.getPlayerParty(); const expShareModifier = this.findModifier(m => m instanceof ExpShareModifier) as ExpShareModifier; const expBalanceModifier = this.findModifier(m => m instanceof ExpBalanceModifier) as ExpBalanceModifier; const multipleParticipantExpBonusModifier = this.findModifier(m => m instanceof MultipleParticipantExpBonusModifier) as MultipleParticipantExpBonusModifier; diff --git a/src/data/ability.ts b/src/data/ability.ts index 5be87fc2397..8ec0f296068 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -4869,7 +4869,7 @@ class ForceSwitchOutHelper { * - If the Pokémon is still alive (hp > 0), and if so, it leaves the field and a new SwitchPhase is initiated. */ if (switchOutTarget instanceof PlayerPokemon) { - if (switchOutTarget.scene.getParty().filter((p) => p.isAllowedInBattle() && !p.isOnField()).length < 1) { + if (switchOutTarget.scene.getPlayerParty().filter((p) => p.isAllowedInBattle() && !p.isOnField()).length < 1) { return false; } @@ -4950,7 +4950,7 @@ class ForceSwitchOutHelper { return false; } - const party = player ? pokemon.scene.getParty() : pokemon.scene.getEnemyParty(); + const party = player ? pokemon.scene.getPlayerParty() : pokemon.scene.getEnemyParty(); return (!player && pokemon.scene.currentBattle.battleType === BattleType.WILD) || party.filter(p => p.isAllowedInBattle() && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)).length > pokemon.scene.currentBattle.getBattlerCount(); diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts index c0b213e4def..8f22b288f45 100644 --- a/src/data/balance/pokemon-evolutions.ts +++ b/src/data/balance/pokemon-evolutions.ts @@ -478,7 +478,7 @@ export const pokemonEvolutions: PokemonEvolutions = { ], [Species.NINCADA]: [ new SpeciesEvolution(Species.NINJASK, 20, null, null), - new SpeciesEvolution(Species.SHEDINJA, 20, null, new SpeciesEvolutionCondition(p => p.scene.getParty().length < 6 && p.scene.pokeballCounts[PokeballType.POKEBALL] > 0)) + new SpeciesEvolution(Species.SHEDINJA, 20, null, new SpeciesEvolutionCondition(p => p.scene.getPlayerParty().length < 6 && p.scene.pokeballCounts[PokeballType.POKEBALL] > 0)) ], [Species.WHISMUR]: [ new SpeciesEvolution(Species.LOUDRED, 20, null, null) @@ -890,7 +890,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.GOGOAT, 32, null, null) ], [Species.PANCHAM]: [ - new SpeciesEvolution(Species.PANGORO, 32, null, new SpeciesEvolutionCondition(p => !!p.scene.getParty().find(p => p.getTypes(false, false, true).indexOf(Type.DARK) > -1)), SpeciesWildEvolutionDelay.MEDIUM) + new SpeciesEvolution(Species.PANGORO, 32, null, new SpeciesEvolutionCondition(p => !!p.scene.getPlayerParty().find(p => p.getTypes(false, false, true).indexOf(Type.DARK) > -1)), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.ESPURR]: [ new SpeciesFormEvolution(Species.MEOWSTIC, "", "female", 25, null, new SpeciesEvolutionCondition(p => p.gender === Gender.FEMALE, p => p.gender = Gender.FEMALE)), diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index 37900a3ab5a..5928a65b4e3 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -428,7 +428,7 @@ class AnimTimedAddBgEvent extends AnimTimedBgEvent { moveAnim.bgSprite.setScale(1.25); moveAnim.bgSprite.setAlpha(this.opacity / 255); scene.field.add(moveAnim.bgSprite); - const fieldPokemon = scene.getNonSwitchedEnemyPokemon() || scene.getNonSwitchedPlayerPokemon(); + const fieldPokemon = scene.getEnemyPokemon(false) ?? scene.getPlayerPokemon(false); if (!isNullOrUndefined(priority)) { scene.field.moveTo(moveAnim.bgSprite as Phaser.GameObjects.GameObject, priority); } else if (fieldPokemon?.isOnField()) { @@ -999,7 +999,7 @@ export abstract class BattleAnim { const setSpritePriority = (priority: integer) => { switch (priority) { case 0: - scene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, scene.getNonSwitchedEnemyPokemon() || scene.getNonSwitchedPlayerPokemon()!); // This bang assumes that if (the EnemyPokemon is undefined, then the PlayerPokemon function must return an object), correct assumption? + scene.field.moveBelow(moveSprite as Phaser.GameObjects.GameObject, scene.getEnemyPokemon(false) ?? scene.getPlayerPokemon(false)!); // TODO: is this bang correct? break; case 1: scene.field.moveTo(moveSprite, scene.field.getAll().length - 1); diff --git a/src/data/move.ts b/src/data/move.ts index cd206755238..2fc34d13df5 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1743,7 +1743,7 @@ export class PartyStatusCureAttr extends MoveEffectAttr { if (!this.canApply(user, target, move, args)) { return false; } - const partyPokemon = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); + const partyPokemon = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty(); partyPokemon.forEach(p => this.cureStatus(p, user.id)); if (this.message) { @@ -1815,7 +1815,7 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr { } // We don't know which party member will be chosen, so pick the highest max HP in the party - const maxPartyMemberHp = user.scene.getParty().map(p => p.getMaxHp()).reduce((maxHp: integer, hp: integer) => Math.max(hp, maxHp), 0); + const maxPartyMemberHp = user.scene.getPlayerParty().map(p => p.getMaxHp()).reduce((maxHp: integer, hp: integer) => Math.max(hp, maxHp), 0); user.scene.pushPhase(new PokemonHealPhase(user.scene, user.getBattlerIndex(), maxPartyMemberHp, i18next.t("moveTriggers:sacrificialFullRestore", { pokemonName: getPokemonNameWithAffix(user) }), true, false, false, true), true); @@ -1828,7 +1828,7 @@ export class SacrificialFullRestoreAttr extends SacrificialAttr { } getCondition(): MoveConditionFunc { - return (user, target, move) => user.scene.getParty().filter(p => p.isActive()).length > user.scene.currentBattle.getBattlerCount(); + return (user, _target, _move) => user.scene.getPlayerParty().filter(p => p.isActive()).length > user.scene.currentBattle.getBattlerCount(); } } @@ -2158,7 +2158,7 @@ export class MultiHitAttr extends MoveAttr { case MultiHitType._10: return 10; case MultiHitType.BEAT_UP: - const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); + const party = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty(); // No status means the ally pokemon can contribute to Beat Up return party.reduce((total, pokemon) => { return total + (pokemon.id === user.id ? 1 : pokemon?.status && pokemon.status.effect !== StatusEffect.NONE ? 0 : 1); @@ -3467,7 +3467,7 @@ export class MovePowerMultiplierAttr extends VariablePowerAttr { * @returns The base power of the Beat Up hit. */ const beatUpFunc = (user: Pokemon, allyIndex: number): number => { - const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); + const party = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty(); for (let i = allyIndex; i < party.length; i++) { const pokemon = party[i]; @@ -3495,7 +3495,7 @@ export class BeatUpAttr extends VariablePowerAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const power = args[0] as Utils.NumberHolder; - const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); + const party = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty(); const allyCount = party.filter(pokemon => { return pokemon.id === user.id || !pokemon.status?.effect; }).length; @@ -5720,7 +5720,7 @@ export class RevivalBlessingAttr extends MoveEffectAttr { return new Promise(resolve => { // If user is player, checks if the user has fainted pokemon if (user instanceof PlayerPokemon - && user.scene.getParty().findIndex(p => p.isFainted()) > -1) { + && user.scene.getPlayerParty().findIndex(p => p.isFainted()) > -1) { (user as PlayerPokemon).revivalBlessing().then(() => { resolve(true); }); @@ -5794,7 +5794,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { } } // Switch out logic for the player's Pokemon - if (switchOutTarget.scene.getParty().filter((p) => p.isAllowedInBattle() && !p.isOnField()).length < 1) { + if (switchOutTarget.scene.getPlayerParty().filter((p) => p.isAllowedInBattle() && !p.isOnField()).length < 1) { return false; } @@ -5903,7 +5903,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { } } - const party = player ? user.scene.getParty() : user.scene.getEnemyParty(); + const party = player ? user.scene.getPlayerParty() : user.scene.getEnemyParty(); return (!player && !user.scene.currentBattle.battleType) || party.filter(p => p.isAllowedInBattle() && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot)).length > user.scene.currentBattle.getBattlerCount(); @@ -7254,7 +7254,7 @@ const targetSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target const failIfLastCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => user.scene.phaseQueue.find(phase => phase instanceof MovePhase) !== undefined; const failIfLastInPartyCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => { - const party: Pokemon[] = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); + const party: Pokemon[] = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty(); return party.some(pokemon => pokemon.isActive() && !pokemon.isOnField()); }; @@ -9184,7 +9184,7 @@ export function initMoves() { .target(MoveTarget.ALL) .condition((user, target, move) => { // If any fielded pokémon is grass-type and grounded. - return [ ...user.scene.getEnemyParty(), ...user.scene.getParty() ].some((poke) => poke.isOfType(Type.GRASS) && poke.isGrounded()); + return [ ...user.scene.getEnemyParty(), ...user.scene.getPlayerParty() ].some((poke) => poke.isOfType(Type.GRASS) && poke.isGrounded()); }) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => target.isOfType(Type.GRASS) && target.isGrounded() }), new StatusMove(Moves.STICKY_WEB, Type.BUG, -1, 20, -1, 0, 6) diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts index c53b802bb22..fa8e1aed1c7 100644 --- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts +++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts @@ -181,7 +181,7 @@ export const AbsoluteAvariceEncounter: MysteryEncounter = // Sort berries by party member ID to more easily re-add later if necessary const berryItemsMap = new Map(); - scene.getParty().forEach(pokemon => { + scene.getPlayerParty().forEach(pokemon => { const pokemonBerries = berryItems.filter(b => b.pokemonId === pokemon.id); if (pokemonBerries?.length > 0) { berryItemsMap.set(pokemon.id, pokemonBerries); @@ -267,7 +267,7 @@ export const AbsoluteAvariceEncounter: MysteryEncounter = const revSeed = generateModifierType(scene, modifierTypes.REVIVER_SEED); encounter.setDialogueToken("foodReward", revSeed?.name ?? i18next.t("modifierType:ModifierType.REVIVER_SEED.name")); const givePartyPokemonReviverSeeds = () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party.forEach(p => { const heldItems = p.getHeldItems(); if (revSeed && !heldItems.some(item => item instanceof PokemonInstantReviveModifier)) { @@ -308,7 +308,7 @@ export const AbsoluteAvariceEncounter: MysteryEncounter = const berryMap = encounter.misc.berryItemsMap; // Returns 2/5 of the berries stolen to each Pokemon - const party = scene.getParty(); + const party = scene.getPlayerParty(); party.forEach(pokemon => { const stolenBerries: BerryModifier[] = berryMap.get(pokemon.id); const berryTypesAsArray: BerryType[] = []; diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts index 095f8a8473b..5524511c67b 100644 --- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts +++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts @@ -58,7 +58,7 @@ export const BerriesAboundEncounter: MysteryEncounter = // Calculate boss mon const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getParty()), true); + const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true); const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true); encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); const config: EnemyPartyConfig = { @@ -77,7 +77,7 @@ export const BerriesAboundEncounter: MysteryEncounter = scene.currentBattle.waveIndex > 160 ? 7 : scene.currentBattle.waveIndex > 120 ? 5 : scene.currentBattle.waveIndex > 40 ? 4 : 2; - regenerateModifierPoolThresholds(scene.getParty(), ModifierPoolType.PLAYER, 0); + regenerateModifierPoolThresholds(scene.getPlayerParty(), ModifierPoolType.PLAYER, 0); encounter.misc = { numBerries }; const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); @@ -253,7 +253,7 @@ function tryGiveBerry(scene: BattleScene, prioritizedPokemon?: PlayerPokemon) { const berryType = randSeedInt(Object.keys(BerryType).filter(s => !isNaN(Number(s))).length) as BerryType; const berry = generateModifierType(scene, modifierTypes.BERRY, [ berryType ]) as BerryModifierType; - const party = scene.getParty(); + const party = scene.getPlayerParty(); // Will try to apply to prioritized pokemon first, then do normal application method if it fails if (prioritizedPokemon) { diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index e24eadb56c7..f2605795955 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -331,7 +331,7 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = const encounter = scene.currentBattle.mysteryEncounter!; // Player gets different rewards depending on the number of bug types they have - const numBugTypes = scene.getParty().filter(p => p.isOfType(Type.BUG, true)).length; + const numBugTypes = scene.getPlayerParty().filter(p => p.isOfType(Type.BUG, true)).length; const numBugTypesText = i18next.t(`${namespace}:numBugTypes`, { count: numBugTypes }); encounter.setDialogueToken("numBugTypes", numBugTypesText); diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index 0a88c5a699c..5502cc7b53a 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -245,7 +245,7 @@ export const ClowningAroundEncounter: MysteryEncounter = // So Vitamins, form change items, etc. are not included const encounter = scene.currentBattle.mysteryEncounter!; - const party = scene.getParty(); + const party = scene.getPlayerParty(); let mostHeldItemsPokemon = party[0]; let count = mostHeldItemsPokemon.getHeldItems() .filter(m => m.isTransferable && !(m instanceof BerryModifier)) @@ -328,7 +328,7 @@ export const ClowningAroundEncounter: MysteryEncounter = .withPreOptionPhase(async (scene: BattleScene) => { // Randomize the second type of all player's pokemon // If the pokemon does not normally have a second type, it will gain 1 - for (const pokemon of scene.getParty()) { + for (const pokemon of scene.getPlayerParty()) { const originalTypes = pokemon.getTypes(false, false, true); // If the Pokemon has non-status moves that don't match the Pokemon's type, prioritizes those as the new type diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts index 55d7ce0e92d..bae5a8790e9 100644 --- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts +++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts @@ -1,32 +1,32 @@ -import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { Species } from "#enums/species"; +import { BattlerIndex } from "#app/battle"; import BattleScene from "#app/battle-scene"; +import { EncounterBattleAnim } from "#app/data/battle-anims"; import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { Moves } from "#enums/moves"; -import { TrainerSlot } from "#app/data/trainer-config"; -import PokemonData from "#app/system/pokemon-data"; -import { Biome } from "#enums/biome"; -import { EncounterBattleAnim } from "#app/data/battle-anims"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { DANCING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { BattlerIndex } from "#app/battle"; +import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { catchPokemon, getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { PokeballType } from "#enums/pokeball"; +import { getPokemonSpecies } from "#app/data/pokemon-species"; +import { TrainerSlot } from "#app/data/trainer-config"; +import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; import { modifierTypes } from "#app/modifier/modifier-type"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; -import { Stat } from "#enums/stat"; +import PokemonData from "#app/system/pokemon-data"; +import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Biome } from "#enums/biome"; import { EncounterAnim } from "#enums/encounter-anims"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; +import { Moves } from "#enums/moves"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokeballType } from "#enums/pokeball"; +import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; import i18next from "i18next"; /** the i18n namespace for this encounter */ @@ -92,7 +92,7 @@ export const DancingLessonsEncounter: MysteryEncounter = .withCatchAllowed(true) .withFleeAllowed(false) .withOnVisualsStart((scene: BattleScene) => { - const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, scene.getEnemyPokemon()!, scene.getParty()[0]); + const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, scene.getEnemyPokemon()!, scene.getPlayerPokemon()!); danceAnim.play(scene); return true; @@ -217,7 +217,7 @@ export const DancingLessonsEncounter: MysteryEncounter = const onPokemonSelected = (pokemon: PlayerPokemon) => { encounter.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); - scene.unshiftPhase(new LearnMovePhase(scene, scene.getParty().indexOf(pokemon), Moves.REVELATION_DANCE)); + scene.unshiftPhase(new LearnMovePhase(scene, scene.getPlayerParty().indexOf(pokemon), Moves.REVELATION_DANCE)); // Play animation again to "learn" the dance const danceAnim = new EncounterBattleAnim(EncounterAnim.DANCE, scene.getEnemyPokemon()!, scene.getPlayerPokemon()); diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index d5f9388b56c..d5a938b9cef 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -1,22 +1,22 @@ -import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import Pokemon, { PlayerPokemon } from "#app/field/pokemon"; -import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { Species } from "#enums/species"; import BattleScene from "#app/battle-scene"; import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { CombinationPokemonRequirement, HeldItemRequirement, MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { BerryModifier, HealingBoosterModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PokemonHeldItemModifier, PreserveBerryModifier } from "#app/modifier/modifier"; -import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import i18next from "#app/plugins/i18n"; -import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; import { getPokemonSpecies } from "#app/data/pokemon-species"; +import Pokemon, { PlayerPokemon } from "#app/field/pokemon"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; +import { BerryModifier, HealingBoosterModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PokemonHeldItemModifier, PreserveBerryModifier } from "#app/modifier/modifier"; +import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; +import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; +import i18next from "#app/plugins/i18n"; +import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Species } from "#enums/species"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/delibirdy"; @@ -133,7 +133,7 @@ export const DelibirdyEncounter: MysteryEncounter = if (existing && existing.getStackCount() >= existing.getMaxStackCount(scene)) { // At max stacks, give the first party pokemon a Shell Bell instead const shellBell = generateModifierType(scene, modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(scene, scene.getParty()[0], shellBell); + await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell); scene.playSound("item_fanfare"); await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); } else { @@ -207,7 +207,7 @@ export const DelibirdyEncounter: MysteryEncounter = if (existing && existing.getStackCount() >= existing.getMaxStackCount(scene)) { // At max stacks, give the first party pokemon a Shell Bell instead const shellBell = generateModifierType(scene, modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(scene, scene.getParty()[0], shellBell); + await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell); scene.playSound("item_fanfare"); await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); } else { @@ -220,7 +220,7 @@ export const DelibirdyEncounter: MysteryEncounter = if (existing && existing.getStackCount() >= existing.getMaxStackCount(scene)) { // At max stacks, give the first party pokemon a Shell Bell instead const shellBell = generateModifierType(scene, modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(scene, scene.getParty()[0], shellBell); + await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerPokemon()!, shellBell); scene.playSound("item_fanfare"); await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); } else { @@ -299,7 +299,7 @@ export const DelibirdyEncounter: MysteryEncounter = if (existing && existing.getStackCount() >= existing.getMaxStackCount(scene)) { // At max stacks, give the first party pokemon a Shell Bell instead const shellBell = generateModifierType(scene, modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; - await applyModifierTypeToPlayerPokemon(scene, scene.getParty()[0], shellBell); + await applyModifierTypeToPlayerPokemon(scene, scene.getPlayerParty()[0], shellBell); scene.playSound("item_fanfare"); await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: shellBell.name }), null, undefined, true); } else { diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts index bf5fb28163b..1c26df0cf71 100644 --- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts +++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts @@ -214,7 +214,7 @@ function pokemonAndMoveChosen(scene: BattleScene, pokemon: PlayerPokemon, move: text: `${namespace}:incorrect_exp`, }, ]; - setEncounterExp(scene, scene.getParty().map((p) => p.id), 50); + setEncounterExp(scene, scene.getPlayerParty().map((p) => p.id), 50); } else { encounter.selectedOption!.dialogue!.selected = [ { diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index 5c16e5d8564..5794277ffe1 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -184,7 +184,7 @@ export const FieryFalloutEncounter: MysteryEncounter = async (scene: BattleScene) => { // Damage non-fire types and burn 1 random non-fire type member + give it Heatproof const encounter = scene.currentBattle.mysteryEncounter!; - const nonFireTypes = scene.getParty().filter((p) => p.isAllowedInBattle() && !p.getTypes().includes(Type.FIRE)); + const nonFireTypes = scene.getPlayerParty().filter((p) => p.isAllowedInBattle() && !p.getTypes().includes(Type.FIRE)); for (const pkm of nonFireTypes) { const percentage = DAMAGE_PERCENTAGE / 100; @@ -257,7 +257,7 @@ export const FieryFalloutEncounter: MysteryEncounter = function giveLeadPokemonAttackTypeBoostItem(scene: BattleScene) { // Give first party pokemon attack type boost item for free at end of battle - const leadPokemon = scene.getParty()?.[0]; + const leadPokemon = scene.getPlayerParty()?.[0]; if (leadPokemon) { // Generate type booster held item, default to Charcoal if item fails to generate let boosterModifierType = generateModifierType(scene, modifierTypes.ATTACK_TYPE_BOOSTER) as AttackTypeBoosterModifierType; diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts index 889868519d2..3f9030dc3b2 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts @@ -56,7 +56,7 @@ export const FightOrFlightEncounter: MysteryEncounter = // Calculate boss mon const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getParty()), true); + const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true); const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true); encounter.setDialogueToken("enemyPokemon", bossPokemon.getNameToRender()); const config: EnemyPartyConfig = { @@ -86,11 +86,11 @@ export const FightOrFlightEncounter: MysteryEncounter = : scene.currentBattle.waveIndex > 40 ? ModifierTier.ULTRA : ModifierTier.GREAT; - regenerateModifierPoolThresholds(scene.getParty(), ModifierPoolType.PLAYER, 0); + regenerateModifierPoolThresholds(scene.getPlayerParty(), ModifierPoolType.PLAYER, 0); let item: ModifierTypeOption | null = null; // TMs and Candy Jar excluded from possible rewards as they're too swingy in value for a singular item reward while (!item || item.type.id.includes("TM_") || item.type.id === "CANDY_JAR") { - item = getPlayerModifierTypeOptions(1, scene.getParty(), [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0]; + item = getPlayerModifierTypeOptions(1, scene.getPlayerParty(), [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0]; } encounter.setDialogueToken("itemName", item.type.name); encounter.misc = item; diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts index b843a929c08..7bf48aa5926 100644 --- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts +++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts @@ -165,7 +165,7 @@ async function summonPlayerPokemon(scene: BattleScene) { const playerPokemon = encounter.misc.playerPokemon; // Swaps the chosen Pokemon and the first player's lead Pokemon in the party - const party = scene.getParty(); + const party = scene.getPlayerParty(); const chosenIndex = party.indexOf(playerPokemon); if (chosenIndex !== 0) { const leadPokemon = party[0]; diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts index 376bdf0c95d..1d65fd6c9a6 100644 --- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts +++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts @@ -191,7 +191,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = receivedPokemonData.pokeball = randInt(4) as PokeballType; const dataSource = new PokemonData(receivedPokemonData); const newPlayerPokemon = scene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource); - scene.getParty().push(newPlayerPokemon); + scene.getPlayerParty().push(newPlayerPokemon); await newPlayerPokemon.loadAssets(); for (const mod of modifiers) { @@ -224,7 +224,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = const encounter = scene.currentBattle.mysteryEncounter!; const onPokemonSelected = (pokemon: PlayerPokemon) => { // Randomly generate a Wonder Trade pokemon - const randomTradeOption = generateTradeOption(scene.getParty().map(p => p.species)); + const randomTradeOption = generateTradeOption(scene.getPlayerParty().map(p => p.species)); const tradePokemon = new EnemyPokemon(scene, randomTradeOption, pokemon.level, TrainerSlot.NONE, false); // Extra shiny roll at 1/128 odds (boosted by events and charms) if (!tradePokemon.shiny) { @@ -299,7 +299,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = receivedPokemonData.pokeball = randInt(4) as PokeballType; const dataSource = new PokemonData(receivedPokemonData); const newPlayerPokemon = scene.addPlayerPokemon(receivedPokemonData.species, receivedPokemonData.level, dataSource.abilityIndex, dataSource.formIndex, dataSource.gender, dataSource.shiny, dataSource.variant, dataSource.ivs, dataSource.nature, dataSource); - scene.getParty().push(newPlayerPokemon); + scene.getPlayerParty().push(newPlayerPokemon); await newPlayerPokemon.loadAssets(); for (const mod of modifiers) { @@ -384,11 +384,11 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = tier++; } - regenerateModifierPoolThresholds(scene.getParty(), ModifierPoolType.PLAYER, 0); + regenerateModifierPoolThresholds(scene.getPlayerParty(), ModifierPoolType.PLAYER, 0); let item: ModifierTypeOption | null = null; // TMs excluded from possible rewards while (!item || item.type.id.includes("TM_")) { - item = getPlayerModifierTypeOptions(1, scene.getParty(), [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0]; + item = getPlayerModifierTypeOptions(1, scene.getPlayerParty(), [], { guaranteedModifierTiers: [ tier ], allowLuckUpgrades: false })[0]; } encounter.setDialogueToken("itemName", item.type.name); @@ -430,9 +430,9 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = function getPokemonTradeOptions(scene: BattleScene): Map { const tradeOptionsMap: Map = new Map(); // Starts by filtering out any current party members as valid resulting species - const alreadyUsedSpecies: PokemonSpecies[] = scene.getParty().map(p => p.species); + const alreadyUsedSpecies: PokemonSpecies[] = scene.getPlayerParty().map(p => p.species); - scene.getParty().forEach(pokemon => { + scene.getPlayerParty().forEach(pokemon => { // If the party member is legendary/mythical, the only trade options available are always pulled from generation-specific legendary trade pools if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) { const generation = pokemon.species.generation; diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index 8e7ea52a967..a8cb076bbe9 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -104,7 +104,7 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with ], }, async (scene: BattleScene) => { - const allowedPokemon = scene.getParty().filter((p) => p.isAllowedInBattle()); + const allowedPokemon = scene.getPlayerParty().filter((p) => p.isAllowedInBattle()); for (const pkm of allowedPokemon) { const percentage = DAMAGE_PERCENTAGE / 100; diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index 693d935ae17..ab6517e97af 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -1,19 +1,19 @@ -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { ModifierTier } from "#app/modifier/modifier-tier"; -import { randSeedInt } from "#app/utils"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import BattleScene from "#app/battle-scene"; import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { Species } from "#enums/species"; -import { Moves } from "#enums/moves"; -import { GameOverPhase } from "#app/phases/game-over-phase"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; +import { ModifierTier } from "#app/modifier/modifier-tier"; +import { GameOverPhase } from "#app/phases/game-over-phase"; +import { randSeedInt } from "#app/utils"; +import { Moves } from "#enums/moves"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Species } from "#enums/species"; /** i18n namespace for encounter */ const namespace = "mysteryEncounters/mysteriousChest"; @@ -177,7 +177,7 @@ export const MysteriousChestEncounter: MysteryEncounter = await showEncounterText(scene, `${namespace}:option.1.bad`); // Handle game over edge case - const allowedPokemon = scene.getParty().filter(p => p.isAllowedInBattle()); + const allowedPokemon = scene.getPokemonAllowedInBattle(); if (allowedPokemon.length === 0) { // If there are no longer any legal pokemon in the party, game over. scene.clearPhaseQueue(); diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts index 8dd730492b1..798e85868f6 100644 --- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts +++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts @@ -100,7 +100,7 @@ export const ShadyVitaminDealerEncounter: MysteryEncounter = // Only Pokemon that can gain benefits are above half HP with no status const selectableFilter = (pokemon: Pokemon) => { // If pokemon meets primary pokemon reqs, it can be selected - if (!pokemon.isAllowed()) { + if (!pokemon.isAllowedInChallenge()) { return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null; } if (!encounter.pokemonMeetsPrimaryRequirements(scene, pokemon)) { diff --git a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts index e8f11f02e18..faeba95f358 100644 --- a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts +++ b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts @@ -134,7 +134,7 @@ export const TeleportingHijinksEncounter: MysteryEncounter = // Init enemy const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getParty()), true); + const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true); const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true); encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); const config: EnemyPartyConfig = { @@ -170,7 +170,7 @@ async function doBiomeTransitionDialogueAndBattleInit(scene: BattleScene) { // Init enemy const level = getEncounterPokemonLevelForWave(scene, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER); - const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getParty()), true); + const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true); const bossPokemon = new EnemyPokemon(scene, bossSpecies, level, TrainerSlot.NONE, true); encounter.setDialogueToken("enemyPokemon", getPokemonNameWithAffix(bossPokemon)); diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts index 610209f8aad..7c904bd047a 100644 --- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts @@ -126,7 +126,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = ]; // Determine the 3 pokemon the player can battle with - let partyCopy = scene.getParty().slice(0); + let partyCopy = scene.getPlayerParty().slice(0); partyCopy = partyCopy .filter(p => p.isAllowedInBattle()) .sort((a, b) => a.friendship - b.friendship); @@ -508,11 +508,11 @@ function getEggOptions(scene: BattleScene, commonEggs: number, rareEggs: number) } function removePokemonFromPartyAndStoreHeldItems(scene: BattleScene, encounter: MysteryEncounter, chosenPokemon: PlayerPokemon) { - const party = scene.getParty(); + const party = scene.getPlayerParty(); const chosenIndex = party.indexOf(chosenPokemon); party[chosenIndex] = party[0]; party[0] = chosenPokemon; - encounter.misc.originalParty = scene.getParty().slice(1); + encounter.misc.originalParty = scene.getPlayerParty().slice(1); encounter.misc.originalPartyHeldItems = encounter.misc.originalParty .map(p => p.getHeldItems()); scene["party"] = [ @@ -529,7 +529,7 @@ function checkAchievement(scene: BattleScene) { function restorePartyAndHeldItems(scene: BattleScene) { const encounter = scene.currentBattle.mysteryEncounter!; // Restore original party - scene.getParty().push(...encounter.misc.originalParty); + scene.getPlayerParty().push(...encounter.misc.originalParty); // Restore held items const originalHeldItems = encounter.misc.originalPartyHeldItems; diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts index 397d2af9522..b1ef6cedb21 100644 --- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts @@ -140,7 +140,7 @@ export const TheStrongStuffEncounter: MysteryEncounter = // -15 to all base stats of highest BST (halved for HP), +10 to all base stats of rest of party (halved for HP) // Sort party by bst - const sortedParty = scene.getParty().slice(0) + const sortedParty = scene.getPlayerParty().slice(0) .sort((pokemon1, pokemon2) => { const pokemon1Bst = pokemon1.calculateBaseStats().reduce((a, b) => a + b, 0); const pokemon2Bst = pokemon2.calculateBaseStats().reduce((a, b) => a + b, 0); diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts index bf322802f81..7d9b531c9ab 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -189,7 +189,7 @@ function endTrainerBattleAndShowDialogue(scene: BattleScene): Promise { const playerField = scene.getPlayerField(); playerField.forEach((_, p) => scene.unshiftPhase(new ReturnPhase(scene, p))); - for (const pokemon of scene.getParty()) { + for (const pokemon of scene.getPlayerParty()) { // Only trigger form change when Eiscue is in Noice form // Hardcoded Eiscue for now in case it is fused with another pokemon if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) { diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts index 03341a713f2..8814eb0d8cf 100644 --- a/src/data/mystery-encounters/encounters/training-session-encounter.ts +++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts @@ -152,7 +152,7 @@ export const TrainingSessionEncounter: MysteryEncounter = } // Add pokemon and mods back - scene.getParty().push(playerPokemon); + scene.getPlayerParty().push(playerPokemon); for (const mod of modifiers.value) { mod.pokemonId = playerPokemon.id; scene.addModifier(mod, true, false, false, true); @@ -229,7 +229,7 @@ export const TrainingSessionEncounter: MysteryEncounter = scene.gameData.setPokemonCaught(playerPokemon, false); // Add pokemon and modifiers back - scene.getParty().push(playerPokemon); + scene.getPlayerParty().push(playerPokemon); for (const mod of modifiers.value) { mod.pokemonId = playerPokemon.id; scene.addModifier(mod, true, false, false, true); @@ -342,7 +342,7 @@ export const TrainingSessionEncounter: MysteryEncounter = scene.gameData.setPokemonCaught(playerPokemon, false); // Add pokemon and mods back - scene.getParty().push(playerPokemon); + scene.getPlayerParty().push(playerPokemon); for (const mod of modifiers.value) { mod.pokemonId = playerPokemon.id; scene.addModifier(mod, true, false, false, true); diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts index d3c16ce2122..fba3a6ca95e 100644 --- a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts +++ b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts @@ -164,7 +164,7 @@ async function tryApplyDigRewardItems(scene: BattleScene) { const shellBell = generateModifierType(scene, modifierTypes.SHELL_BELL) as PokemonHeldItemModifierType; const leftovers = generateModifierType(scene, modifierTypes.LEFTOVERS) as PokemonHeldItemModifierType; - const party = scene.getParty(); + const party = scene.getPlayerParty(); // Iterate over the party until an item was successfully given // First leftovers diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts index b7ce3bab48c..a2c32c6af40 100644 --- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts +++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts @@ -51,7 +51,7 @@ export const UncommonBreedEncounter: MysteryEncounter = // Calculate boss mon // Level equal to 2 below highest party member const level = getHighestLevelPlayerPokemon(scene, false, true).level - 2; - const species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getParty()), true); + const species = scene.arena.randomSpecies(scene.currentBattle.waveIndex, level, 0, getPartyLuckValue(scene.getPlayerParty()), true); const pokemon = new EnemyPokemon(scene, species, level, TrainerSlot.NONE, true); // Pokemon will always have one of its egg moves in its moveset diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts index 2ecba6ce658..c05e707ed4d 100644 --- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts +++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts @@ -176,7 +176,7 @@ export const WeirdDreamEncounter: MysteryEncounter = for (const transformation of scene.currentBattle.mysteryEncounter!.misc.teamTransformations) { scene.removePokemonFromPlayerParty(transformation.previousPokemon, false); - scene.getParty().push(transformation.newPokemon); + scene.getPlayerParty().push(transformation.newPokemon); } }) .withOptionPhase(async (scene: BattleScene) => { @@ -280,7 +280,7 @@ export const WeirdDreamEncounter: MysteryEncounter = const onBeforeRewards = () => { // Before battle rewards, unlock the passive on a pokemon in the player's team for the rest of the run (not permanently) // One random pokemon will get its passive unlocked - const passiveDisabledPokemon = scene.getParty().filter(p => !p.passive); + const passiveDisabledPokemon = scene.getPlayerParty().filter(p => !p.passive); if (passiveDisabledPokemon?.length > 0) { const enablePassiveMon = passiveDisabledPokemon[randSeedInt(passiveDisabledPokemon.length)]; enablePassiveMon.passive = true; @@ -306,7 +306,7 @@ export const WeirdDreamEncounter: MysteryEncounter = }, async (scene: BattleScene) => { // Leave, reduce party levels by 10% - for (const pokemon of scene.getParty()) { + for (const pokemon of scene.getPlayerParty()) { pokemon.level = Math.max(Math.ceil((100 - PERCENT_LEVEL_LOSS_ON_REFUSE) / 100 * pokemon.level), 1); pokemon.exp = getLevelTotalExp(pokemon.level, pokemon.species.growthRate); pokemon.levelExp = 0; @@ -329,7 +329,7 @@ interface PokemonTransformation { } function getTeamTransformations(scene: BattleScene): PokemonTransformation[] { - const party = scene.getParty(); + const party = scene.getPlayerParty(); // Removes all pokemon from the party const alreadyUsedSpecies: PokemonSpecies[] = party.map(p => p.species); const pokemonTransformations: PokemonTransformation[] = party.map(p => { @@ -404,7 +404,7 @@ async function doNewTeamPostProcess(scene: BattleScene, transformations: Pokemon if (shouldGetOldGateau(newPokemon)) { const stats = getOldGateauBoostedStats(newPokemon); const modType = modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU() - .generateType(scene.getParty(), [ OLD_GATEAU_STATS_UP, stats ]) + .generateType(scene.getPlayerParty(), [ OLD_GATEAU_STATS_UP, stats ]) ?.withIdFromFunc(modifierTypes.MYSTERY_ENCOUNTER_OLD_GATEAU); const modifier = modType?.newModifier(newPokemon); if (modifier) { @@ -417,7 +417,7 @@ async function doNewTeamPostProcess(scene: BattleScene, transformations: Pokemon } // One random pokemon will get its passive unlocked - const passiveDisabledPokemon = scene.getParty().filter(p => !p.passive); + const passiveDisabledPokemon = scene.getPlayerParty().filter(p => !p.passive); if (passiveDisabledPokemon?.length > 0) { const enablePassiveMon = passiveDisabledPokemon[randSeedInt(passiveDisabledPokemon.length)]; enablePassiveMon.passive = true; diff --git a/src/data/mystery-encounters/mystery-encounter-option.ts b/src/data/mystery-encounters/mystery-encounter-option.ts index ffae71b9555..c674ebdc46e 100644 --- a/src/data/mystery-encounters/mystery-encounter-option.ts +++ b/src/data/mystery-encounters/mystery-encounter-option.ts @@ -88,7 +88,7 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption { * @param pokemon */ pokemonMeetsPrimaryRequirements(scene: BattleScene, pokemon: Pokemon): boolean { - return !this.primaryPokemonRequirements.some(req => !req.queryParty(scene.getParty()).map(p => p.id).includes(pokemon.id)); + return !this.primaryPokemonRequirements.some(req => !req.queryParty(scene.getPlayerParty()).map(p => p.id).includes(pokemon.id)); } /** @@ -102,10 +102,10 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption { if (!this.primaryPokemonRequirements || this.primaryPokemonRequirements.length === 0) { return true; } - let qualified: PlayerPokemon[] = scene.getParty(); + let qualified: PlayerPokemon[] = scene.getPlayerParty(); for (const req of this.primaryPokemonRequirements) { if (req.meetsRequirement(scene)) { - const queryParty = req.queryParty(scene.getParty()); + const queryParty = req.queryParty(scene.getPlayerParty()); qualified = qualified.filter(pkmn => queryParty.includes(pkmn)); } else { this.primaryPokemon = undefined; @@ -162,10 +162,10 @@ export default class MysteryEncounterOption implements IMysteryEncounterOption { return true; } - let qualified: PlayerPokemon[] = scene.getParty(); + let qualified: PlayerPokemon[] = scene.getPlayerParty(); for (const req of this.secondaryPokemonRequirements) { if (req.meetsRequirement(scene)) { - const queryParty = req.queryParty(scene.getParty()); + const queryParty = req.queryParty(scene.getPlayerParty()); qualified = qualified.filter(pkmn => queryParty.includes(pkmn)); } else { this.secondaryPokemon = []; diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts index 91ea0c5be19..1358c465d17 100644 --- a/src/data/mystery-encounters/mystery-encounter-requirements.ts +++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts @@ -1,21 +1,21 @@ -import { PlayerPokemon } from "#app/field/pokemon"; import BattleScene from "#app/battle-scene"; -import { isNullOrUndefined } from "#app/utils"; -import { Abilities } from "#enums/abilities"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { TimeOfDay } from "#enums/time-of-day"; -import { Nature } from "#app/data/nature"; +import { allAbilities } from "#app/data/ability"; import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; +import { Nature } from "#app/data/nature"; import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms"; import { StatusEffect } from "#app/data/status-effect"; import { Type } from "#app/data/type"; import { WeatherType } from "#app/data/weather"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PlayerPokemon } from "#app/field/pokemon"; import { AttackTypeBoosterModifier } from "#app/modifier/modifier"; import { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type"; +import { isNullOrUndefined } from "#app/utils"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Species } from "#enums/species"; import { SpeciesFormKey } from "#enums/species-form-key"; -import { allAbilities } from "#app/data/ability"; +import { TimeOfDay } from "#enums/time-of-day"; export interface EncounterRequirement { meetsRequirement(scene: BattleScene): boolean; // Boolean to see if a requirement is met @@ -333,7 +333,7 @@ export class PartySizeRequirement extends EncounterSceneRequirement { override meetsRequirement(scene: BattleScene): boolean { if (!isNullOrUndefined(this.partySizeRange) && this.partySizeRange[0] <= this.partySizeRange[1]) { - const partySize = this.excludeDisallowedPokemon ? scene.getParty().filter(p => p.isAllowedInBattle()).length : scene.getParty().length; + const partySize = this.excludeDisallowedPokemon ? scene.getPokemonAllowedInBattle().length : scene.getPlayerParty().length; if (partySize >= 0 && (this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize) || (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize)) { return false; } @@ -343,7 +343,7 @@ export class PartySizeRequirement extends EncounterSceneRequirement { } override getDialogueToken(scene: BattleScene, pokemon?: PlayerPokemon): [string, string] { - return [ "partySize", scene.getParty().length.toString() ]; + return [ "partySize", scene.getPlayerParty().length.toString() ]; } } @@ -358,7 +358,7 @@ export class PersistentModifierRequirement extends EncounterSceneRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredHeldItemModifiers?.length < 0) { return false; } @@ -421,7 +421,7 @@ export class SpeciesRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredSpecies?.length < 0) { return false; } @@ -459,7 +459,7 @@ export class NatureRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredNature?.length < 0) { return false; } @@ -498,7 +498,7 @@ export class TypeRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - let partyPokemon = scene.getParty(); + let partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon)) { return false; @@ -545,7 +545,7 @@ export class MoveRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredMoves?.length < 0) { return false; } @@ -594,7 +594,7 @@ export class CompatibleMoveRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredMoves?.length < 0) { return false; } @@ -635,7 +635,7 @@ export class AbilityRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredAbilities?.length < 0) { return false; } @@ -677,7 +677,7 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredStatusEffect?.length < 0) { return false; } @@ -746,7 +746,7 @@ export class CanFormChangeWithItemRequirement extends EncounterPokemonRequiremen } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredFormChangeItem?.length < 0) { return false; } @@ -798,7 +798,7 @@ export class CanEvolveWithItemRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon) || this.requiredEvolutionItem?.length < 0) { return false; } @@ -849,7 +849,7 @@ export class HeldItemRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon)) { return false; } @@ -900,7 +900,7 @@ export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRe } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); if (isNullOrUndefined(partyPokemon)) { return false; } @@ -957,7 +957,7 @@ export class LevelRequirement extends EncounterPokemonRequirement { override meetsRequirement(scene: BattleScene): boolean { // Party Pokemon inside required level range if (!isNullOrUndefined(this.requiredLevelRange) && this.requiredLevelRange[0] <= this.requiredLevelRange[1]) { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); const pokemonInRange = this.queryParty(partyPokemon); if (pokemonInRange.length < this.minNumberOfPokemon) { return false; @@ -995,7 +995,7 @@ export class FriendshipRequirement extends EncounterPokemonRequirement { override meetsRequirement(scene: BattleScene): boolean { // Party Pokemon inside required friendship range if (!isNullOrUndefined(this.requiredFriendshipRange) && this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1]) { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); const pokemonInRange = this.queryParty(partyPokemon); if (pokemonInRange.length < this.minNumberOfPokemon) { return false; @@ -1038,7 +1038,7 @@ export class HealthRatioRequirement extends EncounterPokemonRequirement { override meetsRequirement(scene: BattleScene): boolean { // Party Pokemon's health inside required health range if (!isNullOrUndefined(this.requiredHealthRange) && this.requiredHealthRange[0] <= this.requiredHealthRange[1]) { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); const pokemonInRange = this.queryParty(partyPokemon); if (pokemonInRange.length < this.minNumberOfPokemon) { return false; @@ -1082,7 +1082,7 @@ export class WeightRequirement extends EncounterPokemonRequirement { override meetsRequirement(scene: BattleScene): boolean { // Party Pokemon's weight inside required weight range if (!isNullOrUndefined(this.requiredWeightRange) && this.requiredWeightRange[0] <= this.requiredWeightRange[1]) { - const partyPokemon = scene.getParty(); + const partyPokemon = scene.getPlayerParty(); const pokemonInRange = this.queryParty(partyPokemon); if (pokemonInRange.length < this.minNumberOfPokemon) { return false; diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts index c045ee51bd7..badbfcf7a56 100644 --- a/src/data/mystery-encounters/mystery-encounter.ts +++ b/src/data/mystery-encounters/mystery-encounter.ts @@ -314,7 +314,7 @@ export default class MysteryEncounter implements IMysteryEncounter { * @param pokemon */ pokemonMeetsPrimaryRequirements(scene: BattleScene, pokemon: Pokemon): boolean { - return !this.primaryPokemonRequirements.some(req => !req.queryParty(scene.getParty()).map(p => p.id).includes(pokemon.id)); + return !this.primaryPokemonRequirements.some(req => !req.queryParty(scene.getPlayerParty()).map(p => p.id).includes(pokemon.id)); } /** @@ -326,18 +326,18 @@ export default class MysteryEncounter implements IMysteryEncounter { */ private meetsPrimaryRequirementAndPrimaryPokemonSelected(scene: BattleScene): boolean { if (!this.primaryPokemonRequirements || this.primaryPokemonRequirements.length === 0) { - const activeMon = scene.getParty().filter(p => p.isActive(true)); + const activeMon = scene.getPlayerParty().filter(p => p.isActive(true)); if (activeMon.length > 0) { this.primaryPokemon = activeMon[0]; } else { - this.primaryPokemon = scene.getParty().filter(p => p.isAllowedInBattle())[0]; + this.primaryPokemon = scene.getPlayerParty().filter(p => p.isAllowedInBattle())[0]; } return true; } - let qualified: PlayerPokemon[] = scene.getParty(); + let qualified: PlayerPokemon[] = scene.getPlayerParty(); for (const req of this.primaryPokemonRequirements) { if (req.meetsRequirement(scene)) { - qualified = qualified.filter(pkmn => req.queryParty(scene.getParty()).includes(pkmn)); + qualified = qualified.filter(pkmn => req.queryParty(scene.getPlayerParty()).includes(pkmn)); } else { this.primaryPokemon = undefined; return false; @@ -394,10 +394,10 @@ export default class MysteryEncounter implements IMysteryEncounter { return true; } - let qualified: PlayerPokemon[] = scene.getParty(); + let qualified: PlayerPokemon[] = scene.getPlayerParty(); for (const req of this.secondaryPokemonRequirements) { if (req.meetsRequirement(scene)) { - qualified = qualified.filter(pkmn => req.queryParty(scene.getParty()).includes(pkmn)); + qualified = qualified.filter(pkmn => req.queryParty(scene.getPlayerParty()).includes(pkmn)); } else { this.secondaryPokemon = []; return false; diff --git a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts index f34d383dbbc..a2c08938fbe 100644 --- a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts +++ b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts @@ -39,7 +39,7 @@ export class CanLearnMoveRequirement extends EncounterPokemonRequirement { } override meetsRequirement(scene: BattleScene): boolean { - const partyPokemon = scene.getParty().filter((pkm) => (this.includeFainted ? pkm.isAllowed() : pkm.isAllowedInBattle())); + const partyPokemon = scene.getPlayerParty().filter((pkm) => (this.includeFainted ? pkm.isAllowedInChallenge() : pkm.isAllowedInBattle())); if (isNullOrUndefined(partyPokemon) || this.requiredMoves?.length < 0) { return false; diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 66459c96ede..429b6bfa292 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -418,9 +418,9 @@ export function generateModifierType(scene: BattleScene, modifier: () => Modifie // Populates item id and tier (order matters) result = result .withIdFromFunc(modifierTypes[modifierId]) - .withTierFromPool(ModifierPoolType.PLAYER, scene.getParty()); + .withTierFromPool(ModifierPoolType.PLAYER, scene.getPlayerParty()); - return result instanceof ModifierTypeGenerator ? result.generateType(scene.getParty(), pregenArgs) : result; + return result instanceof ModifierTypeGenerator ? result.generateType(scene.getPlayerParty(), pregenArgs) : result; } /** @@ -451,9 +451,9 @@ export function selectPokemonForOption(scene: BattleScene, onPokemonSelected: (p // Open party screen to choose pokemon scene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: number, option: PartyOption) => { - if (slotIndex < scene.getParty().length) { + if (slotIndex < scene.getPlayerParty().length) { scene.ui.setMode(modeToSetOnExit).then(() => { - const pokemon = scene.getParty()[slotIndex]; + const pokemon = scene.getPlayerParty()[slotIndex]; const secondaryOptions = onPokemonSelected(pokemon); if (!secondaryOptions) { scene.currentBattle.mysteryEncounter!.setDialogueToken("selectedPokemon", pokemon.getNameToRender()); @@ -563,7 +563,7 @@ export function selectOptionThenPokemon(scene: BattleScene, options: OptionSelec const selectPokemonAfterOption = (selectedOptionIndex: number) => { // Open party screen to choose a Pokemon scene.ui.setMode(Mode.PARTY, PartyUiMode.SELECT, -1, (slotIndex: number, option: PartyOption) => { - if (slotIndex < scene.getParty().length) { + if (slotIndex < scene.getPlayerParty().length) { // Pokemon and option selected scene.ui.setMode(modeToSetOnExit).then(() => { const result: PokemonAndOptionSelected = { selectedPokemonIndex: slotIndex, selectedOptionIndex: selectedOptionIndex }; @@ -713,7 +713,7 @@ export function leaveEncounterWithoutBattle(scene: BattleScene, addHealPhase: bo * @param doNotContinue - default `false`. If set to true, will not end the battle and continue to next wave */ export function handleMysteryEncounterVictory(scene: BattleScene, addHealPhase: boolean = false, doNotContinue: boolean = false) { - const allowedPkm = scene.getParty().filter((pkm) => pkm.isAllowedInBattle()); + const allowedPkm = scene.getPlayerParty().filter((pkm) => pkm.isAllowedInBattle()); if (allowedPkm.length === 0) { scene.clearPhaseQueue(); @@ -750,7 +750,7 @@ export function handleMysteryEncounterVictory(scene: BattleScene, addHealPhase: * @param addHealPhase */ export function handleMysteryEncounterBattleFailed(scene: BattleScene, addHealPhase: boolean = false, doNotContinue: boolean = false) { - const allowedPkm = scene.getParty().filter((pkm) => pkm.isAllowedInBattle()); + const allowedPkm = scene.getPlayerParty().filter((pkm) => pkm.isAllowedInBattle()); if (allowedPkm.length === 0) { scene.clearPhaseQueue(); diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index b1adc478ab0..dd42cc9ce55 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -53,24 +53,24 @@ export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string, } /** - * Will never remove the player's last non-fainted Pokemon (if they only have 1) + * Will never remove the player's last non-fainted Pokemon (if they only have 1). * Otherwise, picks a Pokemon completely at random and removes from the party * @param scene - * @param isAllowed Default false. If true, only picks from legal mons. If no legal mons are found (or there is 1, with `doNotReturnLastAllowedMon = true), will return a mon that is not allowed. - * @param isFainted Default false. If true, includes fainted mons. - * @param doNotReturnLastAllowedMon Default false. If true, will never return the last unfainted pokemon in the party. Useful when this function is being used to determine what Pokemon to remove from the party (Don't want to remove last unfainted) + * @param isAllowed Default `false`. If `true`, only picks from legal mons. If no legal mons are found (or there is 1, with `doNotReturnLastAllowedMon = true`), will return a mon that is not allowed. + * @param isFainted Default `false`. If `true`, includes fainted mons. + * @param doNotReturnLastAllowedMon Default `false`. If `true`, will never return the last unfainted pokemon in the party. Useful when this function is being used to determine what Pokemon to remove from the party (Don't want to remove last unfainted) * @returns */ export function getRandomPlayerPokemon(scene: BattleScene, isAllowed: boolean = false, isFainted: boolean = false, doNotReturnLastAllowedMon: boolean = false): PlayerPokemon { - const party = scene.getParty(); + const party = scene.getPlayerParty(); let chosenIndex: number; let chosenPokemon: PlayerPokemon | null = null; - const fullyLegalMons = party.filter(p => (!isAllowed || p.isAllowed()) && (isFainted || !p.isFainted())); - const allowedOnlyMons = party.filter(p => p.isAllowed()); + const fullyLegalMons = party.filter(p => (!isAllowed || p.isAllowedInChallenge()) && (isFainted || !p.isFainted())); + const allowedOnlyMons = party.filter(p => p.isAllowedInChallenge()); if (doNotReturnLastAllowedMon && fullyLegalMons.length === 1) { // If there is only 1 legal/unfainted mon left, select from fainted legal mons - const faintedLegalMons = party.filter(p => (!isAllowed || p.isAllowed()) && p.isFainted()); + const faintedLegalMons = party.filter(p => (!isAllowed || p.isAllowedInChallenge()) && p.isFainted()); if (faintedLegalMons.length > 0) { chosenIndex = randSeedInt(faintedLegalMons.length); chosenPokemon = faintedLegalMons[chosenIndex]; @@ -101,11 +101,11 @@ export function getRandomPlayerPokemon(scene: BattleScene, isAllowed: boolean = * @returns */ export function getHighestLevelPlayerPokemon(scene: BattleScene, isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { - const party = scene.getParty(); + const party = scene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; for (const p of party) { - if (isAllowed && !p.isAllowed()) { + if (isAllowed && !p.isAllowedInChallenge()) { continue; } if (!isFainted && p.isFainted()) { @@ -127,11 +127,11 @@ export function getHighestLevelPlayerPokemon(scene: BattleScene, isAllowed: bool * @returns */ export function getHighestStatPlayerPokemon(scene: BattleScene, stat: PermanentStat, isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { - const party = scene.getParty(); + const party = scene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; for (const p of party) { - if (isAllowed && !p.isAllowed()) { + if (isAllowed && !p.isAllowedInChallenge()) { continue; } if (!isFainted && p.isFainted()) { @@ -152,11 +152,11 @@ export function getHighestStatPlayerPokemon(scene: BattleScene, stat: PermanentS * @returns */ export function getLowestLevelPlayerPokemon(scene: BattleScene, isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { - const party = scene.getParty(); + const party = scene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; for (const p of party) { - if (isAllowed && !p.isAllowed()) { + if (isAllowed && !p.isAllowedInChallenge()) { continue; } if (!isFainted && p.isFainted()) { @@ -177,11 +177,11 @@ export function getLowestLevelPlayerPokemon(scene: BattleScene, isAllowed: boole * @returns */ export function getHighestStatTotalPlayerPokemon(scene: BattleScene, isAllowed: boolean = false, isFainted: boolean = false): PlayerPokemon { - const party = scene.getParty(); + const party = scene.getPlayerParty(); let pokemon: PlayerPokemon | null = null; for (const p of party) { - if (isAllowed && !p.isAllowed()) { + if (isAllowed && !p.isAllowedInChallenge()) { continue; } if (!isFainted && p.isFainted()) { @@ -315,7 +315,7 @@ export function applyHealToPokemon(scene: BattleScene, pokemon: PlayerPokemon, h */ export async function modifyPlayerPokemonBST(pokemon: PlayerPokemon, value: number) { const modType = modifierTypes.MYSTERY_ENCOUNTER_SHUCKLE_JUICE() - .generateType(pokemon.scene.getParty(), [ value ]) + .generateType(pokemon.scene.getPlayerParty(), [ value ]) ?.withIdFromFunc(modifierTypes.MYSTERY_ENCOUNTER_SHUCKLE_JUICE); const modifier = modType?.newModifier(pokemon); if (modifier) { @@ -591,7 +591,7 @@ export async function catchPokemon(scene: BattleScene, pokemon: EnemyPokemon, po const addToParty = (slotIndex?: number) => { const newPokemon = pokemon.addToParty(pokeballType, slotIndex); const modifiers = scene.findModifiers(m => m instanceof PokemonHeldItemModifier, false); - if (scene.getParty().filter(p => p.isShiny()).length === 6) { + if (scene.getPlayerParty().filter(p => p.isShiny()).length === 6) { scene.validateAchv(achvs.SHINY_PARTY); } Promise.all(modifiers.map(m => scene.addModifier(m, true))).then(() => { @@ -605,7 +605,7 @@ export async function catchPokemon(scene: BattleScene, pokemon: EnemyPokemon, po }); }; Promise.all([ pokemon.hideInfo(), scene.gameData.setPokemonCaught(pokemon) ]).then(() => { - if (scene.getParty().length === 6) { + if (scene.getPlayerParty().length === 6) { const promptRelease = () => { scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => { scene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); @@ -826,7 +826,7 @@ export async function addPokemonDataToDexAndValidateAchievements(scene: BattleSc * @param invalidSelectionKey */ export function isPokemonValidForEncounterOptionSelection(pokemon: Pokemon, scene: BattleScene, invalidSelectionKey: string): string | null { - if (!pokemon.isAllowed()) { + if (!pokemon.isAllowedInChallenge()) { return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: pokemon.getNameToRender() }) ?? null; } if (!pokemon.isAllowedInBattle()) { diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 6c328fa25cc..2dcef4b3965 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -325,35 +325,45 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.scene.field.getIndex(this) > -1; } - isFainted(checkStatus?: boolean): boolean { - return !this.hp && (!checkStatus || this.status?.effect === StatusEffect.FAINT); + /** + * Checks if a pokemon is fainted (ie: its `hp <= 0`). + * It's usually better to call {@linkcode isAllowedInBattle()} + * @param checkStatus `true` to also check that the pokemon's status is {@linkcode StatusEffect.FAINT} + * @returns `true` if the pokemon is fainted + */ + public isFainted(checkStatus: boolean = false): boolean { + return this.hp <= 0 && (!checkStatus || this.status?.effect === StatusEffect.FAINT); } /** - * Check if this pokemon is both not fainted (or a fled wild pokemon) and allowed to be in battle. - * This is frequently a better alternative to {@link isFainted} - * @returns {boolean} True if pokemon is allowed in battle + * Check if this pokemon is both not fainted and allowed to be in battle based on currently active challenges. + * @returns {boolean} `true` if pokemon is allowed in battle */ - isAllowedInBattle(): boolean { - return !this.isFainted() && this.isAllowed(); + public isAllowedInBattle(): boolean { + return !this.isFainted() && this.isAllowedInChallenge(); } /** - * Check if this pokemon is allowed (no challenge exclusion) - * This is frequently a better alternative to {@link isFainted} - * @returns {boolean} True if pokemon is allowed in battle + * Check if this pokemon is allowed based on any active challenges. + * It's usually better to call {@linkcode isAllowedInBattle()} + * @returns {boolean} `true` if pokemon is allowed in battle */ - isAllowed(): boolean { + public isAllowedInChallenge(): boolean { const challengeAllowed = new Utils.BooleanHolder(true); applyChallenges(this.scene.gameMode, ChallengeType.POKEMON_IN_BATTLE, this, challengeAllowed); return challengeAllowed.value; } - isActive(onField?: boolean): boolean { + /** + * Checks if the pokemon is allowed in battle (ie: not fainted, and allowed under any active challenges). + * @param onField `true` to also check if the pokemon is currently on the field, defaults to `false` + * @returns `true` if the pokemon is "active". Returns `false` if there is no active {@linkcode BattleScene} + */ + public isActive(onField: boolean = false): boolean { if (!this.scene) { return false; } - return this.isAllowedInBattle() && !!this.scene && (!onField || this.isOnField()); + return this.isAllowedInBattle() && (!onField || this.isOnField()); } getDexAttr(): bigint { @@ -4198,7 +4208,7 @@ export class PlayerPokemon extends Pokemon { return new Promise(resolve => { this.scene.ui.setMode(Mode.PARTY, PartyUiMode.REVIVAL_BLESSING, this.getFieldIndex(), (slotIndex:integer, option: PartyOption) => { if (slotIndex >= 0 && slotIndex < 6) { - const pokemon = this.scene.getParty()[slotIndex]; + const pokemon = this.scene.getPlayerParty()[slotIndex]; if (!pokemon || !pokemon.isFainted()) { resolve(); } @@ -4208,7 +4218,7 @@ export class PlayerPokemon extends Pokemon { pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp())); this.scene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: pokemon.name }), 0, true); - if (this.scene.currentBattle.double && this.scene.getParty().length > 1) { + if (this.scene.currentBattle.double && this.scene.getPlayerParty().length > 1) { const allyPokemon = this.getAlly(); if (slotIndex <= 1) { // Revived ally pokemon @@ -4350,7 +4360,7 @@ export class PlayerPokemon extends Pokemon { newPokemon.fusionLuck = this.fusionLuck; newPokemon.usedTMs = this.usedTMs; - this.scene.getParty().push(newPokemon); + this.scene.getPlayerParty().push(newPokemon); newPokemon.evolve((!isFusion ? newEvolution : new FusionSpeciesFormEvolution(this.id, newEvolution)), evoSpecies); const modifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id, true) as PokemonHeldItemModifier[]; @@ -4466,8 +4476,8 @@ export class PlayerPokemon extends Pokemon { this.generateCompatibleTms(); this.updateInfo(true); - const fusedPartyMemberIndex = this.scene.getParty().indexOf(pokemon); - let partyMemberIndex = this.scene.getParty().indexOf(this); + const fusedPartyMemberIndex = this.scene.getPlayerParty().indexOf(pokemon); + let partyMemberIndex = this.scene.getPlayerParty().indexOf(this); if (partyMemberIndex > fusedPartyMemberIndex) { partyMemberIndex--; } @@ -4480,8 +4490,8 @@ export class PlayerPokemon extends Pokemon { Promise.allSettled(transferModifiers).then(() => { this.scene.updateModifiers(true, true).then(() => { this.scene.removePartyMemberModifiers(fusedPartyMemberIndex); - this.scene.getParty().splice(fusedPartyMemberIndex, 1)[0]; - const newPartyMemberIndex = this.scene.getParty().indexOf(this); + this.scene.getPlayerParty().splice(fusedPartyMemberIndex, 1)[0]; + const newPartyMemberIndex = this.scene.getPlayerParty().indexOf(this); pokemon.getMoveset(true).map((m: PokemonMove) => this.scene.unshiftPhase(new LearnMovePhase(this.scene, newPartyMemberIndex, m.getMove().id))); pokemon.destroy(); this.updateFusionPalette(); @@ -5072,7 +5082,7 @@ export class EnemyPokemon extends Pokemon { * @returns the pokemon that was added or null if the pokemon could not be added */ addToParty(pokeballType: PokeballType, slotIndex: number = -1) { - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); let ret: PlayerPokemon | null = null; if (party.length < PLAYER_PARTY_MAX_SIZE) { diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index d34804ba040..0891262649c 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -746,7 +746,7 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { return 0; } if (pokemon.isPlayer() && forThreshold) { - return scene.getParty().map(p => this.getMaxHeldItemCount(p)).reduce((stackCount: number, maxStackCount: number) => Math.max(stackCount, maxStackCount), 0); + return scene.getPlayerParty().map(p => this.getMaxHeldItemCount(p)).reduce((stackCount: number, maxStackCount: number) => Math.max(stackCount, maxStackCount), 0); } return this.getMaxHeldItemCount(pokemon); } @@ -2022,7 +2022,7 @@ export abstract class ConsumablePokemonModifier extends ConsumableModifier { abstract override apply(playerPokemon: PlayerPokemon, ...args: unknown[]): boolean | Promise; getPokemon(scene: BattleScene) { - return scene.getParty().find(p => p.id === this.pokemonId); + return scene.getPlayerParty().find(p => p.id === this.pokemonId); } } @@ -2224,7 +2224,7 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier { playerPokemon.addFriendship(FRIENDSHIP_GAIN_FROM_RARE_CANDY); - playerPokemon.scene.unshiftPhase(new LevelUpPhase(playerPokemon.scene, playerPokemon.scene.getParty().indexOf(playerPokemon), playerPokemon.level - levelCount.value, playerPokemon.level)); + playerPokemon.scene.unshiftPhase(new LevelUpPhase(playerPokemon.scene, playerPokemon.scene.getPlayerParty().indexOf(playerPokemon), playerPokemon.level - levelCount.value, playerPokemon.level)); return true; } @@ -2244,7 +2244,7 @@ export class TmModifier extends ConsumablePokemonModifier { */ override apply(playerPokemon: PlayerPokemon): boolean { - playerPokemon.scene.unshiftPhase(new LearnMovePhase(playerPokemon.scene, playerPokemon.scene.getParty().indexOf(playerPokemon), this.type.moveId, LearnMoveType.TM)); + playerPokemon.scene.unshiftPhase(new LearnMovePhase(playerPokemon.scene, playerPokemon.scene.getPlayerParty().indexOf(playerPokemon), this.type.moveId, LearnMoveType.TM)); return true; } @@ -2266,7 +2266,7 @@ export class RememberMoveModifier extends ConsumablePokemonModifier { */ override apply(playerPokemon: PlayerPokemon, cost?: number): boolean { - playerPokemon.scene.unshiftPhase(new LearnMovePhase(playerPokemon.scene, playerPokemon.scene.getParty().indexOf(playerPokemon), playerPokemon.getLearnableLevelMoves()[this.levelMoveIndex], LearnMoveType.MEMORY, cost)); + playerPokemon.scene.unshiftPhase(new LearnMovePhase(playerPokemon.scene, playerPokemon.scene.getPlayerParty().indexOf(playerPokemon), playerPokemon.getLearnableLevelMoves()[this.levelMoveIndex], LearnMoveType.MEMORY, cost)); return true; } @@ -2783,7 +2783,7 @@ export class MoneyRewardModifier extends ConsumableModifier { battleScene.addMoney(moneyAmount.value); - battleScene.getParty().map(p => { + battleScene.getPlayerParty().map(p => { if (p.species?.speciesId === Species.GIMMIGHOUL || p.fusionSpecies?.speciesId === Species.GIMMIGHOUL) { p.evoCounter ? p.evoCounter++ : p.evoCounter = 1; const modifier = getModifierType(modifierTypes.EVOLUTION_TRACKER_GIMMIGHOUL).newModifier(p) as EvoTrackerModifier; diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index 3e46fc792f0..483e6eac943 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -1,21 +1,22 @@ -import BattleScene from "#app/battle-scene"; import { BattlerIndex } from "#app/battle"; -import { getPokeballCatchMultiplier, getPokeballAtlasKey, getPokeballTintColor, doPokeballBounceAnim } from "#app/data/pokeball"; +import BattleScene from "#app/battle-scene"; +import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; +import { SubstituteTag } from "#app/data/battler-tags"; +import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor } from "#app/data/pokeball"; import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; -import { PokeballType } from "#app/enums/pokeball"; -import { StatusEffect } from "#app/enums/status-effect"; -import { addPokeballOpenParticles, addPokeballCaptureStars } from "#app/field/anims"; +import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; import { EnemyPokemon } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import { PokemonHeldItemModifier } from "#app/modifier/modifier"; +import { PokemonPhase } from "#app/phases/pokemon-phase"; +import { VictoryPhase } from "#app/phases/victory-phase"; import { achvs } from "#app/system/achv"; -import { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; +import { PartyOption, PartyUiMode } from "#app/ui/party-ui-handler"; import { SummaryUiMode } from "#app/ui/summary-ui-handler"; import { Mode } from "#app/ui/ui"; +import { PokeballType } from "#enums/pokeball"; +import { StatusEffect } from "#enums/status-effect"; import i18next from "i18next"; -import { PokemonPhase } from "./pokemon-phase"; -import { VictoryPhase } from "./victory-phase"; -import { SubstituteTag } from "#app/data/battler-tags"; export class AttemptCapturePhase extends PokemonPhase { private pokeballType: PokeballType; @@ -235,7 +236,7 @@ export class AttemptCapturePhase extends PokemonPhase { const addToParty = (slotIndex?: number) => { const newPokemon = pokemon.addToParty(this.pokeballType, slotIndex); const modifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier, false); - if (this.scene.getParty().filter(p => p.isShiny()).length === 6) { + if (this.scene.getPlayerParty().filter(p => p.isShiny()).length === PLAYER_PARTY_MAX_SIZE) { this.scene.validateAchv(achvs.SHINY_PARTY); } Promise.all(modifiers.map(m => this.scene.addModifier(m, true))).then(() => { @@ -249,7 +250,7 @@ export class AttemptCapturePhase extends PokemonPhase { }); }; Promise.all([ pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon) ]).then(() => { - if (this.scene.getParty().length === 6) { + if (this.scene.getPlayerParty().length === PLAYER_PARTY_MAX_SIZE) { const promptRelease = () => { this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.getNameToRender() }), null, () => { this.scene.pokemonInfoContainer.makeRoomForConfirmUi(1, true); diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts index bae61aa2288..3b9ca012ef7 100644 --- a/src/phases/battle-end-phase.ts +++ b/src/phases/battle-end-phase.ts @@ -1,8 +1,8 @@ +import BattleScene from "#app/battle-scene"; import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/ability"; import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier"; import { BattlePhase } from "./battle-phase"; import { GameOverPhase } from "./game-over-phase"; -import BattleScene from "#app/battle-scene"; export class BattleEndPhase extends BattlePhase { /** If true, will increment battles won */ @@ -41,7 +41,7 @@ export class BattleEndPhase extends BattlePhase { } } - for (const pokemon of this.scene.getParty().filter(p => p.isAllowedInBattle())) { + for (const pokemon of this.scene.getPokemonAllowedInBattle()) { applyPostBattleAbAttrs(PostBattleAbAttr, pokemon); } diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts index 5e459d0e6b5..b87dff32f60 100644 --- a/src/phases/check-switch-phase.ts +++ b/src/phases/check-switch-phase.ts @@ -37,7 +37,7 @@ export class CheckSwitchPhase extends BattlePhase { return; } - if (!this.scene.getParty().slice(1).filter(p => p.isActive()).length) { + if (!this.scene.getPlayerParty().slice(1).filter(p => p.isActive()).length) { super.end(); return; } diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts index b7071c4cc6f..c4d919c0325 100644 --- a/src/phases/encounter-phase.ts +++ b/src/phases/encounter-phase.ts @@ -1,40 +1,40 @@ -import BattleScene from "#app/battle-scene"; import { BattlerIndex, BattleType } from "#app/battle"; +import BattleScene from "#app/battle-scene"; +import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; import { applyAbAttrs, SyncEncounterNatureAbAttr } from "#app/data/ability"; +import { initEncounterAnims, loadEncounterAnimAssets } from "#app/data/battle-anims"; import { getCharVariantFromDialogue } from "#app/data/dialogue"; +import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { doTrainerExclamation } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { TrainerSlot } from "#app/data/trainer-config"; import { getRandomWeatherType } from "#app/data/weather"; -import { BattleSpec } from "#app/enums/battle-spec"; -import { PlayerGender } from "#app/enums/player-gender"; -import { Species } from "#app/enums/species"; import { EncounterPhaseEvent } from "#app/events/battle-scene"; import Pokemon, { FieldPosition } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier"; +import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; +import Overrides from "#app/overrides"; +import { BattlePhase } from "#app/phases/battle-phase"; +import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; +import { GameOverPhase } from "#app/phases/game-over-phase"; +import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; +import { PostSummonPhase } from "#app/phases/post-summon-phase"; +import { ReturnPhase } from "#app/phases/return-phase"; +import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; +import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase"; +import { SummonPhase } from "#app/phases/summon-phase"; +import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; import { achvs } from "#app/system/achv"; import { handleTutorial, Tutorial } from "#app/tutorial"; import { Mode } from "#app/ui/ui"; -import i18next from "i18next"; -import { BattlePhase } from "./battle-phase"; -import * as Utils from "#app/utils"; -import { randSeedInt } from "#app/utils"; -import { CheckSwitchPhase } from "./check-switch-phase"; -import { GameOverPhase } from "./game-over-phase"; -import { PostSummonPhase } from "./post-summon-phase"; -import { ReturnPhase } from "./return-phase"; -import { ScanIvsPhase } from "./scan-ivs-phase"; -import { ShinySparklePhase } from "./shiny-sparkle-phase"; -import { SummonPhase } from "./summon-phase"; -import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; -import Overrides from "#app/overrides"; -import { initEncounterAnims, loadEncounterAnimAssets } from "#app/data/battle-anims"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { doTrainerExclamation } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { randSeedInt, randSeedItem } from "#app/utils"; +import { BattleSpec } from "#enums/battle-spec"; import { Biome } from "#enums/biome"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; +import i18next from "i18next"; import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters"; export class EncounterPhase extends BattlePhase { @@ -116,7 +116,7 @@ export class EncounterPhase extends BattlePhase { if (this.scene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) { battle.enemyParty[e].ivs = new Array(6).fill(31); } - this.scene.getParty().slice(0, !battle.double ? 1 : 2).reverse().forEach(playerPokemon => { + this.scene.getPlayerParty().slice(0, !battle.double ? 1 : 2).reverse().forEach(playerPokemon => { applyAbAttrs(SyncEncounterNatureAbAttr, playerPokemon, null, false, battle.enemyParty[e]); }); } @@ -156,7 +156,7 @@ export class EncounterPhase extends BattlePhase { return true; }); - if (this.scene.getParty().filter(p => p.isShiny()).length === 6) { + if (this.scene.getPlayerParty().filter(p => p.isShiny()).length === PLAYER_PARTY_MAX_SIZE) { this.scene.validateAchv(achvs.SHINY_PARTY); } @@ -248,7 +248,7 @@ export class EncounterPhase extends BattlePhase { /*if (startingWave > 10) { for (let m = 0; m < Math.min(Math.floor(startingWave / 10), 99); m++) - this.scene.addModifier(getPlayerModifierTypeOptionsForWave((m + 1) * 10, 1, this.scene.getParty())[0].type.newModifier(), true); + this.scene.addModifier(getPlayerModifierTypeOptionsForWave((m + 1) * 10, 1, this.scene.getPlayerParty())[0].type.newModifier(), true); this.scene.updateModifiers(true); }*/ @@ -259,7 +259,7 @@ export class EncounterPhase extends BattlePhase { this.scene.mysteryEncounterSaveData.encounterSpawnChance += WEIGHT_INCREMENT_ON_SPAWN_MISS; } - for (const pokemon of this.scene.getParty()) { + for (const pokemon of this.scene.getPlayerParty()) { if (pokemon) { pokemon.resetBattleData(); } @@ -338,7 +338,7 @@ export class EncounterPhase extends BattlePhase { const doSummon = () => { this.scene.currentBattle.started = true; this.scene.playBgm(undefined); - this.scene.pbTray.showPbTray(this.scene.getParty()); + this.scene.pbTray.showPbTray(this.scene.getPlayerParty()); this.scene.pbTrayEnemy.showPbTray(this.scene.getEnemyParty()); const doTrainerSummon = () => { this.hideEnemyTrainer(); @@ -362,7 +362,7 @@ export class EncounterPhase extends BattlePhase { doSummon(); } else { let message: string; - this.scene.executeWithSeedOffset(() => message = Utils.randSeedItem(encounterMessages), this.scene.currentBattle.waveIndex); + this.scene.executeWithSeedOffset(() => message = randSeedItem(encounterMessages), this.scene.currentBattle.waveIndex); message = message!; // tell TS compiler it's defined now const showDialogueAndSummon = () => { this.scene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => { @@ -447,13 +447,13 @@ export class EncounterPhase extends BattlePhase { if (![ BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER ].includes(this.scene.currentBattle.battleType)) { enemyField.map(p => this.scene.pushConditionalPhase(new PostSummonPhase(this.scene, p.getBattlerIndex()), () => { // if there is not a player party, we can't continue - if (!this.scene.getParty()?.length) { + if (!this.scene.getPlayerParty().length) { return false; } // how many player pokemon are on the field ? - const pokemonsOnFieldCount = this.scene.getParty().filter(p => p.isOnField()).length; + const pokemonsOnFieldCount = this.scene.getPlayerParty().filter(p => p.isOnField()).length; // if it's a 2vs1, there will never be a 2nd pokemon on our field even - const requiredPokemonsOnField = Math.min(this.scene.getParty().filter((p) => !p.isFainted()).length, 2); + const requiredPokemonsOnField = Math.min(this.scene.getPlayerParty().filter((p) => !p.isFainted()).length, 2); // if it's a double, there should be 2, otherwise 1 if (this.scene.currentBattle.double) { return pokemonsOnFieldCount === requiredPokemonsOnField; @@ -467,7 +467,7 @@ export class EncounterPhase extends BattlePhase { } if (!this.loaded) { - const availablePartyMembers = this.scene.getParty().filter(p => p.isAllowedInBattle()); + const availablePartyMembers = this.scene.getPokemonAllowedInBattle(); if (!availablePartyMembers[0].isOnField()) { this.scene.pushPhase(new SummonPhase(this.scene, 0)); diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts index 59b73fe9e11..7b079c3fbf9 100644 --- a/src/phases/evolution-phase.ts +++ b/src/phases/evolution-phase.ts @@ -223,7 +223,7 @@ export class EvolutionPhase extends Phase { this.pokemon.evolve(this.evolution, this.pokemon.species).then(() => { const levelMoves = this.pokemon.getLevelMoves(this.lastLevel + 1, true); for (const lm of levelMoves) { - this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.scene.getParty().indexOf(this.pokemon), lm[1])); + this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.scene.getPlayerParty().indexOf(this.pokemon), lm[1])); } this.scene.unshiftPhase(new EndEvolutionPhase(this.scene)); diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index 8eb84beded5..3e90233a38c 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -1,24 +1,24 @@ -import BattleScene from "#app/battle-scene"; import { BattlerIndex, BattleType } from "#app/battle"; -import { applyPostFaintAbAttrs, PostFaintAbAttr, applyPostKnockOutAbAttrs, PostKnockOutAbAttr, applyPostVictoryAbAttrs, PostVictoryAbAttr } from "#app/data/ability"; +import BattleScene from "#app/battle-scene"; +import { applyPostFaintAbAttrs, applyPostKnockOutAbAttrs, applyPostVictoryAbAttrs, PostFaintAbAttr, PostKnockOutAbAttr, PostVictoryAbAttr } from "#app/data/ability"; import { BattlerTagLapseType, DestinyBondTag } from "#app/data/battler-tags"; import { battleSpecDialogue } from "#app/data/dialogue"; import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/move"; +import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { BattleSpec } from "#app/enums/battle-spec"; import { StatusEffect } from "#app/enums/status-effect"; -import Pokemon, { PokemonMove, EnemyPokemon, PlayerPokemon, HitResult } from "#app/field/pokemon"; +import Pokemon, { EnemyPokemon, HitResult, PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import { PokemonInstantReviveModifier } from "#app/modifier/modifier"; +import { SwitchType } from "#enums/switch-type"; import i18next from "i18next"; import { DamagePhase } from "./damage-phase"; +import { GameOverPhase } from "./game-over-phase"; import { PokemonPhase } from "./pokemon-phase"; +import { SwitchPhase } from "./switch-phase"; import { SwitchSummonPhase } from "./switch-summon-phase"; import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; -import { GameOverPhase } from "./game-over-phase"; -import { SwitchPhase } from "./switch-phase"; import { VictoryPhase } from "./victory-phase"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; -import { SwitchType } from "#enums/switch-type"; import { isNullOrUndefined } from "#app/utils"; import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters"; @@ -120,7 +120,7 @@ export class FaintPhase extends PokemonPhase { if (this.player) { /** The total number of Pokemon in the player's party that can legally fight */ - const legalPlayerPokemon = this.scene.getParty().filter(p => p.isAllowedInBattle()); + const legalPlayerPokemon = this.scene.getPokemonAllowedInBattle(); /** The total number of legal player Pokemon that aren't currently on the field */ const legalPlayerPartyPokemon = legalPlayerPokemon.filter(p => !p.isActive(true)); if (!legalPlayerPokemon.length) { diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts index 9c444fc40f0..1302d8fc652 100644 --- a/src/phases/game-over-phase.ts +++ b/src/phases/game-over-phase.ts @@ -1,8 +1,8 @@ import { clientSessionId } from "#app/account"; import { BattleType } from "#app/battle"; import BattleScene from "#app/battle-scene"; -import { getCharVariantFromDialogue } from "#app/data/dialogue"; import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; +import { getCharVariantFromDialogue } from "#app/data/dialogue"; import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species"; import { trainerConfigs } from "#app/data/trainer-config"; import Pokemon from "#app/field/pokemon"; @@ -65,7 +65,7 @@ export class GameOverPhase extends BattlePhase { this.scene.gameData.loadSession(this.scene, this.scene.sessionSlotId).then(() => { this.scene.pushPhase(new EncounterPhase(this.scene, true)); - const availablePartyMembers = this.scene.getParty().filter(p => p.isAllowedInBattle()).length; + const availablePartyMembers = this.scene.getPokemonAllowedInBattle().length; this.scene.pushPhase(new SummonPhase(this.scene, 0)); if (this.scene.currentBattle.double && availablePartyMembers > 1) { @@ -97,7 +97,7 @@ export class GameOverPhase extends BattlePhase { firstClear = this.scene.validateAchv(achvs.CLASSIC_VICTORY); this.scene.validateAchv(achvs.UNEVOLVED_CLASSIC_VICTORY); this.scene.gameData.gameStats.sessionsWon++; - for (const pokemon of this.scene.getParty()) { + for (const pokemon of this.scene.getPlayerParty()) { this.awardRibbon(pokemon); if (pokemon.species.getRootSpeciesId() !== pokemon.species.getRootSpeciesId(true)) { @@ -195,13 +195,13 @@ export class GameOverPhase extends BattlePhase { if (!this.scene.gameData.unlocks[Unlockables.ENDLESS_MODE]) { this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.ENDLESS_MODE)); } - if (this.scene.getParty().filter(p => p.fusionSpecies).length && !this.scene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE]) { + if (this.scene.getPlayerParty().filter(p => p.fusionSpecies).length && !this.scene.gameData.unlocks[Unlockables.SPLICED_ENDLESS_MODE]) { this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.SPLICED_ENDLESS_MODE)); } if (!this.scene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) { this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.MINI_BLACK_HOLE)); } - if (!this.scene.gameData.unlocks[Unlockables.EVIOLITE] && this.scene.getParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)) { + if (!this.scene.gameData.unlocks[Unlockables.EVIOLITE] && this.scene.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)) { this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.EVIOLITE)); } } diff --git a/src/phases/mystery-encounter-phases.ts b/src/phases/mystery-encounter-phases.ts index 49e78fa5369..e7d1f7e9074 100644 --- a/src/phases/mystery-encounter-phases.ts +++ b/src/phases/mystery-encounter-phases.ts @@ -1,31 +1,31 @@ +import { BattlerTagLapseType } from "#app/data/battler-tags"; +import MysteryEncounterOption, { OptionPhaseCallback } from "#app/data/mystery-encounters/mystery-encounter-option"; +import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; +import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; +import { GameOverPhase } from "#app/phases/game-over-phase"; +import { NewBattlePhase } from "#app/phases/new-battle-phase"; +import { PostTurnStatusEffectPhase } from "#app/phases/post-turn-status-effect-phase"; +import { ReturnPhase } from "#app/phases/return-phase"; +import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; +import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { SummonPhase } from "#app/phases/summon-phase"; +import { SwitchPhase } from "#app/phases/switch-phase"; +import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { SwitchType } from "#enums/switch-type"; import i18next from "i18next"; import BattleScene from "../battle-scene"; +import { getCharVariantFromDialogue } from "../data/dialogue"; +import { OptionSelectSettings, transitionMysteryEncounterIntroVisuals } from "../data/mystery-encounters/utils/encounter-phase-utils"; +import { TrainerSlot } from "../data/trainer-config"; +import { IvScannerModifier } from "../modifier/modifier"; import { Phase } from "../phase"; import { Mode } from "../ui/ui"; -import { transitionMysteryEncounterIntroVisuals, OptionSelectSettings } from "../data/mystery-encounters/utils/encounter-phase-utils"; -import MysteryEncounterOption, { OptionPhaseCallback } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { getCharVariantFromDialogue } from "../data/dialogue"; -import { TrainerSlot } from "../data/trainer-config"; -import { BattleSpec } from "#enums/battle-spec"; -import { IvScannerModifier } from "../modifier/modifier"; import * as Utils from "../utils"; import { isNullOrUndefined } from "../utils"; -import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { BattlerTagLapseType } from "#app/data/battler-tags"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { PostTurnStatusEffectPhase } from "#app/phases/post-turn-status-effect-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; -import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; -import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; -import { ReturnPhase } from "#app/phases/return-phase"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; -import { GameOverPhase } from "#app/phases/game-over-phase"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; -import { SwitchType } from "#enums/switch-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; /** * Will handle (in order): @@ -238,7 +238,7 @@ export class MysteryEncounterBattleStartCleanupPhase extends Phase { } // The total number of Pokemon in the player's party that can legally fight - const legalPlayerPokemon = this.scene.getParty().filter(p => p.isAllowedInBattle()); + const legalPlayerPokemon = this.scene.getPokemonAllowedInBattle(); // The total number of legal player Pokemon that aren't currently on the field const legalPlayerPartyPokemon = legalPlayerPokemon.filter(p => !p.isActive(true)); if (!legalPlayerPokemon.length) { @@ -343,7 +343,7 @@ export class MysteryEncounterBattlePhase extends Phase { const doSummon = () => { scene.currentBattle.started = true; scene.playBgm(undefined); - scene.pbTray.showPbTray(scene.getParty()); + scene.pbTray.showPbTray(scene.getPlayerParty()); scene.pbTrayEnemy.showPbTray(scene.getEnemyParty()); const doTrainerSummon = () => { this.hideEnemyTrainer(); @@ -402,7 +402,7 @@ export class MysteryEncounterBattlePhase extends Phase { } } - const availablePartyMembers = scene.getParty().filter(p => p.isAllowedInBattle()); + const availablePartyMembers = scene.getPlayerParty().filter(p => p.isAllowedInBattle()); if (!availablePartyMembers[0].isOnField()) { scene.pushPhase(new SummonPhase(scene, 0)); diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts index eea591c3936..910306b76ad 100644 --- a/src/phases/new-biome-encounter-phase.ts +++ b/src/phases/new-biome-encounter-phase.ts @@ -11,13 +11,13 @@ export class NewBiomeEncounterPhase extends NextEncounterPhase { doEncounter(): void { this.scene.playBgm(undefined, true); - for (const pokemon of this.scene.getParty()) { + for (const pokemon of this.scene.getPlayerParty()) { if (pokemon) { pokemon.resetBattleData(); } } - for (const pokemon of this.scene.getParty().filter(p => p.isOnField())) { + for (const pokemon of this.scene.getPlayerParty().filter(p => p.isOnField())) { applyAbAttrs(PostBiomeChangeAbAttr, pokemon, null); } diff --git a/src/phases/next-encounter-phase.ts b/src/phases/next-encounter-phase.ts index 407d7c26b5d..e086ed4fe3e 100644 --- a/src/phases/next-encounter-phase.ts +++ b/src/phases/next-encounter-phase.ts @@ -13,7 +13,7 @@ export class NextEncounterPhase extends EncounterPhase { doEncounter(): void { this.scene.playBgm(undefined, true); - for (const pokemon of this.scene.getParty()) { + for (const pokemon of this.scene.getPlayerParty()) { if (pokemon) { pokemon.resetBattleData(); } diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts index e6ee11202df..4841bf9a5b4 100644 --- a/src/phases/party-heal-phase.ts +++ b/src/phases/party-heal-phase.ts @@ -19,7 +19,7 @@ export class PartyHealPhase extends BattlePhase { this.scene.fadeOutBgm(1000, false); } this.scene.ui.fadeOut(1000).then(() => { - for (const pokemon of this.scene.getParty()) { + for (const pokemon of this.scene.getPlayerParty()) { pokemon.hp = pokemon.getMaxHp(); pokemon.resetStatus(); for (const move of pokemon.moveset) { diff --git a/src/phases/party-member-pokemon-phase.ts b/src/phases/party-member-pokemon-phase.ts index 2b6ca01261d..f2e2b23bfb2 100644 --- a/src/phases/party-member-pokemon-phase.ts +++ b/src/phases/party-member-pokemon-phase.ts @@ -18,7 +18,7 @@ export abstract class PartyMemberPokemonPhase extends FieldPhase { } getParty(): Pokemon[] { - return this.player ? this.scene.getParty() : this.scene.getEnemyParty(); + return this.player ? this.scene.getPlayerParty() : this.scene.getEnemyParty(); } getPokemon(): Pokemon { diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index e5a60692bb4..98975e30720 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -38,7 +38,7 @@ export class SelectModifierPhase extends BattlePhase { this.scene.reroll = false; } - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); if (!this.isCopy) { regenerateModifierPoolThresholds(party, this.getPoolType(), this.rerollCount); } @@ -289,7 +289,7 @@ export class SelectModifierPhase extends BattlePhase { } getModifierTypeOptions(modifierCount: integer): ModifierTypeOption[] { - return getPlayerModifierTypeOptions(modifierCount, this.scene.getParty(), this.scene.lockModifierTiers ? this.modifierTiers : undefined, this.customModifierSettings); + return getPlayerModifierTypeOptions(modifierCount, this.scene.getPlayerParty(), this.scene.lockModifierTiers ? this.modifierTiers : undefined, this.customModifierSettings); } copy(): SelectModifierPhase { diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index 1692b5f2234..2273ab1cd3c 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -3,16 +3,15 @@ import { applyChallenges, ChallengeType } from "#app/data/challenge"; import { Gender } from "#app/data/gender"; import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { Species } from "#app/enums/species"; -import { PlayerPokemon } from "#app/field/pokemon"; -import { overrideModifiers, overrideHeldItems } from "#app/modifier/modifier"; +import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier"; +import Overrides from "#app/overrides"; import { Phase } from "#app/phase"; +import { TitlePhase } from "#app/phases/title-phase"; import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; import { Starter } from "#app/ui/starter-select-ui-handler"; import { Mode } from "#app/ui/ui"; +import { Species } from "#enums/species"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import { TitlePhase } from "./title-phase"; -import Overrides from "#app/overrides"; export class SelectStarterPhase extends Phase { @@ -44,7 +43,7 @@ export class SelectStarterPhase extends Phase { * @param starters {@linkcode Pokemon} with which to start the first battle */ initBattle(starters: Starter[]) { - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); const loadPokemonAssets: Promise[] = []; starters.forEach((starter: Starter, i: integer) => { if (!i && Overrides.STARTER_SPECIES_OVERRIDE) { @@ -103,7 +102,7 @@ export class SelectStarterPhase extends Phase { this.scene.sessionPlayTime = 0; this.scene.lastSavePlayTime = 0; // Ensures Keldeo (or any future Pokemon that have this type of form change) starts in the correct form - this.scene.getParty().forEach((p: PlayerPokemon) => { + this.scene.getPlayerParty().forEach((p) => { this.scene.triggerPokemonFormChange(p, SpeciesFormChangeMoveLearnedTrigger); }); this.end(); diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts index f5ce2179715..2abb109a529 100644 --- a/src/phases/switch-phase.ts +++ b/src/phases/switch-phase.ts @@ -1,7 +1,7 @@ import BattleScene from "#app/battle-scene"; -import { SwitchType } from "#enums/switch-type"; -import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; +import PartyUiHandler, { PartyOption, PartyUiMode } from "#app/ui/party-ui-handler"; import { Mode } from "#app/ui/ui"; +import { SwitchType } from "#enums/switch-type"; import { BattlePhase } from "./battle-phase"; import { SwitchSummonPhase } from "./switch-summon-phase"; @@ -38,7 +38,7 @@ export class SwitchPhase extends BattlePhase { super.start(); // Skip modal switch if impossible (no remaining party members that aren't in battle) - if (this.isModal && !this.scene.getParty().filter(p => p.isAllowedInBattle() && !p.isActive(true)).length) { + if (this.isModal && !this.scene.getPlayerParty().filter(p => p.isAllowedInBattle() && !p.isActive(true)).length) { return super.end(); } @@ -49,7 +49,7 @@ export class SwitchPhase extends BattlePhase { * if the mon should have already been returned but is still alive and well * on the field. see also; battle.test.ts */ - if (this.isModal && !this.doReturn && !this.scene.getParty()[this.fieldIndex].isFainted()) { + if (this.isModal && !this.doReturn && !this.scene.getPlayerParty()[this.fieldIndex].isFainted()) { return super.end(); } @@ -59,7 +59,7 @@ export class SwitchPhase extends BattlePhase { } // Override field index to 0 in case of double battle where 2/3 remaining legal party members fainted at once - const fieldIndex = this.scene.currentBattle.getBattlerCount() === 1 || this.scene.getParty().filter(p => p.isAllowedInBattle()).length > 1 ? this.fieldIndex : 0; + const fieldIndex = this.scene.currentBattle.getBattlerCount() === 1 || this.scene.getPokemonAllowedInBattle().length > 1 ? this.fieldIndex : 0; this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, fieldIndex, (slotIndex: integer, option: PartyOption) => { if (slotIndex >= this.scene.currentBattle.getBattlerCount() && slotIndex < 6) { diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index c7e7bbe011e..36db8b7a7e7 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -54,7 +54,7 @@ export class SwitchSummonPhase extends SummonPhase { } } - if (!this.doReturn || (this.slotIndex !== -1 && !(this.player ? this.scene.getParty() : this.scene.getEnemyParty())[this.slotIndex])) { + if (!this.doReturn || (this.slotIndex !== -1 && !(this.player ? this.scene.getPlayerParty() : this.scene.getEnemyParty())[this.slotIndex])) { if (this.player) { return this.switchAndSummon(); } else { diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts index 58683cf8ec8..8338d39b81f 100644 --- a/src/phases/title-phase.ts +++ b/src/phases/title-phase.ts @@ -1,21 +1,21 @@ import { loggedInUser } from "#app/account"; -import BattleScene from "#app/battle-scene"; import { BattleType } from "#app/battle"; -import { getDailyRunStarters, fetchDailyRunSeed } from "#app/data/daily-run"; +import BattleScene from "#app/battle-scene"; +import { fetchDailyRunSeed, getDailyRunStarters } from "#app/data/daily-run"; import { Gender } from "#app/data/gender"; import { getBiomeKey } from "#app/field/arena"; -import { GameModes, GameMode, getGameMode } from "#app/game-mode"; -import { regenerateModifierPoolThresholds, ModifierPoolType, modifierTypes, getDailyRunStarterModifiers } from "#app/modifier/modifier-type"; +import { GameMode, GameModes, getGameMode } from "#app/game-mode"; +import { Modifier } from "#app/modifier/modifier"; +import { getDailyRunStarterModifiers, ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; import { Phase } from "#app/phase"; import { SessionSaveData } from "#app/system/game-data"; import { Unlockables } from "#app/system/unlockables"; import { vouchers } from "#app/system/voucher"; -import { OptionSelectItem, OptionSelectConfig } from "#app/ui/abstact-option-select-ui-handler"; +import { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; import { Mode } from "#app/ui/ui"; -import i18next from "i18next"; import * as Utils from "#app/utils"; -import { Modifier } from "#app/modifier/modifier"; +import i18next from "i18next"; import { CheckSwitchPhase } from "./check-switch-phase"; import { EncounterPhase } from "./encounter-phase"; import { SelectChallengePhase } from "./select-challenge-phase"; @@ -203,7 +203,7 @@ export class TitlePhase extends Phase { const starters = getDailyRunStarters(this.scene, seed); const startingLevel = this.scene.gameMode.getStartingLevel(); - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); const loadPokemonAssets: Promise[] = []; for (const starter of starters) { const starterProps = this.scene.gameData.getSpeciesDexAttrProps(starter.species, starter.dexAttr); @@ -276,7 +276,7 @@ export class TitlePhase extends Phase { this.scene.pushPhase(new EncounterPhase(this.scene, this.loaded)); if (this.loaded) { - const availablePartyMembers = this.scene.getParty().filter(p => p.isAllowedInBattle()).length; + const availablePartyMembers = this.scene.getPokemonAllowedInBattle().length; this.scene.pushPhase(new SummonPhase(this.scene, 0, true, true)); if (this.scene.currentBattle.double && availablePartyMembers > 1) { diff --git a/src/phases/toggle-double-position-phase.ts b/src/phases/toggle-double-position-phase.ts index 563af8575d7..eff92bc6acd 100644 --- a/src/phases/toggle-double-position-phase.ts +++ b/src/phases/toggle-double-position-phase.ts @@ -16,9 +16,9 @@ export class ToggleDoublePositionPhase extends BattlePhase { const playerPokemon = this.scene.getPlayerField().find(p => p.isActive(true)); if (playerPokemon) { - playerPokemon.setFieldPosition(this.double && this.scene.getParty().filter(p => p.isAllowedInBattle()).length > 1 ? FieldPosition.LEFT : FieldPosition.CENTER, 500).then(() => { + playerPokemon.setFieldPosition(this.double && this.scene.getPokemonAllowedInBattle().length > 1 ? FieldPosition.LEFT : FieldPosition.CENTER, 500).then(() => { if (playerPokemon.getFieldIndex() === 1) { - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); party[1] = party[0]; party[0] = playerPokemon; } diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts index 2f1b539cdcf..baff6c7d73f 100644 --- a/src/phases/turn-init-phase.ts +++ b/src/phases/turn-init-phase.ts @@ -1,15 +1,15 @@ -import BattleScene from "#app/battle-scene"; import { BattlerIndex } from "#app/battle"; +import BattleScene from "#app/battle-scene"; +import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { TurnInitEvent } from "#app/events/battle-scene"; import { PlayerPokemon } from "#app/field/pokemon"; import i18next from "i18next"; -import { FieldPhase } from "./field-phase"; -import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; import { CommandPhase } from "./command-phase"; import { EnemyCommandPhase } from "./enemy-command-phase"; +import { FieldPhase } from "./field-phase"; import { GameOverPhase } from "./game-over-phase"; +import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; import { TurnStartPhase } from "./turn-start-phase"; -import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; export class TurnInitPhase extends FieldPhase { constructor(scene: BattleScene) { @@ -24,7 +24,7 @@ export class TurnInitPhase extends FieldPhase { if (p.isOnField() && !p.isAllowedInBattle()) { this.scene.queueMessage(i18next.t("challenges:illegalEvolution", { "pokemon": p.name }), null, true); - const allowedPokemon = this.scene.getParty().filter(p => p.isAllowedInBattle()); + const allowedPokemon = this.scene.getPokemonAllowedInBattle(); if (!allowedPokemon.length) { // If there are no longer any legal pokemon in the party, game over. diff --git a/src/system/achv.ts b/src/system/achv.ts index 366813328e2..d94fcba48f2 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -328,7 +328,7 @@ export const achvs = { HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY", "", "HIDDEN_ABILITY.description", "ability_charm", 75), PERFECT_IVS: new Achv("PERFECT_IVS", "", "PERFECT_IVS.description", "blunder_policy", 100), CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY", "", "CLASSIC_VICTORY.description", "relic_crown", 150, c => c.gameData.gameStats.sessionsWon === 0), - UNEVOLVED_CLASSIC_VICTORY: new Achv("UNEVOLVED_CLASSIC_VICTORY", "", "UNEVOLVED_CLASSIC_VICTORY.description", "eviolite", 175, c => c.getParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)), + UNEVOLVED_CLASSIC_VICTORY: new Achv("UNEVOLVED_CLASSIC_VICTORY", "", "UNEVOLVED_CLASSIC_VICTORY.description", "eviolite", 175, c => c.getPlayerParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)), MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE", "", "MONO_GEN_ONE.description", "ribbon_gen1", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 1 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)), MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO", "", "MONO_GEN_TWO.description", "ribbon_gen2", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 2 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)), MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE", "", "MONO_GEN_THREE.description", "ribbon_gen3", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 3 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)), diff --git a/src/system/game-data.ts b/src/system/game-data.ts index c00159a7fd7..49a677cd019 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -949,7 +949,7 @@ export class GameData { seed: scene.seed, playTime: scene.sessionPlayTime, gameMode: scene.gameMode.modeId, - party: scene.getParty().map(p => new PokemonData(p)), + party: scene.getPlayerParty().map(p => new PokemonData(p)), enemyParty: scene.getEnemyParty().map(p => new PokemonData(p)), modifiers: scene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)), enemyModifiers: scene.findModifiers(() => true, false).map(m => new PersistentModifierData(m, false)), @@ -1028,7 +1028,7 @@ export class GameData { const loadPokemonAssets: Promise[] = []; - const party = scene.getParty(); + const party = scene.getPlayerParty(); party.splice(0, party.length); for (const p of sessionData.party) { diff --git a/src/system/modifier-data.ts b/src/system/modifier-data.ts index 1514f7e3fb3..c68f9ccb47d 100644 --- a/src/system/modifier-data.ts +++ b/src/system/modifier-data.ts @@ -38,7 +38,7 @@ export default class ModifierData { type.id = this.typeId; if (type instanceof ModifierTypeGenerator) { - type = (type as ModifierTypeGenerator).generateType(this.player ? scene.getParty() : scene.getEnemyField(), this.typePregenArgs); + type = (type as ModifierTypeGenerator).generateType(this.player ? scene.getPlayerParty() : scene.getEnemyField(), this.typePregenArgs); } const ret = Reflect.construct(constructor, ([ type ] as any[]).concat(this.args).concat(this.stackCount)) as PersistentModifier; diff --git a/src/test/abilities/aroma_veil.test.ts b/src/test/abilities/aroma_veil.test.ts index 4284eb43a75..e74d0ff5a39 100644 --- a/src/test/abilities/aroma_veil.test.ts +++ b/src/test/abilities/aroma_veil.test.ts @@ -36,7 +36,7 @@ describe("Moves - Aroma Veil", () => { it("Aroma Veil protects the Pokemon's side against most Move Restriction Battler Tags", async () => { await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]); - const party = game.scene.getParty()! as PlayerPokemon[]; + const party = game.scene.getPlayerParty()! as PlayerPokemon[]; game.move.select(Moves.GROWL); game.move.select(Moves.GROWL); @@ -50,7 +50,7 @@ describe("Moves - Aroma Veil", () => { it("Aroma Veil does not protect against Imprison", async () => { await game.classicMode.startBattle([ Species.REGIELEKI, Species.BULBASAUR ]); - const party = game.scene.getParty()! as PlayerPokemon[]; + const party = game.scene.getPlayerParty()! as PlayerPokemon[]; game.move.select(Moves.GROWL); game.move.select(Moves.GROWL, 1); diff --git a/src/test/abilities/battle_bond.test.ts b/src/test/abilities/battle_bond.test.ts index 283fb0d0f14..e9970e1c049 100644 --- a/src/test/abilities/battle_bond.test.ts +++ b/src/test/abilities/battle_bond.test.ts @@ -40,7 +40,7 @@ describe("Abilities - BATTLE BOND", () => { it("check if fainted pokemon switches to base form on arena reset", async () => { await game.classicMode.startBattle([ Species.MAGIKARP, Species.GRENINJA ]); - const greninja = game.scene.getParty()[1]; + const greninja = game.scene.getPlayerParty()[1]; expect(greninja.formIndex).toBe(ashForm); greninja.hp = 0; diff --git a/src/test/abilities/disguise.test.ts b/src/test/abilities/disguise.test.ts index 0241aa4b9ea..f44782207cb 100644 --- a/src/test/abilities/disguise.test.ts +++ b/src/test/abilities/disguise.test.ts @@ -138,7 +138,7 @@ describe("Abilities - Disguise", () => { }); await game.classicMode.startBattle([ Species.FURRET, Species.MIMIKYU ]); - const mimikyu = game.scene.getParty()[1]!; + const mimikyu = game.scene.getPlayerParty()[1]!; expect(mimikyu.formIndex).toBe(bustedForm); game.move.select(Moves.SPLASH); diff --git a/src/test/abilities/forecast.test.ts b/src/test/abilities/forecast.test.ts index 6da31307789..18d43a67a9d 100644 --- a/src/test/abilities/forecast.test.ts +++ b/src/test/abilities/forecast.test.ts @@ -81,7 +81,7 @@ describe("Abilities - Forecast", () => { }); await game.startBattle([ Species.CASTFORM, Species.FEEBAS, Species.KYOGRE, Species.GROUDON, Species.RAYQUAZA, Species.ALTARIA ]); - vi.spyOn(game.scene.getParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]); + vi.spyOn(game.scene.getPlayerParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]); const castform = game.scene.getPlayerField()[0]; expect(castform.formIndex).toBe(NORMAL_FORM); diff --git a/src/test/abilities/ice_face.test.ts b/src/test/abilities/ice_face.test.ts index 1c7f7bd6093..e31bee1c721 100644 --- a/src/test/abilities/ice_face.test.ts +++ b/src/test/abilities/ice_face.test.ts @@ -192,7 +192,7 @@ describe("Abilities - Ice Face", () => { game.doSwitchPokemon(1); await game.phaseInterceptor.to(TurnEndPhase); - eiscue = game.scene.getParty()[1]; + eiscue = game.scene.getPlayerParty()[1]; expect(eiscue.formIndex).toBe(noiceForm); expect(eiscue.getTag(BattlerTagType.ICE_FACE)).toBeUndefined(); diff --git a/src/test/abilities/mimicry.test.ts b/src/test/abilities/mimicry.test.ts index 4e62ddc0b76..8f22de33061 100644 --- a/src/test/abilities/mimicry.test.ts +++ b/src/test/abilities/mimicry.test.ts @@ -35,7 +35,7 @@ describe("Abilities - Mimicry", () => { game.override.enemyAbility(Abilities.MISTY_SURGE); await game.classicMode.startBattle([ Species.FEEBAS, Species.ABRA ]); - const [ playerPokemon1, playerPokemon2 ] = game.scene.getParty(); + const [ playerPokemon1, playerPokemon2 ] = game.scene.getPlayerParty(); game.move.select(Moves.SPLASH); await game.toNextTurn(); expect(playerPokemon1.getTypes().includes(Type.FAIRY)).toBe(true); diff --git a/src/test/abilities/pastel_veil.test.ts b/src/test/abilities/pastel_veil.test.ts index 660ff2616e9..6f09fd8ff06 100644 --- a/src/test/abilities/pastel_veil.test.ts +++ b/src/test/abilities/pastel_veil.test.ts @@ -51,7 +51,7 @@ describe("Abilities - Pastel Veil", () => { it("it heals the poisoned status condition of allies if user is sent out into battle", async () => { await game.startBattle([ Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA ]); - const ponyta = game.scene.getParty()[2]; + const ponyta = game.scene.getPlayerParty()[2]; const magikarp = game.scene.getPlayerField()[0]; ponyta.abilityIndex = 1; diff --git a/src/test/abilities/power_construct.test.ts b/src/test/abilities/power_construct.test.ts index 1a9e7d4818a..bb80e9f3ac8 100644 --- a/src/test/abilities/power_construct.test.ts +++ b/src/test/abilities/power_construct.test.ts @@ -43,7 +43,7 @@ describe("Abilities - POWER CONSTRUCT", () => { await game.classicMode.startBattle([ Species.MAGIKARP, Species.ZYGARDE ]); - const zygarde = game.scene.getParty().find((p) => p.species.speciesId === Species.ZYGARDE); + const zygarde = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.ZYGARDE); expect(zygarde).not.toBe(undefined); expect(zygarde!.formIndex).toBe(completeForm); @@ -73,7 +73,7 @@ describe("Abilities - POWER CONSTRUCT", () => { await game.classicMode.startBattle([ Species.MAGIKARP, Species.ZYGARDE ]); - const zygarde = game.scene.getParty().find((p) => p.species.speciesId === Species.ZYGARDE); + const zygarde = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.ZYGARDE); expect(zygarde).not.toBe(undefined); expect(zygarde!.formIndex).toBe(completeForm); diff --git a/src/test/abilities/schooling.test.ts b/src/test/abilities/schooling.test.ts index aacc7bbd4c2..5f953dbf9ab 100644 --- a/src/test/abilities/schooling.test.ts +++ b/src/test/abilities/schooling.test.ts @@ -43,7 +43,7 @@ describe("Abilities - SCHOOLING", () => { await game.startBattle([ Species.MAGIKARP, Species.WISHIWASHI ]); - const wishiwashi = game.scene.getParty().find((p) => p.species.speciesId === Species.WISHIWASHI)!; + const wishiwashi = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.WISHIWASHI)!; expect(wishiwashi).not.toBe(undefined); expect(wishiwashi.formIndex).toBe(schoolForm); diff --git a/src/test/abilities/serene_grace.test.ts b/src/test/abilities/serene_grace.test.ts index ddca87496e9..3318c7fc27a 100644 --- a/src/test/abilities/serene_grace.test.ts +++ b/src/test/abilities/serene_grace.test.ts @@ -43,7 +43,7 @@ describe("Abilities - Serene Grace", () => { game.scene.getEnemyParty()[0].stats[Stat.SPDEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + expect(game.scene.getPlayerParty()[0].formIndex).toBe(0); game.move.select(moveToUse); @@ -70,7 +70,7 @@ describe("Abilities - Serene Grace", () => { ]); game.scene.getEnemyParty()[0].stats[Stat.SPDEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + expect(game.scene.getPlayerParty()[0].formIndex).toBe(0); game.move.select(moveToUse); diff --git a/src/test/abilities/sheer_force.test.ts b/src/test/abilities/sheer_force.test.ts index 63c81e9aafc..826694752b7 100644 --- a/src/test/abilities/sheer_force.test.ts +++ b/src/test/abilities/sheer_force.test.ts @@ -1,17 +1,16 @@ import { BattlerIndex } from "#app/battle"; import { applyAbAttrs, applyPostDefendAbAttrs, applyPreAttackAbAttrs, MoveEffectChanceMultiplierAbAttr, MovePowerBoostAbAttr, PostDefendTypeChangeAbAttr } from "#app/data/ability"; -import { Stat } from "#enums/stat"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import * as Utils from "#app/utils"; +import { NumberHolder } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { allMoves } from "#app/data/move"; - describe("Abilities - Sheer Force", () => { let phaserGame: Phaser.Game; let game: GameManager; @@ -39,13 +38,10 @@ describe("Abilities - Sheer Force", () => { it("Sheer Force", async () => { const moveToUse = Moves.AIR_SLASH; game.override.ability(Abilities.SHEER_FORCE); - await game.startBattle([ - Species.PIDGEOT - ]); + await game.classicMode.startBattle([ Species.PIDGEOT ]); - - game.scene.getEnemyParty()[0].stats[Stat.SPDEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + game.scene.getEnemyPokemon()!.stats[Stat.SPDEF] = 10000; + expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0); game.move.select(moveToUse); @@ -57,8 +53,8 @@ describe("Abilities - Sheer Force", () => { expect(move.id).toBe(Moves.AIR_SLASH); //Verify the move is boosted and has no chance of secondary effects - const power = new Utils.IntegerHolder(move.power); - const chance = new Utils.IntegerHolder(move.chance); + const power = new NumberHolder(move.power); + const chance = new NumberHolder(move.chance); applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getFirstTarget(), false); applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getFirstTarget()!, move, false, power); @@ -72,13 +68,11 @@ describe("Abilities - Sheer Force", () => { it("Sheer Force with exceptions including binding moves", async () => { const moveToUse = Moves.BIND; game.override.ability(Abilities.SHEER_FORCE); - await game.startBattle([ - Species.PIDGEOT - ]); + await game.classicMode.startBattle([ Species.PIDGEOT ]); - game.scene.getEnemyParty()[0].stats[Stat.DEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + game.scene.getEnemyPokemon()!.stats[Stat.DEF] = 10000; + expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0); game.move.select(moveToUse); @@ -90,8 +84,8 @@ describe("Abilities - Sheer Force", () => { expect(move.id).toBe(Moves.BIND); //Binding moves and other exceptions are not affected by Sheer Force and have a chance.value of -1 - const power = new Utils.IntegerHolder(move.power); - const chance = new Utils.IntegerHolder(move.chance); + const power = new NumberHolder(move.power); + const chance = new NumberHolder(move.chance); applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getFirstTarget(), false); applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getFirstTarget()!, move, false, power); @@ -105,13 +99,11 @@ describe("Abilities - Sheer Force", () => { it("Sheer Force with moves with no secondary effect", async () => { const moveToUse = Moves.TACKLE; game.override.ability(Abilities.SHEER_FORCE); - await game.startBattle([ - Species.PIDGEOT - ]); + await game.classicMode.startBattle([ Species.PIDGEOT ]); - game.scene.getEnemyParty()[0].stats[Stat.DEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + game.scene.getEnemyPokemon()!.stats[Stat.DEF] = 10000; + expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0); game.move.select(moveToUse); @@ -123,8 +115,8 @@ describe("Abilities - Sheer Force", () => { expect(move.id).toBe(Moves.TACKLE); //Binding moves and other exceptions are not affected by Sheer Force and have a chance.value of -1 - const power = new Utils.IntegerHolder(move.power); - const chance = new Utils.IntegerHolder(move.chance); + const power = new NumberHolder(move.power); + const chance = new NumberHolder(move.chance); applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getFirstTarget(), false); applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getFirstTarget()!, move, false, power); @@ -140,13 +132,11 @@ describe("Abilities - Sheer Force", () => { game.override.enemyAbility(Abilities.COLOR_CHANGE); game.override.startingHeldItems([{ name: "KINGS_ROCK", count: 1 }]); game.override.ability(Abilities.SHEER_FORCE); - await game.startBattle([ - Species.PIDGEOT - ]); + await game.startBattle([ Species.PIDGEOT ]); - game.scene.getEnemyParty()[0].stats[Stat.DEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + game.scene.getEnemyPokemon()!.stats[Stat.DEF] = 10000; + expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0); game.move.select(moveToUse); @@ -158,8 +148,8 @@ describe("Abilities - Sheer Force", () => { expect(move.id).toBe(Moves.CRUSH_CLAW); //Disable color change due to being hit by Sheer Force - const power = new Utils.IntegerHolder(move.power); - const chance = new Utils.IntegerHolder(move.chance); + const power = new NumberHolder(move.power); + const chance = new NumberHolder(move.chance); const user = phase.getUserPokemon()!; const target = phase.getFirstTarget()!; const opponentType = target.getTypes()[0]; @@ -186,7 +176,7 @@ describe("Abilities - Sheer Force", () => { Species.PIDGEOT ]); - const pidgeot = game.scene.getParty()[0]; + const pidgeot = game.scene.getPlayerParty()[0]; const onix = game.scene.getEnemyParty()[0]; pidgeot.stats[Stat.DEF] = 10000; diff --git a/src/test/abilities/shield_dust.test.ts b/src/test/abilities/shield_dust.test.ts index ccedf6873d7..9f1e6aeb11d 100644 --- a/src/test/abilities/shield_dust.test.ts +++ b/src/test/abilities/shield_dust.test.ts @@ -1,11 +1,11 @@ import { BattlerIndex } from "#app/battle"; import { applyAbAttrs, applyPreDefendAbAttrs, IgnoreMoveEffectsAbAttr, MoveEffectChanceMultiplierAbAttr } from "#app/data/ability"; -import { Stat } from "#enums/stat"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import * as Utils from "#app/utils"; +import { NumberHolder } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -27,26 +27,22 @@ describe("Abilities - Shield Dust", () => { beforeEach(() => { game = new GameManager(phaserGame); - const movesToUse = [ Moves.AIR_SLASH ]; game.override.battleType("single"); game.override.enemySpecies(Species.ONIX); game.override.enemyAbility(Abilities.SHIELD_DUST); game.override.startingLevel(100); - game.override.moveset(movesToUse); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override.moveset(Moves.AIR_SLASH); + game.override.enemyMoveset(Moves.TACKLE); }); it("Shield Dust", async () => { - const moveToUse = Moves.AIR_SLASH; - await game.startBattle([ - Species.PIDGEOT - ]); + await game.classicMode.startBattle([ Species.PIDGEOT ]); - game.scene.getEnemyParty()[0].stats[Stat.SPDEF] = 10000; - expect(game.scene.getParty()[0].formIndex).toBe(0); + game.scene.getEnemyPokemon()!.stats[Stat.SPDEF] = 10000; + expect(game.scene.getPlayerPokemon()!.formIndex).toBe(0); - game.move.select(moveToUse); + game.move.select(Moves.AIR_SLASH); await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]); await game.phaseInterceptor.to(MoveEffectPhase, false); @@ -56,7 +52,7 @@ describe("Abilities - Shield Dust", () => { const move = phase.move.getMove(); expect(move.id).toBe(Moves.AIR_SLASH); - const chance = new Utils.IntegerHolder(move.chance); + const chance = new NumberHolder(move.chance); applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getFirstTarget(), false); applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, phase.getFirstTarget()!, phase.getUserPokemon()!, null, null, false, chance); expect(chance.value).toBe(0); diff --git a/src/test/abilities/shields_down.test.ts b/src/test/abilities/shields_down.test.ts index d3d72ac80a5..fbb2e96e463 100644 --- a/src/test/abilities/shields_down.test.ts +++ b/src/test/abilities/shields_down.test.ts @@ -43,7 +43,7 @@ describe("Abilities - SHIELDS DOWN", () => { await game.startBattle([ Species.MAGIKARP, Species.MINIOR ]); - const minior = game.scene.getParty().find((p) => p.species.speciesId === Species.MINIOR)!; + const minior = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.MINIOR)!; expect(minior).not.toBe(undefined); expect(minior.formIndex).toBe(coreForm); diff --git a/src/test/abilities/synchronize.test.ts b/src/test/abilities/synchronize.test.ts index cdd2834f588..d34b5631271 100644 --- a/src/test/abilities/synchronize.test.ts +++ b/src/test/abilities/synchronize.test.ts @@ -1,8 +1,8 @@ import { StatusEffect } from "#app/data/status-effect"; -import GameManager from "#app/test/utils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,7 +30,7 @@ describe("Abilities - Synchronize", () => { .enemyAbility(Abilities.SYNCHRONIZE) .moveset([ Moves.SPLASH, Moves.THUNDER_WAVE, Moves.SPORE, Moves.PSYCHO_SHIFT ]) .ability(Abilities.NO_GUARD); - }, 20000); + }); it("does not trigger when no status is applied by opponent Pokemon", async () => { await game.classicMode.startBattle([ Species.FEEBAS ]); @@ -38,9 +38,9 @@ describe("Abilities - Synchronize", () => { game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase"); - expect(game.scene.getParty()[0].status).toBeUndefined(); + expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); expect(game.phaseInterceptor.log).not.toContain("ShowAbilityPhase"); - }, 20000); + }); it("sets the status of the source pokemon to Paralysis when paralyzed by it", async () => { await game.classicMode.startBattle([ Species.FEEBAS ]); @@ -48,10 +48,10 @@ describe("Abilities - Synchronize", () => { game.move.select(Moves.THUNDER_WAVE); await game.phaseInterceptor.to("BerryPhase"); - expect(game.scene.getParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS); - expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.PARALYSIS); + expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.PARALYSIS); expect(game.phaseInterceptor.log).toContain("ShowAbilityPhase"); - }, 20000); + }); it("does not trigger on Sleep", async () => { await game.classicMode.startBattle(); @@ -60,10 +60,10 @@ describe("Abilities - Synchronize", () => { await game.phaseInterceptor.to("BerryPhase"); - expect(game.scene.getParty()[0].status?.effect).toBeUndefined(); - expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.SLEEP); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBeUndefined(); + expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.SLEEP); expect(game.phaseInterceptor.log).not.toContain("ShowAbilityPhase"); - }, 20000); + }); it("does not trigger when Pokemon is statused by Toxic Spikes", async () => { game.override @@ -79,10 +79,10 @@ describe("Abilities - Synchronize", () => { game.doSwitchPokemon(1); await game.phaseInterceptor.to("BerryPhase"); - expect(game.scene.getParty()[0].status?.effect).toBe(StatusEffect.POISON); - expect(game.scene.getEnemyParty()[0].status?.effect).toBeUndefined(); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.POISON); + expect(game.scene.getEnemyPokemon()!.status?.effect).toBeUndefined(); expect(game.phaseInterceptor.log).not.toContain("ShowAbilityPhase"); - }, 20000); + }); it("shows ability even if it fails to set the status of the opponent Pokemon", async () => { await game.classicMode.startBattle([ Species.PIKACHU ]); @@ -90,10 +90,10 @@ describe("Abilities - Synchronize", () => { game.move.select(Moves.THUNDER_WAVE); await game.phaseInterceptor.to("BerryPhase"); - expect(game.scene.getParty()[0].status?.effect).toBeUndefined(); - expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBeUndefined(); + expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.PARALYSIS); expect(game.phaseInterceptor.log).toContain("ShowAbilityPhase"); - }, 20000); + }); it("should activate with Psycho Shift after the move clears the status", async () => { game.override.statusEffect(StatusEffect.PARALYSIS); @@ -102,8 +102,8 @@ describe("Abilities - Synchronize", () => { game.move.select(Moves.PSYCHO_SHIFT); await game.phaseInterceptor.to("BerryPhase"); - expect(game.scene.getParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS); // keeping old gen < V impl for now since it's buggy otherwise - expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS); + expect(game.scene.getPlayerPokemon()!.status?.effect).toBe(StatusEffect.PARALYSIS); // keeping old gen < V impl for now since it's buggy otherwise + expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.PARALYSIS); expect(game.phaseInterceptor.log).toContain("ShowAbilityPhase"); - }, 20000); + }); }); diff --git a/src/test/abilities/wimp_out.test.ts b/src/test/abilities/wimp_out.test.ts index ee943befc16..6f56a2f4e7e 100644 --- a/src/test/abilities/wimp_out.test.ts +++ b/src/test/abilities/wimp_out.test.ts @@ -42,7 +42,7 @@ describe("Abilities - Wimp Out", () => { }); function confirmSwitch(): void { - const [ pokemon1, pokemon2 ] = game.scene.getParty(); + const [ pokemon1, pokemon2 ] = game.scene.getPlayerParty(); expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); @@ -54,7 +54,7 @@ describe("Abilities - Wimp Out", () => { } function confirmNoSwitch(): void { - const [ pokemon1, pokemon2 ] = game.scene.getParty(); + const [ pokemon1, pokemon2 ] = game.scene.getPlayerParty(); expect(game.phaseInterceptor.log).not.toContain("SwitchSummonPhase"); @@ -135,7 +135,7 @@ describe("Abilities - Wimp Out", () => { expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); expect(game.scene.getPlayerPokemon()!.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - expect(game.scene.getParty()[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined(); + expect(game.scene.getPlayerParty()[1].getTag(BattlerTagType.TRAPPED)).toBeUndefined(); confirmSwitch(); }); @@ -263,7 +263,7 @@ describe("Abilities - Wimp Out", () => { game.doSelectPartyPokemon(1); await game.phaseInterceptor.to("TurnEndPhase"); - expect(game.scene.getParty()[1].getHpRatio()).toBeGreaterThan(0.5); + expect(game.scene.getPlayerParty()[1].getHpRatio()).toBeGreaterThan(0.5); expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.TYRUNT); }); @@ -424,7 +424,7 @@ describe("Abilities - Wimp Out", () => { game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); - expect(game.scene.getParty()[0].getHpRatio()).toEqual(0.51); + expect(game.scene.getPlayerParty()[0].getHpRatio()).toEqual(0.51); expect(game.phaseInterceptor.log).not.toContain("SwitchSummonPhase"); expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.WIMPOD); }); @@ -522,7 +522,7 @@ describe("Abilities - Wimp Out", () => { game.doSelectPartyPokemon(1); await game.phaseInterceptor.to("TurnEndPhase"); - expect(game.scene.getParty()[1].status?.effect).toEqual(StatusEffect.POISON); + expect(game.scene.getPlayerParty()[1].status?.effect).toEqual(StatusEffect.POISON); confirmSwitch(); }); diff --git a/src/test/abilities/zen_mode.test.ts b/src/test/abilities/zen_mode.test.ts index 2601954a9a4..74575415788 100644 --- a/src/test/abilities/zen_mode.test.ts +++ b/src/test/abilities/zen_mode.test.ts @@ -1,29 +1,23 @@ -import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; +import { Status, StatusEffect } from "#app/data/status-effect"; import { DamagePhase } from "#app/phases/damage-phase"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { SwitchPhase } from "#app/phases/switch-phase"; import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { Mode } from "#app/ui/ui"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import { SwitchType } from "#enums/switch-type"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import { Status, StatusEffect } from "#app/data/status-effect"; -import { SwitchType } from "#enums/switch-type"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Abilities - ZEN MODE", () => { let phaserGame: Phaser.Game; let game: GameManager; + const baseForm = 0; + const zenForm = 1; beforeAll(() => { phaserGame = new Phaser.Game({ @@ -37,121 +31,104 @@ describe("Abilities - ZEN MODE", () => { beforeEach(() => { game = new GameManager(phaserGame); - const moveToUse = Moves.SPLASH; - game.override.battleType("single"); - game.override.enemySpecies(Species.RATTATA); - game.override.enemyAbility(Abilities.HYDRATION); - game.override.ability(Abilities.ZEN_MODE); - game.override.startingLevel(100); - game.override.moveset([ moveToUse ]); - game.override.enemyMoveset([ Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE ]); + game.override + .battleType("single") + .enemySpecies(Species.RATTATA) + .enemyAbility(Abilities.HYDRATION) + .ability(Abilities.ZEN_MODE) + .startingLevel(100) + .moveset(Moves.SPLASH) + .enemyMoveset(Moves.TACKLE); }); - test( - "not enough damage to change form", - async () => { - const moveToUse = Moves.SPLASH; - await game.startBattle([ Species.DARMANITAN ]); - game.scene.getParty()[0].stats[Stat.HP] = 100; - game.scene.getParty()[0].hp = 100; - expect(game.scene.getParty()[0].formIndex).toBe(0); + it("shouldn't change form when taking damage if not dropping below 50% HP", async () => { + await game.classicMode.startBattle([ Species.DARMANITAN ]); + const player = game.scene.getPlayerPokemon()!; + player.stats[Stat.HP] = 100; + player.hp = 100; + expect(player.formIndex).toBe(baseForm); - game.move.select(moveToUse); + game.move.select(Moves.SPLASH); + await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.phaseInterceptor.to("BerryPhase"); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.phaseInterceptor.to(DamagePhase, false); - // await game.phaseInterceptor.runFrom(DamagePhase).to(DamagePhase, false); - const damagePhase = game.scene.getCurrentPhase() as DamagePhase; - damagePhase.updateAmount(40); - await game.phaseInterceptor.runFrom(DamagePhase).to(TurnEndPhase, false); - expect(game.scene.getParty()[0].hp).toBeLessThan(100); - expect(game.scene.getParty()[0].formIndex).toBe(0); - }, - ); + expect(player.hp).toBeLessThan(100); + expect(player.formIndex).toBe(baseForm); + }); - test( - "enough damage to change form", - async () => { - const moveToUse = Moves.SPLASH; - await game.startBattle([ Species.DARMANITAN ]); - game.scene.getParty()[0].stats[Stat.HP] = 1000; - game.scene.getParty()[0].hp = 100; - expect(game.scene.getParty()[0].formIndex).toBe(0); + it("should change form when falling below 50% HP", async () => { + await game.classicMode.startBattle([ Species.DARMANITAN ]); - game.move.select(moveToUse); + const player = game.scene.getPlayerPokemon()!; + player.stats[Stat.HP] = 1000; + player.hp = 100; + expect(player.formIndex).toBe(baseForm); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.phaseInterceptor.to(QuietFormChangePhase); - await game.phaseInterceptor.to(TurnInitPhase, false); - expect(game.scene.getParty()[0].hp).not.toBe(100); - expect(game.scene.getParty()[0].formIndex).not.toBe(0); - }, - ); + game.move.select(Moves.SPLASH); - test( - "kill pokemon while on zen mode", - async () => { - const moveToUse = Moves.SPLASH; - await game.startBattle([ Species.DARMANITAN, Species.CHARIZARD ]); - game.scene.getParty()[0].stats[Stat.HP] = 1000; - game.scene.getParty()[0].hp = 100; - expect(game.scene.getParty()[0].formIndex).toBe(0); + await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.phaseInterceptor.to("QuietFormChangePhase"); + await game.phaseInterceptor.to("TurnInitPhase", false); - game.move.select(moveToUse); + expect(player.hp).not.toBe(100); + expect(player.formIndex).toBe(zenForm); + }); - await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); - await game.phaseInterceptor.to(DamagePhase, false); - // await game.phaseInterceptor.runFrom(DamagePhase).to(DamagePhase, false); - const damagePhase = game.scene.getCurrentPhase() as DamagePhase; - damagePhase.updateAmount(80); - await game.phaseInterceptor.runFrom(DamagePhase).to(QuietFormChangePhase); - expect(game.scene.getParty()[0].hp).not.toBe(100); - expect(game.scene.getParty()[0].formIndex).not.toBe(0); - await game.killPokemon(game.scene.getParty()[0]); - expect(game.scene.getParty()[0].isFainted()).toBe(true); - await game.phaseInterceptor.run(MessagePhase); - await game.phaseInterceptor.run(EnemyCommandPhase); - await game.phaseInterceptor.run(TurnStartPhase); - game.onNextPrompt("SwitchPhase", Mode.PARTY, () => { - game.scene.unshiftPhase(new SwitchSummonPhase(game.scene, SwitchType.SWITCH, 0, 1, false)); - game.scene.ui.setMode(Mode.MESSAGE); - }); - game.onNextPrompt("SwitchPhase", Mode.MESSAGE, () => { - game.endPhase(); - }); - await game.phaseInterceptor.run(SwitchPhase); - await game.phaseInterceptor.to(PostSummonPhase); - expect(game.scene.getParty()[1].formIndex).toBe(1); - }, - ); + it("should stay zen mode when fainted", async () => { + await game.classicMode.startBattle([ Species.DARMANITAN, Species.CHARIZARD ]); + const player = game.scene.getPlayerPokemon()!; + player.stats[Stat.HP] = 1000; + player.hp = 100; + expect(player.formIndex).toBe(baseForm); - test( - "check if fainted pokemon switches to base form on arena reset", - async () => { - const baseForm = 0, - zenForm = 1; - game.override.startingWave(4); - game.override.starterForms({ - [Species.DARMANITAN]: zenForm, - }); + game.move.select(Moves.SPLASH); - await game.startBattle([ Species.MAGIKARP, Species.DARMANITAN ]); + await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); + await game.phaseInterceptor.to(DamagePhase, false); + const damagePhase = game.scene.getCurrentPhase() as DamagePhase; + damagePhase.updateAmount(80); + await game.phaseInterceptor.to("QuietFormChangePhase"); - const darmanitan = game.scene.getParty().find((p) => p.species.speciesId === Species.DARMANITAN)!; - expect(darmanitan).not.toBe(undefined); - expect(darmanitan.formIndex).toBe(zenForm); + expect(player.hp).not.toBe(100); + expect(player.formIndex).toBe(zenForm); - darmanitan.hp = 0; - darmanitan.status = new Status(StatusEffect.FAINT); - expect(darmanitan.isFainted()).toBe(true); + await game.killPokemon(player); + expect(player.isFainted()).toBe(true); - game.move.select(Moves.SPLASH); - await game.doKillOpponents(); - await game.phaseInterceptor.to(TurnEndPhase); - game.doSelectModifier(); - await game.phaseInterceptor.to(QuietFormChangePhase); + await game.phaseInterceptor.to("TurnStartPhase"); + game.onNextPrompt("SwitchPhase", Mode.PARTY, () => { + game.scene.unshiftPhase(new SwitchSummonPhase(game.scene, SwitchType.SWITCH, 0, 1, false)); + game.scene.ui.setMode(Mode.MESSAGE); + }); + game.onNextPrompt("SwitchPhase", Mode.MESSAGE, () => { + game.endPhase(); + }); + await game.phaseInterceptor.to("PostSummonPhase"); - expect(darmanitan.formIndex).toBe(baseForm); - }, - ); + expect(game.scene.getPlayerParty()[1].formIndex).toBe(zenForm); + }); + + it("should switch to base form on arena reset", async () => { + game.override.startingWave(4); + game.override.starterForms({ + [Species.DARMANITAN]: zenForm, + }); + + await game.classicMode.startBattle([ Species.MAGIKARP, Species.DARMANITAN ]); + + const darmanitan = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.DARMANITAN)!; + expect(darmanitan.formIndex).toBe(zenForm); + + darmanitan.hp = 0; + darmanitan.status = new Status(StatusEffect.FAINT); + expect(darmanitan.isFainted()).toBe(true); + + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + await game.phaseInterceptor.to("TurnEndPhase"); + game.doSelectModifier(); + await game.phaseInterceptor.to("QuietFormChangePhase"); + + expect(darmanitan.formIndex).toBe(baseForm); + }); }); diff --git a/src/test/abilities/zero_to_hero.test.ts b/src/test/abilities/zero_to_hero.test.ts index 48a451e99a2..160b43abf1e 100644 --- a/src/test/abilities/zero_to_hero.test.ts +++ b/src/test/abilities/zero_to_hero.test.ts @@ -41,8 +41,8 @@ describe("Abilities - ZERO TO HERO", () => { await game.startBattle([ Species.FEEBAS, Species.PALAFIN, Species.PALAFIN ]); - const palafin1 = game.scene.getParty()[1]; - const palafin2 = game.scene.getParty()[2]; + const palafin1 = game.scene.getPlayerParty()[1]; + const palafin2 = game.scene.getPlayerParty()[2]; expect(palafin1.formIndex).toBe(heroForm); expect(palafin2.formIndex).toBe(heroForm); palafin2.hp = 0; diff --git a/src/test/battle/battle.test.ts b/src/test/battle/battle.test.ts index eed76397f85..656cc62ac59 100644 --- a/src/test/battle/battle.test.ts +++ b/src/test/battle/battle.test.ts @@ -136,9 +136,9 @@ describe("Test Battle Phase", () => { Species.CHANSEY, Species.MEW ]); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.CHARIZARD); - expect(game.scene.getParty()[1].species.speciesId).toBe(Species.CHANSEY); - expect(game.scene.getParty()[2].species.speciesId).toBe(Species.MEW); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CHARIZARD); + expect(game.scene.getPlayerParty()[1].species.speciesId).toBe(Species.CHANSEY); + expect(game.scene.getPlayerParty()[2].species.speciesId).toBe(Species.MEW); }, 20000); it("test remove random battle seed int", async () => { diff --git a/src/test/battle/double_battle.test.ts b/src/test/battle/double_battle.test.ts index b7a5616d642..a7585d55bab 100644 --- a/src/test/battle/double_battle.test.ts +++ b/src/test/battle/double_battle.test.ts @@ -49,7 +49,7 @@ describe("Double Battles", () => { await game.phaseInterceptor.to(BattleEndPhase); game.doSelectModifier(); - const charizard = game.scene.getParty().findIndex(p => p.species.speciesId === Species.CHARIZARD); + const charizard = game.scene.getPlayerParty().findIndex(p => p.species.speciesId === Species.CHARIZARD); game.doRevivePokemon(charizard); await game.phaseInterceptor.to(TurnInitPhase); diff --git a/src/test/daily_mode.test.ts b/src/test/daily_mode.test.ts index 100cf07f9c0..2a88ce10ae7 100644 --- a/src/test/daily_mode.test.ts +++ b/src/test/daily_mode.test.ts @@ -30,7 +30,7 @@ describe("Daily Mode", () => { it("should initialize properly", async () => { await game.dailyMode.runToSummon(); - const party = game.scene.getParty(); + const party = game.scene.getPlayerParty(); expect(party).toHaveLength(3); party.forEach(pkm => { expect(pkm.level).toBe(20); diff --git a/src/test/evolution.test.ts b/src/test/evolution.test.ts index b94d45d6537..3046d103cbc 100644 --- a/src/test/evolution.test.ts +++ b/src/test/evolution.test.ts @@ -35,8 +35,8 @@ describe("Evolution", () => { it("should keep hidden ability after evolving", async () => { await game.classicMode.runToSummon([ Species.EEVEE, Species.TRAPINCH ]); - const eevee = game.scene.getParty()[0]; - const trapinch = game.scene.getParty()[1]; + const eevee = game.scene.getPlayerParty()[0]; + const trapinch = game.scene.getPlayerParty()[1]; eevee.abilityIndex = 2; trapinch.abilityIndex = 2; @@ -50,8 +50,8 @@ describe("Evolution", () => { it("should keep same ability slot after evolving", async () => { await game.classicMode.runToSummon([ Species.BULBASAUR, Species.CHARMANDER ]); - const bulbasaur = game.scene.getParty()[0]; - const charmander = game.scene.getParty()[1]; + const bulbasaur = game.scene.getPlayerParty()[0]; + const charmander = game.scene.getPlayerParty()[1]; bulbasaur.abilityIndex = 0; charmander.abilityIndex = 1; @@ -80,8 +80,8 @@ describe("Evolution", () => { nincada.metBiome = -1; nincada.evolve(pokemonEvolutions[Species.NINCADA][0], nincada.getSpeciesForm()); - const ninjask = game.scene.getParty()[0]; - const shedinja = game.scene.getParty()[1]; + const ninjask = game.scene.getPlayerParty()[0]; + const shedinja = game.scene.getPlayerParty()[1]; expect(ninjask.abilityIndex).toBe(2); expect(shedinja.abilityIndex).toBe(1); // Regression test for https://github.com/pagefaultgames/pokerogue/issues/3842 diff --git a/src/test/field/pokemon.test.ts b/src/test/field/pokemon.test.ts index aeaecab5874..ce9862e22e4 100644 --- a/src/test/field/pokemon.test.ts +++ b/src/test/field/pokemon.test.ts @@ -45,7 +45,7 @@ describe("Spec - Pokemon", () => { const zubat = scene.getEnemyPokemon()!; zubat.addToParty(PokeballType.LUXURY_BALL); - const party = scene.getParty(); + const party = scene.getPlayerParty(); expect(party).toHaveLength(6); party.forEach((pkm, index) =>{ expect(pkm.species.speciesId).toBe(index === 5 ? Species.ZUBAT : Species.ABRA); @@ -57,7 +57,7 @@ describe("Spec - Pokemon", () => { const zubat = scene.getEnemyPokemon()!; zubat.addToParty(PokeballType.LUXURY_BALL, slotIndex); - const party = scene.getParty(); + const party = scene.getPlayerParty(); expect(party).toHaveLength(6); party.forEach((pkm, index) =>{ expect(pkm.species.speciesId).toBe(index === slotIndex ? Species.ZUBAT : Species.ABRA); diff --git a/src/test/items/eviolite.test.ts b/src/test/items/eviolite.test.ts index 7b2f9a15fce..a97c287da29 100644 --- a/src/test/items/eviolite.test.ts +++ b/src/test/items/eviolite.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#enums/stat"; +import { StatBoosterModifier } from "#app/modifier/modifier"; +import { NumberHolder, randItem } from "#app/utils"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; import Phase from "phaser"; -import * as Utils from "#app/utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { StatBoosterModifier } from "#app/modifier/modifier"; describe("Items - Eviolite", () => { let phaserGame: Phaser.Game; @@ -28,14 +28,12 @@ describe("Items - Eviolite", () => { }); it("should provide 50% boost to DEF and SPDEF for unevolved, unfused pokemon", async() => { - await game.classicMode.startBattle([ - Species.PICHU - ]); + await game.classicMode.startBattle([ Species.PICHU ]); const partyMember = game.scene.getPlayerPokemon()!; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity @@ -51,14 +49,12 @@ describe("Items - Eviolite", () => { }); it("should not provide a boost for fully evolved, unfused pokemon", async() => { - await game.classicMode.startBattle([ - Species.RAICHU, - ]); + await game.classicMode.startBattle([ Species.RAICHU ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerPokemon()!; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity @@ -75,12 +71,9 @@ describe("Items - Eviolite", () => { }); it("should provide 50% boost to DEF and SPDEF for completely unevolved, fused pokemon", async() => { - await game.classicMode.startBattle([ - Species.PICHU, - Species.CLEFFA - ]); + await game.classicMode.startBattle([ Species.PICHU, Species.CLEFFA ]); - const [ partyMember, ally ] = game.scene.getParty(); + const [ partyMember, ally ] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -92,7 +85,7 @@ describe("Items - Eviolite", () => { partyMember.fusionLuck = ally.luck; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity @@ -108,12 +101,9 @@ describe("Items - Eviolite", () => { }); it("should provide 25% boost to DEF and SPDEF for partially unevolved (base), fused pokemon", async() => { - await game.classicMode.startBattle([ - Species.PICHU, - Species.CLEFABLE - ]); + await game.classicMode.startBattle([ Species.PICHU, Species.CLEFABLE ]); - const [ partyMember, ally ] = game.scene.getParty(); + const [ partyMember, ally ] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -125,7 +115,7 @@ describe("Items - Eviolite", () => { partyMember.fusionLuck = ally.luck; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity @@ -141,12 +131,9 @@ describe("Items - Eviolite", () => { }); it("should provide 25% boost to DEF and SPDEF for partially unevolved (fusion), fused pokemon", async() => { - await game.classicMode.startBattle([ - Species.RAICHU, - Species.CLEFFA - ]); + await game.classicMode.startBattle([ Species.RAICHU, Species.CLEFFA ]); - const [ partyMember, ally ] = game.scene.getParty(); + const [ partyMember, ally ] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -158,7 +145,7 @@ describe("Items - Eviolite", () => { partyMember.fusionLuck = ally.luck; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity @@ -174,12 +161,9 @@ describe("Items - Eviolite", () => { }); it("should not provide a boost for fully evolved, fused pokemon", async() => { - await game.classicMode.startBattle([ - Species.RAICHU, - Species.CLEFABLE - ]); + await game.classicMode.startBattle([ Species.RAICHU, Species.CLEFABLE ]); - const [ partyMember, ally ] = game.scene.getParty(); + const [ partyMember, ally ] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -191,7 +175,7 @@ describe("Items - Eviolite", () => { partyMember.fusionLuck = ally.luck; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity @@ -216,14 +200,12 @@ describe("Items - Eviolite", () => { const gMaxablePokemon = [ Species.PIKACHU, Species.EEVEE, Species.DURALUDON, Species.MEOWTH ]; - await game.classicMode.startBattle([ - Utils.randItem(gMaxablePokemon) - ]); + await game.classicMode.startBattle([ randItem(gMaxablePokemon) ]); const partyMember = game.scene.getPlayerPokemon()!; vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => { - const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false)); + const statValue = new NumberHolder(partyMember.getStat(stat, false)); game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue); // Ignore other calculations for simplicity diff --git a/src/test/items/leek.test.ts b/src/test/items/leek.test.ts index e27462a9265..901b353b3d3 100644 --- a/src/test/items/leek.test.ts +++ b/src/test/items/leek.test.ts @@ -89,7 +89,7 @@ describe("Items - Leek", () => { Species.PIKACHU, ]); - const [ partyMember, ally ] = game.scene.getParty(); + const [ partyMember, ally ] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -120,7 +120,7 @@ describe("Items - Leek", () => { species[Utils.randInt(species.length)] ]); - const [ partyMember, ally ] = game.scene.getParty(); + const [ partyMember, ally ] = game.scene.getPlayerParty(); // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; diff --git a/src/test/items/light_ball.test.ts b/src/test/items/light_ball.test.ts index 78375487f3b..fe79b6a2045 100644 --- a/src/test/items/light_ball.test.ts +++ b/src/test/items/light_ball.test.ts @@ -35,7 +35,7 @@ describe("Items - Light Ball", () => { Species.PIKACHU ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Light Ball is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); @@ -68,7 +68,7 @@ describe("Items - Light Ball", () => { Species.PIKACHU ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const atkStat = partyMember.getStat(Stat.ATK); const spAtkStat = partyMember.getStat(Stat.SPATK); @@ -97,8 +97,8 @@ describe("Items - Light Ball", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -136,8 +136,8 @@ describe("Items - Light Ball", () => { Species.PIKACHU ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -174,7 +174,7 @@ describe("Items - Light Ball", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const atkStat = partyMember.getStat(Stat.ATK); const spAtkStat = partyMember.getStat(Stat.SPATK); diff --git a/src/test/items/metal_powder.test.ts b/src/test/items/metal_powder.test.ts index c577182f350..86e7d329ecb 100644 --- a/src/test/items/metal_powder.test.ts +++ b/src/test/items/metal_powder.test.ts @@ -35,7 +35,7 @@ describe("Items - Metal Powder", () => { Species.DITTO ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Metal Powder is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); @@ -68,7 +68,7 @@ describe("Items - Metal Powder", () => { Species.DITTO ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const defStat = partyMember.getStat(Stat.DEF); @@ -91,8 +91,8 @@ describe("Items - Metal Powder", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -124,8 +124,8 @@ describe("Items - Metal Powder", () => { Species.DITTO ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -156,7 +156,7 @@ describe("Items - Metal Powder", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const defStat = partyMember.getStat(Stat.DEF); diff --git a/src/test/items/quick_powder.test.ts b/src/test/items/quick_powder.test.ts index 4eb6f6fb164..905d023ad8b 100644 --- a/src/test/items/quick_powder.test.ts +++ b/src/test/items/quick_powder.test.ts @@ -35,7 +35,7 @@ describe("Items - Quick Powder", () => { Species.DITTO ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Quick Powder is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); @@ -68,7 +68,7 @@ describe("Items - Quick Powder", () => { Species.DITTO ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const spdStat = partyMember.getStat(Stat.SPD); @@ -91,8 +91,8 @@ describe("Items - Quick Powder", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -124,8 +124,8 @@ describe("Items - Quick Powder", () => { Species.DITTO ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -156,7 +156,7 @@ describe("Items - Quick Powder", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const spdStat = partyMember.getStat(Stat.SPD); diff --git a/src/test/items/thick_club.test.ts b/src/test/items/thick_club.test.ts index 74158089c77..d349a1ad7b9 100644 --- a/src/test/items/thick_club.test.ts +++ b/src/test/items/thick_club.test.ts @@ -35,7 +35,7 @@ describe("Items - Thick Club", () => { Species.CUBONE ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; // Checking console log to make sure Thick Club is applied when getEffectiveStat (with the appropriate stat) is called partyMember.getEffectiveStat(Stat.DEF); @@ -68,7 +68,7 @@ describe("Items - Thick Club", () => { Species.CUBONE ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const atkStat = partyMember.getStat(Stat.ATK); @@ -90,7 +90,7 @@ describe("Items - Thick Club", () => { Species.MAROWAK ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const atkStat = partyMember.getStat(Stat.ATK); @@ -112,7 +112,7 @@ describe("Items - Thick Club", () => { Species.ALOLA_MAROWAK ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const atkStat = partyMember.getStat(Stat.ATK); @@ -139,8 +139,8 @@ describe("Items - Thick Club", () => { Species.PIKACHU ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -176,8 +176,8 @@ describe("Items - Thick Club", () => { species[randSpecies] ]); - const partyMember = game.scene.getParty()[0]; - const ally = game.scene.getParty()[1]; + const partyMember = game.scene.getPlayerParty()[0]; + const ally = game.scene.getPlayerParty()[1]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) partyMember.fusionSpecies = ally.species; @@ -208,7 +208,7 @@ describe("Items - Thick Club", () => { Species.PIKACHU ]); - const partyMember = game.scene.getParty()[0]; + const partyMember = game.scene.getPlayerParty()[0]; const atkStat = partyMember.getStat(Stat.ATK); diff --git a/src/test/moves/aromatherapy.test.ts b/src/test/moves/aromatherapy.test.ts index f547ed0e54c..874dadc0a1f 100644 --- a/src/test/moves/aromatherapy.test.ts +++ b/src/test/moves/aromatherapy.test.ts @@ -33,7 +33,7 @@ describe("Moves - Aromatherapy", () => { it("should cure status effect of the user, its ally, and all party pokemon", async () => { await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getParty(); + const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); @@ -79,7 +79,7 @@ describe("Moves - Aromatherapy", () => { it("should not cure status effect of allies ON FIELD with Sap Sipper, should still cure allies in party", async () => { game.override.ability(Abilities.SAP_SIPPER); await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getParty(); + const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); diff --git a/src/test/moves/baton_pass.test.ts b/src/test/moves/baton_pass.test.ts index 9d4a9358715..52e4c3ec016 100644 --- a/src/test/moves/baton_pass.test.ts +++ b/src/test/moves/baton_pass.test.ts @@ -95,7 +95,7 @@ describe("Moves - Baton Pass", () => { game.override.enemyMoveset([ Moves.SALT_CURE ]); await game.classicMode.startBattle([ Species.PIKACHU, Species.FEEBAS ]); - const [ player1, player2 ] = game.scene.getParty(); + const [ player1, player2 ] = game.scene.getPlayerParty(); game.move.select(Moves.BATON_PASS); await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]); diff --git a/src/test/moves/beat_up.test.ts b/src/test/moves/beat_up.test.ts index e51ac6ea452..a0129621f0e 100644 --- a/src/test/moves/beat_up.test.ts +++ b/src/test/moves/beat_up.test.ts @@ -65,7 +65,7 @@ describe("Moves - Beat Up", () => { const playerPokemon = game.scene.getPlayerPokemon()!; - game.scene.getParty()[1].trySetStatus(StatusEffect.BURN); + game.scene.getPlayerParty()[1].trySetStatus(StatusEffect.BURN); game.move.select(Moves.BEAT_UP); diff --git a/src/test/moves/dragon_rage.test.ts b/src/test/moves/dragon_rage.test.ts index dcbed7107e6..595f347a6b5 100644 --- a/src/test/moves/dragon_rage.test.ts +++ b/src/test/moves/dragon_rage.test.ts @@ -48,7 +48,7 @@ describe("Moves - Dragon Rage", () => { await game.startBattle(); - partyPokemon = game.scene.getParty()[0]; + partyPokemon = game.scene.getPlayerParty()[0]; enemyPokemon = game.scene.getEnemyPokemon()!; // remove berries diff --git a/src/test/moves/dragon_tail.test.ts b/src/test/moves/dragon_tail.test.ts index cf801eb42c1..6b3e669f770 100644 --- a/src/test/moves/dragon_tail.test.ts +++ b/src/test/moves/dragon_tail.test.ts @@ -73,7 +73,7 @@ describe("Moves - Dragon Tail", () => { .enemyAbility(Abilities.ROUGH_SKIN); await game.classicMode.startBattle([ Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD ]); - const leadPokemon = game.scene.getParty()[0]!; + const leadPokemon = game.scene.getPlayerParty()[0]!; const enemyLeadPokemon = game.scene.getEnemyParty()[0]!; const enemySecPokemon = game.scene.getEnemyParty()[1]!; @@ -105,8 +105,8 @@ describe("Moves - Dragon Tail", () => { .enemyAbility(Abilities.ROUGH_SKIN); await game.classicMode.startBattle([ Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD ]); - const leadPokemon = game.scene.getParty()[0]!; - const secPokemon = game.scene.getParty()[1]!; + const leadPokemon = game.scene.getPlayerParty()[0]!; + const secPokemon = game.scene.getPlayerParty()[1]!; const enemyLeadPokemon = game.scene.getEnemyParty()[0]!; const enemySecPokemon = game.scene.getEnemyParty()[1]!; diff --git a/src/test/moves/fissure.test.ts b/src/test/moves/fissure.test.ts index 16c3faa6827..12f075f1b55 100644 --- a/src/test/moves/fissure.test.ts +++ b/src/test/moves/fissure.test.ts @@ -43,7 +43,7 @@ describe("Moves - Fissure", () => { await game.startBattle(); - partyPokemon = game.scene.getParty()[0]; + partyPokemon = game.scene.getPlayerParty()[0]; enemyPokemon = game.scene.getEnemyPokemon()!; // remove berries diff --git a/src/test/moves/fusion_flare_bolt.test.ts b/src/test/moves/fusion_flare_bolt.test.ts index 0d9b9898276..1bcd0514357 100644 --- a/src/test/moves/fusion_flare_bolt.test.ts +++ b/src/test/moves/fusion_flare_bolt.test.ts @@ -176,7 +176,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { Species.ZEKROM ]); - const party = game.scene.getParty(); + const party = game.scene.getPlayerParty(); const enemyParty = game.scene.getEnemyParty(); // Get rid of any modifiers that may alter power @@ -235,7 +235,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { Species.ZEKROM ]); - const party = game.scene.getParty(); + const party = game.scene.getPlayerParty(); const enemyParty = game.scene.getEnemyParty(); // Get rid of any modifiers that may alter power diff --git a/src/test/moves/heal_bell.test.ts b/src/test/moves/heal_bell.test.ts index e4a019d9c0e..b180588d3a3 100644 --- a/src/test/moves/heal_bell.test.ts +++ b/src/test/moves/heal_bell.test.ts @@ -33,7 +33,7 @@ describe("Moves - Heal Bell", () => { it("should cure status effect of the user, its ally, and all party pokemon", async () => { await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getParty(); + const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); @@ -79,7 +79,7 @@ describe("Moves - Heal Bell", () => { it("should not cure status effect of allies ON FIELD with Soundproof, should still cure allies in party", async () => { game.override.ability(Abilities.SOUNDPROOF); await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getParty(); + const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); vi.spyOn(leftPlayer, "resetStatus"); vi.spyOn(rightPlayer, "resetStatus"); diff --git a/src/test/moves/magnet_rise.test.ts b/src/test/moves/magnet_rise.test.ts index 0afcad67ea3..b26bbf42ed0 100644 --- a/src/test/moves/magnet_rise.test.ts +++ b/src/test/moves/magnet_rise.test.ts @@ -35,10 +35,10 @@ describe("Moves - Magnet Rise", () => { it("MAGNET RISE", async () => { await game.startBattle(); - const startingHp = game.scene.getParty()[0].hp; + const startingHp = game.scene.getPlayerParty()[0].hp; game.move.select(moveToUse); await game.phaseInterceptor.to(TurnEndPhase); - const finalHp = game.scene.getParty()[0].hp; + const finalHp = game.scene.getPlayerParty()[0].hp; const hpLost = finalHp - startingHp; expect(hpLost).toBe(0); }, 20000); @@ -46,15 +46,15 @@ describe("Moves - Magnet Rise", () => { it("MAGNET RISE - Gravity", async () => { await game.startBattle(); - const startingHp = game.scene.getParty()[0].hp; + const startingHp = game.scene.getPlayerParty()[0].hp; game.move.select(moveToUse); await game.phaseInterceptor.to(CommandPhase); - let finalHp = game.scene.getParty()[0].hp; + let finalHp = game.scene.getPlayerParty()[0].hp; let hpLost = finalHp - startingHp; expect(hpLost).toBe(0); game.move.select(Moves.GRAVITY); await game.phaseInterceptor.to(TurnEndPhase); - finalHp = game.scene.getParty()[0].hp; + finalHp = game.scene.getPlayerParty()[0].hp; hpLost = finalHp - startingHp; expect(hpLost).not.toBe(0); }, 20000); diff --git a/src/test/moves/multi_target.test.ts b/src/test/moves/multi_target.test.ts index b6836b1dcb9..965876d3445 100644 --- a/src/test/moves/multi_target.test.ts +++ b/src/test/moves/multi_target.test.ts @@ -79,7 +79,7 @@ describe("Multi-target damage reduction", () => { it("should reduce earthquake when more than one pokemon other than user is not fainted", async () => { await game.startBattle([ Species.MAGIKARP, Species.FEEBAS ]); - const player2 = game.scene.getParty()[1]; + const player2 = game.scene.getPlayerParty()[1]; const [ enemy1, enemy2 ] = game.scene.getEnemyField(); game.move.select(Moves.EARTHQUAKE); diff --git a/src/test/moves/parting_shot.test.ts b/src/test/moves/parting_shot.test.ts index e5a2fc38b94..cfdf6c15966 100644 --- a/src/test/moves/parting_shot.test.ts +++ b/src/test/moves/parting_shot.test.ts @@ -84,19 +84,19 @@ describe("Moves - Parting Shot", () => { // use Memento 3 times to debuff enemy game.move.select(Moves.MEMENTO); await game.phaseInterceptor.to(FaintPhase); - expect(game.scene.getParty()[0].isFainted()).toBe(true); + expect(game.scene.getPlayerParty()[0].isFainted()).toBe(true); game.doSelectPartyPokemon(1); await game.phaseInterceptor.to(TurnInitPhase, false); game.move.select(Moves.MEMENTO); await game.phaseInterceptor.to(FaintPhase); - expect(game.scene.getParty()[0].isFainted()).toBe(true); + expect(game.scene.getPlayerParty()[0].isFainted()).toBe(true); game.doSelectPartyPokemon(2); await game.phaseInterceptor.to(TurnInitPhase, false); game.move.select(Moves.MEMENTO); await game.phaseInterceptor.to(FaintPhase); - expect(game.scene.getParty()[0].isFainted()).toBe(true); + expect(game.scene.getPlayerParty()[0].isFainted()).toBe(true); game.doSelectPartyPokemon(3); // set up done @@ -182,8 +182,8 @@ describe("Moves - Parting Shot", () => { game.move.select(Moves.SPLASH); // intentionally kill party pokemon, switch to second slot (now 1 party mon is fainted) - await game.killPokemon(game.scene.getParty()[0]); - expect(game.scene.getParty()[0].isFainted()).toBe(true); + await game.killPokemon(game.scene.getPlayerParty()[0]); + expect(game.scene.getPlayerParty()[0].isFainted()).toBe(true); await game.phaseInterceptor.run(MessagePhase); game.doSelectPartyPokemon(1); diff --git a/src/test/moves/rollout.test.ts b/src/test/moves/rollout.test.ts index 4a14b100f6d..199f4e1dcf2 100644 --- a/src/test/moves/rollout.test.ts +++ b/src/test/moves/rollout.test.ts @@ -44,7 +44,7 @@ describe("Moves - Rollout", () => { await game.startBattle(); - const playerPkm = game.scene.getParty()[0]; + const playerPkm = game.scene.getPlayerParty()[0]; vi.spyOn(playerPkm, "stats", "get").mockReturnValue([ 500000, 1, 1, 1, 1, 1 ]); // HP, ATK, DEF, SPATK, SPDEF, SPD const enemyPkm = game.scene.getEnemyParty()[0]; diff --git a/src/test/moves/shed_tail.test.ts b/src/test/moves/shed_tail.test.ts index 4d761a8af24..33a7d81e460 100644 --- a/src/test/moves/shed_tail.test.ts +++ b/src/test/moves/shed_tail.test.ts @@ -59,7 +59,7 @@ describe("Moves - Shed Tail", () => { await game.classicMode.startBattle([ Species.MAGIKARP ]); const magikarp = game.scene.getPlayerPokemon()!; - expect(game.scene.getParty().length).toBe(1); + expect(game.scene.getPlayerParty().length).toBe(1); game.move.select(Moves.SHED_TAIL); diff --git a/src/test/moves/sparkly_swirl.test.ts b/src/test/moves/sparkly_swirl.test.ts index 8449f2785f8..a83f1c3a437 100644 --- a/src/test/moves/sparkly_swirl.test.ts +++ b/src/test/moves/sparkly_swirl.test.ts @@ -38,7 +38,7 @@ describe("Moves - Sparkly Swirl", () => { .battleType("double") .statusEffect(StatusEffect.BURN); await game.classicMode.startBattle([ Species.RATTATA, Species.RATTATA, Species.RATTATA ]); - const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getParty(); + const [ leftPlayer, rightPlayer, partyPokemon ] = game.scene.getPlayerParty(); const leftOpp = game.scene.getEnemyPokemon()!; vi.spyOn(leftPlayer, "resetStatus"); diff --git a/src/test/moves/spikes.test.ts b/src/test/moves/spikes.test.ts index 1dd13f8f65e..35e89c8caf7 100644 --- a/src/test/moves/spikes.test.ts +++ b/src/test/moves/spikes.test.ts @@ -46,7 +46,7 @@ describe("Moves - Spikes", () => { game.doSwitchPokemon(1); await game.toNextTurn(); - const player = game.scene.getParty()[0]; + const player = game.scene.getPlayerParty()[0]; expect(player.hp).toBe(player.getMaxHp()); }, 20000); diff --git a/src/test/moves/tackle.test.ts b/src/test/moves/tackle.test.ts index 5d5ff1a366d..ff50f027f87 100644 --- a/src/test/moves/tackle.test.ts +++ b/src/test/moves/tackle.test.ts @@ -53,7 +53,7 @@ describe("Moves - Tackle", () => { Species.MIGHTYENA, ]); game.scene.currentBattle.enemyParty[0].stats[Stat.DEF] = 50; - game.scene.getParty()[0].stats[Stat.ATK] = 50; + game.scene.getPlayerParty()[0].stats[Stat.ATK] = 50; const hpOpponent = game.scene.currentBattle.enemyParty[0].hp; diff --git a/src/test/moves/tera_starstorm.test.ts b/src/test/moves/tera_starstorm.test.ts index f0759dd242d..c7b6b66c1ce 100644 --- a/src/test/moves/tera_starstorm.test.ts +++ b/src/test/moves/tera_starstorm.test.ts @@ -70,8 +70,8 @@ describe("Moves - Tera Starstorm", () => { it("applies the effects when Terapagos in Stellar Form is fused with another Pokemon", async () => { await game.classicMode.startBattle([ Species.TERAPAGOS, Species.CHARMANDER, Species.MAGIKARP ]); - const fusionedMon = game.scene.getParty()[0]; - const magikarp = game.scene.getParty()[2]; + const fusionedMon = game.scene.getPlayerParty()[0]; + const magikarp = game.scene.getPlayerParty()[2]; // Fuse party members (taken from PlayerPokemon.fuse(...) function) fusionedMon.fusionSpecies = magikarp.species; diff --git a/src/test/moves/u_turn.test.ts b/src/test/moves/u_turn.test.ts index b995c20f503..c6e255e01b2 100644 --- a/src/test/moves/u_turn.test.ts +++ b/src/test/moves/u_turn.test.ts @@ -1,10 +1,8 @@ -import { Abilities } from "#app/enums/abilities"; -import { StatusEffect } from "#app/enums/status-effect"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#app/test/utils/gameManager"; +import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; +import { StatusEffect } from "#enums/status-effect"; +import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -38,19 +36,16 @@ describe("Moves - U-turn", () => { // arrange const playerHp = 1; game.override.ability(Abilities.REGENERATOR); - await game.startBattle([ - Species.RAICHU, - Species.SHUCKLE - ]); + await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); game.scene.getPlayerPokemon()!.hp = playerHp; // act game.move.select(Moves.U_TURN); game.doSelectPartyPokemon(1); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); // assert - expect(game.scene.getParty()[1].hp).toEqual(Math.floor(game.scene.getParty()[1].getMaxHp() * 0.33 + playerHp)); + expect(game.scene.getPlayerParty()[1].hp).toEqual(Math.floor(game.scene.getPlayerParty()[1].getMaxHp() * 0.33 + playerHp)); expect(game.phaseInterceptor.log).toContain("SwitchSummonPhase"); expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.SHUCKLE); }, 20000); @@ -58,15 +53,12 @@ describe("Moves - U-turn", () => { it("triggers rough skin on the u-turn user before a new pokemon is switched in", async () => { // arrange game.override.enemyAbility(Abilities.ROUGH_SKIN); - await game.startBattle([ - Species.RAICHU, - Species.SHUCKLE - ]); + await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); // act game.move.select(Moves.U_TURN); game.doSelectPartyPokemon(1); - await game.phaseInterceptor.to(SwitchPhase, false); + await game.phaseInterceptor.to("SwitchPhase", false); // assert const playerPkm = game.scene.getPlayerPokemon()!; @@ -79,15 +71,12 @@ describe("Moves - U-turn", () => { it("triggers contact abilities on the u-turn user (eg poison point) before a new pokemon is switched in", async () => { // arrange game.override.enemyAbility(Abilities.POISON_POINT); - await game.startBattle([ - Species.RAICHU, - Species.SHUCKLE - ]); + await game.classicMode.startBattle([ Species.RAICHU, Species.SHUCKLE ]); vi.spyOn(game.scene.getEnemyPokemon()!, "randSeedInt").mockReturnValue(0); // act game.move.select(Moves.U_TURN); - await game.phaseInterceptor.to(SwitchPhase, false); + await game.phaseInterceptor.to("SwitchPhase", false); // assert const playerPkm = game.scene.getPlayerPokemon()!; @@ -108,7 +97,7 @@ describe("Moves - U-turn", () => { // KO the opponent with U-Turn game.move.select(Moves.U_TURN); game.doSelectPartyPokemon(1); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.isFainted()).toBe(true); // Check that U-Turn forced a switch diff --git a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts index a72a9fbb5a3..61d8aaa9f5a 100644 --- a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts @@ -143,7 +143,7 @@ describe("Absolute Avarice - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase, false); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); - for (const partyPokemon of scene.getParty()) { + for (const partyPokemon of scene.getPlayerParty()) { const pokemonId = partyPokemon.id; const pokemonItems = scene.findModifiers(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId, true) as PokemonHeldItemModifier[]; @@ -230,13 +230,13 @@ describe("Absolute Avarice - Mystery Encounter", () => { it("should add Greedent to the party", async () => { await game.runToMysteryEncounter(MysteryEncounterType.ABSOLUTE_AVARICE, defaultParty); - const partyCountBefore = scene.getParty().length; + const partyCountBefore = scene.getPlayerParty().length; await runMysteryEncounterToEnd(game, 3); - const partyCountAfter = scene.getParty().length; + const partyCountAfter = scene.getPlayerParty().length; expect(partyCountBefore + 1).toBe(partyCountAfter); - const greedent = scene.getParty()[scene.getParty().length - 1]; + const greedent = scene.getPlayerParty()[scene.getPlayerParty().length - 1]; expect(greedent.species.speciesId).toBe(Species.GREEDENT); const moveset = greedent.moveset.map(m => m?.moveId); expect(moveset?.length).toBe(4); diff --git a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts index 0585b4ce72b..727a3993d9b 100644 --- a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts @@ -147,13 +147,13 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { it("Should remove the Pokemon from the party", async () => { await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty); - const initialPartySize = scene.getParty().length; + const initialPartySize = scene.getPlayerParty().length; const pokemonName = scene.currentBattle.mysteryEncounter!.misc.pokemon.name; await runMysteryEncounterToEnd(game, 1); - expect(scene.getParty().length).toBe(initialPartySize - 1); - expect(scene.getParty().find(p => p.name === pokemonName)).toBeUndefined(); + expect(scene.getPlayerParty().length).toBe(initialPartySize - 1); + expect(scene.getPlayerParty().find(p => p.name === pokemonName)).toBeUndefined(); }); it("should leave encounter without battle", async () => { @@ -186,7 +186,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { it("should award EXP to a pokemon with an ability in EXTORTION_ABILITIES", async () => { await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty); - const party = scene.getParty(); + const party = scene.getPlayerParty(); const gyarados = party.find((pkm) => pkm.species.speciesId === Species.GYARADOS)!; const expBefore = gyarados.exp; @@ -199,7 +199,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => { it("should award EXP to a pokemon with a move in EXTORTION_MOVES", async () => { game.override.ability(Abilities.SYNCHRONIZE); // Not an extortion ability, so we can test extortion move await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, [ Species.ABRA ]); - const party = scene.getParty(); + const party = scene.getPlayerParty(); const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!; abra.moveset = [ new PokemonMove(Moves.BEAT_UP) ]; const expBefore = abra.exp; diff --git a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts index bfa3d428bc0..2507b94e5ae 100644 --- a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts @@ -176,7 +176,7 @@ describe("Berries Abound - Mystery Encounter", () => { const encounterTextSpy = vi.spyOn(EncounterDialogueUtils, "showEncounterText"); await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty); - scene.getParty().forEach(pkm => { + scene.getPlayerParty().forEach(pkm => { vi.spyOn(pkm, "getStat").mockReturnValue(1); // for ease return for every stat }); @@ -200,7 +200,7 @@ describe("Berries Abound - Mystery Encounter", () => { const encounterTextSpy = vi.spyOn(EncounterDialogueUtils, "showEncounterText"); await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty); - scene.getParty().forEach(pkm => { + scene.getPlayerParty().forEach(pkm => { vi.spyOn(pkm, "getStat").mockReturnValue(1); // for ease return for every stat }); @@ -225,7 +225,7 @@ describe("Berries Abound - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty); - scene.getParty().forEach(pkm => { + scene.getPlayerParty().forEach(pkm => { vi.spyOn(pkm, "getStat").mockReturnValue(9999); // for ease return for every stat }); diff --git a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts index 82ed558e6db..7ea1f883bd1 100644 --- a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -218,7 +218,7 @@ describe("Clowning Around - Mystery Encounter", () => { // Stop next battle before it runs await game.phaseInterceptor.to(NewBattlePhase, false); - const leadPokemon = scene.getParty()[0]; + const leadPokemon = scene.getPlayerParty()[0]; expect(leadPokemon.customPokemonData?.ability).toBe(abilityToTrain); }); }); @@ -251,35 +251,35 @@ describe("Clowning Around - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty); // Set some moves on party for attack type booster generation - scene.getParty()[0].moveset = [ new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.THIEF) ]; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.TACKLE), new PokemonMove(Moves.THIEF) ]; // 2 Sitrus Berries on lead scene.modifiers = []; let itemType = generateModifierType(scene, modifierTypes.BERRY, [ BerryType.SITRUS ]) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[0], 2, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType); // 2 Ganlon Berries on lead itemType = generateModifierType(scene, modifierTypes.BERRY, [ BerryType.GANLON ]) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[0], 2, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType); // 5 Golden Punch on lead (ultra) itemType = generateModifierType(scene, modifierTypes.GOLDEN_PUNCH) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[0], 5, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[0], 5, itemType); // 5 Lucky Egg on lead (ultra) itemType = generateModifierType(scene, modifierTypes.LUCKY_EGG) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[0], 5, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[0], 5, itemType); // 5 Soul Dew on lead (rogue) itemType = generateModifierType(scene, modifierTypes.SOUL_DEW) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[0], 5, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[0], 5, itemType); // 2 Golden Egg on lead (rogue) itemType = generateModifierType(scene, modifierTypes.GOLDEN_EGG) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[0], 2, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[0], 2, itemType); // 5 Soul Dew on second party pokemon (these should not change) itemType = generateModifierType(scene, modifierTypes.SOUL_DEW) as PokemonHeldItemModifierType; - await addItemToPokemon(scene, scene.getParty()[1], 5, itemType); + await addItemToPokemon(scene, scene.getPlayerParty()[1], 5, itemType); await runMysteryEncounterToEnd(game, 2); - const leadItemsAfter = scene.getParty()[0].getHeldItems(); + const leadItemsAfter = scene.getPlayerParty()[0].getHeldItems(); const ultraCountAfter = leadItemsAfter .filter(m => m.type.tier === ModifierTier.ULTRA) .reduce((a, b) => a + b.stackCount, 0); @@ -289,7 +289,7 @@ describe("Clowning Around - Mystery Encounter", () => { expect(ultraCountAfter).toBe(10); expect(rogueCountAfter).toBe(7); - const secondItemsAfter = scene.getParty()[1].getHeldItems(); + const secondItemsAfter = scene.getPlayerParty()[1].getHeldItems(); expect(secondItemsAfter.length).toBe(1); expect(secondItemsAfter[0].type.id).toBe("SOUL_DEW"); expect(secondItemsAfter[0]?.stackCount).toBe(5); @@ -333,16 +333,16 @@ describe("Clowning Around - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty); // Same type moves on lead - scene.getParty()[0].moveset = [ new PokemonMove(Moves.ICE_BEAM), new PokemonMove(Moves.SURF) ]; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.ICE_BEAM), new PokemonMove(Moves.SURF) ]; // Different type moves on second - scene.getParty()[1].moveset = [ new PokemonMove(Moves.GRASS_KNOT), new PokemonMove(Moves.ELECTRO_BALL) ]; + scene.getPlayerParty()[1].moveset = [ new PokemonMove(Moves.GRASS_KNOT), new PokemonMove(Moves.ELECTRO_BALL) ]; // No moves on third - scene.getParty()[2].moveset = []; + scene.getPlayerParty()[2].moveset = []; await runMysteryEncounterToEnd(game, 3); - const leadTypesAfter = scene.getParty()[0].customPokemonData?.types; - const secondaryTypesAfter = scene.getParty()[1].customPokemonData?.types; - const thirdTypesAfter = scene.getParty()[2].customPokemonData?.types; + const leadTypesAfter = scene.getPlayerParty()[0].customPokemonData?.types; + const secondaryTypesAfter = scene.getPlayerParty()[1].customPokemonData?.types; + const thirdTypesAfter = scene.getPlayerParty()[2].customPokemonData?.types; expect(leadTypesAfter.length).toBe(2); expect(leadTypesAfter[0]).toBe(Type.WATER); diff --git a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts index 47625541160..147930f05d1 100644 --- a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts @@ -98,7 +98,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); // Make party lead's level arbitrarily high to not get KOed by move - const partyLead = scene.getParty()[0]; + const partyLead = scene.getPlayerParty()[0]; partyLead.level = 1000; partyLead.calculateStats(); await runMysteryEncounterToEnd(game, 1, undefined, true); @@ -119,7 +119,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { it("should have a Baton in the rewards after battle", async () => { await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); // Make party lead's level arbitrarily high to not get KOed by move - const partyLead = scene.getParty()[0]; + const partyLead = scene.getPlayerParty()[0]; partyLead.level = 1000; partyLead.calculateStats(); await runMysteryEncounterToEnd(game, 1, undefined, true); @@ -157,7 +157,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { const phaseSpy = vi.spyOn(scene, "unshiftPhase"); await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); - scene.getParty()[0].moveset = []; + scene.getPlayerParty()[0].moveset = []; await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1 }); const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof LearnMovePhase).map(p => p[0]); @@ -169,7 +169,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); - scene.getParty()[0].moveset = []; + scene.getPlayerParty()[0].moveset = []; await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1 }); expect(leaveEncounterWithoutBattleSpy).toBeCalled(); @@ -196,13 +196,13 @@ describe("Dancing Lessons - Mystery Encounter", () => { it("should add Oricorio to the party", async () => { await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); - const partyCountBefore = scene.getParty().length; - scene.getParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ]; + const partyCountBefore = scene.getPlayerParty().length; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ]; await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); - const partyCountAfter = scene.getParty().length; + const partyCountAfter = scene.getPlayerParty().length; expect(partyCountBefore + 1).toBe(partyCountAfter); - const oricorio = scene.getParty()[scene.getParty().length - 1]; + const oricorio = scene.getPlayerParty()[scene.getPlayerParty().length - 1]; expect(oricorio.species.speciesId).toBe(Species.ORICORIO); const moveset = oricorio.moveset.map(m => m?.moveId); expect(moveset?.some(m => m === Moves.REVELATION_DANCE)).toBeTruthy(); @@ -211,8 +211,8 @@ describe("Dancing Lessons - Mystery Encounter", () => { it("should NOT be selectable if the player doesn't have a Dance type move", async () => { await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); - const partyCountBefore = scene.getParty().length; - scene.getParty().forEach(p => p.moveset = []); + const partyCountBefore = scene.getPlayerParty().length; + scene.getPlayerParty().forEach(p => p.moveset = []); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -223,7 +223,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { vi.spyOn(scene.ui, "playError"); await runSelectMysteryEncounterOption(game, 3); - const partyCountAfter = scene.getParty().length; + const partyCountAfter = scene.getPlayerParty().length; expect(scene.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name); expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled @@ -236,7 +236,7 @@ describe("Dancing Lessons - Mystery Encounter", () => { const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.DANCING_LESSONS, defaultParty); - scene.getParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ]; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.DRAGON_DANCE) ]; await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 }); expect(leaveEncounterWithoutBattleSpy).toBeCalled(); diff --git a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts index 66d628ef82f..c226d60a9b4 100644 --- a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts @@ -191,7 +191,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 2 Sitrus berries on party lead scene.modifiers = []; const sitrus = generateModifierType(scene, modifierTypes.BERRY, [ BerryType.SITRUS ])!; - const sitrusMod = sitrus.newModifier(scene.getParty()[0]) as BerryModifier; + const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier; sitrusMod.stackCount = 2; await scene.addModifier(sitrusMod, true, false, false, true); await scene.updateModifiers(true); @@ -212,7 +212,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Reviver Seed on party lead scene.modifiers = []; const revSeed = generateModifierType(scene, modifierTypes.REVIVER_SEED)!; - const modifier = revSeed.newModifier(scene.getParty()[0]) as PokemonInstantReviveModifier; + const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -238,7 +238,7 @@ describe("Delibird-y - Mystery Encounter", () => { const sitrus = generateModifierType(scene, modifierTypes.BERRY, [ BerryType.SITRUS ])!; // Sitrus berries on party - const sitrusMod = sitrus.newModifier(scene.getParty()[0]) as BerryModifier; + const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier; sitrusMod.stackCount = 2; await scene.addModifier(sitrusMod, true, false, false, true); await scene.updateModifiers(true); @@ -267,7 +267,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Reviver Seed on party lead const revSeed = generateModifierType(scene, modifierTypes.REVIVER_SEED)!; - const modifier = revSeed.newModifier(scene.getParty()[0]) as PokemonInstantReviveModifier; + const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -291,7 +291,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Soul Dew on party lead scene.modifiers = []; const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]); + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]); await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -319,7 +319,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Reviver Seed on party lead const revSeed = generateModifierType(scene, modifierTypes.REVIVER_SEED)!; - const modifier = revSeed.newModifier(scene.getParty()[0]) as PokemonInstantReviveModifier; + const modifier = revSeed.newModifier(scene.getPlayerParty()[0]) as PokemonInstantReviveModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -353,7 +353,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 2 Soul Dew on party lead scene.modifiers = []; const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]) as PokemonNatureWeightModifier; + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 2; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -374,7 +374,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Soul Dew on party lead scene.modifiers = []; const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]) as PokemonNatureWeightModifier; + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -400,7 +400,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Soul Dew on party lead const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]) as PokemonNatureWeightModifier; + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -424,7 +424,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Reviver Seed on party lead scene.modifiers = []; const revSeed = generateModifierType(scene, modifierTypes.REVIVER_SEED)!; - const modifier = revSeed.newModifier(scene.getParty()[0]); + const modifier = revSeed.newModifier(scene.getPlayerParty()[0]); await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -453,7 +453,7 @@ describe("Delibird-y - Mystery Encounter", () => { // Set 1 Soul Dew on party lead scene.modifiers = []; const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]) as PokemonNatureWeightModifier; + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); diff --git a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts index 5a270f1cbec..92555e98679 100644 --- a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts @@ -175,7 +175,7 @@ describe("Fiery Fallout - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase, false); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); - const leadPokemonId = scene.getParty()?.[0].id; + const leadPokemonId = scene.getPlayerParty()?.[0].id; const leadPokemonItems = scene.findModifiers(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === leadPokemonId, true) as PokemonHeldItemModifier[]; const item = leadPokemonItems.find(i => i instanceof AttackTypeBoosterModifier); @@ -202,7 +202,7 @@ describe("Fiery Fallout - Mystery Encounter", () => { it("should damage all non-fire party PKM by 20%, and burn + give Heatproof to a random Pokemon", async () => { await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, defaultParty); - const party = scene.getParty(); + const party = scene.getPlayerParty(); const lapras = party.find((pkm) => pkm.species.speciesId === Species.LAPRAS)!; lapras.status = new Status(StatusEffect.POISON); const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!; @@ -254,7 +254,7 @@ describe("Fiery Fallout - Mystery Encounter", () => { await game.phaseInterceptor.to(SelectModifierPhase, false); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); - const leadPokemonItems = scene.getParty()?.[0].getHeldItems() as PokemonHeldItemModifier[]; + const leadPokemonItems = scene.getPlayerParty()?.[0].getHeldItems() as PokemonHeldItemModifier[]; const item = leadPokemonItems.find(i => i instanceof AttackTypeBoosterModifier); expect(item).toBeDefined; }); diff --git a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts index d23e7919267..a5098f682eb 100644 --- a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts @@ -151,7 +151,7 @@ describe("Fight or Flight - Mystery Encounter", () => { it("should NOT be selectable if the player doesn't have a Stealing move", async () => { await game.runToMysteryEncounter(MysteryEncounterType.FIGHT_OR_FLIGHT, defaultParty); - scene.getParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => p.moveset = []); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -175,7 +175,7 @@ describe("Fight or Flight - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.FIGHT_OR_FLIGHT, defaultParty); // Mock moveset - scene.getParty()[0].moveset = [ new PokemonMove(Moves.KNOCK_OFF) ]; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.KNOCK_OFF) ]; const item = game.scene.currentBattle.mysteryEncounter!.misc; await runMysteryEncounterToEnd(game, 2); diff --git a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts index b08f8008b68..e8d19ff50b9 100644 --- a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts @@ -106,10 +106,10 @@ describe("Global Trade System - Mystery Encounter", () => { it("Should trade a Pokemon from the player's party for the first of 3 Pokemon options", async () => { await game.runToMysteryEncounter(MysteryEncounterType.GLOBAL_TRADE_SYSTEM, defaultParty); - const speciesBefore = scene.getParty()[0].species.speciesId; + const speciesBefore = scene.getPlayerParty()[0].species.speciesId; await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1, optionNo: 1 }); - const speciesAfter = scene.getParty().at(-1)?.species.speciesId; + const speciesAfter = scene.getPlayerParty().at(-1)?.species.speciesId; expect(speciesAfter).toBeDefined(); expect(speciesBefore).not.toBe(speciesAfter); @@ -119,10 +119,10 @@ describe("Global Trade System - Mystery Encounter", () => { it("Should trade a Pokemon from the player's party for the second of 3 Pokemon options", async () => { await game.runToMysteryEncounter(MysteryEncounterType.GLOBAL_TRADE_SYSTEM, defaultParty); - const speciesBefore = scene.getParty()[1].species.speciesId; + const speciesBefore = scene.getPlayerParty()[1].species.speciesId; await runMysteryEncounterToEnd(game, 1, { pokemonNo: 2, optionNo: 2 }); - const speciesAfter = scene.getParty().at(-1)?.species.speciesId; + const speciesAfter = scene.getPlayerParty().at(-1)?.species.speciesId; expect(speciesAfter).toBeDefined(); expect(speciesBefore).not.toBe(speciesAfter); @@ -132,10 +132,10 @@ describe("Global Trade System - Mystery Encounter", () => { it("Should trade a Pokemon from the player's party for the third of 3 Pokemon options", async () => { await game.runToMysteryEncounter(MysteryEncounterType.GLOBAL_TRADE_SYSTEM, defaultParty); - const speciesBefore = scene.getParty()[2].species.speciesId; + const speciesBefore = scene.getPlayerParty()[2].species.speciesId; await runMysteryEncounterToEnd(game, 1, { pokemonNo: 3, optionNo: 3 }); - const speciesAfter = scene.getParty().at(-1)?.species.speciesId; + const speciesAfter = scene.getPlayerParty().at(-1)?.species.speciesId; expect(speciesAfter).toBeDefined(); expect(speciesBefore).not.toBe(speciesAfter); @@ -166,10 +166,10 @@ describe("Global Trade System - Mystery Encounter", () => { it("Should trade a Pokemon from the player's party for a random wonder trade Pokemon", async () => { await game.runToMysteryEncounter(MysteryEncounterType.GLOBAL_TRADE_SYSTEM, defaultParty); - const speciesBefore = scene.getParty()[2].species.speciesId; + const speciesBefore = scene.getPlayerParty()[2].species.speciesId; await runMysteryEncounterToEnd(game, 2, { pokemonNo: 1 }); - const speciesAfter = scene.getParty().at(-1)?.species.speciesId; + const speciesAfter = scene.getPlayerParty().at(-1)?.species.speciesId; expect(speciesAfter).toBeDefined(); expect(speciesBefore).not.toBe(speciesAfter); @@ -204,7 +204,7 @@ describe("Global Trade System - Mystery Encounter", () => { // Set 2 Soul Dew on party lead scene.modifiers = []; const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]) as PokemonNatureWeightModifier; + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 2; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); @@ -229,7 +229,7 @@ describe("Global Trade System - Mystery Encounter", () => { // Set 1 Soul Dew on party lead scene.modifiers = []; const soulDew = generateModifierType(scene, modifierTypes.SOUL_DEW)!; - const modifier = soulDew.newModifier(scene.getParty()[0]) as PokemonNatureWeightModifier; + const modifier = soulDew.newModifier(scene.getPlayerParty()[0]) as PokemonNatureWeightModifier; modifier.stackCount = 1; await scene.addModifier(modifier, true, false, false, true); await scene.updateModifiers(true); diff --git a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts index dec14d46cc8..51f759c9268 100644 --- a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts @@ -114,7 +114,7 @@ describe("Lost at Sea - Mystery Encounter", () => { const laprasSpecies = getPokemonSpecies(Species.LAPRAS); await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty); - const party = game.scene.getParty(); + const party = game.scene.getPlayerParty(); const blastoise = party.find((pkm) => pkm.species.speciesId === Species.BLASTOISE); const expBefore = blastoise!.exp; @@ -179,7 +179,7 @@ describe("Lost at Sea - Mystery Encounter", () => { game.override.startingWave(wave); await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty); - const party = game.scene.getParty(); + const party = game.scene.getPlayerParty(); const pidgeot = party.find((pkm) => pkm.species.speciesId === Species.PIDGEOT); const expBefore = pidgeot!.exp; @@ -241,7 +241,7 @@ describe("Lost at Sea - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.LOST_AT_SEA, defaultParty); - const party = game.scene.getParty(); + const party = game.scene.getPlayerParty(); const abra = party.find((pkm) => pkm.species.speciesId === Species.ABRA)!; vi.spyOn(abra, "isAllowedInBattle").mockReturnValue(false); diff --git a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts index ba8ce648a3f..e063a4f3349 100644 --- a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts @@ -101,7 +101,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Override party levels to 50 so stats can be fully reflective - scene.getParty().forEach(p => { + scene.getPlayerParty().forEach(p => { p.level = 50; p.calculateStats(); }); @@ -109,7 +109,7 @@ describe("Part-Timer - Mystery Encounter", () => { expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene, scene.getWaveMoneyAmount(1), true, false); // Expect PP of mon's moves to have been reduced to 2 - const moves = scene.getParty()[0].moveset; + const moves = scene.getPlayerParty()[0].moveset; for (const move of moves) { expect((move?.getMovePp() ?? 0) - (move?.ppUsed ?? 0)).toBe(2); } @@ -120,7 +120,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Override party levels to 50 so stats can be fully reflective - scene.getParty().forEach(p => { + scene.getPlayerParty().forEach(p => { p.level = 50; p.ivs = [ 20, 20, 20, 20, 20, 20 ]; p.calculateStats(); @@ -129,7 +129,7 @@ describe("Part-Timer - Mystery Encounter", () => { expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene, scene.getWaveMoneyAmount(4), true, false); // Expect PP of mon's moves to have been reduced to 2 - const moves = scene.getParty()[1].moveset; + const moves = scene.getPlayerParty()[1].moveset; for (const move of moves) { expect((move?.getMovePp() ?? 0) - (move?.ppUsed ?? 0)).toBe(2); } @@ -166,7 +166,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Override party levels to 50 so stats can be fully reflective - scene.getParty().forEach(p => { + scene.getPlayerParty().forEach(p => { p.level = 50; p.calculateStats(); }); @@ -174,7 +174,7 @@ describe("Part-Timer - Mystery Encounter", () => { expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene, scene.getWaveMoneyAmount(1), true, false); // Expect PP of mon's moves to have been reduced to 2 - const moves = scene.getParty()[2].moveset; + const moves = scene.getPlayerParty()[2].moveset; for (const move of moves) { expect((move?.getMovePp() ?? 0) - (move?.ppUsed ?? 0)).toBe(2); } @@ -185,7 +185,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Override party levels to 50 so stats can be fully reflective - scene.getParty().forEach(p => { + scene.getPlayerParty().forEach(p => { p.level = 50; p.ivs = [ 20, 20, 20, 20, 20, 20 ]; p.calculateStats(); @@ -194,7 +194,7 @@ describe("Part-Timer - Mystery Encounter", () => { expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene, scene.getWaveMoneyAmount(4), true, false); // Expect PP of mon's moves to have been reduced to 2 - const moves = scene.getParty()[3].moveset; + const moves = scene.getPlayerParty()[3].moveset; for (const move of moves) { expect((move?.getMovePp() ?? 0) - (move?.ppUsed ?? 0)).toBe(2); } @@ -232,7 +232,7 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Mock movesets - scene.getParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => p.moveset = []); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -256,12 +256,12 @@ describe("Part-Timer - Mystery Encounter", () => { await game.runToMysteryEncounter(MysteryEncounterType.PART_TIMER, defaultParty); // Mock moveset - scene.getParty()[0].moveset = [ new PokemonMove(Moves.ATTRACT) ]; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.ATTRACT) ]; await runMysteryEncounterToEnd(game, 3); expect(EncounterPhaseUtils.updatePlayerMoney).toHaveBeenCalledWith(scene, scene.getWaveMoneyAmount(2.5), true, false); // Expect PP of mon's moves to have been reduced to 2 - const moves = scene.getParty()[0].moveset; + const moves = scene.getPlayerParty()[0].moveset; for (const move of moves) { expect((move?.getMovePp() ?? 0) - (move?.ppUsed ?? 0)).toBe(2); } diff --git a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts index a3a43815ec6..7fc2490fcc9 100644 --- a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts @@ -152,7 +152,7 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(scene.currentBattle.trainer).toBeDefined(); expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE); - expect(scene.getParty().length).toBe(1); + expect(scene.getPlayerParty().length).toBe(1); }); it("Should reward the player with friendship and eggs based on pokemon selected", async () => { @@ -231,7 +231,7 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(scene.currentBattle.trainer).toBeDefined(); expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE); - expect(scene.getParty().length).toBe(1); + expect(scene.getPlayerParty().length).toBe(1); }); it("Should reward the player with friendship and eggs based on pokemon selected", async () => { @@ -310,7 +310,7 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => { expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(scene.currentBattle.trainer).toBeDefined(); expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE); - expect(scene.getParty().length).toBe(1); + expect(scene.getPlayerParty().length).toBe(1); }); it("Should reward the player with friendship and eggs based on pokemon selected", async () => { diff --git a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts index 040381c4ac3..a50c0cf4c9e 100644 --- a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts @@ -140,14 +140,14 @@ describe("The Pokemon Salesman - Mystery Encounter", () => { scene.money = 20000; await game.runToMysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN, defaultParty); - const initialPartySize = scene.getParty().length; + const initialPartySize = scene.getPlayerParty().length; const pokemonName = scene.currentBattle.mysteryEncounter!.misc.pokemon.name; await runMysteryEncounterToEnd(game, 1); - expect(scene.getParty().length).toBe(initialPartySize + 1); + expect(scene.getPlayerParty().length).toBe(initialPartySize + 1); - const newlyPurchasedPokemon = scene.getParty()[scene.getParty().length - 1]; + const newlyPurchasedPokemon = scene.getPlayerParty()[scene.getPlayerParty().length - 1]; expect(newlyPurchasedPokemon.name).toBe(pokemonName); expect(newlyPurchasedPokemon!.moveset.length > 0).toBeTruthy(); }); diff --git a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts index 4d95ff31d36..be0e6e68b5e 100644 --- a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts @@ -143,10 +143,10 @@ describe("The Strong Stuff - Mystery Encounter", () => { it("should lower stats of 2 highest BST and raise stats for rest of party", async () => { await game.runToMysteryEncounter(MysteryEncounterType.THE_STRONG_STUFF, defaultParty); - const bstsPrior = scene.getParty().map(p => p.getSpeciesForm().getBaseStatTotal()); + const bstsPrior = scene.getPlayerParty().map(p => p.getSpeciesForm().getBaseStatTotal()); await runMysteryEncounterToEnd(game, 1); - const bstsAfter = scene.getParty().map(p => { + const bstsAfter = scene.getPlayerParty().map(p => { const baseStats = p.getSpeciesForm().baseStats.slice(0); scene.applyModifiers(PokemonBaseStatTotalModifier, true, p, baseStats); return baseStats.reduce((a, b) => a + b); diff --git a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts index fa1b5ecdeb7..c811bda673d 100644 --- a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts @@ -214,11 +214,11 @@ describe("Uncommon Breed - Mystery Encounter", () => { // Berries on party lead const sitrus = generateModifierType(scene, modifierTypes.BERRY, [ BerryType.SITRUS ])!; - const sitrusMod = sitrus.newModifier(scene.getParty()[0]) as BerryModifier; + const sitrusMod = sitrus.newModifier(scene.getPlayerParty()[0]) as BerryModifier; sitrusMod.stackCount = 2; await scene.addModifier(sitrusMod, true, false, false, true); const ganlon = generateModifierType(scene, modifierTypes.BERRY, [ BerryType.GANLON ])!; - const ganlonMod = ganlon.newModifier(scene.getParty()[0]) as BerryModifier; + const ganlonMod = ganlon.newModifier(scene.getPlayerParty()[0]) as BerryModifier; ganlonMod.stackCount = 3; await scene.addModifier(ganlonMod, true, false, false, true); await scene.updateModifiers(true); @@ -248,7 +248,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { it("should NOT be selectable if the player doesn't have an Attracting move", async () => { await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); - scene.getParty().forEach(p => p.moveset = []); + scene.getPlayerParty().forEach(p => p.moveset = []); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -270,7 +270,7 @@ describe("Uncommon Breed - Mystery Encounter", () => { const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.UNCOMMON_BREED, defaultParty); // Mock moveset - scene.getParty()[0].moveset = [ new PokemonMove(Moves.CHARM) ]; + scene.getPlayerParty()[0].moveset = [ new PokemonMove(Moves.CHARM) ]; await runMysteryEncounterToEnd(game, 3); expect(leaveEncounterWithoutBattleSpy).toBeCalled(); diff --git a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts index c1fa6d83a18..ec9cf1509b1 100644 --- a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts @@ -110,14 +110,14 @@ describe("Weird Dream - Mystery Encounter", () => { it("should transform the new party into new species, 2 at +90/+110, the rest at +40/50 BST", async () => { await game.runToMysteryEncounter(MysteryEncounterType.WEIRD_DREAM, defaultParty); - const pokemonPrior = scene.getParty().map(pokemon => pokemon); + const pokemonPrior = scene.getPlayerParty().map(pokemon => pokemon); const bstsPrior = pokemonPrior.map(species => species.getSpeciesForm().getBaseStatTotal()); await runMysteryEncounterToEnd(game, 1); await game.phaseInterceptor.to(SelectModifierPhase, false); expect(scene.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name); - const pokemonAfter = scene.getParty(); + const pokemonAfter = scene.getPlayerParty(); const bstsAfter = pokemonAfter.map(pokemon => pokemon.getSpeciesForm().getBaseStatTotal()); const bstDiff = bstsAfter.map((bst, index) => bst - bstsPrior[index]); @@ -184,7 +184,7 @@ describe("Weird Dream - Mystery Encounter", () => { const enemyField = scene.getEnemyField(); expect(scene.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name); expect(enemyField.length).toBe(1); - expect(scene.getEnemyParty().length).toBe(scene.getParty().length); + expect(scene.getEnemyParty().length).toBe(scene.getPlayerParty().length); }); it("should have 2 Rogue/2 Ultra/2 Great items in rewards", async () => { @@ -227,14 +227,14 @@ describe("Weird Dream - Mystery Encounter", () => { const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.WEIRD_DREAM, defaultParty); - const levelsPrior = scene.getParty().map(p => p.level); + const levelsPrior = scene.getPlayerParty().map(p => p.level); await runMysteryEncounterToEnd(game, 3); - const levelsAfter = scene.getParty().map(p => p.level); + const levelsAfter = scene.getPlayerParty().map(p => p.level); for (let i = 0; i < levelsPrior.length; i++) { expect(Math.max(Math.ceil(0.9 * levelsPrior[i]), 1)).toBe(levelsAfter[i]); - expect(scene.getParty()[i].levelExp).toBe(0); + expect(scene.getPlayerParty()[i].levelExp).toBe(0); } expect(leaveEncounterWithoutBattleSpy).toBeCalled(); diff --git a/src/test/mystery-encounter/mystery-encounter-utils.test.ts b/src/test/mystery-encounter/mystery-encounter-utils.test.ts index 134966a188d..b57a88d5cad 100644 --- a/src/test/mystery-encounter/mystery-encounter-utils.test.ts +++ b/src/test/mystery-encounter/mystery-encounter-utils.test.ts @@ -50,7 +50,7 @@ describe("Mystery Encounter Utils", () => { it("gets a fainted pokemon from player party if isAllowedInBattle is false", () => { // Both pokemon fainted - scene.getParty().forEach(p => { + scene.getPlayerParty().forEach(p => { p.hp = 0; p.trySetStatus(StatusEffect.FAINT); p.updateInfo(); @@ -70,7 +70,7 @@ describe("Mystery Encounter Utils", () => { it("gets an unfainted legal pokemon from player party if isAllowed is true and isFainted is false", () => { // Only faint 1st pokemon - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); party[0].updateInfo(); @@ -89,7 +89,7 @@ describe("Mystery Encounter Utils", () => { it("returns last unfainted pokemon if doNotReturnLastAbleMon is false", () => { // Only faint 1st pokemon - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); party[0].updateInfo(); @@ -108,7 +108,7 @@ describe("Mystery Encounter Utils", () => { it("never returns last unfainted pokemon if doNotReturnLastAbleMon is true", () => { // Only faint 1st pokemon - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); party[0].updateInfo(); @@ -128,7 +128,7 @@ describe("Mystery Encounter Utils", () => { describe("getHighestLevelPlayerPokemon", () => { it("gets highest level pokemon", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].level = 100; const result = getHighestLevelPlayerPokemon(scene); @@ -136,7 +136,7 @@ describe("Mystery Encounter Utils", () => { }); it("gets highest level pokemon at different index", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[1].level = 100; const result = getHighestLevelPlayerPokemon(scene); @@ -144,7 +144,7 @@ describe("Mystery Encounter Utils", () => { }); it("breaks ties by getting returning lower index", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].level = 100; party[1].level = 100; @@ -153,7 +153,7 @@ describe("Mystery Encounter Utils", () => { }); it("returns highest level unfainted if unfainted is true", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].level = 100; party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); @@ -167,7 +167,7 @@ describe("Mystery Encounter Utils", () => { describe("getLowestLevelPokemon", () => { it("gets lowest level pokemon", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].level = 100; const result = getLowestLevelPlayerPokemon(scene); @@ -175,7 +175,7 @@ describe("Mystery Encounter Utils", () => { }); it("gets lowest level pokemon at different index", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[1].level = 100; const result = getLowestLevelPlayerPokemon(scene); @@ -183,7 +183,7 @@ describe("Mystery Encounter Utils", () => { }); it("breaks ties by getting returning lower index", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].level = 100; party[1].level = 100; @@ -192,7 +192,7 @@ describe("Mystery Encounter Utils", () => { }); it("returns lowest level unfainted if unfainted is true", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); party[0].level = 10; party[0].hp = 0; party[0].trySetStatus(StatusEffect.FAINT); @@ -239,7 +239,7 @@ describe("Mystery Encounter Utils", () => { describe("koPlayerPokemon", () => { it("KOs a pokemon", () => { - const party = scene.getParty(); + const party = scene.getPlayerParty(); const arceus = party[0]; arceus.hp = 100; expect(arceus.isAllowedInBattle()).toBe(true); diff --git a/src/test/phases/select-modifier-phase.test.ts b/src/test/phases/select-modifier-phase.test.ts index a945aff055b..60f81f3ad54 100644 --- a/src/test/phases/select-modifier-phase.test.ts +++ b/src/test/phases/select-modifier-phase.test.ts @@ -150,10 +150,10 @@ describe("SelectModifierPhase", () => { const pokemon = new PlayerPokemon(scene, getPokemonSpecies(Species.BULBASAUR), 10, undefined, 0, undefined, true, 2, undefined, undefined, undefined); // Fill party with max shinies - while (scene.getParty().length > 0) { - scene.getParty().pop(); + while (scene.getPlayerParty().length > 0) { + scene.getPlayerParty().pop(); } - scene.getParty().push(pokemon, pokemon, pokemon, pokemon, pokemon, pokemon); + scene.getPlayerParty().push(pokemon, pokemon, pokemon, pokemon, pokemon, pokemon); const selectModifierPhase = new SelectModifierPhase(scene, 0, undefined, customModifiers); scene.pushPhase(selectModifierPhase); diff --git a/src/test/ui/starter-select.test.ts b/src/test/ui/starter-select.test.ts index 94370ca1b74..8f86d62c546 100644 --- a/src/test/ui/starter-select.test.ts +++ b/src/test/ui/starter-select.test.ts @@ -91,10 +91,10 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(true); - expect(game.scene.getParty()[0].variant).toBe(2); - expect(game.scene.getParty()[0].gender).toBe(Gender.MALE); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(true); + expect(game.scene.getPlayerParty()[0].variant).toBe(2); + expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.MALE); }, 20000); it("Bulbasaur - shiny - variant 2 female hardy overgrow", async() => { @@ -152,11 +152,11 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(true); - expect(game.scene.getParty()[0].variant).toBe(2); - expect(game.scene.getParty()[0].nature).toBe(Nature.HARDY); - expect(game.scene.getParty()[0].getAbility().id).toBe(Abilities.OVERGROW); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(true); + expect(game.scene.getPlayerParty()[0].variant).toBe(2); + expect(game.scene.getPlayerParty()[0].nature).toBe(Nature.HARDY); + expect(game.scene.getPlayerParty()[0].getAbility().id).toBe(Abilities.OVERGROW); }, 20000); it("Bulbasaur - shiny - variant 2 female lonely chlorophyl", async() => { @@ -216,12 +216,12 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(true); - expect(game.scene.getParty()[0].variant).toBe(2); - expect(game.scene.getParty()[0].gender).toBe(Gender.FEMALE); - expect(game.scene.getParty()[0].nature).toBe(Nature.LONELY); - expect(game.scene.getParty()[0].getAbility().id).toBe(Abilities.CHLOROPHYLL); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(true); + expect(game.scene.getPlayerParty()[0].variant).toBe(2); + expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.FEMALE); + expect(game.scene.getPlayerParty()[0].nature).toBe(Nature.LONELY); + expect(game.scene.getPlayerParty()[0].getAbility().id).toBe(Abilities.CHLOROPHYLL); }, 20000); it("Bulbasaur - shiny - variant 2 female", async() => { @@ -279,10 +279,10 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(true); - expect(game.scene.getParty()[0].variant).toBe(2); - expect(game.scene.getParty()[0].gender).toBe(Gender.FEMALE); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(true); + expect(game.scene.getPlayerParty()[0].variant).toBe(2); + expect(game.scene.getPlayerParty()[0].gender).toBe(Gender.FEMALE); }, 20000); it("Bulbasaur - not shiny", async() => { @@ -340,9 +340,9 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(false); - expect(game.scene.getParty()[0].variant).toBe(0); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(false); + expect(game.scene.getPlayerParty()[0].variant).toBe(0); }, 20000); it("Bulbasaur - shiny - variant 1", async() => { @@ -401,9 +401,9 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(true); - expect(game.scene.getParty()[0].variant).toBe(1); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(true); + expect(game.scene.getPlayerParty()[0].variant).toBe(1); }, 20000); it("Bulbasaur - shiny - variant 0", async() => { @@ -461,9 +461,9 @@ describe("UI - Starter select", () => { }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.BULBASAUR); - expect(game.scene.getParty()[0].shiny).toBe(true); - expect(game.scene.getParty()[0].variant).toBe(0); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.BULBASAUR); + expect(game.scene.getPlayerParty()[0].shiny).toBe(true); + expect(game.scene.getPlayerParty()[0].variant).toBe(0); }, 20000); it("Check if first pokemon in party is caterpie from gen 1 and 1rd row, 3rd column", async() => { @@ -527,7 +527,7 @@ describe("UI - Starter select", () => { saveSlotSelectUiHandler.processInput(Button.ACTION); }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.CATERPIE); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CATERPIE); }, 20000); it("Check if first pokemon in party is nidoran_m from gen 1 and 2nd row, 4th column (cursor (9+4)-1)", async() => { @@ -593,6 +593,6 @@ describe("UI - Starter select", () => { saveSlotSelectUiHandler.processInput(Button.ACTION); }); await game.phaseInterceptor.whenAboutToRun(EncounterPhase); - expect(game.scene.getParty()[0].species.speciesId).toBe(Species.NIDORAN_M); + expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.NIDORAN_M); }, 20000); }); diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts index 86c51972c8b..a7d67911228 100644 --- a/src/test/utils/gameManager.ts +++ b/src/test/utils/gameManager.ts @@ -1,20 +1,20 @@ import { updateUserInfo } from "#app/account"; import { BattlerIndex } from "#app/battle"; import BattleScene from "#app/battle-scene"; -import { BattleStyle } from "#app/enums/battle-style"; -import { Moves } from "#app/enums/moves"; import { getMoveTargets } from "#app/data/move"; import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import Trainer from "#app/field/trainer"; import { GameModes, getGameMode } from "#app/game-mode"; import { ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type"; import overrides from "#app/overrides"; +import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; import { CommandPhase } from "#app/phases/command-phase"; import { EncounterPhase } from "#app/phases/encounter-phase"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { FaintPhase } from "#app/phases/faint-phase"; import { LoginPhase } from "#app/phases/login-phase"; import { MovePhase } from "#app/phases/move-phase"; +import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { NewBattlePhase } from "#app/phases/new-battle-phase"; import { SelectStarterPhase } from "#app/phases/select-starter-phase"; import { SelectTargetPhase } from "#app/phases/select-target-phase"; @@ -24,37 +24,36 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import ErrorInterceptor from "#app/test/utils/errorInterceptor"; import InputsHandler from "#app/test/utils/inputsHandler"; +import BattleMessageUiHandler from "#app/ui/battle-message-ui-handler"; import CommandUiHandler from "#app/ui/command-ui-handler"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import PartyUiHandler from "#app/ui/party-ui-handler"; import TargetSelectUiHandler from "#app/ui/target-select-ui-handler"; import { Mode } from "#app/ui/ui"; +import { isNullOrUndefined } from "#app/utils"; +import { BattleStyle } from "#enums/battle-style"; import { Button } from "#enums/buttons"; +import { ExpGainsSpeed } from "#enums/exp-gains-speed"; import { ExpNotification } from "#enums/exp-notification"; +import { Moves } from "#enums/moves"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; import { generateStarter, waitUntil } from "#test/utils/gameManagerUtils"; import GameWrapper from "#test/utils/gameWrapper"; +import { ChallengeModeHelper } from "#test/utils/helpers/challengeModeHelper"; +import { ClassicModeHelper } from "#test/utils/helpers/classicModeHelper"; +import { DailyModeHelper } from "#test/utils/helpers/dailyModeHelper"; +import { ModifierHelper } from "#test/utils/helpers/modifiersHelper"; +import { MoveHelper } from "#test/utils/helpers/moveHelper"; +import { OverridesHelper } from "#test/utils/helpers/overridesHelper"; +import { ReloadHelper } from "#test/utils/helpers/reloadHelper"; +import { SettingsHelper } from "#test/utils/helpers/settingsHelper"; import PhaseInterceptor from "#test/utils/phaseInterceptor"; import TextInterceptor from "#test/utils/TextInterceptor"; import { AES, enc } from "crypto-js"; import fs from "fs"; -import { vi } from "vitest"; -import { ClassicModeHelper } from "./helpers/classicModeHelper"; -import { DailyModeHelper } from "./helpers/dailyModeHelper"; -import { ChallengeModeHelper } from "./helpers/challengeModeHelper"; -import { MoveHelper } from "./helpers/moveHelper"; -import { OverridesHelper } from "./helpers/overridesHelper"; -import { SettingsHelper } from "./helpers/settingsHelper"; -import { ReloadHelper } from "./helpers/reloadHelper"; -import { ModifierHelper } from "./helpers/modifiersHelper"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import BattleMessageUiHandler from "#app/ui/battle-message-ui-handler"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { expect } from "vitest"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { isNullOrUndefined } from "#app/utils"; -import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; +import { expect, vi } from "vitest"; /** * Class to manage the game state and transitions between phases. @@ -427,7 +426,7 @@ export default class GameManager { * @param pokemonIndex the index of the pokemon in your party to revive */ doRevivePokemon(pokemonIndex: number) { - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); const candidate = new ModifierTypeOption(modifierTypes.MAX_REVIVE(), 0); const modifier = candidate.type!.newModifier(party[pokemonIndex]); this.scene.addModifier(modifier, false); diff --git a/src/test/utils/gameManagerUtils.ts b/src/test/utils/gameManagerUtils.ts index 543ee9627fe..0c70bcf7f18 100644 --- a/src/test/utils/gameManagerUtils.ts +++ b/src/test/utils/gameManagerUtils.ts @@ -105,7 +105,7 @@ export function initSceneWithoutEncounterPhase(scene: BattleScene, species?: Spe const starterIvs = scene.gameData.dexData[starter.species.speciesId].ivs.slice(0); const starterPokemon = scene.addPlayerPokemon(starter.species, scene.gameMode.getStartingLevel(), starter.abilityIndex, starterFormIndex, starterGender, starterProps.shiny, starterProps.variant, starterIvs, starter.nature); starter.moveset && starterPokemon.tryPopulateMoveset(starter.moveset); - scene.getParty().push(starterPokemon); + scene.getPlayerParty().push(starterPokemon); }); scene.currentBattle = new Battle(getGameMode(GameModes.CLASSIC), 5, BattleType.WILD, undefined, false); diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index 832d665b290..180fc66ed9b 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -170,7 +170,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler { if (!this.scene.showLevelUpStats) { return resolve(); } - const newStats = (this.scene as BattleScene).getParty()[partyMemberIndex].stats; + const newStats = (this.scene as BattleScene).getPlayerParty()[partyMemberIndex].stats; let levelUpStatsValuesText = ""; for (const s of PERMANENT_STATS) { levelUpStatsValuesText += `${showTotals ? newStats[s] : newStats[s] - prevStats[s]}\n`; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index e96fde8d54f..a26aa572ef3 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -346,13 +346,13 @@ export default class PartyUiHandler extends MessageUiHandler { if (this.optionsMode) { const option = this.options[this.optionsCursor]; if (button === Button.ACTION) { - const pokemon = this.scene.getParty()[this.cursor]; + const pokemon = this.scene.getPlayerParty()[this.cursor]; if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode && option !== PartyOption.CANCEL) { this.startTransfer(); let ableToTransfer: string; - for (let p = 0; p < this.scene.getParty().length; p++) { // this fore look goes through each of the party pokemon - const newPokemon = this.scene.getParty()[p]; + for (let p = 0; p < this.scene.getPlayerParty().length; p++) { // this fore look goes through each of the party pokemon + const newPokemon = this.scene.getPlayerParty()[p]; // this next line gets all of the transferable items from pokemon [p]; it does this by getting all the held modifiers that are transferable and checking to see if they belong to pokemon [p] const getTransferrableItemsFromPokemon = (newPokemon: PlayerPokemon) => this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).isTransferable && (m as PokemonHeldItemModifier).pokemonId === newPokemon.id) as PokemonHeldItemModifier[]; @@ -409,7 +409,7 @@ export default class PartyUiHandler extends MessageUiHandler { filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]!); // TODO: is this bang correct? } } else { - filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)(pokemon, getTransferrableItemsFromPokemon(this.scene.getParty()[this.transferCursor])[this.transferOptionCursor]); + filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)(pokemon, getTransferrableItemsFromPokemon(this.scene.getPlayerParty()[this.transferCursor])[this.transferOptionCursor]); } if (filterResult === null) { if (this.partyUiMode !== PartyUiMode.SPLICE) { @@ -419,7 +419,7 @@ export default class PartyUiHandler extends MessageUiHandler { if (option === PartyOption.TRANSFER) { if (this.transferCursor !== this.cursor) { if (this.transferAll) { - getTransferrableItemsFromPokemon(this.scene.getParty()[this.transferCursor]).forEach((_, i) => (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, i, this.transferQuantitiesMax[i], this.cursor)); + getTransferrableItemsFromPokemon(this.scene.getPlayerParty()[this.transferCursor]).forEach((_, i) => (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, i, this.transferQuantitiesMax[i], this.cursor)); } else { (this.selectCallback as PartyModifierTransferSelectCallback)(this.transferCursor, this.transferOptionCursor, this.transferQuantities[this.transferOptionCursor], this.cursor); } @@ -580,7 +580,7 @@ export default class PartyUiHandler extends MessageUiHandler { // show move description if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { const option = this.options[this.optionsCursor]; - const pokemon = this.scene.getParty()[this.cursor]; + const pokemon = this.scene.getPlayerParty()[this.cursor]; const move = allMoves[pokemon.getLearnableLevelMoves()[option]]; if (move) { this.moveInfoOverlay.show(move); @@ -596,7 +596,7 @@ export default class PartyUiHandler extends MessageUiHandler { if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) { /** Initialize item quantities for the selected Pokemon */ const itemModifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier - && m.isTransferable && m.pokemonId === this.scene.getParty()[this.cursor].id) as PokemonHeldItemModifier[]; + && m.isTransferable && m.pokemonId === this.scene.getPlayerParty()[this.cursor].id) as PokemonHeldItemModifier[]; this.transferQuantities = itemModifiers.map(item => item.getStackCount()); this.transferQuantitiesMax = itemModifiers.map(item => item.getStackCount()); } @@ -664,7 +664,7 @@ export default class PartyUiHandler extends MessageUiHandler { } populatePartySlots() { - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); if (this.cursor < 6 && this.cursor >= party.length) { this.cursor = party.length - 1; @@ -803,7 +803,7 @@ export default class PartyUiHandler extends MessageUiHandler { } updateOptions(): void { - const pokemon = this.scene.getParty()[this.cursor]; + const pokemon = this.scene.getPlayerParty()[this.cursor]; const learnableLevelMoves = this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER ? pokemon.getLearnableLevelMoves() @@ -1059,13 +1059,13 @@ export default class PartyUiHandler extends MessageUiHandler { } doRelease(slotIndex: integer): void { - this.showText(this.getReleaseMessage(getPokemonNameWithAffix(this.scene.getParty()[slotIndex])), null, () => { + this.showText(this.getReleaseMessage(getPokemonNameWithAffix(this.scene.getPlayerParty()[slotIndex])), null, () => { this.clearPartySlots(); this.scene.removePartyMemberModifiers(slotIndex); - const releasedPokemon = this.scene.getParty().splice(slotIndex, 1)[0]; + const releasedPokemon = this.scene.getPlayerParty().splice(slotIndex, 1)[0]; releasedPokemon.destroy(); this.populatePartySlots(); - if (this.cursor >= this.scene.getParty().length) { + if (this.cursor >= this.scene.getPlayerParty().length) { this.setCursor(this.cursor - 1); } if (this.partyUiMode === PartyUiMode.RELEASE) { diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index b35c0ca3303..9a61dd0f688 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -554,7 +554,7 @@ export default class SummaryUiHandler extends UiHandler { break; } const isDown = button === Button.DOWN; - const party = this.scene.getParty(); + const party = this.scene.getPlayerParty(); const partyMemberIndex = this.pokemon ? party.indexOf(this.pokemon) : -1; if ((isDown && partyMemberIndex < party.length - 1) || (!isDown && partyMemberIndex)) { const page = this.cursor;