From 51a2a157997e2060cac6a31e59a9400b16d6bcb1 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Wed, 11 Jun 2025 22:11:03 +0200
Subject: [PATCH] Converted Berries Abound encounter

---
 .../encounters/berries-abound-encounter.ts    | 34 ++++---------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
index 65ae3ea6c4f..efffd2d1547 100644
--- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
+++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
@@ -1,7 +1,6 @@
 import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
 import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import {
-  generateModifierType,
   generateModifierTypeOption,
   getRandomEncounterSpecies,
   initBattleWithEnemyConfig,
@@ -11,7 +10,7 @@ import {
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import type { PlayerPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
-import type { BerryModifierType, ModifierTypeOption } from "#app/modifier/modifier-type";
+import type { ModifierTypeOption } from "#app/modifier/modifier-type";
 import { ModifierPoolType, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
 import { randSeedInt } from "#app/utils/common";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -24,18 +23,17 @@ import { getPokemonNameWithAffix } from "#app/messages";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import {
-  applyModifierTypeToPlayerPokemon,
   getEncounterPokemonLevelForWave,
   getHighestStatPlayerPokemon,
   getSpriteKeysFromPokemon,
   STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER,
 } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
 import PokemonData from "#app/system/pokemon-data";
-import { BerryModifier } from "#app/modifier/modifier";
 import i18next from "#app/plugins/i18n";
 import { BerryType } from "#enums/berry-type";
 import { PERMANENT_STATS, Stat } from "#enums/stat";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
+import { berryTypeToHeldItem } from "#app/items/held-items/berry";
 
 /** the i18n namespace for the encounter */
 const namespace = "mysteryEncounters/berriesAbound";
@@ -310,35 +308,17 @@ export const BerriesAboundEncounter: MysteryEncounter = MysteryEncounterBuilder.
 
 function tryGiveBerry(prioritizedPokemon?: PlayerPokemon) {
   const berryType = randSeedInt(Object.keys(BerryType).filter(s => !Number.isNaN(Number(s))).length) as BerryType;
-  const berry = generateModifierType(modifierTypes.BERRY, [berryType]) as BerryModifierType;
+  const berry = berryTypeToHeldItem[berryType];
 
   const party = globalScene.getPlayerParty();
 
-  // Will try to apply to prioritized pokemon first, then do normal application method if it fails
-  if (prioritizedPokemon) {
-    const heldBerriesOfType = globalScene.findModifier(
-      m =>
-        m instanceof BerryModifier &&
-        m.pokemonId === prioritizedPokemon.id &&
-        (m as BerryModifier).berryType === berryType,
-      true,
-    ) as BerryModifier;
-
-    if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount()) {
-      applyModifierTypeToPlayerPokemon(prioritizedPokemon, berry);
-      return;
-    }
+  // Will give the berry to a Pokemon, starting from the prioritized one
+  if (prioritizedPokemon?.heldItemManager.add(berry)) {
+    return;
   }
 
-  // Iterate over the party until berry was successfully given
   for (const pokemon of party) {
-    const heldBerriesOfType = globalScene.findModifier(
-      m => m instanceof BerryModifier && m.pokemonId === pokemon.id && (m as BerryModifier).berryType === berryType,
-      true,
-    ) as BerryModifier;
-
-    if (!heldBerriesOfType || heldBerriesOfType.getStackCount() < heldBerriesOfType.getMaxStackCount()) {
-      applyModifierTypeToPlayerPokemon(pokemon, berry);
+    if (pokemon.heldItemManager.add(berry)) {
       return;
     }
   }