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

Fixed more conflicts from merge

Browse Source
This commit is contained in:
Wlowscha 2025-08-10 18:14:55 +02:00
parent 1e8f06da03
commit e4f236c73a
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,8 @@ import { CustomPokemonData } from "#data/pokemon-data";
import type { PokemonSpecies } from "#data/pokemon-species"; import type { PokemonSpecies } from "#data/pokemon-species";
import { getStatusEffectCatchRateMultiplier } from "#data/status-effect"; import { getStatusEffectCatchRateMultiplier } from "#data/status-effect";
import type { AbilityId } from "#enums/ability-id"; import type { AbilityId } from "#enums/ability-id";
import type { HeldItemId } from "#enums/held-item-id";
import { ChallengeType } from "#enums/challenge-type"; import { ChallengeType } from "#enums/challenge-type";
import type { HeldItemId } from "#enums/held-item-id";
import { PlayerGender } from "#enums/player-gender"; import { PlayerGender } from "#enums/player-gender";
import type { PokeballType } from "#enums/pokeball"; import type { PokeballType } from "#enums/pokeball";
import type { PokemonType } from "#enums/pokemon-type"; import type { PokemonType } from "#enums/pokemon-type";
@ -643,22 +643,17 @@ export async function catchPokemon(
} }
}; };
const addToParty = (slotIndex?: number) => { const addToParty = (slotIndex?: number) => {
pokemon.addToParty(pokeballType, slotIndex); const newPokemon = pokemon.addToParty(pokeballType, slotIndex);
if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === 6) { if (globalScene.getPlayerParty().filter(p => p.isShiny()).length === 6) {
globalScene.validateAchv(achvs.SHINY_PARTY); globalScene.validateAchv(achvs.SHINY_PARTY);
} }
}; globalScene.updateItems(true);
Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => { removePokemon();
const addStatus = new BooleanHolder(true); if (newPokemon) {
applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus); newPokemon.loadAssets().then(end);
if (!addStatus.value) { } else {
removePokemon(); end();
if (newPokemon) { }
newPokemon.loadAssets().then(end);
} else {
end();
}
});
}; };
Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => { Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => {
const addStatus = new BooleanHolder(true); const addStatus = new BooleanHolder(true);

2
src/ui/party-ui-handler.ts
View File

@ -187,7 +187,7 @@ export class PartyUiHandler extends MessageUiHandler {
private lastCursor = 0; private lastCursor = 0;
private lastLeftPokemonCursor = 0; private lastLeftPokemonCursor = 0;
private lastRightPokemonCursor = 0; private lastRightPokemonCursor = 0;
private selectCallback: PartySelectCallback | PokemonItemTransferSelectFilter | null; private selectCallback: PartySelectCallback | PartyItemTransferSelectCallback | null;
private selectFilter: PokemonSelectFilter | PokemonItemTransferSelectFilter; private selectFilter: PokemonSelectFilter | PokemonItemTransferSelectFilter;
private moveSelectFilter: PokemonMoveSelectFilter; private moveSelectFilter: PokemonMoveSelectFilter;
private tmMoveId: MoveId; private tmMoveId: MoveId;

6
src/utils/challenge-utils.ts
View File

@ -8,7 +8,7 @@ import type { MoveId } from "#enums/move-id";
import type { MoveSourceType } from "#enums/move-source-type"; import type { MoveSourceType } from "#enums/move-source-type";
import type { SpeciesId } from "#enums/species-id"; import type { SpeciesId } from "#enums/species-id";
import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
import type { ModifierTypeOption } from "#modifiers/modifier-type"; import type { RewardOption } from "#items/reward";
import type { DexAttrProps } from "#system/game-data"; import type { DexAttrProps } from "#system/game-data";
import { BooleanHolder, type NumberHolder } from "./common"; import { BooleanHolder, type NumberHolder } from "./common";
import { getPokemonSpecies } from "./pokemon-utils"; import { getPokemonSpecies } from "./pokemon-utils";
@ -229,7 +229,7 @@ export function applyChallenges(
*/ */
export function applyChallenges( export function applyChallenges(
challengeType: ChallengeType.SHOP_ITEM, challengeType: ChallengeType.SHOP_ITEM,
shopItem: ModifierTypeOption | null, shopItem: RewardOption | null,
status: BooleanHolder, status: BooleanHolder,
): boolean; ): boolean;
@ -242,7 +242,7 @@ export function applyChallenges(
*/ */
export function applyChallenges( export function applyChallenges(
challengeType: ChallengeType.WAVE_REWARD, challengeType: ChallengeType.WAVE_REWARD,
reward: ModifierTypeOption | null, reward: RewardOption | null,
status: BooleanHolder, status: BooleanHolder,
): boolean; ): boolean;