From 8a4b89d04b5dc7f3fe403160a303024a419c2b24 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Sun, 3 Aug 2025 22:58:52 -0400 Subject: [PATCH] Removed duplicate class member so biome won't yell at meeeeeee --- src/battle-scene.ts | 22 +++------------------- src/ui/party-ui-handler.ts | 1 + 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index f0a544aa6d7..3111641fc74 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -69,8 +69,8 @@ import { HeldItemPoolType, RewardPoolType } from "#enums/reward-pool-type"; import { ShopCursorTarget } from "#enums/shop-cursor-target"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import { TrainerItemId } from "#enums/trainer-item-id"; import { TextStyle } from "#enums/text-style"; +import { TrainerItemId } from "#enums/trainer-item-id"; import type { TrainerSlot } from "#enums/trainer-slot"; import { TrainerType } from "#enums/trainer-type"; import { TrainerVariant } from "#enums/trainer-variant"; @@ -2643,6 +2643,8 @@ export class BattleScene extends SceneBase { this.playSound(soundName); } + // TODO: fix later + // @ts-expect-error if (!reward.shouldApply(params)) { return false; } @@ -2780,7 +2782,6 @@ export class BattleScene extends SceneBase { }); } - // TODO @Wlowscha: Fix this /** * Attempt to discard one or more copies of a held item. @@ -2799,23 +2800,6 @@ export class BattleScene extends SceneBase { return this.removeModifier(itemModifier); } - /** - * Attempt to discard one or more copies of a held item. - * @param itemModifier - The {@linkcode PokemonHeldItemModifier} being discarded - * @param discardQuantity - The number of copies to remove (up to the amount currently held); default `1` - * @returns Whether the item was successfully discarded. - * Removing fewer items than requested is still considered a success. - */ - tryDiscardHeldItemModifier(itemModifier: PokemonHeldItemModifier, discardQuantity = 1): boolean { - const countTaken = Math.min(discardQuantity, itemModifier.stackCount); - itemModifier.stackCount -= countTaken; - - if (itemModifier.stackCount > 0) { - return true; - } - - return this.removeModifier(itemModifier); - } canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean { const mod = itemModifier.clone() as PokemonHeldItemModifier; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 20096719198..d87de6998d6 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -2160,6 +2160,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { * @remarks * This will also reveal the button if it is currently hidden. */ + // TODO: Reminder to fix public toggleIcon(partyMode: PartyUiMode.MODIFIER_TRANSFER | PartyUiMode.DISCARD): void { this.setActive(true).setVisible(true); switch (partyMode) {