[Enhancement] Add several new trainer types #6771
Draft
+536
−42
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are the changes the user will see?
This adds the Aroma Lady, Bird Keeper, Bug Catcher, Camper, Collector, Dragon Tamer, Fairy Tale Girl, Interviewers, Mysterious Sisters, Ruin Maniac, Scuba Diver, Snow Ace Trainer, and Young Couple trainer types to the game. With the addition of the Scuba Diver trainer type, random trainers are now permitted in the Seabed biome again at a 1/16th chance.
Note that biome placement, species pools, and species filters for new trainer types are not yet finalized.
Why am I making these changes?
More unique trainer types were desired to fill out specific biomes that lacked trainer types, preferably in the Common tier.
What are the changes from a developer perspective?
New trainer type data has been added, which includes enum entries, dialogue entries, biome placement, and (currently temporary) trainer config data
Screenshots/Videos
New Trainer Types
Aroma Lady
Bird Keeper
Bug Catcher
Camper/Picnicker
Collector
Dragon Tamer
Fairy Tale Girl
Interviewers
Mysterious Sisters
Ruin Maniac
Scuba Diver/Free Diver
Snow Ace Trainer
Young Couple
How to test the changes?
Set BATTLE_TYPE_OVERRIDE to
BattleType.TRAINERand set RANDOM_TRAINER_OVERRIDE to whatever trainer you want to test, such as{trainerType: TrainerType.AROMA_LADY}.Checklist
betaas my base branchpnpm test:silent)- [ ] Have I created new automated tests (pnpm test:create) or updated existing tests related to the PR's changes?- [ ] Have I made sure that any UI change works for both UI themes (default and legacy)?Are there any localization additions or changes? If so:
Does this require any changes to the assets folder? If so: