diff --git a/src/field/pokemon-held-item-manager.ts b/src/field/pokemon-held-item-manager.ts index 71890f03247..52eabc9b50a 100644 --- a/src/field/pokemon-held-item-manager.ts +++ b/src/field/pokemon-held-item-manager.ts @@ -12,22 +12,18 @@ type HeldItemPropertyMap = { }; export class PokemonItemManager { - private heldItems: HeldItemPropertyMap; + public heldItems: HeldItemPropertyMap; constructor() { this.heldItems = {}; } - getHeldItems(): HeldItemPropertyMap { - return this.heldItems; - } - getHeldItemKeys(): number[] { return Object.keys(this.heldItems).map(k => Number(k)); } hasItem(itemType: HeldItems): boolean { - return itemType in this.getHeldItems(); + return itemType in this.heldItems; } getItem(itemType: HeldItems): HeldItemProperties { @@ -36,7 +32,7 @@ export class PokemonItemManager { } getStack(itemType: HeldItems): number { - return itemType in this.getHeldItems() ? this.heldItems[itemType].stack : 0; + return itemType in this.heldItems ? this.heldItems[itemType].stack : 0; } add(itemType: HeldItems, addStack = 1) { diff --git a/src/items/held-items/attack-type-booster.ts b/src/items/held-items/attack-type-booster.ts index cb8966fbb99..275d1d5b8d5 100644 --- a/src/items/held-items/attack-type-booster.ts +++ b/src/items/held-items/attack-type-booster.ts @@ -65,7 +65,7 @@ export class AttackTypeBoosterHeldItem extends HeldItem { export function applyAttackTypeBoosterHeldItem(pokemon: Pokemon, moveType: PokemonType, movePower: NumberHolder) { if (pokemon) { - for (const item of Object.keys(pokemon.heldItemManager.getHeldItems())) { + for (const item of Object.keys(pokemon.heldItemManager.heldItems)) { if (allHeldItems[item] instanceof AttackTypeBoosterHeldItem) { allHeldItems[item].apply(pokemon, moveType, movePower); } diff --git a/src/items/held-items/hit-heal.ts b/src/items/held-items/hit-heal.ts index 8ea06d6cc6f..eb32dccf104 100644 --- a/src/items/held-items/hit-heal.ts +++ b/src/items/held-items/hit-heal.ts @@ -47,7 +47,7 @@ export class HitHealHeldItem extends HeldItem { export function applyHitHealHeldItem(pokemon: Pokemon) { if (pokemon) { - for (const item of Object.keys(pokemon.heldItemManager.getHeldItems())) { + for (const item of Object.keys(pokemon.heldItemManager.heldItems)) { if (allHeldItems[item] instanceof HitHealHeldItem) { allHeldItems[item].apply(pokemon); } diff --git a/src/items/held-items/reset-negative-stat-stage.ts b/src/items/held-items/reset-negative-stat-stage.ts index c84690148d1..d27514ec888 100644 --- a/src/items/held-items/reset-negative-stat-stage.ts +++ b/src/items/held-items/reset-negative-stat-stage.ts @@ -60,7 +60,7 @@ export class ResetNegativeStatStageHeldItem extends ConsumableHeldItem { export function applyResetNegativeStatStageHeldItem(pokemon: Pokemon): boolean { let applied = false; if (pokemon) { - for (const item of Object.keys(pokemon.heldItemManager.getHeldItems())) { + for (const item of Object.keys(pokemon.heldItemManager.heldItems)) { if (allHeldItems[item] instanceof ResetNegativeStatStageHeldItem) { applied ||= allHeldItems[item].apply(pokemon); } diff --git a/src/items/held-items/turn-heal.ts b/src/items/held-items/turn-heal.ts index 348d03c243c..c48205022e6 100644 --- a/src/items/held-items/turn-heal.ts +++ b/src/items/held-items/turn-heal.ts @@ -42,7 +42,7 @@ export class TurnHealHeldItem extends HeldItem { export function applyTurnHealHeldItem(pokemon: Pokemon) { if (pokemon) { - for (const item of Object.keys(pokemon.heldItemManager.getHeldItems())) { + for (const item of Object.keys(pokemon.heldItemManager.heldItems)) { if (allHeldItems[item] instanceof TurnHealHeldItem) { allHeldItems[item].apply(pokemon); }