mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-10 18:32:16 +02:00
Merge branch 'east' of github.com:Fontbane/pokerogue into east
This commit is contained in:
AJ Fontaine
commit
a5a0dd10b7
@ -2219,18 +2219,6 @@ export class PostSummonMessageAbAttr extends PostSummonAbAttr {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes illusions when a Pokemon is summoned.
|
||||
*/
|
||||
export class PostSummonRemoveIllusionAbAttr extends PostSummonAbAttr {
|
||||
applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
|
||||
for (const pokemon of globalScene.getField(true)) {
|
||||
pokemon.breakIllusion();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
export class PostSummonUnnamedMessageAbAttr extends PostSummonAbAttr {
|
||||
//Attr doesn't force pokemon name on the message
|
||||
private message: string;
|
||||
@ -5177,7 +5165,14 @@ export class IllusionPreSummonAbAttr extends PreSummonAbAttr {
|
||||
}
|
||||
}
|
||||
|
||||
export class IllusionBreakAbAttr extends PostDefendAbAttr {
|
||||
export class IllusionBreakAbAttr extends AbAttr {
|
||||
override apply(pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder | null, _args: any[]): void {
|
||||
pokemon.breakIllusion();
|
||||
pokemon.summonData.illusionBroken = true;
|
||||
}
|
||||
}
|
||||
|
||||
export class PostDefendIllusionBreakAbAttr extends PostDefendAbAttr {
|
||||
/**
|
||||
* Destroy the illusion upon taking damage
|
||||
*
|
||||
@ -6269,7 +6264,7 @@ export function applyOnGainAbAttrs(
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears primal weather/neutralizing gas during the turn if {@linkcode pokemon}'s ability corresponds to one
|
||||
* Applies ability attributes which activate when the ability is lost or suppressed (i.e. primal weather)
|
||||
*/
|
||||
export function applyOnLoseAbAttrs(pokemon: Pokemon, passive = false, simulated = false, ...args: any[]): void {
|
||||
applySingleAbAttrs<PreLeaveFieldAbAttr>(
|
||||
@ -6281,6 +6276,17 @@ export function applyOnLoseAbAttrs(pokemon: Pokemon, passive = false, simulated
|
||||
args,
|
||||
true,
|
||||
simulated);
|
||||
|
||||
applySingleAbAttrs<IllusionBreakAbAttr>(
|
||||
pokemon,
|
||||
passive,
|
||||
IllusionBreakAbAttr,
|
||||
(attr, passive) => attr.apply(pokemon, passive, simulated, null, args),
|
||||
(attr, passive) => attr.canApply(pokemon, passive, simulated, args),
|
||||
args,
|
||||
true,
|
||||
simulated
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -6780,11 +6786,12 @@ export function initAbilities() {
|
||||
return isNullOrUndefined(movePhase);
|
||||
}, 1.3),
|
||||
new Ability(Abilities.ILLUSION, 5)
|
||||
//The pokemon generate an illusion if it's available
|
||||
// The Pokemon generate an illusion if it's available
|
||||
.attr(IllusionPreSummonAbAttr, false)
|
||||
//The pokemon loses his illusion when he is damaged by a move
|
||||
.attr(IllusionBreakAbAttr, true)
|
||||
//Illusion is available again after a battle
|
||||
.attr(IllusionBreakAbAttr)
|
||||
// The Pokemon loses its illusion when damaged by a move
|
||||
.attr(PostDefendIllusionBreakAbAttr, true)
|
||||
// Illusion is available again after a battle
|
||||
.conditionalAttr((pokemon) => pokemon.isAllowedInBattle(), IllusionPostBattleAbAttr, false)
|
||||
.uncopiable()
|
||||
.bypassFaint(),
|
||||
@ -7198,8 +7205,6 @@ export function initAbilities() {
|
||||
.attr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr)
|
||||
.uncopiable()
|
||||
.attr(NoTransformAbilityAbAttr)
|
||||
.attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonNeutralizingGas", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))
|
||||
.attr(PostSummonRemoveIllusionAbAttr)
|
||||
.bypassFaint(),
|
||||
new Ability(Abilities.PASTEL_VEIL, 8)
|
||||
.attr(PostSummonUserFieldRemoveStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
|
||||
|
||||
@ -11,87 +11,87 @@ export type SignatureSpecies = {
|
||||
*/
|
||||
export const signatureSpecies: SignatureSpecies = {
|
||||
// Gym Leaders- Kanto
|
||||
BROCK: [Species.GEODUDE, Species.ONIX],
|
||||
MISTY: [Species.STARYU, Species.PSYDUCK],
|
||||
LT_SURGE: [Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ],
|
||||
BROCK: [Species.ONIX, Species.GEODUDE, [Species.OMANYTE, Species.KABUTO], Species.AERODACTYL],
|
||||
MISTY: [Species.STARYU, Species.PSYDUCK, Species.WOOPER, Species.LAPRAS],
|
||||
LT_SURGE: [Species.PICHU, Species.VOLTORB, Species.ELEKID, Species.JOLTEON],
|
||||
ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP],
|
||||
JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT],
|
||||
SABRINA: [Species.ABRA, Species.MR_MIME, Species.ESPEON],
|
||||
BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGMAR],
|
||||
GIOVANNI: [Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F],
|
||||
JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT, Species.KOFFING],
|
||||
SABRINA: [Species.ABRA, Species.MR_MIME, Species.SMOOCHUM, Species.ESPEON],
|
||||
BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGBY, Species.VULPIX],
|
||||
GIOVANNI: [Species.RHYHORN, Species.MEOWTH, [Species.NIDORAN_F, Species.NIDORAN_M], Species.DIGLETT], // Tera Ground Meowth
|
||||
// Gym Leaders- Johto
|
||||
FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.DODUO],
|
||||
BUGSY: [Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR],
|
||||
WHITNEY: [Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG],
|
||||
MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE],
|
||||
CHUCK: [Species.POLIWRATH, Species.MANKEY],
|
||||
JASMINE: [Species.MAGNEMITE, Species.STEELIX],
|
||||
PRYCE: [Species.SEEL, Species.SWINUB],
|
||||
CLAIR: [Species.DRATINI, Species.HORSEA, Species.GYARADOS],
|
||||
FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.NATU, Species.MURKROW],
|
||||
BUGSY: [Species.SCYTHER, Species.SHUCKLE, Species.YANMA, [Species.PINSIR, Species.HERACROSS]],
|
||||
WHITNEY: [Species.MILTANK, Species.AIPOM, Species.IGGLYBUFF, [Species.GIRAFARIG, Species.STANTLER]],
|
||||
MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.DUSKULL, Species.SABLEYE],
|
||||
CHUCK: [Species.POLIWRATH, Species.MANKEY, Species.TYROGUE, Species.MACHOP],
|
||||
JASMINE: [Species.STEELIX, Species.MAGNEMITE, Species.PINECO, Species.SKARMORY],
|
||||
PRYCE: [Species.SWINUB, Species.SEEL, Species.SHELLDER, Species.SNEASEL],
|
||||
CLAIR: [Species.HORSEA, Species.DRATINI, Species.MAGIKARP, Species.DRUDDIGON], // Tera Dragon Magikarp
|
||||
// Gym Leaders- Hoenn
|
||||
ROXANNE: [Species.GEODUDE, Species.NOSEPASS],
|
||||
BRAWLY: [Species.MACHOP, Species.MAKUHITA],
|
||||
WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE],
|
||||
FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL],
|
||||
NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON],
|
||||
ROXANNE: [Species.NOSEPASS, Species.GEODUDE, [Species.LILEEP, Species.ANORITH], Species.ARON],
|
||||
BRAWLY: [Species.MAKUHITA, Species.MACHOP, Species.MEDITITE, Species.SHROOMISH],
|
||||
WATTSON: [Species.ELECTRIKE, Species.VOLTORB, Species.MAGNEMITE, [Species.PLUSLE, Species.MINUN]],
|
||||
FLANNERY: [Species.TORKOAL, Species.SLUGMA, Species.NUMEL, Species.HOUNDOUR],
|
||||
NORMAN: [Species.SLAKOTH, Species.KECLEON, Species.WHISMUR, Species.ZANGOOSE],
|
||||
WINONA: [Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY],
|
||||
TATE: [Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE],
|
||||
LIZA: [Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR],
|
||||
JUAN: [Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.RELICANTH],
|
||||
TATE: [Species.SOLROCK, Species.NATU, Species.CHINGLING, Species.GALLADE],
|
||||
LIZA: [Species.LUNATONE, Species.BALTOY, Species.SPOINK, Species.GARDEVOIR],
|
||||
JUAN: [Species.HORSEA, Species.SPHEAL, Species.BARBOACH, Species.CORPHISH],
|
||||
// Gym Leaders- Sinnoh
|
||||
ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE],
|
||||
GARDENIA: [Species.ROSELIA, Species.TANGELA, Species.TURTWIG],
|
||||
MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR],
|
||||
ROARK: [Species.CRANIDOS, Species.GEODUDE, Species.NOSEPASS, Species.LARVITAR],
|
||||
GARDENIA: [Species.BUDEW, Species.CHERUBI, Species.TURTWIG, Species.LEAFEON],
|
||||
MAYLENE: [Species.RIOLU, Species.MEDITITE, Species.CHIMCHAR, Species.CROAGUNK],
|
||||
CRASHER_WAKE: [Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP],
|
||||
FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB],
|
||||
BYRON: [Species.SHIELDON, Species.BRONZOR, Species.AGGRON],
|
||||
CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT],
|
||||
VOLKNER: [Species.SHINX, Species.CHINCHOU, Species.ROTOM],
|
||||
FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.DUSKULL, Species.SPIRITOMB],
|
||||
BYRON: [Species.SHIELDON, Species.BRONZOR, Species.ARON, Species.SKARMORY],
|
||||
CANDICE: [Species.FROSLASS, Species.SNOVER, Species.SNEASEL, Species.GLACEON],
|
||||
VOLKNER: [Species.ELEKID, Species.SHINX, Species.CHINCHOU, Species.ROTOM],
|
||||
// Gym Leaders- Unova
|
||||
CILAN: [Species.PANSAGE, Species.FOONGUS, Species.PETILIL],
|
||||
CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.NUMEL],
|
||||
CRESS: [Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE],
|
||||
CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE],
|
||||
LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO],
|
||||
ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI],
|
||||
BURGH: [Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST],
|
||||
ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK],
|
||||
CLAY: [Species.DRILBUR, Species.SANDILE, Species.GOLETT],
|
||||
SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET],
|
||||
BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO],
|
||||
DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO],
|
||||
MARLON: [Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA],
|
||||
CILAN: [Species.PANSAGE, Species.SNIVY, Species.MARACTUS, Species.FERROSEED],
|
||||
CHILI: [Species.PANSEAR, Species.TEPIG, Species.HEATMOR, Species.DARUMAKA],
|
||||
CRESS: [Species.PANPOUR, Species.OSHAWOTT, Species.BASCULIN, Species.TYMPOLE],
|
||||
CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE, Species.BOUFFALANT],
|
||||
LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO, Species.BRAVIARY],
|
||||
ROXIE: [Species.VENIPEDE, Species.KOFFING, Species.TRUBBISH, Species.TOXEL],
|
||||
BURGH: [Species.SEWADDLE, Species.DWEBBLE, [Species.KARRABLAST, Species.SHELMET], Species.DURANT],
|
||||
ELESA: [Species.BLITZLE, Species.EMOLGA, Species.JOLTIK, Species.TYNAMO],
|
||||
CLAY: [Species.DRILBUR, Species.SANDILE, Species.TYMPOLE, Species.GOLETT],
|
||||
SKYLA: [Species.DUCKLETT, Species.WOOBAT, [Species.RUFFLET, Species.VULLABY], Species.ARCHEN],
|
||||
BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO, Species.GALAR_DARUMAKA],
|
||||
DRAYDEN: [Species.AXEW, Species.DRUDDIGON, Species.TRAPINCH, Species.DEINO],
|
||||
MARLON: [Species.FRILLISH, Species.TIRTOUGA, Species.WAILMER, Species.MANTYKE],
|
||||
// Gym Leaders- Kalos
|
||||
VIOLA: [Species.SURSKIT, Species.SCATTERBUG],
|
||||
GRANT: [Species.AMAURA, Species.TYRUNT],
|
||||
KORRINA: [Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO],
|
||||
RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT],
|
||||
CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA],
|
||||
VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME],
|
||||
OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING],
|
||||
WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL],
|
||||
VIOLA: [Species.SCATTERBUG, Species.SURSKIT, Species.CUTIEFLY, Species.BLIPBUG],
|
||||
GRANT: [Species.TYRUNT, Species.AMAURA, Species.BINACLE, Species.DWEBBLE],
|
||||
KORRINA: [Species.RIOLU, Species.MIENFOO, Species.HAWLUCHA, Species.PANCHAM],
|
||||
RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT, [Species.PHANTUMP, Species.PUMPKABOO]],
|
||||
CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.DEDENNE, Species.ROTOM],
|
||||
VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME, [Species.SPRITZEE, Species.SWIRLIX]],
|
||||
OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.INKAY, Species.SLOWKING],
|
||||
WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL, Species.SWINUB],
|
||||
// Gym Leaders- Galar
|
||||
MILO: [Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET],
|
||||
NESSA: [Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD],
|
||||
KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL],
|
||||
BEA: [Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS],
|
||||
ALLISTER: [Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY],
|
||||
OPAL: [Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING],
|
||||
BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR],
|
||||
GORDIE: [Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE],
|
||||
MELONY: [Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME],
|
||||
PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY],
|
||||
MARNIE: [Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO],
|
||||
RAIHAN: [Species.DURALUDON, Species.TURTONATOR, Species.GOOMY],
|
||||
MILO: [Species.GOSSIFLEUR, Species.SEEDOT, Species.APPLIN, Species.LOTAD],
|
||||
NESSA: [Species.CHEWTLE, Species.WIMPOD, Species.ARROKUDA, Species.MAREANIE],
|
||||
KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.GROWLITHE, Species.TORKOAL],
|
||||
BEA: [Species.MACHOP, Species.GALAR_FARFETCHD, Species.CLOBBOPUS, Species.FALINKS],
|
||||
ALLISTER: [Species.GASTLY, Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.SINISTEA],
|
||||
OPAL: [Species.MILCERY, Species.GALAR_WEEZING, Species.TOGEPI, Species.MAWILE],
|
||||
BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR, Species.SYLVEON],
|
||||
GORDIE: [Species.ROLYCOLY, [Species.SHUCKLE, Species.BINACLE], Species.STONJOURNER, Species.LARVITAR],
|
||||
MELONY: [Species.LAPRAS, Species.SNOM, Species.EISCUE, [Species.GALAR_MR_MIME, Species.GALAR_DARUMAKA]],
|
||||
PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.TOXEL, Species.INKAY], // Tera Dark Toxel
|
||||
MARNIE: [Species.IMPIDIMP, Species.MORPEKO, Species.PURRLOIN, Species.CROAGUNK], // Tera Dark Croagunk
|
||||
RAIHAN: [Species.DURALUDON, Species.TRAPINCH, Species.GOOMY, Species.TURTONATOR],
|
||||
// Gym Leaders- Paldea; First slot is Tera
|
||||
KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA], // Tera Bug Teddiursa
|
||||
BRASSIUS: [Species.SUDOWOODO, Species.BRAMBLIN, Species.SMOLIV], // Tera Grass Sudowoodo
|
||||
IONO: [Species.MISDREAVUS, Species.TADBULB, Species.WATTREL], // Tera Ghost Misdreavus
|
||||
KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA, Species.RELLOR], // Tera Bug Teddiursa
|
||||
BRASSIUS: [Species.BONSLY, Species.SMOLIV, Species.BRAMBLIN, Species.SUNKERN], // Tera Grass Bonsly
|
||||
IONO: [Species.MISDREAVUS, Species.TADBULB, Species.WATTREL, Species.MAGNEMITE], // Tera Ghost Misdreavus
|
||||
KOFU: [Species.CRABRAWLER, Species.VELUZA, Species.WIGLETT, Species.WINGULL], // Tera Water Crabrawler
|
||||
LARRY: [Species.STARLY, Species.DUNSPARCE, Species.LECHONK, Species.KOMALA], // Tera Normal Starly
|
||||
RYME: [Species.TOXEL, Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], // Tera Ghost Toxel
|
||||
TULIP: [Species.FLABEBE, Species.FLITTLE, Species.RALTS, Species.GIRAFARIG], // Tera Psychic Flabebe
|
||||
GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.CUBCHOO, Species.ALOLA_VULPIX], // Tera Ice Swablu
|
||||
GRUSHA: [Species.SWABLU, Species.CETODDLE, Species.SNOM, Species.CUBCHOO], // Tera Ice Swablu
|
||||
|
||||
// Elite Four- Kanto
|
||||
LORELEI: [
|
||||
|
||||
@ -2579,252 +2579,252 @@ export const trainerConfigs: TrainerConfigs = {
|
||||
),
|
||||
|
||||
[TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK))
|
||||
.initForGymLeader(signatureSpecies["BROCK"], true, PokemonType.ROCK)
|
||||
.initForGymLeader(signatureSpecies["BROCK"], true, PokemonType.ROCK, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.MISTY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["MISTY"], false, PokemonType.WATER)
|
||||
.initForGymLeader(signatureSpecies["MISTY"], false, PokemonType.WATER, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.LT_SURGE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["LT_SURGE"], true, PokemonType.ELECTRIC)
|
||||
.initForGymLeader(signatureSpecies["LT_SURGE"], true, PokemonType.ELECTRIC, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.ERIKA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["ERIKA"], false, PokemonType.GRASS)
|
||||
.initForGymLeader(signatureSpecies["ERIKA"], false, PokemonType.GRASS, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.JANINE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["JANINE"], false, PokemonType.POISON)
|
||||
.initForGymLeader(signatureSpecies["JANINE"], false, PokemonType.POISON, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.SABRINA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["SABRINA"], false, PokemonType.PSYCHIC)
|
||||
.initForGymLeader(signatureSpecies["SABRINA"], false, PokemonType.PSYCHIC, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.BLAINE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BLAINE"], true, PokemonType.FIRE)
|
||||
.initForGymLeader(signatureSpecies["BLAINE"], true, PokemonType.FIRE, false, -1)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.GIOVANNI]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["GIOVANNI"], true, PokemonType.DARK)
|
||||
.initForGymLeader(signatureSpecies["GIOVANNI"], true, PokemonType.GROUND, false, -2)
|
||||
.setBattleBgm("battle_kanto_gym")
|
||||
.setMixedBattleBgm("battle_kanto_gym"),
|
||||
[TrainerType.FALKNER]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["FALKNER"], true, PokemonType.FLYING)
|
||||
.initForGymLeader(signatureSpecies["FALKNER"], true, PokemonType.FLYING, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.BUGSY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BUGSY"], true, PokemonType.BUG)
|
||||
.initForGymLeader(signatureSpecies["BUGSY"], true, PokemonType.BUG, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.WHITNEY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["WHITNEY"], false, PokemonType.NORMAL)
|
||||
.initForGymLeader(signatureSpecies["WHITNEY"], false, PokemonType.NORMAL, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.MORTY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["MORTY"], true, PokemonType.GHOST)
|
||||
.initForGymLeader(signatureSpecies["MORTY"], true, PokemonType.GHOST, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.CHUCK]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CHUCK"], true, PokemonType.FIGHTING)
|
||||
.initForGymLeader(signatureSpecies["CHUCK"], true, PokemonType.FIGHTING, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.JASMINE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["JASMINE"], false, PokemonType.STEEL)
|
||||
.initForGymLeader(signatureSpecies["JASMINE"], false, PokemonType.STEEL, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.PRYCE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["PRYCE"], true, PokemonType.ICE)
|
||||
.initForGymLeader(signatureSpecies["PRYCE"], true, PokemonType.ICE, false, -1)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.CLAIR]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CLAIR"], false, PokemonType.DRAGON)
|
||||
.initForGymLeader(signatureSpecies["CLAIR"], false, PokemonType.DRAGON, false, -3)
|
||||
.setBattleBgm("battle_johto_gym")
|
||||
.setMixedBattleBgm("battle_johto_gym"),
|
||||
[TrainerType.ROXANNE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["ROXANNE"], false, PokemonType.ROCK)
|
||||
.initForGymLeader(signatureSpecies["ROXANNE"], false, PokemonType.ROCK, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.BRAWLY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BRAWLY"], true, PokemonType.FIGHTING)
|
||||
.initForGymLeader(signatureSpecies["BRAWLY"], true, PokemonType.FIGHTING, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.WATTSON]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["WATTSON"], true, PokemonType.ELECTRIC)
|
||||
.initForGymLeader(signatureSpecies["WATTSON"], true, PokemonType.ELECTRIC, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.FLANNERY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["FLANNERY"], false, PokemonType.FIRE)
|
||||
.initForGymLeader(signatureSpecies["FLANNERY"], false, PokemonType.FIRE, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.NORMAN]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["NORMAN"], true, PokemonType.NORMAL)
|
||||
.initForGymLeader(signatureSpecies["NORMAN"], true, PokemonType.NORMAL, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.WINONA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["WINONA"], false, PokemonType.FLYING)
|
||||
.initForGymLeader(signatureSpecies["WINONA"], false, PokemonType.FLYING, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.TATE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["TATE"], true, PokemonType.PSYCHIC)
|
||||
.initForGymLeader(signatureSpecies["TATE"], true, PokemonType.PSYCHIC, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym")
|
||||
.setHasDouble("tate_liza_double")
|
||||
.setDoubleTrainerType(TrainerType.LIZA)
|
||||
.setDoubleTitle("gym_leader_double"),
|
||||
[TrainerType.LIZA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["LIZA"], false, PokemonType.PSYCHIC)
|
||||
.initForGymLeader(signatureSpecies["LIZA"], false, PokemonType.PSYCHIC, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym")
|
||||
.setHasDouble("liza_tate_double")
|
||||
.setDoubleTrainerType(TrainerType.TATE)
|
||||
.setDoubleTitle("gym_leader_double"),
|
||||
[TrainerType.JUAN]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["JUAN"], true, PokemonType.WATER)
|
||||
.initForGymLeader(signatureSpecies["JUAN"], true, PokemonType.WATER, false, -1)
|
||||
.setBattleBgm("battle_hoenn_gym")
|
||||
.setMixedBattleBgm("battle_hoenn_gym"),
|
||||
[TrainerType.ROARK]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["ROARK"], true, PokemonType.ROCK)
|
||||
.initForGymLeader(signatureSpecies["ROARK"], true, PokemonType.ROCK, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.GARDENIA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["GARDENIA"], false, PokemonType.GRASS)
|
||||
.initForGymLeader(signatureSpecies["GARDENIA"], false, PokemonType.GRASS, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.MAYLENE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["MAYLENE"], false, PokemonType.FIGHTING)
|
||||
.initForGymLeader(signatureSpecies["MAYLENE"], false, PokemonType.FIGHTING, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.CRASHER_WAKE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CRASHER_WAKE"], true, PokemonType.WATER)
|
||||
.initForGymLeader(signatureSpecies["CRASHER_WAKE"], true, PokemonType.WATER, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.FANTINA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["FANTINA"], false, PokemonType.GHOST)
|
||||
.initForGymLeader(signatureSpecies["FANTINA"], false, PokemonType.GHOST, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.BYRON]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BYRON"], true, PokemonType.STEEL)
|
||||
.initForGymLeader(signatureSpecies["BYRON"], true, PokemonType.STEEL, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.CANDICE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CANDICE"], false, PokemonType.ICE)
|
||||
.initForGymLeader(signatureSpecies["CANDICE"], false, PokemonType.ICE, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.VOLKNER]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["VOLKNER"], true, PokemonType.ELECTRIC)
|
||||
.initForGymLeader(signatureSpecies["VOLKNER"], true, PokemonType.ELECTRIC, false, -1)
|
||||
.setBattleBgm("battle_sinnoh_gym")
|
||||
.setMixedBattleBgm("battle_sinnoh_gym"),
|
||||
[TrainerType.CILAN]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CILAN"], true, PokemonType.GRASS)
|
||||
.initForGymLeader(signatureSpecies["CILAN"], true, PokemonType.GRASS, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.CHILI]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CHILI"], true, PokemonType.FIRE)
|
||||
.initForGymLeader(signatureSpecies["CHILI"], true, PokemonType.FIRE, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.CRESS]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CRESS"], true, PokemonType.WATER)
|
||||
.initForGymLeader(signatureSpecies["CRESS"], true, PokemonType.WATER, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.CHEREN]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CHEREN"], true, PokemonType.NORMAL)
|
||||
.initForGymLeader(signatureSpecies["CHEREN"], true, PokemonType.NORMAL, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.LENORA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["LENORA"], false, PokemonType.NORMAL)
|
||||
.initForGymLeader(signatureSpecies["LENORA"], false, PokemonType.NORMAL, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.ROXIE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["ROXIE"], false, PokemonType.POISON)
|
||||
.initForGymLeader(signatureSpecies["ROXIE"], false, PokemonType.POISON, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.BURGH]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BURGH"], true, PokemonType.BUG)
|
||||
.initForGymLeader(signatureSpecies["BURGH"], true, PokemonType.BUG, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.ELESA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["ELESA"], false, PokemonType.ELECTRIC)
|
||||
.initForGymLeader(signatureSpecies["ELESA"], false, PokemonType.ELECTRIC, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.CLAY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CLAY"], true, PokemonType.GROUND)
|
||||
.initForGymLeader(signatureSpecies["CLAY"], true, PokemonType.GROUND, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.SKYLA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["SKYLA"], false, PokemonType.FLYING)
|
||||
.initForGymLeader(signatureSpecies["SKYLA"], false, PokemonType.FLYING, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.BRYCEN]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BRYCEN"], true, PokemonType.ICE)
|
||||
.initForGymLeader(signatureSpecies["BRYCEN"], true, PokemonType.ICE, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.DRAYDEN]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["DRAYDEN"], true, PokemonType.DRAGON)
|
||||
.initForGymLeader(signatureSpecies["DRAYDEN"], true, PokemonType.DRAGON, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.MARLON]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["MARLON"], true, PokemonType.WATER)
|
||||
.initForGymLeader(signatureSpecies["MARLON"], true, PokemonType.WATER, false, -1)
|
||||
.setMixedBattleBgm("battle_unova_gym"),
|
||||
[TrainerType.VIOLA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["VIOLA"], false, PokemonType.BUG)
|
||||
.initForGymLeader(signatureSpecies["VIOLA"], false, PokemonType.BUG, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.GRANT]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["GRANT"], true, PokemonType.ROCK)
|
||||
.initForGymLeader(signatureSpecies["GRANT"], true, PokemonType.ROCK, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.KORRINA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["KORRINA"], false, PokemonType.FIGHTING)
|
||||
.initForGymLeader(signatureSpecies["KORRINA"], false, PokemonType.FIGHTING, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.RAMOS]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["RAMOS"], true, PokemonType.GRASS)
|
||||
.initForGymLeader(signatureSpecies["RAMOS"], true, PokemonType.GRASS, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.CLEMONT]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["CLEMONT"], true, PokemonType.ELECTRIC)
|
||||
.initForGymLeader(signatureSpecies["CLEMONT"], true, PokemonType.ELECTRIC, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.VALERIE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["VALERIE"], false, PokemonType.FAIRY)
|
||||
.initForGymLeader(signatureSpecies["VALERIE"], false, PokemonType.FAIRY, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.OLYMPIA]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["OLYMPIA"], false, PokemonType.PSYCHIC)
|
||||
.initForGymLeader(signatureSpecies["OLYMPIA"], false, PokemonType.PSYCHIC, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.WULFRIC]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["WULFRIC"], true, PokemonType.ICE)
|
||||
.initForGymLeader(signatureSpecies["WULFRIC"], true, PokemonType.ICE, false, -1)
|
||||
.setMixedBattleBgm("battle_kalos_gym"),
|
||||
[TrainerType.MILO]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["MILO"], true, PokemonType.GRASS)
|
||||
.initForGymLeader(signatureSpecies["MILO"], true, PokemonType.GRASS, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.NESSA]: new TrainerConfig(++t)
|
||||
.setName("Nessa")
|
||||
.initForGymLeader(signatureSpecies["NESSA"], false, PokemonType.WATER)
|
||||
.initForGymLeader(signatureSpecies["NESSA"], false, PokemonType.WATER, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.KABU]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["KABU"], true, PokemonType.FIRE)
|
||||
.initForGymLeader(signatureSpecies["KABU"], true, PokemonType.FIRE, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.BEA]: new TrainerConfig(++t)
|
||||
.setName("Bea")
|
||||
.initForGymLeader(signatureSpecies["BEA"], false, PokemonType.FIGHTING)
|
||||
.initForGymLeader(signatureSpecies["BEA"], false, PokemonType.FIGHTING, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.ALLISTER]: new TrainerConfig(++t)
|
||||
.setName("Allister")
|
||||
.initForGymLeader(signatureSpecies["ALLISTER"], true, PokemonType.GHOST)
|
||||
.initForGymLeader(signatureSpecies["ALLISTER"], true, PokemonType.GHOST, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.OPAL]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["OPAL"], false, PokemonType.FAIRY)
|
||||
.initForGymLeader(signatureSpecies["OPAL"], false, PokemonType.FAIRY, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.BEDE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["BEDE"], true, PokemonType.FAIRY)
|
||||
.initForGymLeader(signatureSpecies["BEDE"], true, PokemonType.FAIRY, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.GORDIE]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["GORDIE"], true, PokemonType.ROCK)
|
||||
.initForGymLeader(signatureSpecies["GORDIE"], true, PokemonType.ROCK, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.MELONY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["MELONY"], false, PokemonType.ICE)
|
||||
.initForGymLeader(signatureSpecies["MELONY"], false, PokemonType.ICE, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.PIERS]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["PIERS"], true, PokemonType.DARK)
|
||||
.initForGymLeader(signatureSpecies["PIERS"], true, PokemonType.DARK, false, -3)
|
||||
.setHasDouble("piers_marnie_double")
|
||||
.setDoubleTrainerType(TrainerType.MARNIE)
|
||||
.setDoubleTitle("gym_leader_double")
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.MARNIE]: new TrainerConfig(++t)
|
||||
.setName("Marnie")
|
||||
.initForGymLeader(signatureSpecies["MARNIE"], false, PokemonType.DARK)
|
||||
.initForGymLeader(signatureSpecies["MARNIE"], false, PokemonType.DARK, false, -4)
|
||||
.setHasDouble("marnie_piers_double")
|
||||
.setDoubleTrainerType(TrainerType.PIERS)
|
||||
.setDoubleTitle("gym_leader_double")
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.RAIHAN]: new TrainerConfig(++t)
|
||||
.setName("Raihan")
|
||||
.initForGymLeader(signatureSpecies["RAIHAN"], true, PokemonType.DRAGON)
|
||||
.initForGymLeader(signatureSpecies["RAIHAN"], true, PokemonType.DRAGON, false, -1)
|
||||
.setMixedBattleBgm("battle_galar_gym"),
|
||||
[TrainerType.KATY]: new TrainerConfig(++t)
|
||||
.initForGymLeader(signatureSpecies["KATY"], false, PokemonType.BUG, true, -1)
|
||||
|
||||
@ -7164,8 +7164,8 @@ export class EnemyPokemon extends Pokemon {
|
||||
initBattleInfo(): void {
|
||||
if (!this.battleInfo) {
|
||||
this.battleInfo = new EnemyBattleInfo();
|
||||
this.battleInfo.updateBossSegments(this);
|
||||
this.battleInfo.initInfo(this);
|
||||
this.battleInfo.updateBossSegments(this);
|
||||
} else {
|
||||
this.battleInfo.updateBossSegments(this);
|
||||
}
|
||||
|
||||
@ -2,10 +2,11 @@ import { type PokeballCounts } from "#app/battle-scene";
|
||||
import { EvolutionItem } from "#app/data/balance/pokemon-evolutions";
|
||||
import { Gender } from "#app/data/gender";
|
||||
import { FormChangeItem } from "#app/data/pokemon-forms";
|
||||
import { Variant } from "#app/sprites/variant";
|
||||
import { type ModifierOverride } from "#app/modifier/modifier-type";
|
||||
import { Variant } from "#app/sprites/variant";
|
||||
import { Unlockables } from "#app/system/unlockables";
|
||||
import { Abilities } from "#enums/abilities";
|
||||
import { BattleType } from "#enums/battle-type";
|
||||
import { BerryType } from "#enums/berry-type";
|
||||
import { Biome } from "#enums/biome";
|
||||
import { EggTier } from "#enums/egg-type";
|
||||
@ -15,13 +16,12 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
|
||||
import { PokeballType } from "#enums/pokeball";
|
||||
import { PokemonType } from "#enums/pokemon-type";
|
||||
import { Species } from "#enums/species";
|
||||
import { BATTLE_STATS, Stat } from "#enums/stat";
|
||||
import { Stat } from "#enums/stat";
|
||||
import { StatusEffect } from "#enums/status-effect";
|
||||
import { TimeOfDay } from "#enums/time-of-day";
|
||||
import { TrainerType } from "#enums/trainer-type";
|
||||
import { VariantTier } from "#enums/variant-tier";
|
||||
import { WeatherType } from "#enums/weather-type";
|
||||
import { TrainerType } from "#enums/trainer-type";
|
||||
import { BattleType } from "#enums/battle-type";
|
||||
|
||||
/**
|
||||
* This comment block exists to prevent IDEs from automatically removing unused imports
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
|
||||
import Phaser from "phaser";
|
||||
import GameManager from "#test/testUtils/gameManager";
|
||||
import { Species } from "#enums/species";
|
||||
import { TurnEndPhase } from "#app/phases/turn-end-phase";
|
||||
import { Moves } from "#enums/moves";
|
||||
import { Abilities } from "#enums/abilities";
|
||||
import { PokeballType } from "#app/enums/pokeball";
|
||||
import { Gender } from "#app/data/gender";
|
||||
import { BerryPhase } from "#app/phases/berry-phase";
|
||||
import { PokeballType } from "#app/enums/pokeball";
|
||||
import { Abilities } from "#enums/abilities";
|
||||
import { Moves } from "#enums/moves";
|
||||
import { Species } from "#enums/species";
|
||||
import GameManager from "#test/testUtils/gameManager";
|
||||
import Phaser from "phaser";
|
||||
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
|
||||
|
||||
describe("Abilities - Illusion", () => {
|
||||
let phaserGame: Phaser.Game;
|
||||
@ -48,7 +46,7 @@ describe("Abilities - Illusion", () => {
|
||||
await game.classicMode.startBattle([Species.AXEW]);
|
||||
game.move.select(Moves.TACKLE);
|
||||
|
||||
await game.phaseInterceptor.to(TurnEndPhase);
|
||||
await game.phaseInterceptor.to("TurnEndPhase");
|
||||
|
||||
const zorua = game.scene.getEnemyPokemon()!;
|
||||
|
||||
@ -60,7 +58,7 @@ describe("Abilities - Illusion", () => {
|
||||
await game.classicMode.startBattle([Species.AXEW]);
|
||||
game.move.select(Moves.WORRY_SEED);
|
||||
|
||||
await game.phaseInterceptor.to(TurnEndPhase);
|
||||
await game.phaseInterceptor.to("TurnEndPhase");
|
||||
|
||||
const zorua = game.scene.getEnemyPokemon()!;
|
||||
|
||||
@ -114,7 +112,7 @@ describe("Abilities - Illusion", () => {
|
||||
|
||||
game.move.select(Moves.FLARE_BLITZ);
|
||||
|
||||
await game.phaseInterceptor.to(TurnEndPhase);
|
||||
await game.phaseInterceptor.to("TurnEndPhase");
|
||||
|
||||
const zoroark = game.scene.getPlayerPokemon()!;
|
||||
|
||||
@ -132,7 +130,7 @@ describe("Abilities - Illusion", () => {
|
||||
|
||||
game.doSwitchPokemon(1);
|
||||
|
||||
await game.phaseInterceptor.to(TurnEndPhase);
|
||||
await game.phaseInterceptor.to("TurnEndPhase");
|
||||
|
||||
const zoroark = game.scene.getPlayerPokemon()!;
|
||||
|
||||
@ -142,4 +140,18 @@ describe("Abilities - Illusion", () => {
|
||||
expect(zoroark.isShiny(true)).equals(true);
|
||||
expect(zoroark.getPokeball(true)).equals(PokeballType.GREAT_BALL);
|
||||
});
|
||||
|
||||
it("breaks when suppressed", async () => {
|
||||
game.override.moveset(Moves.GASTRO_ACID);
|
||||
await game.classicMode.startBattle([Species.MAGIKARP]);
|
||||
const zorua = game.scene.getEnemyPokemon()!;
|
||||
|
||||
expect(!!zorua.summonData?.illusion).toBe(true);
|
||||
|
||||
game.move.select(Moves.GASTRO_ACID);
|
||||
await game.phaseInterceptor.to("BerryPhase");
|
||||
|
||||
expect(zorua.isFullHp()).toBe(true);
|
||||
expect(!!zorua.summonData?.illusion).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user