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

Merge branch 'beta' into terrain-fail-msg

Browse Source
This commit is contained in:
Bertie690 2025-06-05 18:00:16 -04:00 committed by GitHub
commit c1816a3814
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modifier/modifier.ts
View File

@ -40,7 +40,6 @@ import {
type TerastallizeModifierType, type TerastallizeModifierType,
type TmModifierType, type TmModifierType,
getModifierType, getModifierType,
ModifierPoolType,
ModifierTypeGenerator, ModifierTypeGenerator,
modifierTypes, modifierTypes,
PokemonHeldItemModifierType, PokemonHeldItemModifierType,
@ -3232,8 +3231,7 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
} }
/** /**
* Steals an item from a set of target Pokemon. * Steals an item, chosen randomly, from a set of target Pokemon.
* This prioritizes high-tier held items when selecting the item to steal.
* @param pokemon The {@linkcode Pokemon} holding this item * @param pokemon The {@linkcode Pokemon} holding this item
* @param target The {@linkcode Pokemon} to steal from (optional) * @param target The {@linkcode Pokemon} to steal from (optional)
* @param _args N/A * @param _args N/A
@ -3253,30 +3251,15 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
return false; return false;
} }
const poolType = pokemon.isPlayer()
? ModifierPoolType.PLAYER
: pokemon.hasTrainer()
? ModifierPoolType.TRAINER
: ModifierPoolType.WILD;
const transferredModifierTypes: ModifierType[] = []; const transferredModifierTypes: ModifierType[] = [];
const itemModifiers = globalScene.findModifiers( const itemModifiers = globalScene.findModifiers(
m => m instanceof PokemonHeldItemModifier && m.pokemonId === targetPokemon.id && m.isTransferable, m => m instanceof PokemonHeldItemModifier && m.pokemonId === targetPokemon.id && m.isTransferable,
targetPokemon.isPlayer(), targetPokemon.isPlayer(),
) as PokemonHeldItemModifier[]; ) as PokemonHeldItemModifier[];
let highestItemTier = itemModifiers
.map(m => m.type.getOrInferTier(poolType))
.reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is this bang correct?
let tierItemModifiers = itemModifiers.filter(m => m.type.getOrInferTier(poolType) === highestItemTier);
for (let i = 0; i < transferredItemCount; i++) { for (let i = 0; i < transferredItemCount; i++) {
if (!tierItemModifiers.length) { if (!itemModifiers.length) {
while (highestItemTier-- && !tierItemModifiers.length) { break;
tierItemModifiers = itemModifiers.filter(m => m.type.tier === highestItemTier);
}
if (!tierItemModifiers.length) {
break;
}
} }
const randItemIndex = pokemon.randBattleSeedInt(itemModifiers.length); const randItemIndex = pokemon.randBattleSeedInt(itemModifiers.length);
const randItem = itemModifiers[randItemIndex]; const randItem = itemModifiers[randItemIndex];