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

Merge branch 'beta' into splashtexts

Browse Source
This commit is contained in:
damocleas 2025-03-27 17:46:11 -04:00 committed by GitHub
commit cc8ebe84ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/data/ability.ts
View File

@ -1285,6 +1285,9 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
* @see {@linkcode applyPreDefend} * @see {@linkcode applyPreDefend}
*/ */
export class IgnoreMoveEffectsAbAttr extends PreDefendAbAttr { export class IgnoreMoveEffectsAbAttr extends PreDefendAbAttr {
constructor(showAbility: boolean = false) {
super(showAbility);
}
override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean { override canApplyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean {
return (args[0] as Utils.NumberHolder).value > 0; return (args[0] as Utils.NumberHolder).value > 0;
@ -4711,7 +4714,7 @@ export class ForceSwitchOutImmunityAbAttr extends AbAttr {
export class ReduceBerryUseThresholdAbAttr extends AbAttr { export class ReduceBerryUseThresholdAbAttr extends AbAttr {
constructor() { constructor() {
super(); super(false);
} }
override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean { override canApply(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {

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

@ -2000,7 +2000,7 @@ export const modifierTypes = {
}), }),
MYSTICAL_ROCK: () => MYSTICAL_ROCK: () =>
new ModifierType( new PokemonHeldItemModifierType(
"modifierType:ModifierType.MYSTICAL_ROCK", "modifierType:ModifierType.MYSTICAL_ROCK",
"mystical_rock", "mystical_rock",
(type, args) => new FieldEffectModifier(type, (args[0] as Pokemon).id), (type, args) => new FieldEffectModifier(type, (args[0] as Pokemon).id),

10
src/ui/pokedex-ui-handler.ts
View File

@ -37,11 +37,10 @@ import { addWindow } from "./ui-theme";
import type { OptionSelectConfig } from "./abstact-option-select-ui-handler"; import type { OptionSelectConfig } from "./abstact-option-select-ui-handler";
import { FilterText, FilterTextRow } from "./filter-text"; import { FilterText, FilterTextRow } from "./filter-text";
import { allAbilities } from "#app/data/ability"; import { allAbilities } from "#app/data/ability";
import type { PassiveAbilities } from "#app/data/balance/passives";
import { starterPassiveAbilities } from "#app/data/balance/passives"; import { starterPassiveAbilities } from "#app/data/balance/passives";
import { allMoves } from "#app/data/moves/move"; import { allMoves } from "#app/data/moves/move";
import { speciesTmMoves } from "#app/data/balance/tms"; import { speciesTmMoves } from "#app/data/balance/tms";
import { pokemonStarters } from "#app/data/balance/pokemon-evolutions"; import { pokemonPrevolutions, pokemonStarters } from "#app/data/balance/pokemon-evolutions";
import { Biome } from "#enums/biome"; import { Biome } from "#enums/biome";
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
@ -1404,7 +1403,12 @@ export default class PokedexUiHandler extends MessageUiHandler {
// Ability filter // Ability filter
const abilities = [species.ability1, species.ability2, species.abilityHidden].map(a => allAbilities[a].name); const abilities = [species.ability1, species.ability2, species.abilityHidden].map(a => allAbilities[a].name);
const passives = starterPassiveAbilities[starterId] ?? ({} as PassiveAbilities); const passiveId = starterPassiveAbilities.hasOwnProperty(species.speciesId)
? species.speciesId
: starterPassiveAbilities.hasOwnProperty(starterId)
? starterId
: pokemonPrevolutions[starterId];
const passives = starterPassiveAbilities[passiveId];
const selectedAbility1 = this.filterText.getValue(FilterTextRow.ABILITY_1); const selectedAbility1 = this.filterText.getValue(FilterTextRow.ABILITY_1);
const fitsFormAbility1 = species.forms.some(form => const fitsFormAbility1 = species.forms.some(form =>