diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 6fdd9fc8b17..35ca5c6633f 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -173,7 +173,7 @@ import { calculateBossSegmentDamage } from "#utils/damage"; import { getEnumValues } from "#utils/enums"; import { getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils"; import { inSpeedOrder } from "#utils/speed-order-generator"; -import { argbFromRgba, QuantizerCelebi, rgbaFromArgb } from "@material/material-color-utilities"; +import { argbFromRgba, clampInt, QuantizerCelebi, rgbaFromArgb } from "@material/material-color-utilities"; import i18next from "i18next"; import Phaser from "phaser"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; @@ -6405,7 +6405,7 @@ export class EnemyPokemon extends Pokemon { ivs.push(randSeedIntRange(Math.floor(waveIndex / 10), 31)); } this.ivs = ivs; - this.friendship = Math.round(255 * (waveIndex / 200)); + this.friendship = clampInt(50, 255, Math.round(255 * (waveIndex / 145))); } } diff --git a/test/field/pokemon.test.ts b/test/field/pokemon.test.ts index 075ae36672d..aaae19d7193 100644 --- a/test/field/pokemon.test.ts +++ b/test/field/pokemon.test.ts @@ -215,12 +215,12 @@ describe("Spec - Pokemon", () => { }); it.each([ - { wave: 5, friendship: 6 }, - { wave: 25, friendship: 32 }, - { wave: 55, friendship: 70 }, - { wave: 95, friendship: 121 }, - { wave: 145, friendship: 185 }, - { wave: 195, friendship: 249 }, + { wave: 5, friendship: 50 }, + { wave: 25, friendship: 50 }, + { wave: 55, friendship: 97 }, + { wave: 95, friendship: 167 }, + { wave: 145, friendship: 255 }, + { wave: 195, friendship: 255 }, ])("should set friendship for enemy trainer pokemon based on wave ($wave)", async ({ wave, friendship }) => { game.override.startingWave(wave); await game.classicMode.runToSummon([SpeciesId.FEEBAS]);