mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-09 00:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved held item manager to item folder, some name changes

Browse Source
This commit is contained in:
Wlowscha 2025-07-24 20:39:56 +02:00
parent ccd968d5b8
commit 985d352be8
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/field/pokemon.ts
View File

@ -110,10 +110,10 @@ import type { TrainerSlot } from "#enums/trainer-slot";
import { UiMode } from "#enums/ui-mode"; import { UiMode } from "#enums/ui-mode";
import { WeatherType } from "#enums/weather-type"; import { WeatherType } from "#enums/weather-type";
import { doShinySparkleAnim } from "#field/anims"; import { doShinySparkleAnim } from "#field/anims";
import { PokemonItemManager } from "#field/pokemon-held-item-manager";
import { applyHeldItems } from "#items/all-held-items"; import { applyHeldItems } from "#items/all-held-items";
import { HeldItemEffect } from "#items/held-item"; import { HeldItemEffect } from "#items/held-item";
import type { HeldItemConfiguration } from "#items/held-item-data-types"; import type { HeldItemConfiguration } from "#items/held-item-data-types";
import { HeldItemManager } from "#items/held-item-manager";
import { assignItemsFromConfiguration } from "#items/held-item-pool"; import { assignItemsFromConfiguration } from "#items/held-item-pool";
import { TrainerItemEffect } from "#items/trainer-item"; import { TrainerItemEffect } from "#items/trainer-item";
import { applyMoveAttrs } from "#moves/apply-attrs"; import { applyMoveAttrs } from "#moves/apply-attrs";
@ -273,7 +273,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
private shinySparkle: Phaser.GameObjects.Sprite; private shinySparkle: Phaser.GameObjects.Sprite;
public heldItemManager: PokemonItemManager; public heldItemManager: HeldItemManager;
// TODO: Rework this eventually // TODO: Rework this eventually
constructor( constructor(
@ -318,7 +318,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate); this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate);
this.levelExp = dataSource?.levelExp || 0; this.levelExp = dataSource?.levelExp || 0;
this.heldItemManager = new PokemonItemManager(); this.heldItemManager = new HeldItemManager();
if (heldItemConfig) { if (heldItemConfig) {
assignItemsFromConfiguration(heldItemConfig, this); assignItemsFromConfiguration(heldItemConfig, this);
} }

14
src/field/pokemon-held-item-manager.ts → src/items/held-item-manager.ts
View File

@ -18,7 +18,7 @@ import {
} from "#items/held-item-data-types"; } from "#items/held-item-data-types";
import { getTypedEntries, getTypedKeys } from "#utils/common"; import { getTypedEntries, getTypedKeys } from "#utils/common";
export class PokemonItemManager { export class HeldItemManager {
public heldItems: HeldItemDataMap; public heldItems: HeldItemDataMap;
public formChangeItems: FormChangeItemPropertyMap; public formChangeItems: FormChangeItemPropertyMap;
@ -78,21 +78,15 @@ export class PokemonItemManager {
} }
getTransferableHeldItems(): HeldItemId[] { getTransferableHeldItems(): HeldItemId[] {
return getTypedKeys(this.heldItems) return getTypedKeys(this.heldItems).filter(k => allHeldItems[k].isTransferable);
.filter(k => allHeldItems[k].isTransferable)
.map(k => k);
} }
getStealableHeldItems(): HeldItemId[] { getStealableHeldItems(): HeldItemId[] {
return getTypedKeys(this.heldItems) return getTypedKeys(this.heldItems).filter(k => allHeldItems[k].isStealable);
.filter(k => allHeldItems[k].isStealable)
.map(k => k);
} }
getSuppressableHeldItems(): HeldItemId[] { getSuppressableHeldItems(): HeldItemId[] {
return getTypedKeys(this.heldItems) return getTypedKeys(this.heldItems).filter(k => allHeldItems[k].isSuppressable);
.filter(k => allHeldItems[k].isSuppressable)
.map(k => k);
} }
hasItem(itemType: HeldItemId | HeldItemCategoryId): boolean { hasItem(itemType: HeldItemId | HeldItemCategoryId): boolean {