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

Merge branch 'beta' into trainers-common-fix

Browse Source
This commit is contained in:
Wlowscha 2025-04-02 00:01:39 +02:00 committed by GitHub
commit 4c8a61c611
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/modifier/modifier-type.ts
View File

@ -2823,37 +2823,48 @@ const modifierPool: ModifierPool = {
modifierTypes.MYSTICAL_ROCK, modifierTypes.MYSTICAL_ROCK,
(party: Pokemon[]) => { (party: Pokemon[]) => {
return party.some(p => { return party.some(p => {
const moveset = p.getMoveset(true).map(m => m.moveId); let isHoldingMax = false;
for (const i of p.getHeldItems()) {
if (i.type.id === "MYSTICAL_ROCK") {
isHoldingMax = i.getStackCount() === i.getMaxStackCount();
break;
}
}
const hasAbility = [ if (!isHoldingMax) {
Abilities.DRIZZLE, const moveset = p.getMoveset(true).map(m => m.moveId);
Abilities.ORICHALCUM_PULSE,
Abilities.DROUGHT,
Abilities.SAND_STREAM,
Abilities.SAND_SPIT,
Abilities.SNOW_WARNING,
Abilities.ELECTRIC_SURGE,
Abilities.HADRON_ENGINE,
Abilities.PSYCHIC_SURGE,
Abilities.GRASSY_SURGE,
Abilities.SEED_SOWER,
Abilities.MISTY_SURGE,
].some(a => p.hasAbility(a, false, true));
const hasMoves = [ const hasAbility = [
Moves.SUNNY_DAY, Abilities.DROUGHT,
Moves.RAIN_DANCE, Abilities.ORICHALCUM_PULSE,
Moves.SANDSTORM, Abilities.DRIZZLE,
Moves.SNOWSCAPE, Abilities.SAND_STREAM,
Moves.HAIL, Abilities.SAND_SPIT,
Moves.CHILLY_RECEPTION, Abilities.SNOW_WARNING,
Moves.ELECTRIC_TERRAIN, Abilities.ELECTRIC_SURGE,
Moves.PSYCHIC_TERRAIN, Abilities.HADRON_ENGINE,
Moves.GRASSY_TERRAIN, Abilities.PSYCHIC_SURGE,
Moves.MISTY_TERRAIN, Abilities.GRASSY_SURGE,
].some(m => moveset.includes(m)); Abilities.SEED_SOWER,
Abilities.MISTY_SURGE,
].some(a => p.hasAbility(a, false, true));
return hasAbility || hasMoves; const hasMoves = [
Moves.SUNNY_DAY,
Moves.RAIN_DANCE,
Moves.SANDSTORM,
Moves.SNOWSCAPE,
Moves.HAIL,
Moves.CHILLY_RECEPTION,
Moves.ELECTRIC_TERRAIN,
Moves.PSYCHIC_TERRAIN,
Moves.GRASSY_TERRAIN,
Moves.MISTY_TERRAIN,
].some(m => moveset.includes(m));
return hasAbility || hasMoves;
}
return false;
}) })
? 10 ? 10
: 0; : 0;