From 9c13fa5f80a0403ff661d09028a67299672c2558 Mon Sep 17 00:00:00 2001 From: Blitzy <118096277+Blitz425@users.noreply.github.com> Date: Sat, 29 Mar 2025 22:02:27 -0500 Subject: [PATCH] [Balance] Evil Team Tweaks (#5579) * Update evil-admin-trainer-pools.ts * Update trainer-config.ts * Fix Pokemon names * Update / Fix Teams * typo * Rotom Revival Protocol (and Ponyta) Accidentally removed Rotom from two different places * unevolve the buddies * Update evil-admin-trainer-pools.ts --------- Co-authored-by: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> --- src/data/trainers/evil-admin-trainer-pools.ts | 552 ++++++++++-------- src/data/trainers/trainer-config.ts | 51 +- 2 files changed, 325 insertions(+), 278 deletions(-) diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts index ecbd5952143..fe68cf50c9c 100644 --- a/src/data/trainers/evil-admin-trainer-pools.ts +++ b/src/data/trainers/evil-admin-trainer-pools.ts @@ -5,398 +5,434 @@ import { Species } from "#enums/species"; /** Team Rocket's admin trainer pool. */ const ROCKET: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.RATICATE, - Species.ARBOK, + Species.RATTATA, + Species.SPEAROW, + Species.EKANS, Species.VILEPLUME, - Species.ARCANINE, - Species.GENGAR, - Species.HYPNO, - Species.ELECTRODE, - Species.EXEGGUTOR, + Species.DIGLETT, + Species.GROWLITHE, + Species.GRIMER, + Species.DROWZEE, + Species.VOLTORB, + Species.EXEGGCUTE, Species.CUBONE, Species.KOFFING, - Species.GYARADOS, - Species.CROBAT, - Species.STEELIX, - Species.HOUNDOOM, - Species.HONCHKROW, + Species.MAGIKARP, + Species.ZUBAT, + Species.ONIX, + Species.HOUNDOUR, + Species.MURKROW, ], [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.ABRA, + Species.GASTLY, + Species.OMANYTE, + Species.KABUTO, + Species.PORYGON, + Species.MANKEY, + Species.SCYTHER, + Species.ELEKID, + Species.MAGBY, + Species.ALOLA_SANDSHREW, + Species.ALOLA_MEOWTH, + Species.ALOLA_GEODUDE, + Species.ALOLA_GRIMER, Species.PALDEA_TAUROS, ], - [TrainerPoolTier.RARE]: [Species.DRAGONITE, Species.TYRANITAR], + [TrainerPoolTier.RARE]: [Species.DRATINI, Species.LARVITAR], }; /** Team Magma's admin trainer pool */ const MAGMA: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.ARCANINE, - Species.MAGCARGO, - Species.HOUNDOOM, + Species.DIGLETT, + Species.GROWLITHE, + Species.VULPIX, + Species.KOFFING, + Species.RHYHORN, + Species.SLUGMA, + Species.HOUNDOUR, + Species.POOCHYENA, Species.TORKOAL, + Species.ZANGOOSE, Species.SOLROCK, - Species.CLAYDOL, - Species.HIPPOWDON, - Species.MAGMORTAR, - Species.GLISCOR, - Species.COALOSSAL, + Species.BALTOY, + Species.ROLYCOLY, ], [TrainerPoolTier.UNCOMMON]: [ - Species.AGGRON, - Species.FLYGON, - Species.CRADILY, - Species.ARMALDO, - Species.RHYPERIOR, + Species.MAGBY, + Species.TRAPINCH, + Species.LILEEP, + Species.ANORITH, + Species.GOLETT, + Species.FLETCHLING, + Species.SALANDIT, Species.TURTONATOR, - Species.SANDACONDA, - Species.TOEDSCRUEL, - Species.HISUI_ARCANINE, + Species.TOEDSCOOL, + Species.CAPSAKID, + Species.HISUI_GROWLITHE, ], - [TrainerPoolTier.RARE]: [Species.CHARCADET, Species.SCOVILLAIN], + [TrainerPoolTier.RARE]: [Species.CHARCADET, Species.ARON], }; 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.TENTACOOL, + Species.GRIMER, + Species.AZURILL, + Species.CHINCHOU, + Species.REMORAID, + Species.POOCHYENA, + Species.LOTAD, + Species.WINGULL, + Species.WAILMER, + Species.SEVIPER, + Species.BARBOACH, + Species.CORPHISH, + Species.SPHEAL, Species.CLAMPERL, ], [TrainerPoolTier.UNCOMMON]: [ - Species.QUAGSIRE, - Species.MANTINE, - Species.KINGDRA, - Species.MILOTIC, - Species.DRAGALGE, + Species.MANTYKE, + Species.HORSEA, + Species.FEEBAS, + Species.TYMPOLE, + Species.SKRELP, + Species.WIMPOD, Species.DHELMISE, - Species.BARRASKEWDA, - Species.GRAPPLOCT, - Species.OVERQWIL, + Species.ARROKUDA, + Species.CLOBBOPUS, + Species.HISUI_QWILFISH, + Species.WIGLETT, ], [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, + Species.ZUBAT, + Species.MAGNEMITE, + Species.RHYHORN, + Species.TANGELA, + Species.LICKITUNG, + Species.MAGIKARP, + Species.YANMA, + Species.MURKROW, + Species.SWINUB, + Species.ELEKID, + Species.MAGBY, + Species.BRONZOR, + Species.SKORUPI, ], [TrainerPoolTier.UNCOMMON]: [ - Species.ALAKAZAM, - Species.WEAVILE, - Species.GLISCOR, - Species.DUSKNOIR, + Species.ABRA, + Species.GLIGAR, + Species.SNEASEL, + Species.DUSKULL, + Species.DRIFLOON, + Species.CRANIDOS, + Species.SHIELDON, Species.ROTOM, - Species.OVERQWIL, - Species.HISUI_ARCANINE, - Species.HISUI_ELECTRODE, + Species.HISUI_QWILFISH, ], - [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.SNEASLER, Species.HISUI_LILLIGANT], + [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.TEDDIURSA, Species.HISUI_SNEASEL, 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, + Species.SNEASEL, + Species.SWINUB, + Species.SNORUNT, + Species.SNOVER, + Species.TIMBURR, + Species.TYMPOLE, + Species.SANDILE, + Species.DARUMAKA, + Species.VANILLITE, + Species.FOONGUS, + Species.FRILLISH, + Species.JOLTIK, + Species.FERROSEED, + Species.CUBCHOO, + Species.GALAR_DARUMAKA, ], [TrainerPoolTier.UNCOMMON]: [ - Species.EXCADRILL, + Species.SPHEAL, + Species.DRILBUR, Species.SIGILYPH, - Species.ZOROARK, - Species.KLINKLANG, - Species.EELEKTROSS, - Species.MIENSHAO, - Species.GOLURK, - Species.BISHARP, - Species.MANDIBUZZ, + Species.YAMASK, + Species.ZORUA, + Species.TYNAMO, + Species.MIENFOO, + Species.GOLETT, + Species.PAWNIARD, + Species.VULLABY, Species.DURANT, - Species.GALAR_DARMANITAN, + Species.BERGMITE, + Species.EISCUE, + Species.ALOLA_SANDSHREW, + Species.HISUI_ZORUA, ], - [TrainerPoolTier.RARE]: [Species.HAXORUS, Species.HYDREIGON, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY], + [TrainerPoolTier.RARE]: [Species.DEINO, Species.FRIGIBAX, 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, + Species.MAGNEMITE, + Species.GRIMER, + Species.VOLTORB, + Species.PORYGON, + Species.BRONZOR, + Species.ROTOM, + Species.MUNNA, + Species.DWEBBLE, + Species.FERROSEED, + Species.ELGYEM, ], [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, + Species.BELDUM, + Species.SIGILYPH, + Species.TIRTOUGA, + Species.ARCHEN, + Species.TYNAMO, + Species.GOLETT, + Species.BLIPBUG, + Species.VAROOM, + Species.ALOLA_GRIMER, + Species.HISUI_VOLTORB, ], - [TrainerPoolTier.RARE]: [Species.ELECTIVIRE, Species.MAGMORTAR, Species.BISHARP, Species.ARCHALUDON], + [TrainerPoolTier.RARE]: [Species.ELEKID, Species.MAGBY, Species.PAWNIARD, Species.DURALUDON], }; const FLARE: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.MANECTRIC, - Species.DRAPION, - Species.LIEPARD, - Species.AMOONGUSS, - Species.DIGGERSBY, - Species.TALONFLAME, - Species.PYROAR, + Species.ELECTRIKE, + Species.SKORUPI, + Species.PURRLOIN, + Species.FOONGUS, + Species.BUNNELBY, + Species.FLETCHLING, + Species.LITLEO, Species.PANGORO, - Species.MEOWSTIC, - Species.MALAMAR, - Species.CLAWITZER, - Species.HELIOLISK, + Species.ESPURR, + Species.INKAY, + Species.CLAUNCHER, + Species.HELIOPTILE, ], [TrainerPoolTier.UNCOMMON]: [ - Species.HOUNDOOM, - Species.WEAVILE, - Species.CHANDELURE, - Species.AEGISLASH, - Species.BARBARACLE, - Species.DRAGALGE, - Species.GOODRA, - Species.TREVENANT, - Species.GOURGEIST, + Species.HOUNDOUR, + Species.SNEASEL, + Species.LITWICK, + Species.HONEDGE, + Species.BINACLE, + Species.SKRELP, + Species.NOIBAT, + Species.PHANTUMP, + Species.PUMPKABOO, ], - [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_GOODRA, Species.HISUI_AVALUGG], + [TrainerPoolTier.RARE]: [Species.GOOMY, Species.HISUI_AVALUGG], }; const AETHER: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.ALAKAZAM, - Species.SLOWBRO, + Species.ABRA, + Species.SLOWPOKE, + Species.MAGNEMITE, Species.EXEGGUTOR, - Species.XATU, - Species.CLAYDOL, - Species.BEHEEYEM, - Species.ORANGURU, + Species.NATU, + Species.BALTOY, + Species.MIME_JR, + Species.ELGYEM, + Species.INKAY, Species.BRUXISH, - Species.ORBEETLE, - Species.FARIGIRAF, + Species.BLIPBUG, Species.ALOLA_RAICHU, ], [TrainerPoolTier.UNCOMMON]: [ - Species.KIRLIA, - Species.MEDICHAM, - Species.METAGROSS, - Species.MALAMAR, - Species.HATTERENE, - Species.MR_RIME, - Species.GALAR_SLOWKING, + Species.RALTS, + Species.MEDITITE, + Species.BELDUM, + Species.SOLOSIS, + Species.HATENNA, + Species.STANTLER, + Species.GIRAFARIG, + Species.ALOLA_GRIMER, + Species.GALAR_SLOWPOKE, ], - [TrainerPoolTier.RARE]: [Species.PORYGON_Z, Species.ARMAROUGE, Species.HISUI_BRAVIARY], + [TrainerPoolTier.RARE]: [Species.PORYGON, Species.ARMAROUGE], }; const SKULL: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.NIDOQUEEN, - Species.GENGAR, + Species.GASTLY, Species.KOFFING, - Species.CROBAT, - Species.ROSERADE, - Species.SKUNTANK, - Species.TOXICROAK, - Species.SCOLIPEDE, - Species.TOXAPEX, - Species.LURANTIS, - Species.ALOLA_MUK, + Species.ZUBAT, + Species.VENONAT, + Species.STUNKY, + Species.CROAGUNK, + Species.VENIPEDE, + Species.SCRAGGY, + Species.MAREANIE, + Species.FOMANTIS, + Species.ALOLA_GRIMER, ], [TrainerPoolTier.UNCOMMON]: [ - Species.DRAPION, - Species.MANDIBUZZ, - Species.OVERQWIL, - Species.GLIMMORA, - Species.CLODSIRE, - Species.GALAR_SLOWBRO, + Species.NIDORAN_F, + Species.SKORUPI, + Species.PAWNIARD, + Species.VULLABY, + Species.TOXEL, + Species.GLIMMET, + Species.PALDEA_WOOPER, + Species.GALAR_SLOWPOKE, ], - [TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.SNEASLER], + [TrainerPoolTier.RARE]: [Species.SKRELP, Species.HISUI_SNEASEL], }; const MACRO_COSMOS: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.NINETALES, - Species.BELLOSSOM, - Species.MILOTIC, + Species.VULPIX, + Species.FEEBAS, + Species.MAWILE, Species.FROSLASS, - Species.GOTHITELLE, - Species.JELLICENT, - Species.SALAZZLE, + Species.GOTHITA, + Species.FLABEBE, + Species.SALANDIT, Species.TSAREENA, - Species.POLTEAGEIST, - Species.HATTERENE, - Species.GALAR_RAPIDASH, + Species.SINISTEA, + Species.HATENNA, + Species.INDEEDEE, + Species.GALAR_PONYTA, ], [TrainerPoolTier.UNCOMMON]: [ - Species.TOGEKISS, - Species.MANDIBUZZ, - Species.TOXAPEX, - Species.APPLETUN, - Species.CURSOLA, - Species.ALOLA_NINETALES, + Species.TOGEPI, + Species.VULLABY, + Species.MAREANIE, + Species.CUFANT, + Species.TINKATINK, + Species.ALOLA_VULPIX, + Species.GALAR_CORSOLA, ], - [TrainerPoolTier.RARE]: [Species.TINKATON, Species.HISUI_LILLIGANT], + [TrainerPoolTier.RARE]: [Species.APPLIN, 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, + Species.MURKROW, + Species.SEEDOT, + Species.SABLEYE, + Species.CACNEA, + Species.STUNKY, + Species.SANDILE, + Species.INKAY, + Species.NYMBLE, + Species.MASCHIFF, ], [TrainerPoolTier.UNCOMMON]: [ Species.UMBREON, - Species.CRAWDAUNT, - Species.WEAVILE, - Species.ZOROARK, - Species.MALAMAR, + Species.CORPHISH, + Species.SNEASEL, + Species.ZORUA, + Species.IMPIDIMP, Species.BOMBIRDIER, + Species.GALAR_ZIGZAGOON, ], - [TrainerPoolTier.RARE]: [Species.HYDREIGON, Species.MEOWSCARADA], + [TrainerPoolTier.RARE]: [Species.DEINO, Species.SPRIGATITO], }; const STAR_FIRE: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.ARCANINE, - Species.HOUNDOOM, - Species.CAMERUPT, - Species.CHANDELURE, - Species.TALONFLAME, - Species.PYROAR, - Species.COALOSSAL, - Species.SCOVILLAIN, + Species.GROWLITHE, + Species.HOUNDOUR, + Species.NUMEL, + Species.TORKOAL, + Species.FLETCHLING, + Species.LITLEO, + Species.SIZZLIPEDE, + Species.ROLYCOLY, + Species.CAPSAKID, ], [TrainerPoolTier.UNCOMMON]: [ - Species.RAPIDASH, + Species.PONYTA, Species.FLAREON, - Species.TORKOAL, - Species.MAGMORTAR, - Species.SALAZZLE, + Species.MAGBY, + Species.DARUMAKA, + Species.LITWICK, + Species.SALANDIT, Species.TURTONATOR, ], - [TrainerPoolTier.RARE]: [Species.VOLCARONA, Species.SKELEDIRGE], + [TrainerPoolTier.RARE]: [Species.LARVESTA, Species.FUECOCO], }; const STAR_POISON: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.MUK, - Species.CROBAT, - Species.SKUNTANK, - Species.AMOONGUSS, - Species.TOXAPEX, - Species.TOXTRICITY, + Species.GRIMER, + Species.VENONAT, + Species.SEVIPER, + Species.STUNKY, + Species.FOONGUS, + Species.MAREANIE, + Species.TOXEL, Species.GRAFAIAI, - Species.CLODSIRE, + Species.PALDEA_WOOPER, ], [TrainerPoolTier.UNCOMMON]: [ - Species.GENGAR, - Species.SEVIPER, - Species.DRAGALGE, + Species.ZUBAT, + Species.GASTLY, + Species.SKRELP, Species.OVERQWIL, - Species.ALOLA_MUK, - Species.GALAR_SLOWBRO, + Species.ALOLA_GRIMER, + Species.GALAR_SLOWPOKE, ], - [TrainerPoolTier.RARE]: [Species.GLIMMORA, Species.VENUSAUR], + [TrainerPoolTier.RARE]: [Species.GLIMMET, Species.BULBASAUR], }; const STAR_FAIRY: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.CLEFABLE, - Species.WIGGLYTUFF, - Species.AZUMARILL, - Species.WHIMSICOTT, - Species.FLORGES, - Species.HATTERENE, - Species.GRIMMSNARL, - Species.TINKATON, + Species.IGGLYBUFF, + Species.AZURILL, + Species.COTTONEE, + Species.FLABEBE, + Species.KLEFKI, + Species.CUTIEFLY, + Species.HATENNA, + Species.TINKATINK, ], [TrainerPoolTier.UNCOMMON]: [ - Species.TOGEKISS, + Species.CLEFFA, + Species.TOGEPI, Species.GARDEVOIR, Species.SYLVEON, - Species.KLEFKI, Species.MIMIKYU, - Species.ALOLA_NINETALES, + Species.IMPIDIMP, + Species.ALOLA_VULPIX, ], - [TrainerPoolTier.RARE]: [Species.GALAR_RAPIDASH, Species.PRIMARINA], + [TrainerPoolTier.RARE]: [Species.GALAR_PONYTA, Species.POPPLIO], }; const STAR_FIGHTING: TrainerTierPools = { [TrainerPoolTier.COMMON]: [ - Species.BRELOOM, - Species.HARIYAMA, - Species.MEDICHAM, - Species.TOXICROAK, - Species.SCRAFTY, - Species.MIENSHAO, - Species.PAWMOT, - Species.PALDEA_TAUROS, + Species.TYROGUE, + Species.SHROOMISH, + Species.MAKUHITA, + Species.RIOLU, + Species.CROAGUNK, + Species.SCRAGGY, + Species.MIENFOO, + Species.PASSIMIAN, + Species.PAWMI, ], [TrainerPoolTier.UNCOMMON]: [ - Species.LUCARIO, - Species.CONKELDURR, + Species.MEDITITE, + Species.GALLADE, + Species.TIMBURR, Species.HAWLUCHA, - Species.PASSIMIAN, + Species.STUFFUL, Species.FALINKS, Species.FLAMIGO, + Species.PALDEA_TAUROS, ], - [TrainerPoolTier.RARE]: [Species.KOMMO_O, Species.QUAQUAVAL], + [TrainerPoolTier.RARE]: [Species.JANGMO_O, Species.QUAXLY], }; export type EvilTeam = diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts index f23027ffee8..0e53cd71add 100644 --- a/src/data/trainers/trainer-config.ts +++ b/src/data/trainers/trainer-config.ts @@ -1898,19 +1898,21 @@ export const trainerConfigs: TrainerConfigs = { Species.MANKEY, Species.GROWLITHE, Species.MAGNEMITE, - Species.GASTLY, + Species.ONIX, Species.VOLTORB, Species.EXEGGCUTE, Species.CUBONE, Species.LICKITUNG, - Species.SCYTHER, Species.TAUROS, - Species.GYARADOS, + Species.MAGIKARP, Species.MURKROW, Species.ELEKID, Species.MAGBY, ], [TrainerPoolTier.RARE]: [ + Species.ABRA, + Species.GASTLY, + Species.SCYTHER, Species.PORYGON, Species.OMANYTE, Species.KABUTO, @@ -1969,7 +1971,6 @@ export const trainerConfigs: TrainerConfigs = { Species.DIGLETT, Species.GROWLITHE, Species.SLUGMA, - Species.MAGBY, Species.POOCHYENA, Species.ZIGZAGOON, Species.NUMEL, @@ -1978,24 +1979,24 @@ export const trainerConfigs: TrainerConfigs = { ], [TrainerPoolTier.UNCOMMON]: [ Species.RHYHORN, - Species.GLIGAR, Species.PHANPY, + Species.MAGBY, + Species.ZANGOOSE, Species.SOLROCK, - Species.HIPPOPOTAS, Species.HEATMOR, Species.ROLYCOLY, - Species.SILICOBRA, + Species.CAPSAKID, ], [TrainerPoolTier.RARE]: [ - Species.ARON, Species.TRAPINCH, Species.LILEEP, Species.ANORITH, + Species.GOLETT, Species.TURTONATOR, Species.TOEDSCOOL, Species.HISUI_GROWLITHE, ], - [TrainerPoolTier.SUPER_RARE]: [Species.CHARCADET, Species.CAPSAKID], + [TrainerPoolTier.SUPER_RARE]: [Species.CHARCADET, Species.ARON], }), [TrainerType.TABITHA]: new TrainerConfig(++t) .setMoneyMultiplier(1.5) @@ -2028,6 +2029,7 @@ export const trainerConfigs: TrainerConfigs = { Species.REMORAID, Species.ZIGZAGOON, Species.LOTAD, + Species.WINGULL, Species.CARVANHA, Species.WAILMER, Species.BARBOACH, @@ -2039,16 +2041,18 @@ export const trainerConfigs: TrainerConfigs = { Species.HORSEA, Species.CHINCHOU, Species.WOOPER, - Species.WINGULL, Species.AZURILL, + Species.SEVIPER, Species.CLAMPERL, + Species.WIMPOD, Species.CLOBBOPUS, ], [TrainerPoolTier.RARE]: [ Species.MANTYKE, + Species.TYMPOLE, Species.SKRELP, - Species.DHELMISE, Species.ARROKUDA, + Species.WIGLETT, Species.HISUI_QWILFISH, Species.PALDEA_WOOPER, ], @@ -2103,6 +2107,7 @@ export const trainerConfigs: TrainerConfigs = { ], [TrainerPoolTier.RARE]: [ Species.SNEASEL, + Species.TEDDIURSA, Species.ELEKID, Species.MAGBY, Species.DUSKULL, @@ -2206,10 +2211,11 @@ export const trainerConfigs: TrainerConfigs = { .setPartyTemplateFunc(() => getEvilGruntPartyTemplate()) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ - Species.PONYTA, Species.HOUNDOUR, + Species.GULPIN, Species.SKORUPI, Species.CROAGUNK, + Species.PURRLOIN, Species.SCRAGGY, Species.FLETCHLING, Species.SCATTERBUG, @@ -2220,7 +2226,6 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.UNCOMMON]: [ Species.POOCHYENA, Species.ELECTRIKE, - Species.PURRLOIN, Species.FOONGUS, Species.PANCHAM, Species.BINACLE, @@ -2230,8 +2235,13 @@ export const trainerConfigs: TrainerConfigs = { Species.PHANTUMP, Species.PUMPKABOO, ], - [TrainerPoolTier.RARE]: [Species.SNEASEL, Species.LITWICK, Species.PAWNIARD, Species.SLIGGOO], - [TrainerPoolTier.SUPER_RARE]: [Species.NOIBAT, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG], + [TrainerPoolTier.RARE]: [ + Species.SNEASEL, + Species.LITWICK, + Species.PAWNIARD, + Species.NOIBAT, + ], + [TrainerPoolTier.SUPER_RARE]: [Species.SLIGGOO, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG], }), [TrainerType.BRYONY]: new TrainerConfig(++t) .setMoneyMultiplier(1.5) @@ -2286,14 +2296,13 @@ export const trainerConfigs: TrainerConfigs = { Species.ORANGURU, Species.PASSIMIAN, Species.PYUKUMUKU, - Species.MINIOR, Species.BRUXISH, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.ALOLA_MAROWAK, ], [TrainerPoolTier.RARE]: [ - Species.MAGNEMITE, + Species.MINIOR, Species.TURTONATOR, Species.MIMIKYU, Species.DRAMPA, @@ -2321,6 +2330,7 @@ export const trainerConfigs: TrainerConfigs = { .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.EKANS, + Species.VENONAT, Species.DROWZEE, Species.KOFFING, Species.SPINARAK, @@ -2379,7 +2389,7 @@ export const trainerConfigs: TrainerConfigs = { Species.KLINK, Species.SKWOVET, Species.ROOKIDEE, - Species.CRAMORANT, + Species.ROLYCOLY, Species.CUFANT, Species.GALAR_MEOWTH, Species.GALAR_ZIGZAGOON, @@ -2389,9 +2399,11 @@ export const trainerConfigs: TrainerConfigs = { Species.RIOLU, Species.DRILBUR, Species.APPLIN, + Species.CRAMORANT, Species.ARROKUDA, Species.SINISTEA, Species.HATENNA, + Species.FALINKS, Species.GALAR_PONYTA, Species.GALAR_YAMASK, ], @@ -2399,7 +2411,6 @@ export const trainerConfigs: TrainerConfigs = { Species.SCIZOR, Species.BELDUM, Species.HONEDGE, - Species.FALINKS, Species.GALAR_FARFETCHD, Species.GALAR_MR_MIME, Species.GALAR_DARUMAKA, @@ -4833,7 +4844,7 @@ export const trainerConfigs: TrainerConfigs = { p.formIndex = Utils.randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.TECHNO_BLAST)) { // Check if Techno Blast is in the moveset, if not, replace the first move with Techno Blast. - p.moveset[0] = new PokemonMove(Moves.TECHNO_BLAST); + p.moveset[2] = new PokemonMove(Moves.TECHNO_BLAST); } }), )