ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Refactor] Minor refactor of trainer-config files (#5573) 

* Move trainer-config.ts

* move TeraAIMode enum to its own file

* Move TrainerPoolTier enum to its own file

* Move TrainerSlot enum to its own file

* Reorder and group imports

* Move TrainerPartyTemplate to its own file

* Remove speciesPoolPerEvilTeamAdmin method

* Apply kev's suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Fix typo in zinzolin's name

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
This commit is contained in:
Sirz Benjie 2025-03-28 23:19:35 -05:00 committed by GitHub
parent fac20ca97a
commit 5f01caffae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 828 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle-scene.ts
View File

@ -72,8 +72,8 @@ import { GameModes, getGameMode } from "#app/game-mode";
import FieldSpritePipeline from "#app/pipelines/field-sprite";
import SpritePipeline from "#app/pipelines/sprite";
import PartyExpBar from "#app/ui/party-exp-bar";
import type { TrainerSlot } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainer-config";
import type { TrainerSlot } from "./enums/trainer-slot";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import Trainer, { TrainerVariant } from "#app/field/trainer";
import type TrainerData from "#app/system/trainer-data";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";

2
src/battle.ts
View File

@ -5,7 +5,7 @@ import Trainer, { TrainerVariant } from "./field/trainer";
import type { GameMode } from "./game-mode";
import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
import type { PokeballType } from "#enums/pokeball";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { SpeciesFormKey } from "#enums/species-form-key";
import type { EnemyPokemon, PlayerPokemon, TurnMove } from "#app/field/pokemon";
import type Pokemon from "#app/field/pokemon";

2
src/data/dialogue.ts
View File

@ -1,6 +1,6 @@
import { BattleSpec } from "#enums/battle-spec";
import { TrainerType } from "#enums/trainer-type";
import { trainerConfigs } from "./trainer-config";
import { trainerConfigs } from "./trainers/trainer-config";
export interface TrainerTypeMessages {
encounter?: string | string[];

2
src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
View File

@ -6,7 +6,7 @@ import {
setEncounterRewards,
transitionMysteryEncounterIntroVisuals,
} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";

2
src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
View File

@ -31,7 +31,7 @@ import {
catchPokemon,
getHighestLevelPlayerPokemon,
} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { PokeballType } from "#enums/pokeball";
import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
import type { BerryType } from "#enums/berry-type";

11
src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
View File

@ -9,13 +9,10 @@ import {
setEncounterRewards,
transitionMysteryEncounterIntroVisuals,
} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import {
getRandomPartyMemberFunc,
trainerConfigs,
TrainerPartyCompoundTemplate,
TrainerPartyTemplate,
TrainerSlot,
} from "#app/data/trainer-config";
import { getRandomPartyMemberFunc, trainerConfigs } from "#app/data/trainers/trainer-config";
import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerSlot } from "#enums/trainer-slot";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { PartyMemberStrength } from "#enums/party-member-strength";
import { globalScene } from "#app/global-scene";

4
src/data/mystery-encounters/encounters/clowning-around-encounter.ts
View File

@ -8,7 +8,9 @@ import {
setEncounterRewards,
transitionMysteryEncounterIntroVisuals,
} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs, TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { ModifierTier } from "#app/modifier/modifier-tier";
import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { ModifierPoolType, modifierTypes } from "#app/modifier/modifier-type";

2
src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
View File

@ -20,7 +20,7 @@ import {
STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER,
} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import type { PlayerPokemon } from "#app/field/pokemon";
import type Pokemon from "#app/field/pokemon";
import { EnemyPokemon, PokemonMove } from "#app/field/pokemon";

2
src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
View File

@ -10,7 +10,7 @@ import { globalScene } from "#app/global-scene";
import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import type { PlayerPokemon } from "#app/field/pokemon";
import type Pokemon from "#app/field/pokemon";
import { FieldPosition } from "#app/field/pokemon";

2
src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
View File

@ -3,7 +3,7 @@ import {
selectPokemonForOption,
setEncounterRewards,
} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { MusicPreference } from "#app/system/settings/settings";
import type { ModifierTypeOption } from "#app/modifier/modifier-type";

10
src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
View File

@ -3,12 +3,10 @@ import {
initBattleWithEnemyConfig,
setEncounterRewards,
} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import {
trainerConfigs,
TrainerPartyCompoundTemplate,
TrainerPartyTemplate,
trainerPartyTemplates,
} from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { modifierTypes } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";

2
src/data/mystery-encounters/encounters/safari-zone-encounter.ts
View File

@ -10,7 +10,7 @@ import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounte
import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option";
import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { HiddenAbilityRateBoosterModifier, IvScannerModifier } from "#app/modifier/modifier";
import type { EnemyPokemon } from "#app/field/pokemon";
import { PokeballType } from "#enums/pokeball";

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

@ -24,7 +24,7 @@ import { Biome } from "#enums/biome";
import { getBiomeKey } from "#app/field/arena";
import { PokemonType } from "#enums/pokemon-type";
import { getPartyLuckValue, modifierTypes } from "#app/modifier/modifier-type";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { BattlerTagType } from "#enums/battler-tag-type";
import { getPokemonNameWithAffix } from "#app/messages";
import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";

2
src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
View File

@ -4,7 +4,7 @@ import {
initBattleWithEnemyConfig,
setEncounterRewards,
} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { globalScene } from "#app/global-scene";
import { randSeedShuffle } from "#app/utils";

3
src/data/mystery-encounters/encounters/weird-dream-encounter.ts
View File

@ -41,7 +41,8 @@ import { TrainerType } from "#enums/trainer-type";
import PokemonData from "#app/system/pokemon-data";
import { Nature } from "#enums/nature";
import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
import { trainerConfigs, TrainerPartyTemplate } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { PartyMemberStrength } from "#enums/party-member-strength";
/** i18n namespace for encounter */

5
src/data/mystery-encounters/utils/encounter-phase-utils.ts
View File

@ -43,8 +43,9 @@ import type { Moves } from "#enums/moves";
import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import { Status } from "#app/data/status-effect";
import type { TrainerConfig } from "#app/data/trainer-config";
import { trainerConfigs, TrainerSlot } from "#app/data/trainer-config";
import type { TrainerConfig } from "#app/data/trainers/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import type PokemonSpecies from "#app/data/pokemon-species";
import type { IEggOptions } from "#app/data/egg";
import { Egg } from "#app/data/egg";

255
src/data/trainers/TrainerPartyTemplate.ts Normal file
View File

@ -0,0 +1,255 @@
import { startingWave } from "#app/battle-scene";
import { globalScene } from "#app/global-scene";
import { PartyMemberStrength } from "#enums/party-member-strength";
export class TrainerPartyTemplate {
public size: number;
public strength: PartyMemberStrength;
public sameSpecies: boolean;
public balanced: boolean;
constructor(size: number, strength: PartyMemberStrength, sameSpecies?: boolean, balanced?: boolean) {
this.size = size;
this.strength = strength;
this.sameSpecies = !!sameSpecies;
this.balanced = !!balanced;
}
getStrength(_index: number): PartyMemberStrength {
return this.strength;
}
isSameSpecies(_index: number): boolean {
return this.sameSpecies;
}
isBalanced(_index: number): boolean {
return this.balanced;
}
}
export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate {
public templates: TrainerPartyTemplate[];
constructor(...templates: TrainerPartyTemplate[]) {
super(
templates.reduce((total: number, template: TrainerPartyTemplate) => {
total += template.size;
return total;
}, 0),
PartyMemberStrength.AVERAGE,
);
this.templates = templates;
}
getStrength(index: number): PartyMemberStrength {
let t = 0;
for (const template of this.templates) {
if (t + template.size > index) {
return template.getStrength(index - t);
}
t += template.size;
}
return super.getStrength(index);
}
isSameSpecies(index: number): boolean {
let t = 0;
for (const template of this.templates) {
if (t + template.size > index) {
return template.isSameSpecies(index - t);
}
t += template.size;
}
return super.isSameSpecies(index);
}
isBalanced(index: number): boolean {
let t = 0;
for (const template of this.templates) {
if (t + template.size > index) {
return template.isBalanced(index - t);
}
t += template.size;
}
return super.isBalanced(index);
}
}
export const trainerPartyTemplates = {
ONE_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
ONE_AVG: new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
ONE_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
ONE_STRONG: new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
ONE_STRONGER: new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
TWO_WEAKER: new TrainerPartyTemplate(2, PartyMemberStrength.WEAKER),
TWO_WEAK: new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
TWO_WEAK_ONE_AVG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
TWO_WEAK_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
TWO_WEAK_SAME_TWO_WEAK_SAME: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
),
TWO_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
TWO_AVG: new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
TWO_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
TWO_AVG_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
TWO_AVG_SAME_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
TWO_AVG_SAME_TWO_AVG_SAME: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
),
TWO_STRONG: new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
THREE_WEAK: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK),
THREE_WEAK_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, true),
THREE_AVG: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
THREE_AVG_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, true),
THREE_WEAK_BALANCED: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, false, true),
FOUR_WEAKER: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER),
FOUR_WEAKER_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER, true),
FOUR_WEAK: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK),
FOUR_WEAK_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, true),
FOUR_WEAK_BALANCED: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, false, true),
FIVE_WEAKER: new TrainerPartyTemplate(5, PartyMemberStrength.WEAKER),
FIVE_WEAK: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK),
FIVE_WEAK_BALANCED: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK, false, true),
SIX_WEAKER: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER),
SIX_WEAKER_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER, true),
SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, true),
SIX_WEAK_BALANCED: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, false, true),
GYM_LEADER_1: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
GYM_LEADER_2: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_3: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_4: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_5: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
ELITE_FOUR: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(3, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
CHAMPION: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(4, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(2, PartyMemberStrength.STRONGER, false, true),
),
RIVAL: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
RIVAL_2: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
),
RIVAL_3: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
),
RIVAL_4: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
),
RIVAL_5: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
RIVAL_6: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
};
/**
* The function to get variable strength grunts
* @returns the correct TrainerPartyTemplate
*/
export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
const waveIndex = globalScene.currentBattle?.waveIndex;
if (waveIndex < 40) {
return trainerPartyTemplates.TWO_AVG;
}
if (waveIndex < 63) {
return trainerPartyTemplates.THREE_AVG;
}
if (waveIndex < 65) {
return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
}
if (waveIndex < 112) {
return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
}
return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
}
export function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
const { currentBattle, gameMode } = globalScene;
const wave = gameMode.getWaveForDifficulty(currentBattle?.waveIndex || startingWave, true);
const templateIndex = Math.ceil((wave - 20) / 30);
return templates[Phaser.Math.Clamp(templateIndex, 0, templates.length - 1)];
}
export function getGymLeaderPartyTemplate() {
return getWavePartyTemplate(
trainerPartyTemplates.GYM_LEADER_1,
trainerPartyTemplates.GYM_LEADER_2,
trainerPartyTemplates.GYM_LEADER_3,
trainerPartyTemplates.GYM_LEADER_4,
trainerPartyTemplates.GYM_LEADER_5,
);
}

436
src/data/trainers/evil-admin-trainer-pools.ts Normal file
View File

@ -0,0 +1,436 @@
import type { TrainerTierPools } from "#app/data/trainers/typedefs";
import { TrainerPoolTier } from "#enums/trainer-pool-tier";
import { Species } from "#enums/species";
/** Team Rocket's admin trainer pool. */
const ROCKET: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.RATICATE,
Species.ARBOK,
Species.VILEPLUME,
Species.ARCANINE,
Species.GENGAR,
Species.HYPNO,
Species.ELECTRODE,
Species.EXEGGUTOR,
Species.CUBONE,
Species.KOFFING,
Species.GYARADOS,
Species.CROBAT,
Species.STEELIX,
Species.HOUNDOOM,
Species.HONCHKROW,
],
[TrainerPoolTier.UNCOMMON]: [
Species.OMASTAR,
Species.KABUTOPS,
Species.MAGNEZONE,
Species.ELECTIVIRE,
Species.MAGMORTAR,
Species.PORYGON_Z,
Species.ANNIHILAPE,
Species.ALOLA_SANDSLASH,
Species.ALOLA_PERSIAN,
Species.ALOLA_GOLEM,
Species.ALOLA_MUK,
Species.PALDEA_TAUROS,
],
[TrainerPoolTier.RARE]: [Species.DRAGONITE, Species.TYRANITAR],
};
/** Team Magma's admin trainer pool */
const MAGMA: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.ARCANINE,
Species.MAGCARGO,
Species.HOUNDOOM,
Species.TORKOAL,
Species.SOLROCK,
Species.CLAYDOL,
Species.HIPPOWDON,
Species.MAGMORTAR,
Species.GLISCOR,
Species.COALOSSAL,
],
[TrainerPoolTier.UNCOMMON]: [
Species.AGGRON,
Species.FLYGON,
Species.CRADILY,
Species.ARMALDO,
Species.RHYPERIOR,
Species.TURTONATOR,
Species.SANDACONDA,
Species.TOEDSCRUEL,
Species.HISUI_ARCANINE,
],
[TrainerPoolTier.RARE]: [Species.CHARCADET, Species.SCOVILLAIN],
};
const AQUA: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.TENTACRUEL,
Species.LANTURN,
Species.AZUMARILL,
Species.QUAGSIRE,
Species.OCTILLERY,
Species.LUDICOLO,
Species.PELIPPER,
Species.WAILORD,
Species.WHISCASH,
Species.CRAWDAUNT,
Species.WALREIN,
Species.CLAMPERL,
],
[TrainerPoolTier.UNCOMMON]: [
Species.QUAGSIRE,
Species.MANTINE,
Species.KINGDRA,
Species.MILOTIC,
Species.DRAGALGE,
Species.DHELMISE,
Species.BARRASKEWDA,
Species.GRAPPLOCT,
Species.OVERQWIL,
],
[TrainerPoolTier.RARE]: [Species.BASCULEGION, Species.DONDOZO],
};
const GALACTIC: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.ELECTRODE,
Species.GYARADOS,
Species.CROBAT,
Species.HONCHKROW,
Species.BRONZONG,
Species.DRAPION,
Species.LICKILICKY,
Species.TANGROWTH,
Species.ELECTIVIRE,
Species.MAGMORTAR,
Species.YANMEGA,
Species.MAMOSWINE,
],
[TrainerPoolTier.UNCOMMON]: [
Species.ALAKAZAM,
Species.WEAVILE,
Species.GLISCOR,
Species.DUSKNOIR,
Species.ROTOM,
Species.OVERQWIL,
Species.HISUI_ARCANINE,
Species.HISUI_ELECTRODE,
],
[TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.SNEASLER, Species.HISUI_LILLIGANT],
};
const PLASMA_ZINZOLIN: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.GIGALITH,
Species.CONKELDURR,
Species.SEISMITOAD,
Species.KROOKODILE,
Species.DARMANITAN,
Species.COFAGRIGUS,
Species.VANILLUXE,
Species.AMOONGUSS,
Species.JELLICENT,
Species.GALVANTULA,
Species.FERROTHORN,
Species.BEARTIC,
],
[TrainerPoolTier.UNCOMMON]: [
Species.EXCADRILL,
Species.SIGILYPH,
Species.ZOROARK,
Species.KLINKLANG,
Species.EELEKTROSS,
Species.MIENSHAO,
Species.GOLURK,
Species.BISHARP,
Species.MANDIBUZZ,
Species.DURANT,
Species.GALAR_DARMANITAN,
],
[TrainerPoolTier.RARE]: [Species.HAXORUS, Species.HYDREIGON, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY],
};
const PLASMA_COLRESS: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.MUK,
Species.ELECTRODE,
Species.BRONZONG,
Species.MAGNEZONE,
Species.PORYGON_Z,
Species.MUSHARNA,
Species.REUNICLUS,
Species.GALVANTULA,
Species.FERROTHORN,
Species.EELEKTROSS,
Species.BEHEEYEM,
],
[TrainerPoolTier.UNCOMMON]: [
Species.METAGROSS,
Species.ROTOM,
Species.CARRACOSTA,
Species.ARCHEOPS,
Species.GOLURK,
Species.DURANT,
Species.VIKAVOLT,
Species.ORBEETLE,
Species.REVAVROOM,
Species.ALOLA_MUK,
Species.HISUI_ELECTRODE,
],
[TrainerPoolTier.RARE]: [Species.ELECTIVIRE, Species.MAGMORTAR, Species.BISHARP, Species.ARCHALUDON],
};
const FLARE: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.MANECTRIC,
Species.DRAPION,
Species.LIEPARD,
Species.AMOONGUSS,
Species.DIGGERSBY,
Species.TALONFLAME,
Species.PYROAR,
Species.PANGORO,
Species.MEOWSTIC,
Species.MALAMAR,
Species.CLAWITZER,
Species.HELIOLISK,
],
[TrainerPoolTier.UNCOMMON]: [
Species.HOUNDOOM,
Species.WEAVILE,
Species.CHANDELURE,
Species.AEGISLASH,
Species.BARBARACLE,
Species.DRAGALGE,
Species.GOODRA,
Species.TREVENANT,
Species.GOURGEIST,
],
[TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_GOODRA, Species.HISUI_AVALUGG],
};
const AETHER: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.ALAKAZAM,
Species.SLOWBRO,
Species.EXEGGUTOR,
Species.XATU,
Species.CLAYDOL,
Species.BEHEEYEM,
Species.ORANGURU,
Species.BRUXISH,
Species.ORBEETLE,
Species.FARIGIRAF,
Species.ALOLA_RAICHU,
],
[TrainerPoolTier.UNCOMMON]: [
Species.KIRLIA,
Species.MEDICHAM,
Species.METAGROSS,
Species.MALAMAR,
Species.HATTERENE,
Species.MR_RIME,
Species.GALAR_SLOWKING,
],
[TrainerPoolTier.RARE]: [Species.PORYGON_Z, Species.ARMAROUGE, Species.HISUI_BRAVIARY],
};
const SKULL: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.NIDOQUEEN,
Species.GENGAR,
Species.KOFFING,
Species.CROBAT,
Species.ROSERADE,
Species.SKUNTANK,
Species.TOXICROAK,
Species.SCOLIPEDE,
Species.TOXAPEX,
Species.LURANTIS,
Species.ALOLA_MUK,
],
[TrainerPoolTier.UNCOMMON]: [
Species.DRAPION,
Species.MANDIBUZZ,
Species.OVERQWIL,
Species.GLIMMORA,
Species.CLODSIRE,
Species.GALAR_SLOWBRO,
],
[TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.SNEASLER],
};
const MACRO_COSMOS: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.NINETALES,
Species.BELLOSSOM,
Species.MILOTIC,
Species.FROSLASS,
Species.GOTHITELLE,
Species.JELLICENT,
Species.SALAZZLE,
Species.TSAREENA,
Species.POLTEAGEIST,
Species.HATTERENE,
Species.GALAR_RAPIDASH,
],
[TrainerPoolTier.UNCOMMON]: [
Species.TOGEKISS,
Species.MANDIBUZZ,
Species.TOXAPEX,
Species.APPLETUN,
Species.CURSOLA,
Species.ALOLA_NINETALES,
],
[TrainerPoolTier.RARE]: [Species.TINKATON, Species.HISUI_LILLIGANT],
};
const STAR_DARK: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.SHIFTRY,
Species.CACTURNE,
Species.HONCHKROW,
Species.SKUNTANK,
Species.KROOKODILE,
Species.OBSTAGOON,
Species.LOKIX,
Species.MABOSSTIFF,
],
[TrainerPoolTier.UNCOMMON]: [
Species.UMBREON,
Species.CRAWDAUNT,
Species.WEAVILE,
Species.ZOROARK,
Species.MALAMAR,
Species.BOMBIRDIER,
],
[TrainerPoolTier.RARE]: [Species.HYDREIGON, Species.MEOWSCARADA],
};
const STAR_FIRE: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.ARCANINE,
Species.HOUNDOOM,
Species.CAMERUPT,
Species.CHANDELURE,
Species.TALONFLAME,
Species.PYROAR,
Species.COALOSSAL,
Species.SCOVILLAIN,
],
[TrainerPoolTier.UNCOMMON]: [
Species.RAPIDASH,
Species.FLAREON,
Species.TORKOAL,
Species.MAGMORTAR,
Species.SALAZZLE,
Species.TURTONATOR,
],
[TrainerPoolTier.RARE]: [Species.VOLCARONA, Species.SKELEDIRGE],
};
const STAR_POISON: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.MUK,
Species.CROBAT,
Species.SKUNTANK,
Species.AMOONGUSS,
Species.TOXAPEX,
Species.TOXTRICITY,
Species.GRAFAIAI,
Species.CLODSIRE,
],
[TrainerPoolTier.UNCOMMON]: [
Species.GENGAR,
Species.SEVIPER,
Species.DRAGALGE,
Species.OVERQWIL,
Species.ALOLA_MUK,
Species.GALAR_SLOWBRO,
],
[TrainerPoolTier.RARE]: [Species.GLIMMORA, Species.VENUSAUR],
};
const STAR_FAIRY: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.CLEFABLE,
Species.WIGGLYTUFF,
Species.AZUMARILL,
Species.WHIMSICOTT,
Species.FLORGES,
Species.HATTERENE,
Species.GRIMMSNARL,
Species.TINKATON,
],
[TrainerPoolTier.UNCOMMON]: [
Species.TOGEKISS,
Species.GARDEVOIR,
Species.SYLVEON,
Species.KLEFKI,
Species.MIMIKYU,
Species.ALOLA_NINETALES,
],
[TrainerPoolTier.RARE]: [Species.GALAR_RAPIDASH, Species.PRIMARINA],
};
const STAR_FIGHTING: TrainerTierPools = {
[TrainerPoolTier.COMMON]: [
Species.BRELOOM,
Species.HARIYAMA,
Species.MEDICHAM,
Species.TOXICROAK,
Species.SCRAFTY,
Species.MIENSHAO,
Species.PAWMOT,
Species.PALDEA_TAUROS,
],
[TrainerPoolTier.UNCOMMON]: [
Species.LUCARIO,
Species.CONKELDURR,
Species.HAWLUCHA,
Species.PASSIMIAN,
Species.FALINKS,
Species.FLAMIGO,
],
[TrainerPoolTier.RARE]: [Species.KOMMO_O, Species.QUAQUAVAL],
};
export type EvilTeam =
| "rocket"
| "magma"
| "aqua"
| "galactic"
| "plasma_zinzolin"
| "plasma_colress"
| "flare"
| "aether"
| "skull"
| "macro_cosmos"
| "star_dark"
| "star_fire"
| "star_poison"
| "star_fairy"
| "star_fighting";
/** Trainer pools for each evil admin team */
export const evilAdminTrainerPools: Record<EvilTeam, TrainerTierPools> = {
rocket: ROCKET,
magma: MAGMA,
aqua: AQUA,
galactic: GALACTIC,
plasma_zinzolin: PLASMA_ZINZOLIN,
plasma_colress: PLASMA_COLRESS,
flare: FLARE,
aether: AETHER,
macro_cosmos: MACRO_COSMOS,
skull: SKULL,
star_dark: STAR_DARK,
star_fire: STAR_FIRE,
star_poison: STAR_POISON,
star_fairy: STAR_FAIRY,
star_fighting: STAR_FIGHTING,
};

789
src/data/trainer-config.ts → src/data/trainers/trainer-config.ts
View File

@ -1,29 +1,53 @@
import { startingWave } from "#app/battle-scene";
import { globalScene } from "#app/global-scene";
import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
import { modifierTypes } from "#app/modifier/modifier-type";
import type { EnemyPokemon } from "#app/field/pokemon";
import { PokemonMove } from "#app/field/pokemon";
import * as Utils from "#app/utils";
import { PokeballType } from "#enums/pokeball";
import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
import type { PokemonSpeciesFilter } from "#app/data/pokemon-species";
import type PokemonSpecies from "#app/data/pokemon-species";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { tmSpecies } from "#app/data/balance/tms";
import { PokemonType } from "#enums/pokemon-type";
import { doubleBattleDialogue } from "#app/data/dialogue";
import type { PersistentModifier } from "#app/modifier/modifier";
import { TrainerVariant } from "#app/field/trainer";
import { getIsInitialized, initI18n } from "#app/plugins/i18n";
import i18next from "i18next";
import { Moves } from "#enums/moves";
import { Gender } from "#app/data/gender";
import { signatureSpecies } from "../balance/signature-species";
import {
getEvilGruntPartyTemplate,
getGymLeaderPartyTemplate,
getWavePartyTemplate,
TrainerPartyCompoundTemplate,
TrainerPartyTemplate,
trainerPartyTemplates,
} from "./TrainerPartyTemplate";
import { evilAdminTrainerPools } from "./evil-admin-trainer-pools";
// Enum imports
import { PartyMemberStrength } from "#enums/party-member-strength";
import { Species } from "#enums/species";
import { TrainerType } from "#enums/trainer-type";
import { Gender } from "#app/data/gender";
import { signatureSpecies } from "./balance/signature-species";
import { PokeballType } from "#enums/pokeball";
import { PokemonType } from "#enums/pokemon-type";
import { Moves } from "#enums/moves";
import { Abilities } from "#enums/abilities";
import { TeraAIMode } from "#enums/tera-ai-mode";
import { TrainerPoolTier } from "#enums/trainer-pool-tier";
import { TrainerSlot } from "#enums/trainer-slot";
import { TrainerType } from "#enums/trainer-type";
// Type imports
import type { PokemonSpeciesFilter } from "#app/data/pokemon-species";
import type PokemonSpecies from "#app/data/pokemon-species";
import type { ModifierTypeFunc } from "#app/modifier/modifier-type";
import type { EnemyPokemon } from "#app/field/pokemon";
import type { EvilTeam } from "./evil-admin-trainer-pools";
import type {
PartyMemberFunc,
GenModifiersFunc,
GenAIFunc,
PartyTemplateFunc,
TrainerTierPools,
TrainerConfigs,
PartyMemberFuncs,
} from "./typedefs";
/** Minimum BST for Pokemon generated onto the Elite Four's teams */
const ELITE_FOUR_MINIMUM_BST = 460;
@ -31,253 +55,6 @@ const ELITE_FOUR_MINIMUM_BST = 460;
/** The wave at which (non-Paldean) Gym Leaders start having Tera mons*/
const GYM_LEADER_TERA_WAVE = 100;
export enum TrainerPoolTier {
COMMON,
UNCOMMON,
RARE,
SUPER_RARE,
ULTRA_RARE,
}
export interface TrainerTierPools {
[key: number]: Species[];
}
export enum TrainerSlot {
NONE,
TRAINER,
TRAINER_PARTNER,
}
export class TrainerPartyTemplate {
public size: number;
public strength: PartyMemberStrength;
public sameSpecies: boolean;
public balanced: boolean;
constructor(size: number, strength: PartyMemberStrength, sameSpecies?: boolean, balanced?: boolean) {
this.size = size;
this.strength = strength;
this.sameSpecies = !!sameSpecies;
this.balanced = !!balanced;
}
getStrength(_index: number): PartyMemberStrength {
return this.strength;
}
isSameSpecies(_index: number): boolean {
return this.sameSpecies;
}
isBalanced(_index: number): boolean {
return this.balanced;
}
}
export class TrainerPartyCompoundTemplate extends TrainerPartyTemplate {
public templates: TrainerPartyTemplate[];
constructor(...templates: TrainerPartyTemplate[]) {
super(
templates.reduce((total: number, template: TrainerPartyTemplate) => {
total += template.size;
return total;
}, 0),
PartyMemberStrength.AVERAGE,
);
this.templates = templates;
}
getStrength(index: number): PartyMemberStrength {
let t = 0;
for (const template of this.templates) {
if (t + template.size > index) {
return template.getStrength(index - t);
}
t += template.size;
}
return super.getStrength(index);
}
isSameSpecies(index: number): boolean {
let t = 0;
for (const template of this.templates) {
if (t + template.size > index) {
return template.isSameSpecies(index - t);
}
t += template.size;
}
return super.isSameSpecies(index);
}
isBalanced(index: number): boolean {
let t = 0;
for (const template of this.templates) {
if (t + template.size > index) {
return template.isBalanced(index - t);
}
t += template.size;
}
return super.isBalanced(index);
}
}
export const trainerPartyTemplates = {
ONE_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
ONE_AVG: new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
ONE_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
ONE_STRONG: new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
ONE_STRONGER: new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
TWO_WEAKER: new TrainerPartyTemplate(2, PartyMemberStrength.WEAKER),
TWO_WEAK: new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
TWO_WEAK_ONE_AVG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
TWO_WEAK_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
TWO_WEAK_SAME_TWO_WEAK_SAME: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK, true),
),
TWO_WEAK_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.WEAK),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
TWO_AVG: new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
TWO_AVG_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
TWO_AVG_SAME_ONE_AVG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
TWO_AVG_SAME_ONE_STRONG: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
TWO_AVG_SAME_TWO_AVG_SAME: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, true),
),
TWO_STRONG: new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
THREE_WEAK: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK),
THREE_WEAK_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, true),
THREE_AVG: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
THREE_AVG_SAME: new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, true),
THREE_WEAK_BALANCED: new TrainerPartyTemplate(3, PartyMemberStrength.WEAK, false, true),
FOUR_WEAKER: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER),
FOUR_WEAKER_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAKER, true),
FOUR_WEAK: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK),
FOUR_WEAK_SAME: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, true),
FOUR_WEAK_BALANCED: new TrainerPartyTemplate(4, PartyMemberStrength.WEAK, false, true),
FIVE_WEAKER: new TrainerPartyTemplate(5, PartyMemberStrength.WEAKER),
FIVE_WEAK: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK),
FIVE_WEAK_BALANCED: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK, false, true),
SIX_WEAKER: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER),
SIX_WEAKER_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER, true),
SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, true),
SIX_WEAK_BALANCED: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, false, true),
GYM_LEADER_1: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
GYM_LEADER_2: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_3: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_4: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_5: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
ELITE_FOUR: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(3, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
CHAMPION: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(4, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(2, PartyMemberStrength.STRONGER, false, true),
),
RIVAL: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
),
RIVAL_2: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
),
RIVAL_3: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
),
RIVAL_4: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.WEAK, false, true),
),
RIVAL_5: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
),
RIVAL_6: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE, false, true),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
};
type PartyTemplateFunc = () => TrainerPartyTemplate;
type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon;
type GenModifiersFunc = (party: EnemyPokemon[]) => PersistentModifier[];
type GenAIFunc = (party: EnemyPokemon[]) => void;
export interface PartyMemberFuncs {
[key: number]: PartyMemberFunc;
}
export enum TeraAIMode {
NO_TERA,
INSTANT_TERA,
SMART_TERA,
}
/**
* Stores data and helper functions about a trainers AI options.
*/
@ -759,430 +536,6 @@ export class TrainerConfig {
return this;
}
/**
* Returns the pool of species for an evil team admin
* @param team - The evil team the admin belongs to.
* @returns {TrainerTierPools}
*/
speciesPoolPerEvilTeamAdmin(team): TrainerTierPools {
team = team.toLowerCase();
switch (team) {
case "rocket": {
return {
[TrainerPoolTier.COMMON]: [
Species.RATICATE,
Species.ARBOK,
Species.VILEPLUME,
Species.ARCANINE,
Species.GENGAR,
Species.HYPNO,
Species.ELECTRODE,
Species.EXEGGUTOR,
Species.CUBONE,
Species.KOFFING,
Species.GYARADOS,
Species.CROBAT,
Species.STEELIX,
Species.HOUNDOOM,
Species.HONCHKROW,
],
[TrainerPoolTier.UNCOMMON]: [
Species.OMASTAR,
Species.KABUTOPS,
Species.MAGNEZONE,
Species.ELECTIVIRE,
Species.MAGMORTAR,
Species.PORYGON_Z,
Species.ANNIHILAPE,
Species.ALOLA_SANDSLASH,
Species.ALOLA_PERSIAN,
Species.ALOLA_GOLEM,
Species.ALOLA_MUK,
Species.PALDEA_TAUROS,
],
[TrainerPoolTier.RARE]: [Species.DRAGONITE, Species.TYRANITAR],
};
}
case "magma": {
return {
[TrainerPoolTier.COMMON]: [
Species.ARCANINE,
Species.MAGCARGO,
Species.HOUNDOOM,
Species.TORKOAL,
Species.SOLROCK,
Species.CLAYDOL,
Species.HIPPOWDON,
Species.MAGMORTAR,
Species.GLISCOR,
Species.COALOSSAL,
],
[TrainerPoolTier.UNCOMMON]: [
Species.AGGRON,
Species.FLYGON,
Species.CRADILY,
Species.ARMALDO,
Species.RHYPERIOR,
Species.TURTONATOR,
Species.SANDACONDA,
Species.TOEDSCRUEL,
Species.HISUI_ARCANINE,
],
[TrainerPoolTier.RARE]: [Species.CHARCADET, Species.SCOVILLAIN],
};
}
case "aqua": {
return {
[TrainerPoolTier.COMMON]: [
Species.TENTACRUEL,
Species.LANTURN,
Species.AZUMARILL,
Species.QUAGSIRE,
Species.OCTILLERY,
Species.LUDICOLO,
Species.PELIPPER,
Species.WAILORD,
Species.WHISCASH,
Species.CRAWDAUNT,
Species.WALREIN,
Species.CLAMPERL,
],
[TrainerPoolTier.UNCOMMON]: [
Species.QUAGSIRE,
Species.MANTINE,
Species.KINGDRA,
Species.MILOTIC,
Species.DRAGALGE,
Species.DHELMISE,
Species.BARRASKEWDA,
Species.GRAPPLOCT,
Species.OVERQWIL,
],
[TrainerPoolTier.RARE]: [Species.BASCULEGION, Species.DONDOZO],
};
}
case "galactic": {
return {
[TrainerPoolTier.COMMON]: [
Species.ELECTRODE,
Species.GYARADOS,
Species.CROBAT,
Species.HONCHKROW,
Species.BRONZONG,
Species.DRAPION,
Species.LICKILICKY,
Species.TANGROWTH,
Species.ELECTIVIRE,
Species.MAGMORTAR,
Species.YANMEGA,
Species.MAMOSWINE,
],
[TrainerPoolTier.UNCOMMON]: [
Species.ALAKAZAM,
Species.WEAVILE,
Species.GLISCOR,
Species.DUSKNOIR,
Species.ROTOM,
Species.OVERQWIL,
Species.HISUI_ARCANINE,
Species.HISUI_ELECTRODE,
],
[TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.SNEASLER, Species.HISUI_LILLIGANT],
};
}
case "plasma": {
return {
[TrainerPoolTier.COMMON]: [
Species.GIGALITH,
Species.CONKELDURR,
Species.SEISMITOAD,
Species.KROOKODILE,
Species.DARMANITAN,
Species.COFAGRIGUS,
Species.VANILLUXE,
Species.AMOONGUSS,
Species.JELLICENT,
Species.GALVANTULA,
Species.FERROTHORN,
Species.BEARTIC,
],
[TrainerPoolTier.UNCOMMON]: [
Species.EXCADRILL,
Species.SIGILYPH,
Species.ZOROARK,
Species.KLINKLANG,
Species.EELEKTROSS,
Species.MIENSHAO,
Species.GOLURK,
Species.BISHARP,
Species.MANDIBUZZ,
Species.DURANT,
Species.GALAR_DARMANITAN,
],
[TrainerPoolTier.RARE]: [Species.HAXORUS, Species.HYDREIGON, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY],
};
}
case "plasma_2": {
return {
[TrainerPoolTier.COMMON]: [
Species.MUK,
Species.ELECTRODE,
Species.BRONZONG,
Species.MAGNEZONE,
Species.PORYGON_Z,
Species.MUSHARNA,
Species.REUNICLUS,
Species.GALVANTULA,
Species.FERROTHORN,
Species.EELEKTROSS,
Species.BEHEEYEM,
],
[TrainerPoolTier.UNCOMMON]: [
Species.METAGROSS,
Species.ROTOM,
Species.CARRACOSTA,
Species.ARCHEOPS,
Species.GOLURK,
Species.DURANT,
Species.VIKAVOLT,
Species.ORBEETLE,
Species.REVAVROOM,
Species.ALOLA_MUK,
Species.HISUI_ELECTRODE,
],
[TrainerPoolTier.RARE]: [Species.ELECTIVIRE, Species.MAGMORTAR, Species.BISHARP, Species.ARCHALUDON],
};
}
case "flare": {
return {
[TrainerPoolTier.COMMON]: [
Species.MANECTRIC,
Species.DRAPION,
Species.LIEPARD,
Species.AMOONGUSS,
Species.DIGGERSBY,
Species.TALONFLAME,
Species.PYROAR,
Species.PANGORO,
Species.MEOWSTIC,
Species.MALAMAR,
Species.CLAWITZER,
Species.HELIOLISK,
],
[TrainerPoolTier.UNCOMMON]: [
Species.HOUNDOOM,
Species.WEAVILE,
Species.CHANDELURE,
Species.AEGISLASH,
Species.BARBARACLE,
Species.DRAGALGE,
Species.GOODRA,
Species.TREVENANT,
Species.GOURGEIST,
],
[TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_GOODRA, Species.HISUI_AVALUGG],
};
}
case "aether": {
return {
[TrainerPoolTier.COMMON]: [
Species.ALAKAZAM,
Species.SLOWBRO,
Species.EXEGGUTOR,
Species.XATU,
Species.CLAYDOL,
Species.BEHEEYEM,
Species.ORANGURU,
Species.BRUXISH,
Species.ORBEETLE,
Species.FARIGIRAF,
Species.ALOLA_RAICHU,
],
[TrainerPoolTier.UNCOMMON]: [
Species.KIRLIA,
Species.MEDICHAM,
Species.METAGROSS,
Species.MALAMAR,
Species.HATTERENE,
Species.MR_RIME,
Species.GALAR_SLOWKING,
],
[TrainerPoolTier.RARE]: [Species.PORYGON_Z, Species.ARMAROUGE, Species.HISUI_BRAVIARY],
};
}
case "skull": {
return {
[TrainerPoolTier.COMMON]: [
Species.NIDOQUEEN,
Species.GENGAR,
Species.KOFFING,
Species.CROBAT,
Species.ROSERADE,
Species.SKUNTANK,
Species.TOXICROAK,
Species.SCOLIPEDE,
Species.TOXAPEX,
Species.LURANTIS,
Species.ALOLA_MUK,
],
[TrainerPoolTier.UNCOMMON]: [
Species.DRAPION,
Species.MANDIBUZZ,
Species.OVERQWIL,
Species.GLIMMORA,
Species.CLODSIRE,
Species.GALAR_SLOWBRO,
],
[TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.SNEASLER],
};
}
case "macro": {
return {
[TrainerPoolTier.COMMON]: [
Species.NINETALES,
Species.BELLOSSOM,
Species.MILOTIC,
Species.FROSLASS,
Species.GOTHITELLE,
Species.JELLICENT,
Species.SALAZZLE,
Species.TSAREENA,
Species.POLTEAGEIST,
Species.HATTERENE,
Species.GALAR_RAPIDASH,
],
[TrainerPoolTier.UNCOMMON]: [
Species.TOGEKISS,
Species.MANDIBUZZ,
Species.TOXAPEX,
Species.APPLETUN,
Species.CURSOLA,
Species.ALOLA_NINETALES,
],
[TrainerPoolTier.RARE]: [Species.TINKATON, Species.HISUI_LILLIGANT],
};
}
case "star_1": {
return {
[TrainerPoolTier.COMMON]: [
Species.SHIFTRY,
Species.CACTURNE,
Species.HONCHKROW,
Species.SKUNTANK,
Species.KROOKODILE,
Species.OBSTAGOON,
Species.LOKIX,
Species.MABOSSTIFF,
],
[TrainerPoolTier.UNCOMMON]: [
Species.UMBREON,
Species.CRAWDAUNT,
Species.WEAVILE,
Species.ZOROARK,
Species.MALAMAR,
Species.BOMBIRDIER,
],
[TrainerPoolTier.RARE]: [Species.HYDREIGON, Species.MEOWSCARADA],
};
}
case "star_2": {
return {
[TrainerPoolTier.COMMON]: [
Species.ARCANINE,
Species.HOUNDOOM,
Species.CAMERUPT,
Species.CHANDELURE,
Species.TALONFLAME,
Species.PYROAR,
Species.COALOSSAL,
Species.SCOVILLAIN,
],
[TrainerPoolTier.UNCOMMON]: [
Species.RAPIDASH,
Species.FLAREON,
Species.TORKOAL,
Species.MAGMORTAR,
Species.SALAZZLE,
Species.TURTONATOR,
],
[TrainerPoolTier.RARE]: [Species.VOLCARONA, Species.SKELEDIRGE],
};
}
case "star_3": {
return {
[TrainerPoolTier.COMMON]: [
Species.MUK,
Species.CROBAT,
Species.SKUNTANK,
Species.AMOONGUSS,
Species.TOXAPEX,
Species.TOXTRICITY,
Species.GRAFAIAI,
Species.CLODSIRE,
],
[TrainerPoolTier.UNCOMMON]: [
Species.GENGAR,
Species.SEVIPER,
Species.DRAGALGE,
Species.OVERQWIL,
Species.ALOLA_MUK,
Species.GALAR_SLOWBRO,
],
[TrainerPoolTier.RARE]: [Species.GLIMMORA, Species.VENUSAUR],
};
}
case "star_4": {
return {
[TrainerPoolTier.COMMON]: [
Species.CLEFABLE,
Species.WIGGLYTUFF,
Species.AZUMARILL,
Species.WHIMSICOTT,
Species.FLORGES,
Species.HATTERENE,
Species.GRIMMSNARL,
Species.TINKATON,
],
[TrainerPoolTier.UNCOMMON]: [
Species.TOGEKISS,
Species.GARDEVOIR,
Species.SYLVEON,
Species.KLEFKI,
Species.MIMIKYU,
Species.ALOLA_NINETALES,
],
[TrainerPoolTier.RARE]: [Species.GALAR_RAPIDASH, Species.PRIMARINA],
};
}
case "star_5": {
return {
[TrainerPoolTier.COMMON]: [
Species.BRELOOM,
Species.HARIYAMA,
Species.MEDICHAM,
Species.TOXICROAK,
Species.SCRAFTY,
Species.MIENSHAO,
Species.PAWMOT,
Species.PALDEA_TAUROS,
],
[TrainerPoolTier.UNCOMMON]: [
Species.LUCARIO,
Species.CONKELDURR,
Species.HAWLUCHA,
Species.PASSIMIAN,
Species.FALINKS,
Species.FLAMIGO,
],
[TrainerPoolTier.RARE]: [Species.KOMMO_O, Species.QUAQUAVAL],
};
}
}
console.warn(`Evil team admin for ${team} not found. Returning empty species pools.`);
return [];
}
/**
* Initializes the trainer configuration for an evil team admin.
* @param title The title of the evil team admin.
@ -1193,7 +546,7 @@ export class TrainerConfig {
* **/
initForEvilTeamAdmin(
title: string,
poolName: string,
poolName: EvilTeam,
signatureSpecies: (Species | Species[])[],
specialtyType?: PokemonType,
): TrainerConfig {
@ -1208,7 +561,7 @@ export class TrainerConfig {
this.setPartyTemplates(trainerPartyTemplates.RIVAL_5);
// Set the species pools for the evil team admin.
this.speciesPools = this.speciesPoolPerEvilTeamAdmin(poolName);
this.speciesPools = evilAdminTrainerPools[poolName];
signatureSpecies.forEach((speciesPool, s) => {
if (!Array.isArray(speciesPool)) {
@ -1637,56 +990,6 @@ export class TrainerConfig {
let t = 0;
interface TrainerConfigs {
[key: number]: TrainerConfig;
}
/**
* The function to get variable strength grunts
* @returns the correct TrainerPartyTemplate
*/
function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
const waveIndex = globalScene.currentBattle?.waveIndex;
if (waveIndex < 40) {
return trainerPartyTemplates.TWO_AVG;
}
if (waveIndex < 63) {
return trainerPartyTemplates.THREE_AVG;
}
if (waveIndex < 65) {
return trainerPartyTemplates.TWO_AVG_ONE_STRONG;
}
if (waveIndex < 112) {
return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
}
return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
}
function getWavePartyTemplate(...templates: TrainerPartyTemplate[]) {
return templates[
Math.min(
Math.max(
Math.ceil(
(globalScene.gameMode.getWaveForDifficulty(globalScene.currentBattle?.waveIndex || startingWave, true) - 20) /
30,
),
0,
),
templates.length - 1,
)
];
}
function getGymLeaderPartyTemplate() {
return getWavePartyTemplate(
trainerPartyTemplates.GYM_LEADER_1,
trainerPartyTemplates.GYM_LEADER_2,
trainerPartyTemplates.GYM_LEADER_3,
trainerPartyTemplates.GYM_LEADER_4,
trainerPartyTemplates.GYM_LEADER_5,
);
}
/**
* Randomly selects one of the `Species` from `speciesPool`, determines its evolution, level, and strength.
* Then adds Pokemon to globalScene.
@ -2878,7 +2181,7 @@ export const trainerConfigs: TrainerConfigs = {
}),
[TrainerType.ZINZOLIN]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("plasma_sage", "plasma", [Species.CRYOGONAL])
.initForEvilTeamAdmin("plasma_sage", "plasma_zinzolin", [Species.CRYOGONAL])
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_plasma_grunt")
@ -2886,7 +2189,7 @@ export const trainerConfigs: TrainerConfigs = {
.setPartyTemplateFunc(() => getEvilGruntPartyTemplate()),
[TrainerType.COLRESS]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("plasma_boss", "plasma_2", [Species.KLINKLANG])
.initForEvilTeamAdmin("plasma_boss", "plasma_colress", [Species.KLINKLANG])
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_colress")
.setMixedBattleBgm("battle_colress")
@ -3105,7 +2408,7 @@ export const trainerConfigs: TrainerConfigs = {
}),
[TrainerType.OLEANA]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("macro_admin", "macro", [Species.GARBODOR])
.initForEvilTeamAdmin("macro_admin", "macro_cosmos", [Species.GARBODOR])
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_oleana")
@ -3172,7 +2475,7 @@ export const trainerConfigs: TrainerConfigs = {
}),
[TrainerType.GIACOMO]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("star_admin", "star_1", [Species.KINGAMBIT], PokemonType.DARK)
.initForEvilTeamAdmin("star_admin", "star_dark", [Species.KINGAMBIT], PokemonType.DARK)
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_star_admin")
@ -3192,7 +2495,7 @@ export const trainerConfigs: TrainerConfigs = {
),
[TrainerType.MELA]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("star_admin", "star_2", [Species.ARMAROUGE], PokemonType.FIRE)
.initForEvilTeamAdmin("star_admin", "star_fire", [Species.ARMAROUGE], PokemonType.FIRE)
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_star_admin")
@ -3212,7 +2515,7 @@ export const trainerConfigs: TrainerConfigs = {
),
[TrainerType.ATTICUS]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("star_admin", "star_3", [Species.REVAVROOM], PokemonType.POISON)
.initForEvilTeamAdmin("star_admin", "star_poison", [Species.REVAVROOM], PokemonType.POISON)
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_star_admin")
@ -3232,7 +2535,7 @@ export const trainerConfigs: TrainerConfigs = {
),
[TrainerType.ORTEGA]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("star_admin", "star_4", [Species.DACHSBUN], PokemonType.FAIRY)
.initForEvilTeamAdmin("star_admin", "star_fairy", [Species.DACHSBUN], PokemonType.FAIRY)
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_star_admin")
@ -3252,7 +2555,7 @@ export const trainerConfigs: TrainerConfigs = {
),
[TrainerType.ERI]: new TrainerConfig(++t)
.setMoneyMultiplier(1.5)
.initForEvilTeamAdmin("star_admin", "star_5", [Species.ANNIHILAPE], PokemonType.FIGHTING)
.initForEvilTeamAdmin("star_admin", "star_fighting", [Species.ANNIHILAPE], PokemonType.FIGHTING)
.setEncounterBgm(TrainerType.PLASMA_GRUNT)
.setBattleBgm("battle_plasma_grunt")
.setMixedBattleBgm("battle_star_admin")

22
src/data/trainers/typedefs.ts Normal file
View File

@ -0,0 +1,22 @@
import type { EnemyPokemon } from "#app/field/pokemon";
import type { PersistentModifier } from "#app/modifier/modifier";
import type { PartyMemberStrength } from "#enums/party-member-strength";
import type { Species } from "#enums/species";
import type { TrainerConfig } from "./trainer-config";
import type { TrainerPartyTemplate } from "./TrainerPartyTemplate";
export type PartyTemplateFunc = () => TrainerPartyTemplate;
export type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon;
export type GenModifiersFunc = (party: EnemyPokemon[]) => PersistentModifier[];
export type GenAIFunc = (party: EnemyPokemon[]) => void;
export interface TrainerTierPools {
[key: number]: Species[];
}
export interface TrainerConfigs {
[key: number]: TrainerConfig;
}
export interface PartyMemberFuncs {
[key: number]: PartyMemberFunc;
}

5
src/enums/tera-ai-mode.ts Normal file
View File

@ -0,0 +1,5 @@
export enum TeraAIMode {
NO_TERA,
INSTANT_TERA,
SMART_TERA
}

7
src/enums/trainer-pool-tier.ts Normal file
View File

@ -0,0 +1,7 @@
export enum TrainerPoolTier {
COMMON,
UNCOMMON,
RARE,
SUPER_RARE,
ULTRA_RARE
}

5
src/enums/trainer-slot.ts Normal file
View File

@ -0,0 +1,5 @@
export enum TrainerSlot {
NONE,
TRAINER,
TRAINER_PARTNER
}

2
src/field/pokemon.ts
View File

@ -225,7 +225,7 @@ import {
SpeciesFormChangeStatusEffectTrigger,
} from "#app/data/pokemon-forms";
import { TerrainType } from "#app/data/terrain";
import type { TrainerSlot } from "#app/data/trainer-config";
import type { TrainerSlot } from "#enums/trainer-slot";
import Overrides from "#app/overrides";
import i18next from "i18next";
import { speciesEggMoves } from "#app/data/balance/egg-moves";

17
src/field/trainer.ts
View File

@ -2,15 +2,14 @@ import { globalScene } from "#app/global-scene";
import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
import type PokemonSpecies from "#app/data/pokemon-species";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import type { TrainerConfig, TrainerPartyTemplate } from "#app/data/trainer-config";
import {
TrainerPartyCompoundTemplate,
TrainerPoolTier,
TrainerSlot,
trainerConfigs,
trainerPartyTemplates,
TeraAIMode,
} from "#app/data/trainer-config";
import type { TrainerConfig } from "#app/data/trainers/trainer-config";
import type { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerSlot } from "#enums/trainer-slot";
import { TrainerPoolTier } from "#enums/trainer-pool-tier";
import { TeraAIMode } from "#enums/tera-ai-mode";
import type { EnemyPokemon } from "#app/field/pokemon";
import * as Utils from "#app/utils";
import type { PersistentModifier } from "#app/modifier/modifier";

2
src/phases/battle-phase.ts
View File

@ -1,5 +1,5 @@
import { globalScene } from "#app/global-scene";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { Phase } from "#app/phase";
export class BattlePhase extends Phase {

2
src/phases/encounter-phase.ts
View File

@ -7,7 +7,7 @@ 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 { TrainerSlot } from "#enums/trainer-slot";
import { getRandomWeatherType } from "#app/data/weather";
import { EncounterPhaseEvent } from "#app/events/battle-scene";
import type Pokemon from "#app/field/pokemon";

2
src/phases/game-over-phase.ts
View File

@ -5,7 +5,7 @@ import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
import { getCharVariantFromDialogue } from "#app/data/dialogue";
import type PokemonSpecies from "#app/data/pokemon-species";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import type Pokemon from "#app/field/pokemon";
import { modifierTypes } from "#app/modifier/modifier-type";
import { BattlePhase } from "#app/phases/battle-phase";

2
src/phases/mystery-encounter-phases.ts
View File

@ -22,7 +22,7 @@ import { globalScene } from "#app/global-scene";
import { getCharVariantFromDialogue } from "../data/dialogue";
import type { OptionSelectSettings } from "../data/mystery-encounters/utils/encounter-phase-utils";
import { transitionMysteryEncounterIntroVisuals } from "../data/mystery-encounters/utils/encounter-phase-utils";
import { TrainerSlot } from "../data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { IvScannerModifier } from "../modifier/modifier";
import { Phase } from "../phase";
import { Mode } from "../ui/ui";

2
src/phases/summon-phase.ts
View File

@ -1,7 +1,7 @@
import { BattleType } from "#app/battle";
import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { PlayerGender } from "#app/enums/player-gender";
import { addPokeballOpenParticles } from "#app/field/anims";
import type Pokemon from "#app/field/pokemon";

2
src/phases/switch-summon-phase.ts
View File

@ -3,7 +3,7 @@ import { applyPreSwitchOutAbAttrs, PostDamageForceSwitchAbAttr, PreSwitchOutAbAt
import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move";
import { getPokeballTintColor } from "#app/data/pokeball";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import type Pokemon from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import { SwitchEffectTransferModifier } from "#app/modifier/modifier";

2
src/phases/trainer-message-test-phase.ts
View File

@ -1,5 +1,5 @@
import { globalScene } from "#app/global-scene";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import type { TrainerType } from "#app/enums/trainer-type";
import { BattlePhase } from "./battle-phase";
import { TestMessagePhase } from "./test-message-phase";

2
src/phases/trainer-victory-phase.ts
View File

@ -7,7 +7,7 @@ import * as Utils from "#app/utils";
import { BattlePhase } from "./battle-phase";
import { ModifierRewardPhase } from "./modifier-reward-phase";
import { MoneyRewardPhase } from "./money-reward-phase";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { globalScene } from "#app/global-scene";
import { Biome } from "#app/enums/biome";
import { achvs } from "#app/system/achv";

2
src/system/game-data.ts
View File

@ -17,7 +17,7 @@ import { Unlockables } from "#app/system/unlockables";
import { GameModes, getGameMode } from "#app/game-mode";
import { BattleType } from "#app/battle";
import TrainerData from "#app/system/trainer-data";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
import { resetSettings, setSetting, SettingKeys } from "#app/system/settings/settings";
import { achvs } from "#app/system/achv";
import EggData from "#app/system/egg-data";

2
src/system/pokemon-data.ts
View File

@ -6,7 +6,7 @@ import type { PokeballType } from "#enums/pokeball";
import { getPokemonSpecies, getPokemonSpeciesForm } from "../data/pokemon-species";
import { Status } from "../data/status-effect";
import Pokemon, { EnemyPokemon, PokemonMove, PokemonSummonData } from "../field/pokemon";
import { TrainerSlot } from "../data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import type { Variant } from "#app/data/variant";
import { loadBattlerTag } from "../data/battler-tags";
import type { Biome } from "#enums/biome";

2
src/system/voucher.ts
View File

@ -3,7 +3,7 @@ import { AchvTier, achvs, getAchievementDescription } from "./achv";
import type { PlayerGender } from "#enums/player-gender";
import { TrainerType } from "#enums/trainer-type";
import type { ConditionFn } from "#app/@types/common";
import { trainerConfigs } from "#app/data/trainer-config";
import { trainerConfigs } from "#app/data/trainers/trainer-config";
export enum VoucherType {
REGULAR,

2
test/moves/effectiveness.test.ts
View File

@ -1,6 +1,6 @@
import { allMoves } from "#app/data/moves/move";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { TrainerSlot } from "#app/data/trainer-config";
import { TrainerSlot } from "#enums/trainer-slot";
import { PokemonType } from "#enums/pokemon-type";
import { Abilities } from "#app/enums/abilities";
import { Moves } from "#app/enums/moves";

4
test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
View File

@ -16,7 +16,9 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { MysteriousChallengersEncounter } from "#app/data/mystery-encounters/encounters/mysterious-challengers-encounter";
import { TrainerConfig, TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#app/data/trainer-config";
import { TrainerConfig } from "#app/data/trainers/trainer-config";
import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
import { PartyMemberStrength } from "#enums/party-member-strength";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";