From 985d352be849dad7ad495d7148d2e9e7ea632094 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Thu, 24 Jul 2025 20:39:56 +0200
Subject: [PATCH] Moved held item manager to item folder, some name changes

---
 src/field/pokemon.ts                               |  6 +++---
 .../held-item-manager.ts}                          | 14 ++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)
 rename src/{field/pokemon-held-item-manager.ts => items/held-item-manager.ts} (94%)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 6725867f656..ac7a77cf92c 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -110,10 +110,10 @@ import type { TrainerSlot } from "#enums/trainer-slot";
 import { UiMode } from "#enums/ui-mode";
 import { WeatherType } from "#enums/weather-type";
 import { doShinySparkleAnim } from "#field/anims";
-import { PokemonItemManager } from "#field/pokemon-held-item-manager";
 import { applyHeldItems } from "#items/all-held-items";
 import { HeldItemEffect } from "#items/held-item";
 import type { HeldItemConfiguration } from "#items/held-item-data-types";
+import { HeldItemManager } from "#items/held-item-manager";
 import { assignItemsFromConfiguration } from "#items/held-item-pool";
 import { TrainerItemEffect } from "#items/trainer-item";
 import { applyMoveAttrs } from "#moves/apply-attrs";
@@ -273,7 +273,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
 
   private shinySparkle: Phaser.GameObjects.Sprite;
 
-  public heldItemManager: PokemonItemManager;
+  public heldItemManager: HeldItemManager;
 
   // TODO: Rework this eventually
   constructor(
@@ -318,7 +318,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate);
     this.levelExp = dataSource?.levelExp || 0;
 
-    this.heldItemManager = new PokemonItemManager();
+    this.heldItemManager = new HeldItemManager();
     if (heldItemConfig) {
       assignItemsFromConfiguration(heldItemConfig, this);
     }
diff --git a/src/field/pokemon-held-item-manager.ts b/src/items/held-item-manager.ts
similarity index 94%
rename from src/field/pokemon-held-item-manager.ts
rename to src/items/held-item-manager.ts
index ae4509b71b1..2c2a084ed15 100644
--- a/src/field/pokemon-held-item-manager.ts
+++ b/src/items/held-item-manager.ts
@@ -18,7 +18,7 @@ import {
 } from "#items/held-item-data-types";
 import { getTypedEntries, getTypedKeys } from "#utils/common";
 
-export class PokemonItemManager {
+export class HeldItemManager {
   public heldItems: HeldItemDataMap;
   public formChangeItems: FormChangeItemPropertyMap;
 
@@ -78,21 +78,15 @@ export class PokemonItemManager {
   }
 
   getTransferableHeldItems(): HeldItemId[] {
-    return getTypedKeys(this.heldItems)
-      .filter(k => allHeldItems[k].isTransferable)
-      .map(k => k);
+    return getTypedKeys(this.heldItems).filter(k => allHeldItems[k].isTransferable);
   }
 
   getStealableHeldItems(): HeldItemId[] {
-    return getTypedKeys(this.heldItems)
-      .filter(k => allHeldItems[k].isStealable)
-      .map(k => k);
+    return getTypedKeys(this.heldItems).filter(k => allHeldItems[k].isStealable);
   }
 
   getSuppressableHeldItems(): HeldItemId[] {
-    return getTypedKeys(this.heldItems)
-      .filter(k => allHeldItems[k].isSuppressable)
-      .map(k => k);
+    return getTypedKeys(this.heldItems).filter(k => allHeldItems[k].isSuppressable);
   }
 
   hasItem(itemType: HeldItemId | HeldItemCategoryId): boolean {