Fix Bugs struggling; implement some trainer types

Also removes a now-unused learnset for Bloodmoon Ursaluna, as it isn't a form for Ursaluna anymore, but rather a standalone Pokémon.

src/data/biomes.ts

@@ -1640,7 +1640,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.GRASS]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.BREEDER ],
+    [BiomePoolTier.COMMON]: [ TrainerType.BREEDER, TrainerType.STUDENT ],
     [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
     [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1871,7 +1871,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.WASTELAND]: {
-    [BiomePoolTier.COMMON]: [],
+    [BiomePoolTier.COMMON]: [ TrainerType.VETERAN ],
     [BiomePoolTier.UNCOMMON]: [],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
@@ -1948,8 +1948,8 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [BiomePoolTier.BOSS_ULTRA_RARE]: []
   },
   [Biome.SLUM]: {
-    [BiomePoolTier.COMMON]: [ TrainerType.BAKER, TrainerType.OFFICER ],
-    [BiomePoolTier.UNCOMMON]: [],
+    [BiomePoolTier.COMMON]: [ TrainerType.BIKER, TrainerType.OFFICER, TrainerType.ROUGHNECK ],
+    [BiomePoolTier.UNCOMMON]: [ TrainerType.BAKER ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [],
     [BiomePoolTier.ULTRA_RARE]: [],
@@ -7140,13 +7140,16 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ TrainerType.BAKER, [ 
-        [ Biome.SLUM, BiomePoolTier.COMMON ]
+        [ Biome.SLUM, BiomePoolTier.UNCOMMON ]
       ]
     ],
     [ TrainerType.BEAUTY, [
       [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
     ] ],
-    [ TrainerType.BIKER, [] ],
+    [ TrainerType.BIKER, [
+        [ Biome.SLUM, BiomePoolTier.COMMON ]
+      ] 
+    ],
     [ TrainerType.BLACK_BELT, [
         [ Biome.DOJO, BiomePoolTier.COMMON ],
         [ Biome.PLAINS, BiomePoolTier.RARE ],
@@ -7235,7 +7238,10 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ TrainerType.RICH_KID, [] ],
-    [ TrainerType.ROUGHNECK, [] ],
+    [ TrainerType.ROUGHNECK, [
+        [ Biome.SLUM, BiomePoolTier.COMMON ]
+      ] 
+    ],
     [ TrainerType.SCIENTIST, [
         [ Biome.DESERT, BiomePoolTier.COMMON ],
         [ Biome.RUINS, BiomePoolTier.COMMON ]
@@ -7248,7 +7254,10 @@ export const biomeTrainerPools: BiomeTrainerPools = {
       ]
     ],
     [ TrainerType.STRIKER, [] ],
-    [ TrainerType.STUDENT, [] ],
+    [ TrainerType.STUDENT, [
+        [ Biome.GRASS, BiomePoolTier.COMMON ]
+      ] 
+    ],
     [ TrainerType.SWIMMER, [
         [ Biome.SEA, BiomePoolTier.COMMON ]
       ]
@@ -7257,7 +7266,10 @@ export const biomeTrainerPools: BiomeTrainerPools = {
         [ Biome.PLAINS, BiomePoolTier.COMMON ]
       ]
     ],
-    [ TrainerType.VETERAN, [] ],
+    [ TrainerType.VETERAN, [
+        [ Biome.WASTELAND, BiomePoolTier.COMMON ]
+      ] 
+    ],
     [ TrainerType.WAITER, [
         [ Biome.METROPOLIS, BiomePoolTier.COMMON ]
       ]

src/data/pokemon-level-moves.ts

@@ -169,6 +169,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   ],
   [Species.METAPOD]: [
     [ 0, Moves.HARDEN ],
+    [ 1, Moves.HARDEN ],
   ],
   [Species.BUTTERFREE]: [
     [ 0, Moves.GUST ],
@@ -197,6 +198,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   ],
   [Species.KAKUNA]: [
     [ 0, Moves.HARDEN ],
+    [ 1, Moves.HARDEN ],
   ],
   [Species.BEEDRILL]: [
     [ 0, Moves.TWINEEDLE ],
@@ -4472,6 +4474,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   ],
   [Species.SILCOON]: [
     [ 0, Moves.HARDEN ],
+    [ 1, Moves.HARDEN ],
   ],
   [Species.BEAUTIFLY]: [
     [ 0, Moves.GUST ],
@@ -4490,6 +4493,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   ],
   [Species.CASCOON]: [
     [ 0, Moves.HARDEN ],
+    [ 1, Moves.HARDEN ],
   ],
   [Species.DUSTOX]: [
     [ 0, Moves.GUST ],
@@ -18521,26 +18525,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
       [ 51, Moves.BELCH ],
     ],
   },
-  [Species.URSALUNA]: {
-    1: [
-      [ 1, Moves.SCRATCH ],
-      [ 1, Moves.LEER ],
-      [ 1, Moves.LICK ],
-      [ 1, Moves.HEADLONG_RUSH ],
-      [ 8, Moves.FURY_SWIPES ],
-      [ 13, Moves.PAYBACK ],
-      [ 17, Moves.HARDEN ],
-      [ 22, Moves.SLASH ],
-      [ 25, Moves.PLAY_NICE ],
-      [ 35, Moves.SCARY_FACE ],
-      [ 41, Moves.REST ],
-      [ 41, Moves.SNORE ],
-      [ 48, Moves.EARTH_POWER ],
-      [ 56, Moves.MOONBLAST ],
-      [ 64, Moves.HAMMER_ARM ],
-      [ 70, Moves.BLOOD_MOON ],
-    ],
-  },
   [Species.PALDEA_TAUROS]: {
     1: [
       [ 1, Moves.TACKLE ],

src/data/trainer-config.ts

@@ -597,7 +597,7 @@ export const trainerConfigs: TrainerConfigs = {
       [TrainerPoolTier.COMMON]: [ Species.ABRA, Species.DROWZEE, Species.RALTS, Species.SPOINK, Species.GOTHITA, Species.SOLOSIS, Species.BLIPBUG, Species.ESPURR, Species.HATENNA ],
       [TrainerPoolTier.UNCOMMON]: [ Species.MIME_JR, Species.EXEGGCUTE, Species.MEDITITE, Species.NATU, Species.EXEGGCUTE, Species.WOOBAT, Species.INKAY, Species.ORANGURU ],
       [TrainerPoolTier.RARE]: [ Species.ELGYEM, Species.SIGILYPH, Species.BALTOY, Species.GIRAFARIG, Species.MEOWSTIC ],
-      [TrainerPoolTier.SUPER_RARE]: [ Species.BELDUM, Species.ESPEON, Species.WYRDEER ],
+      [TrainerPoolTier.SUPER_RARE]: [ Species.BELDUM, Species.ESPEON, Species.STANTLER ],
     }),
   [TrainerType.RANGER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.BACKPACKER).setHasGenders()
     .setSpeciesPools({
@@ -620,14 +620,20 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.SMASHER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
   [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName('Worker').setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)),
   [TrainerType.STRIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.STUDENT]: new TrainerConfig(++t).setHasGenders(),
+  [TrainerType.STUDENT]: new TrainerConfig(++t).setMoneyMultiplier(0.75).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders(undefined, 'lass')
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [ Species.ODDISH, Species.EXEGGCUTE, Species.TEDDIURSA, Species.WURMPLE, Species.RALTS, Species.SHROOMISH, Species.FLETCHLING ],
+      [TrainerPoolTier.UNCOMMON]: [ Species.VOLTORB, Species.WHISMUR, Species.MEDITITE, Species.MIME_JR, Species.NYMBLE ],
+      [TrainerPoolTier.RARE]: [ Species.TANGELA, Species.EEVEE, Species.YANMA ],
+      [TrainerPoolTier.SUPER_RARE]: [ Species.TADBULB ]
+    }),
   [TrainerType.SWIMMER]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm(TrainerType.PARASOL_LADY).setHasGenders().setSpecialtyTypes(Type.WATER).setSpeciesFilter(s => s.isOfType(Type.WATER)),
   [TrainerType.TWINS]: new TrainerConfig(++t).setDouble().setMoneyMultiplier(0.65).setUseSameSeedForAllMembers()
     .setPartyTemplateFunc(scene => getWavePartyTemplate(scene, trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_STRONG))
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.PLUSLE, Species.VOLBEAT, Species.PACHIRISU, Species.SILCOON, Species.METAPOD, Species.IGGLYBUFF, Species.PETILIL, Species.EEVEE ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MINUN, Species.ILLUMISE, Species.EMOLGA, Species.CASCOON, Species.KAKUNA, Species.CLEFFA, Species.COTTONEE, Species.EEVEE ]))
     .setEncounterBgm(TrainerType.TWINS),
-  [TrainerType.VETERAN]: new TrainerConfig(++t).setHasGenders().setMoneyMultiplier(2.5).setEncounterBgm(TrainerType.RICH),
+  [TrainerType.VETERAN]: new TrainerConfig(++t).setHasGenders().setMoneyMultiplier(2.5).setEncounterBgm(TrainerType.ACE_TRAINER).setSpeciesFilter(s => s.isOfType(Type.DRAGON)),
   [TrainerType.WAITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).setHasGenders('Waitress').setEncounterBgm(TrainerType.CLERK)
     .setSpeciesPools({
       [TrainerPoolTier.COMMON]: [ Species.CLEFFA, Species.CHATOT, Species.PANSAGE, Species.PANSEAR, Species.PANPOUR, Species.MINCCINO ],