From 0d4439630da39f056d6c22b0a07f238097ea7686 Mon Sep 17 00:00:00 2001 From: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Date: Fri, 8 Aug 2025 01:02:21 +0200 Subject: [PATCH] Fixed various minor issues --- src/items/all-rewards.ts | 8 ++++---- src/items/init-reward-pools.ts | 4 ---- src/items/reward-pool-utils.ts | 2 +- src/ui/party-ui-handler.ts | 4 ---- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/items/all-rewards.ts b/src/items/all-rewards.ts index 02ba21b4515..19754c9dbc2 100644 --- a/src/items/all-rewards.ts +++ b/src/items/all-rewards.ts @@ -177,13 +177,13 @@ export const allRewards = { // Trainer items - [RewardId.LURE]: new LapsingTrainerItemReward(TrainerItemId.LURE, RewardId.LURE), - [RewardId.SUPER_LURE]: new LapsingTrainerItemReward(TrainerItemId.SUPER_LURE, RewardId.SUPER_LURE), - [RewardId.MAX_LURE]: new LapsingTrainerItemReward(TrainerItemId.MAX_LURE, RewardId.MAX_LURE), + [RewardId.LURE]: new LapsingTrainerItemReward(TrainerItemId.LURE), + [RewardId.SUPER_LURE]: new LapsingTrainerItemReward(TrainerItemId.SUPER_LURE), + [RewardId.MAX_LURE]: new LapsingTrainerItemReward(TrainerItemId.MAX_LURE), [RewardId.TEMP_STAT_STAGE_BOOSTER]: new TempStatStageBoosterRewardGenerator(), - [RewardId.DIRE_HIT]: new LapsingTrainerItemReward(TrainerItemId.DIRE_HIT, RewardId.TEMP_STAT_STAGE_BOOSTER), + [RewardId.DIRE_HIT]: new LapsingTrainerItemReward(TrainerItemId.DIRE_HIT), } as const satisfies { [k in RewardId]: Reward | RewardGenerator; }; diff --git a/src/items/init-reward-pools.ts b/src/items/init-reward-pools.ts index 0517e4421cd..058c3acea8e 100644 --- a/src/items/init-reward-pools.ts +++ b/src/items/init-reward-pools.ts @@ -1,7 +1,3 @@ -/* biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */ -import { initRewards, Reward } from "#items/reward"; -/* biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */ - import { timedEventManager } from "#app/global-event-manager"; import { globalScene } from "#app/global-scene"; import { pokemonEvolutions } from "#balance/pokemon-evolutions"; diff --git a/src/items/reward-pool-utils.ts b/src/items/reward-pool-utils.ts index eb56770060e..aeb4ce3017a 100644 --- a/src/items/reward-pool-utils.ts +++ b/src/items/reward-pool-utils.ts @@ -184,7 +184,7 @@ export function generatePlayerRewardOptions( } // Applies overrides for testing - overridePlayerRewardOptions(options, party); + overridePlayerRewardOptions(options); return options; } diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 1319bf785c6..dd43c5a8776 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -780,10 +780,6 @@ export class PartyUiHandler extends MessageUiHandler { return this.processDiscardMenuInput(pokemon); } - if (this.partyUiMode === PartyUiMode.DISCARD) { - return this.processDiscardMenuInput(pokemon); - } - // options specific to the mode (moves) if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_REWARD) { return this.processRememberMoveModeInput(pokemon);