From f7d8c7fd161d92c2d26efe2c21273580f11d6777 Mon Sep 17 00:00:00 2001 From: AJ Fontaine Date: Sat, 3 Aug 2024 15:12:18 -0400 Subject: [PATCH] Adjust trainer teams --- src/data/trainer-config.ts | 78 +++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 4f3481b27ac..54aa566d64c 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -893,41 +893,41 @@ export const signatureSpecies: SignatureSpecies = { 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], + GIOVANNI: [Species.DIGLETT, Species.NIDORAN_M, Species.NIDOQUEEN, Species.RHYHORN], FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.DODUO], - BUGSY: [Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR], - WHITNEY: [Species.GIRAFARIG, Species.MILTANK], + BUGSY: [Species.SCYTHER, Species.YANMA, Species.PINECO], + WHITNEY: [Species.AIPOM, Species.CLEFAIRY, Species.MILTANK], MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE], - CHUCK: [Species.POLIWRATH, Species.MANKEY], - JASMINE: [Species.MAGNEMITE, Species.STEELIX], + CHUCK: [Species.POLIWRATH, Species.MANKEY, Species.HITMONTOP], + JASMINE: [Species.SKARMORY, Species.MAGNEMITE, Species.STEELIX], PRYCE: [Species.SEEL, Species.SWINUB], CLAIR: [Species.DRATINI, Species.HORSEA, Species.GYARADOS], ROXANNE: [Species.GEODUDE, Species.NOSEPASS], - BRAWLY: [Species.MACHOP, Species.MAKUHITA], + BRAWLY: [Species.MACHOP, Species.MEDITITE, Species.MAKUHITA], WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE], FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL], - NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.CHANSEY, Species.KANGASKHAN], + NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON], 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], - ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE], - GARDENIA: [Species.ROSELIA, Species.TANGELA, Species.TURTWIG], - MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR], - CRASHER_WAKE: [Species.BUIZEL, Species.MAGIKARP, Species.PIPLUP], - FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB], - BYRON: [Species.SHIELDON, Species.BRONZOR, Species.AGGRON], + JUAN: [Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.CORPHISH], + ROARK: [Species.CRANIDOS, Species.GEODUDE, Species.LARVITAR], + GARDENIA: [Species.ROSELIA, Species.CHERUBI, Species.TURTWIG], + MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CROAGUNK], + CRASHER_WAKE: [Species.BUIZEL, Species.MAGIKARP, Species.WOOPER], + FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.DUSKULL], + BYRON: [Species.SHIELDON, Species.BRONZOR, Species.ARON], CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT], - VOLKNER: [Species.SHINX, Species.CHINCHOU, Species.ROTOM], - CILAN: [Species.PANSAGE, Species.COTTONEE, Species.PETILIL], + VOLKNER: [Species.SHINX, Species.JOLTEON, Species.REMORAID, Species.ELECTABUZZ], + CILAN: [Species.PANSAGE, Species.FERROSEED, Species.MARACTUS], CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.HEATMOR], - CRESS: [Species.PANPOUR, Species.BASCULIN, Species.TYMPOLE], - CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PATRAT], - LENORA: [Species.KANGASKHAN, Species.DEERLING, Species.AUDINO], - ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI], - BURGH: [Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST], + CRESS: [Species.PANPOUR, Species.DUCKLETT, Species.BASCULIN], + CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE], + LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO], + ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.KOFFING], + BURGH: [Species.SEWADDLE, Species.DWEBBLE, Species.SHELMET, Species.KARRABLAST], ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK], - CLAY: [Species.DRILBUR, Species.SANDILE, Species.GOLETT], + CLAY: [Species.DRILBUR, Species.TYMPOLE, Species.GOLETT], SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET], BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO], DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO], @@ -936,30 +936,30 @@ export const signatureSpecies: SignatureSpecies = { 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], + CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.ROTOM], VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME], OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING], WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL], 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], + KABU: [Species.SIZZLIPEDE, Species.GROWLITHE, Species.TORKOAL], + BEA: [Species.GALAR_FARFETCHD, Species.FALINKS, Species.CLOBBOPUS], + ALLISTER: [Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.SINISTEA], + OPAL: [Species.MILCERY, Species.TOGETIC, Species.SPRITZEE, 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], - KATY: [Species.NYMBLE, Species.TAROUNTULA, Species.HERACROSS], - BRASSIUS: [Species.SMOLIV, Species.SHROOMISH, Species.ODDISH], - IONO: [Species.TADBULB, Species.WATTREL, Species.VOLTORB], - KOFU: [Species.VELUZA, Species.WIGLETT, Species.WINGULL], + RAIHAN: [Species.DURALUDON, Species.TRAPINCH, Species.TURTONATOR], + KATY: [Species.NYMBLE, Species.TAROUNTULA, Species.FIDOUGH], + BRASSIUS: [Species.SMOLIV, Species.BRAMBLIN, Species.BONSLY], + IONO: [Species.TADBULB, Species.WATTREL, Species.MISDREAVUS], + KOFU: [Species.VELUZA, Species.WIGLETT, Species.CRABRAWLER], LARRY: [Species.STARLY, Species.DUNSPARCE, Species.KOMALA], - RYME: [Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU], - TULIP: [Species.GIRAFARIG, Species.FLITTLE, Species.RALTS], - GRUSHA: [Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO], + RYME: [Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU, Species.TOXEL], + TULIP: [Species.GIRAFARIG, Species.FLITTLE, Species.FLABEBE], + GRUSHA: [Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO, Species.SWABLU], LORELEI: [Species.JYNX, [Species.SLOWBRO, Species.GALAR_SLOWBRO], Species.LAPRAS, [Species.ALOLA_SANDSLASH, Species.CLOYSTER]], BRUNO: [Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [Species.ALOLA_GOLEM, Species.GOLEM]], AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK], @@ -990,8 +990,8 @@ export const signatureSpecies: SignatureSpecies = { KAHILI: [[Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON], MARNIE_ELITE: [Species.MORPEKO, Species.LIEPARD, [Species.TOXICROAK, Species.SCRAFTY], Species.GRIMMSNARL], NESSA_ELITE: [Species.GOLISOPOD, [Species.PELIPPER, Species.QUAGSIRE], Species.TOXAPEX, Species.DREDNAW], - BEA_ELITE: [Species.HAWLUCHA, [Species.GRAPPLOCT, Species.SIRFETCHD], Species.FALINKS, Species.MACHAMP], - ALLISTER_ELITE:[Species.DUSKNOIR, [Species.POLTEAGEIST, Species.RUNERIGUS], Species.CURSOLA, Species.GENGAR], + BEA_ELITE: [[Species.HAWLUCHA, Species.MACHAMP], Species.GRAPPLOCT, Species.SIRFETCHD, Species.FALINKS], + ALLISTER_ELITE:[[Species.DUSKNOIR, Species.GENGAR], Species.POLTEAGEIST, Species.RUNERIGUS, Species.CURSOLA], RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON], RIKA: [Species.WHISCASH, [Species.DONPHAN, Species.DUGTRIO], Species.CAMERUPT, Species.CLODSIRE], POPPY: [Species.COPPERAJAH, Species.BRONZONG, Species.CORVIKNIGHT, Species.TINKATON], @@ -1229,7 +1229,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.JANINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["JANINE"],false, Type.POISON).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), [TrainerType.SABRINA]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["SABRINA"],false, Type.PSYCHIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), [TrainerType.BLAINE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BLAINE"],true, Type.FIRE).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), - [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GIOVANNI"],true, Type.DARK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), + [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["GIOVANNI"],true, Type.GROUND).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"), [TrainerType.FALKNER]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["FALKNER"],true, Type.FLYING).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), [TrainerType.BUGSY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["BUGSY"],true, Type.BUG).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), [TrainerType.WHITNEY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["WHITNEY"],false, Type.NORMAL).setBattleBgm("battle_johto_gym").setMixedBattleBgm("battle_johto_gym"), @@ -1332,7 +1332,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.RAIHAN_ELITE]: new TrainerConfig(++t).setName("Raihan").initForEliteFour(signatureSpecies["RAIHAN_ELITE"],true, Type.DRAGON).setMixedBattleBgm("battle_galar_elite"), [TrainerType.RIKA]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["RIKA"],false, Type.GROUND).setMixedBattleBgm("battle_paldea_elite"), [TrainerType.POPPY]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["POPPY"],false, Type.STEEL).setMixedBattleBgm("battle_paldea_elite"), - [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).setName("Larry").initForEliteFour(signatureSpecies["LARRY_ELITE"],true, Type.NORMAL, Type.FLYING).setMixedBattleBgm("battle_paldea_elite"), + [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).setName("Larry").initForEliteFour(signatureSpecies["LARRY_ELITE"],true, Type.FLYING).setMixedBattleBgm("battle_paldea_elite"), [TrainerType.HASSEL]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["HASSEL"],true, Type.DRAGON).setMixedBattleBgm("battle_paldea_elite"), [TrainerType.CRISPIN]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["CRISPIN"],true, Type.FIRE).setMixedBattleBgm("battle_bb_elite"), [TrainerType.AMARYS]: new TrainerConfig(++t).initForEliteFour(signatureSpecies["AMARYS"],false, Type.STEEL).setMixedBattleBgm("battle_bb_elite"),