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

Allow recursive held item pools

Browse Source
This commit is contained in:
Wlowscha 2025-09-04 19:26:43 +02:00
parent f332093a77
commit 79c3444ac8
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/items/held-item-data-types.ts
View File

@ -49,7 +49,7 @@ export function isHeldItemCategoryEntry(entry: any): entry is HeldItemCategoryEn
} }
type HeldItemPoolEntry = { type HeldItemPoolEntry = {
entry: HeldItemId | HeldItemCategoryId | HeldItemCategoryEntry | HeldItemSpecs; entry: HeldItemId | HeldItemCategoryId | HeldItemCategoryEntry | HeldItemSpecs | HeldItemPool;
weight: number | HeldItemWeightFunc; weight: number | HeldItemWeightFunc;
}; };

4
src/items/held-item-pool.ts
View File

@ -262,6 +262,10 @@ function getNewHeldItemFromPool(pool: HeldItemPool, pokemon: Pokemon, party?: Po
return entry as HeldItemId; return entry as HeldItemId;
} }
if (isHeldItemPool(entry)) {
return getNewHeldItemFromPool(entry, pokemon, party) as HeldItemId;
}
if (isHeldItemCategoryEntry(entry)) { if (isHeldItemCategoryEntry(entry)) {
return getNewHeldItemFromCategory(entry.id, party ?? pokemon, entry?.customWeights, pokemon) as HeldItemId; return getNewHeldItemFromCategory(entry.id, party ?? pokemon, entry?.customWeights, pokemon) as HeldItemId;
} }