mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-01 22:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

pokemon.getHeldItems now uses heldItemManager

Browse Source
This commit is contained in:
Wlowscha 2025-06-09 16:20:21 +02:00
parent 87b0035463
commit 5278a96f24
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/field/pokemon-held-item-manager.ts
View File

@ -31,7 +31,7 @@ export class PokemonItemManager {
this.heldItems = {}; this.heldItems = {};
} }
getHeldItemKeys(): number[] { getHeldItems(): number[] {
return Object.keys(this.heldItems).map(k => Number(k)); return Object.keys(this.heldItems).map(k => Number(k));
} }

10
src/field/pokemon.ts
View File

@ -1198,14 +1198,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.setScale(this.getSpriteScale()); this.setScale(this.getSpriteScale());
} }
getHeldItems(): PokemonHeldItemModifier[] { getHeldItems(): HeldItemId[] {
if (!globalScene) { return this.heldItemManager.getHeldItems();
return [];
}
return globalScene.findModifiers(
m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id,
this.isPlayer(),
) as PokemonHeldItemModifier[];
} }
updateScale(): void { updateScale(): void {

2
src/ui/summary-ui-handler.ts
View File

@ -1050,7 +1050,7 @@ export default class SummaryUiHandler extends UiHandler {
icon.on("pointerout", () => globalScene.ui.hideTooltip()); icon.on("pointerout", () => globalScene.ui.hideTooltip());
}); });
const heldItemKeys = this.pokemon?.heldItemManager.getHeldItemKeys(); const heldItemKeys = this.pokemon?.heldItemManager.getHeldItems();
// TODO: Sort them // TODO: Sort them
//.sort(heldItemSortFunc); //.sort(heldItemSortFunc);