[Balance Hotfix] Slight Alterations to PR#6747 (Trainers) (#6755)

Update trainer-config.ts

Co-authored-by: damocleas <damocleas25@gmail.com>
This commit is contained in:
Blitzy 2025-11-06 09:08:11 -06:00 committed by GitHub
parent 74783b1200
commit c7b563e498
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5475,13 +5475,10 @@ export const trainerConfigs: TrainerConfigs = {
) )
.setPartyMemberFunc( .setPartyMemberFunc(
1, 1,
getRandomPartyMemberFunc([SpeciesId.SCIZOR, SpeciesId.KLEAVOR], TrainerSlot.TRAINER, true, p => { getRandomPartyMemberFunc([SpeciesId.SCIZOR], TrainerSlot.TRAINER, true, p => {
if (p.species.speciesId === SpeciesId.SCIZOR) { p.abilityIndex = 1; // Technician
p.abilityIndex = 1; // Technician
} else if (p.species.speciesId === SpeciesId.KLEAVOR) {
p.abilityIndex = 2; // Sharpness
}
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
p.gender = Gender.MALE;
}), }),
) )
.setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.HERACROSS])) .setPartyMemberFunc(2, getRandomPartyMemberFunc([SpeciesId.HERACROSS]))
@ -5492,6 +5489,7 @@ export const trainerConfigs: TrainerConfigs = {
p.formIndex = 1; // Mega Pinsir p.formIndex = 1; // Mega Pinsir
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL; p.pokeball = PokeballType.ULTRA_BALL;
p.gender = Gender.MALE;
p.generateName(); p.generateName();
}), }),
) )
@ -5518,7 +5516,6 @@ export const trainerConfigs: TrainerConfigs = {
p.setBoss(true, 2); p.setBoss(true, 2);
p.abilityIndex = 2; // Anticipation p.abilityIndex = 2; // Anticipation
p.gender = Gender.MALE; p.gender = Gender.MALE;
p.level = 153; // Made higher level due to being an ace
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
if (!p.moveset.some(move => move != null && move.moveId === MoveId.FIRST_IMPRESSION)) { if (!p.moveset.some(move => move != null && move.moveId === MoveId.FIRST_IMPRESSION)) {
// Check if First Impression is in the moveset, if not, replace the third move with First Impression. // Check if First Impression is in the moveset, if not, replace the third move with First Impression.
@ -5528,27 +5525,24 @@ export const trainerConfigs: TrainerConfigs = {
) )
.setPartyMemberFunc( .setPartyMemberFunc(
1, 1,
getRandomPartyMemberFunc([SpeciesId.SCIZOR, SpeciesId.KLEAVOR], TrainerSlot.TRAINER, true, p => { getRandomPartyMemberFunc([SpeciesId.SCIZOR], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
if (p.species.speciesId === SpeciesId.SCIZOR) { p.abilityIndex = 1; // Technician
p.abilityIndex = 1; // Technician p.moveset[0] = new PokemonMove(MoveId.BUG_BITE);
p.moveset[0] = new PokemonMove(MoveId.BUG_BITE); p.moveset[1] = new PokemonMove(MoveId.BULLET_PUNCH);
p.moveset[1] = new PokemonMove(MoveId.BULLET_PUNCH); p.gender = Gender.MALE;
} else if (p.species.speciesId === SpeciesId.KLEAVOR) { p.pokeball = PokeballType.ULTRA_BALL;
p.abilityIndex = 2; // Sharpness
p.moveset[0] = new PokemonMove(MoveId.X_SCISSOR);
p.moveset[1] = new PokemonMove(MoveId.STONE_AXE);
}
}), }),
) )
.setPartyMemberFunc( .setPartyMemberFunc(
2, 2,
getRandomPartyMemberFunc([SpeciesId.TOXAPEX], TrainerSlot.TRAINER, true, p => { getRandomPartyMemberFunc([SpeciesId.CRAWDAUNT, SpeciesId.HISUI_SAMUROTT], TrainerSlot.TRAINER, true, p => {
p.abilityIndex = 2; // Regenerator p.abilityIndex = 2; // Adaptability Crawdaunt, Sharpness Samurott
p.pokeball = PokeballType.ULTRA_BALL;
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
if (!p.moveset.some(move => move != null && move.moveId === MoveId.BANEFUL_BUNKER)) { if (!p.moveset.some(move => move != null && move.moveId === MoveId.AQUA_JET)) {
// Check if Baneful Bunker is in the moveset, if not, replace the fourth move with Baneful Bunker. // Check if Aqua Jet is in the moveset, if not, replace the third move with Aqua Jet.
p.moveset[3] = new PokemonMove(MoveId.BANEFUL_BUNKER); p.moveset[2] = new PokemonMove(MoveId.AQUA_JET);
} }
}), }),
) )
@ -5561,22 +5555,22 @@ export const trainerConfigs: TrainerConfigs = {
) )
.setPartyMemberFunc( .setPartyMemberFunc(
4, 4,
getRandomPartyMemberFunc([SpeciesId.BUZZWOLE], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.pokeball = PokeballType.ROGUE_BALL;
p.level = 150; // Made lower level due to not being an ace
p.generateAndPopulateMoveset();
}),
)
.setPartyMemberFunc(
5,
getRandomPartyMemberFunc([SpeciesId.PINSIR], TrainerSlot.TRAINER, true, p => { getRandomPartyMemberFunc([SpeciesId.PINSIR], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2); p.setBoss(true, 2);
p.formIndex = 1; // Mega Pinsir p.formIndex = 1; // Mega Pinsir
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
p.generateName(); p.generateName();
p.gender = Gender.MALE;
p.pokeball = PokeballType.ULTRA_BALL; p.pokeball = PokeballType.ULTRA_BALL;
}), }),
)
.setPartyMemberFunc(
5,
getRandomPartyMemberFunc([SpeciesId.BUZZWOLE], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ROGUE_BALL;
}),
), ),
[TrainerType.ROSE]: new TrainerConfig(++t) [TrainerType.ROSE]: new TrainerConfig(++t)
.setName("Rose") .setName("Rose")