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

Merge branch 'beta' into pr-illusion

Browse Source
This commit is contained in:
Lylian BALL 2025-01-26 12:45:13 +01:00 committed by GitHub
commit 24c376a616
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1373 additions and 5081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3224
public/images/pokemon/back/249.json
View File

File diff suppressed because it is too large Load Diff

BIN
public/images/pokemon/back/249.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 37 KiB

3224
public/images/pokemon/back/shiny/249.json
View File

File diff suppressed because it is too large Load Diff

BIN
public/images/pokemon/back/shiny/249.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 37 KiB

6
src/modifier/modifier.ts
View File

@ -3183,12 +3183,12 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
break;
}
}
const randItemIndex = pokemon.randSeedInt(tierItemModifiers.length);
const randItem = tierItemModifiers[randItemIndex];
const randItemIndex = pokemon.randSeedInt(itemModifiers.length);
const randItem = itemModifiers[randItemIndex];
heldItemTransferPromises.push(globalScene.tryTransferHeldItemModifier(randItem, pokemon, false).then(success => {
if (success) {
transferredModifierTypes.push(randItem.type);
tierItemModifiers.splice(randItemIndex, 1);
itemModifiers.splice(randItemIndex, 1);
}
}));
}