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

Restored various changes to held item pool generation; distinguishing target of the generation from the party

Browse Source
This commit is contained in:
Wlowscha 2025-06-19 19:37:21 +02:00
parent afbdf9afb2
commit 46204067f5
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,11 @@ export function assignDailyRunStarterHeldItems(party: PlayerPokemon[]) {
const tier = getDailyRewardTier(tierValue); const tier = getDailyRewardTier(tierValue);
const item = getNewHeldItemFromPool(getHeldItemPool(HeldItemPoolType.DAILY_STARTER)[tier] as HeldItemPool, p); const item = getNewHeldItemFromPool(
getHeldItemPool(HeldItemPoolType.DAILY_STARTER)[tier] as HeldItemPool,
p,
party,
);
p.heldItemManager.add(item); p.heldItemManager.add(item);
} }
} }
@ -160,18 +164,18 @@ function pickWeightedIndex(weights: number[]): number {
return -1; // TODO: Change to something more appropriate return -1; // TODO: Change to something more appropriate
} }
export function getNewVitaminHeldItem(pokemon: Pokemon, customWeights: HeldItemWeights = {}): HeldItemId { export function getNewVitaminHeldItem(customWeights: HeldItemWeights = {}, target?: Pokemon): HeldItemId {
const items = PERMANENT_STATS.map(s => permanentStatToHeldItem[s]); const items = PERMANENT_STATS.map(s => permanentStatToHeldItem[s]);
const weights = items.map(t => (pokemon.heldItemManager.isMaxStack(t) ? 0 : (customWeights[t] ?? 1))); const weights = items.map(t => (target?.heldItemManager.isMaxStack(t) ? 0 : (customWeights[t] ?? 1)));
return items[pickWeightedIndex(weights)]; return items[pickWeightedIndex(weights)];
} }
export function getNewBerryHeldItem(pokemon: Pokemon, customWeights: HeldItemWeights = {}): HeldItemId { export function getNewBerryHeldItem(customWeights: HeldItemWeights = {}, target?: Pokemon): HeldItemId {
const berryTypes = getEnumValues(BerryType); const berryTypes = getEnumValues(BerryType);
const items = berryTypes.map(b => berryTypeToHeldItem[b]); const items = berryTypes.map(b => berryTypeToHeldItem[b]);
const weights = items.map(t => const weights = items.map(t =>
pokemon.heldItemManager.isMaxStack(t) target?.heldItemManager.isMaxStack(t)
? 0 ? 0
: (customWeights[t] ?? : (customWeights[t] ??
(t === HeldItemId.SITRUS_BERRY || t === HeldItemId.LUM_BERRY || t === HeldItemId.LEPPA_BERRY)) (t === HeldItemId.SITRUS_BERRY || t === HeldItemId.LUM_BERRY || t === HeldItemId.LEPPA_BERRY))
@ -183,14 +187,19 @@ export function getNewBerryHeldItem(pokemon: Pokemon, customWeights: HeldItemWei
} }
export function getNewAttackTypeBoosterHeldItem( export function getNewAttackTypeBoosterHeldItem(
pokemon: Pokemon, pokemon: Pokemon | Pokemon[],
customWeights: HeldItemWeights = {}, customWeights: HeldItemWeights = {},
target?: Pokemon,
): HeldItemId | null { ): HeldItemId | null {
const party = coerceArray(pokemon);
// TODO: make this consider moves or abilities that change types // TODO: make this consider moves or abilities that change types
const attackMoveTypes = pokemon const attackMoveTypes = party.flatMap(p =>
.getMoveset() p
.filter(m => m.getMove().is("AttackMove")) .getMoveset()
.map(m => m.getMove().type); .filter(m => m.getMove().is("AttackMove"))
.map(m => m.getMove().type),
);
if (!attackMoveTypes.length) { if (!attackMoveTypes.length) {
return null; return null;
} }
@ -206,7 +215,7 @@ export function getNewAttackTypeBoosterHeldItem(
const types = Array.from(attackMoveTypeWeights.keys()); const types = Array.from(attackMoveTypeWeights.keys());
const weights = types.map(type => const weights = types.map(type =>
pokemon.heldItemManager.isMaxStack(attackTypeToHeldItem[type]) target?.heldItemManager.isMaxStack(attackTypeToHeldItem[type])
? 0 ? 0
: (customWeights[attackTypeToHeldItem[type]] ?? attackMoveTypeWeights.get(type)!), : (customWeights[attackTypeToHeldItem[type]] ?? attackMoveTypeWeights.get(type)!),
); );
@ -217,17 +226,18 @@ export function getNewAttackTypeBoosterHeldItem(
export function getNewHeldItemFromCategory( export function getNewHeldItemFromCategory(
id: HeldItemCategoryId, id: HeldItemCategoryId,
pokemon: Pokemon, pokemon: Pokemon | Pokemon[],
customWeights: HeldItemWeights = {}, customWeights: HeldItemWeights = {},
target?: Pokemon,
): HeldItemId | null { ): HeldItemId | null {
if (id === HeldItemCategoryId.BERRY) { if (id === HeldItemCategoryId.BERRY) {
return getNewBerryHeldItem(pokemon, customWeights); return getNewBerryHeldItem(customWeights, target);
} }
if (id === HeldItemCategoryId.VITAMIN) { if (id === HeldItemCategoryId.VITAMIN) {
return getNewVitaminHeldItem(pokemon, customWeights); return getNewVitaminHeldItem(customWeights, target);
} }
if (id === HeldItemCategoryId.TYPE_ATTACK_BOOSTER) { if (id === HeldItemCategoryId.TYPE_ATTACK_BOOSTER) {
return getNewAttackTypeBoosterHeldItem(pokemon, customWeights); return getNewAttackTypeBoosterHeldItem(pokemon, customWeights, target);
} }
return null; return null;
} }
@ -247,7 +257,7 @@ function getPoolWeights(pool: HeldItemPool, pokemon: Pokemon): number[] {
}); });
} }
function getNewHeldItemFromPool(pool: HeldItemPool, pokemon: Pokemon): HeldItemId | HeldItemSpecs { function getNewHeldItemFromPool(pool: HeldItemPool, pokemon: Pokemon, party?: Pokemon[]): HeldItemId | HeldItemSpecs {
const weights = getPoolWeights(pool, pokemon); const weights = getPoolWeights(pool, pokemon);
const entry = pool[pickWeightedIndex(weights)].entry; const entry = pool[pickWeightedIndex(weights)].entry;
@ -257,7 +267,7 @@ function getNewHeldItemFromPool(pool: HeldItemPool, pokemon: Pokemon): HeldItemI
} }
if (isHeldItemCategoryEntry(entry)) { if (isHeldItemCategoryEntry(entry)) {
return getNewHeldItemFromCategory(entry.id, pokemon, entry?.customWeights) as HeldItemId; return getNewHeldItemFromCategory(entry.id, party ?? pokemon, entry?.customWeights, pokemon) as HeldItemId;
} }
return entry as HeldItemSpecs; return entry as HeldItemSpecs;
@ -278,7 +288,7 @@ export function assignItemsFromConfiguration(config: HeldItemConfiguration, poke
if (isHeldItemCategoryEntry(entry)) { if (isHeldItemCategoryEntry(entry)) {
for (let i = 1; i <= actualCount; i++) { for (let i = 1; i <= actualCount; i++) {
const newItem = getNewHeldItemFromCategory(entry.id, pokemon, entry?.customWeights); const newItem = getNewHeldItemFromCategory(entry.id, pokemon, entry?.customWeights, pokemon);
if (newItem) { if (newItem) {
pokemon.heldItemManager.add(newItem); pokemon.heldItemManager.add(newItem);
} }