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

Cleaning up some updated functions

Browse Source
This commit is contained in:
innerthunder 2024-12-09 00:50:57 -08:00 committed by Sirz Benjie
parent 60d83d40ee
commit d4311354a2
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modifier/modifier.ts
View File

@ -3136,8 +3136,6 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
let highestItemTier = itemModifiers.map(m => m.type.getOrInferTier(poolType)).reduce((highestTier, tier) => Math.max(tier!, highestTier), 0); // TODO: is this bang correct? 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); let tierItemModifiers = itemModifiers.filter(m => m.type.getOrInferTier(poolType) === highestItemTier);
const heldItemTransferPromises: Promise<void>[] = [];
for (let i = 0; i < transferredItemCount; i++) { for (let i = 0; i < transferredItemCount; i++) {
if (!tierItemModifiers.length) { if (!tierItemModifiers.length) {
while (highestItemTier-- && !tierItemModifiers.length) { while (highestItemTier-- && !tierItemModifiers.length) {
@ -3155,11 +3153,9 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
} }
} }
Promise.all(heldItemTransferPromises).then(() => { for (const mt of transferredModifierTypes) {
for (const mt of transferredModifierTypes) { globalScene.queueMessage(this.getTransferMessage(pokemon, targetPokemon, mt));
globalScene.queueMessage(this.getTransferMessage(pokemon, targetPokemon, mt)); }
}
});
return !!transferredModifierTypes.length; return !!transferredModifierTypes.length;
} }