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

Fix missed merge conflicts

Browse Source
This commit is contained in:
NightKev 2025-06-08 04:38:15 -07:00 committed by GitHub
parent 4a4fe185f4
commit 07e14ac67c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/mystery-encounters/encounters/clowning-around-encounter.ts
View File

@ -467,7 +467,7 @@ function displayYesNoOptions(resolve) {
globalScene.ui.setModeWithoutClear(UiMode.OPTION_SELECT, config, null, true); globalScene.ui.setModeWithoutClear(UiMode.OPTION_SELECT, config, null, true);
} }
function handleRepeatedAbility(resolve, pokemon: PlayerPokemon, ability: Abilities) { function handleRepeatedAbility(resolve, pokemon: PlayerPokemon, ability: AbilityId) {
showEncounterText(`${namespace}:option.1.repeated_ability`); showEncounterText(`${namespace}:option.1.repeated_ability`);
const fullOptions = [ const fullOptions = [
{ {

2
src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
View File

@ -1027,7 +1027,7 @@ export function isPokemonValidForEncounterOptionSelection(
* @param flagAcceptAbility * @param flagAcceptAbility
*/ */
export function applyAbilityOverrideToPokemon(pokemon: Pokemon, ability: Abilities, flagAcceptAbility: boolean) { export function applyAbilityOverrideToPokemon(pokemon: Pokemon, ability: AbilityId, flagAcceptAbility: boolean) {
const isFusion = pokemon.isFusion(); const isFusion = pokemon.isFusion();
const data = isFusion const data = isFusion
? (pokemon.fusionCustomPokemonData ??= new CustomPokemonData()) ? (pokemon.fusionCustomPokemonData ??= new CustomPokemonData())